diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-12-26 15:16:46 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-12-30 21:48:56 +0100 |
| commit | 62b9e04cd32587b10bfac2051d3b259f3233e7b2 (patch) | |
| tree | 7b7846443b6cefa2c00620d71dfce5955b65ce26 /src/gridinfo.cpp | |
| parent | 8ab6f683cd316acf57bb89ed83932a267c5aa3c2 (diff) | |
| download | PROJ-62b9e04cd32587b10bfac2051d3b259f3233e7b2.tar.gz PROJ-62b9e04cd32587b10bfac2051d3b259f3233e7b2.zip | |
proj_internal.h: remove use of proj_api.h specific structures
Diffstat (limited to 'src/gridinfo.cpp')
| -rw-r--r-- | src/gridinfo.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gridinfo.cpp b/src/gridinfo.cpp index 1a0bc16a..14759557 100644 --- a/src/gridinfo.cpp +++ b/src/gridinfo.cpp @@ -121,7 +121,7 @@ void pj_gridinfo_free( projCtx ctx, PJ_GRIDINFO *gi ) /* stuff are loaded by pj_gridinfo_init(). */ /************************************************************************/ -int pj_gridinfo_load( projCtx ctx, PJ_GRIDINFO *gi ) +int pj_gridinfo_load( projCtx_t* ctx, PJ_GRIDINFO *gi ) { struct CTABLE ct_tmp; @@ -155,7 +155,7 @@ int pj_gridinfo_load( projCtx ctx, PJ_GRIDINFO *gi ) return 0; } - result = nad_ctable_load( ctx, &ct_tmp, fid ); + result = nad_ctable_load( ctx, &ct_tmp, (struct projFileAPI_t*)fid ); pj_ctx_fclose( ctx, fid ); @@ -182,7 +182,7 @@ int pj_gridinfo_load( projCtx ctx, PJ_GRIDINFO *gi ) return 0; } - result = nad_ctable2_load( ctx, &ct_tmp, fid ); + result = nad_ctable2_load( ctx, &ct_tmp, (struct projFileAPI_t*)fid ); pj_ctx_fclose( ctx, fid ); @@ -941,7 +941,7 @@ PJ_GRIDINFO *pj_gridinfo_init( projCtx ctx, const char *gridname ) else if( header_size >= 9 && strncmp(header + 0,"CTABLE V2",9) == 0 ) { - struct CTABLE *ct = nad_ctable2_init( ctx, fp ); + struct CTABLE *ct = nad_ctable2_init( ctx, (struct projFileAPI_t*)fp ); gilist->format = "ctable2"; gilist->ct = ct; @@ -965,7 +965,7 @@ PJ_GRIDINFO *pj_gridinfo_init( projCtx ctx, const char *gridname ) else { - struct CTABLE *ct = nad_ctable_init( ctx, fp ); + struct CTABLE *ct = nad_ctable_init( ctx, (struct projFileAPI_t*)fp ); if (ct == nullptr) { pj_log( ctx, PJ_LOG_DEBUG_MAJOR, |