diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-10-11 11:04:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-11 11:04:46 +0200 |
| commit | 5e66226efb1d0900b463e71197a9a271a4180606 (patch) | |
| tree | c60194297df45949102a9cd9d17a1be229041c8b | |
| parent | d1d3d4b9db20d440ce17ae4e9a61c632bd95be06 (diff) | |
| parent | f080fc81167f7b091252c24828c288884ffdbfba (diff) | |
| download | PROJ-5e66226efb1d0900b463e71197a9a271a4180606.tar.gz PROJ-5e66226efb1d0900b463e71197a9a271a4180606.zip | |
Merge pull request #1144 from rouault/ntv1_fix
NTv1 grid shift: fix file offset for reading of shift values in ntv1_can.dat
| -rw-r--r-- | src/pj_gridinfo.c | 4 | ||||
| -rw-r--r-- | test/old/td_out.dist | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/pj_gridinfo.c b/src/pj_gridinfo.c index f201f39e..de0e8d31 100644 --- a/src/pj_gridinfo.c +++ b/src/pj_gridinfo.c @@ -660,7 +660,7 @@ static int pj_gridinfo_init_ntv2( projCtx ctx, PAFile fid, PJ_GRIDINFO *gilist ) static int pj_gridinfo_init_ntv1( projCtx ctx, PAFile fid, PJ_GRIDINFO *gi ) { - unsigned char header[176]; + unsigned char header[192]; /* 12 records of 16 bytes */ struct CTABLE *ct; LP ur; @@ -731,7 +731,7 @@ static int pj_gridinfo_init_ntv1( projCtx ctx, PAFile fid, PJ_GRIDINFO *gi ) ct->cvs = NULL; gi->ct = ct; - gi->grid_offset = pj_ctx_ftell( ctx, fid ); + gi->grid_offset = (long) sizeof(header); gi->format = "ntv1"; return 1; diff --git a/test/old/td_out.dist b/test/old/td_out.dist index 060d14d2..f6b2a219 100644 --- a/test/old/td_out.dist +++ b/test/old/td_out.dist @@ -1,6 +1,6 @@ ############################################################## 1st through ntv1, 2nd through conus -111d00'00.000"W 44d00'00.000"N 0.0 111d0'3.085"W 43d59'59.756"N 0.000 +111d00'00.000"W 44d00'00.000"N 0.0 111d0'3.208"W 43d59'59.732"N 0.000 111d00'00.000"W 39d00'00.000"N 0.0 111d0'2.604"W 38d59'59.912"N 0.000 ############################################################## As above, but without ntv1 everything goes through conus file. |