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/nad_init.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/nad_init.cpp')
| -rw-r--r-- | src/nad_init.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/nad_init.cpp b/src/nad_init.cpp index b29f7f0e..d9701e70 100644 --- a/src/nad_init.cpp +++ b/src/nad_init.cpp @@ -74,9 +74,10 @@ static void swap_words( void *data_in, int word_size, int word_count ) /* Load the data portion of a ctable formatted grid. */ /************************************************************************/ -int nad_ctable_load( projCtx ctx, struct CTABLE *ct, PAFile fid ) +int nad_ctable_load( projCtx ctx, struct CTABLE *ct, struct projFileAPI_t* fileapi ) { + PAFile fid = (PAFile)fileapi; size_t a_size; pj_ctx_fseek( ctx, fid, sizeof(struct CTABLE), SEEK_SET ); @@ -105,8 +106,9 @@ int nad_ctable_load( projCtx ctx, struct CTABLE *ct, PAFile fid ) /* Read the header portion of a "ctable" format grid. */ /************************************************************************/ -struct CTABLE *nad_ctable_init( projCtx ctx, PAFile fid ) +struct CTABLE *nad_ctable_init( projCtx ctx, struct projFileAPI_t* fileapi ) { + PAFile fid = (PAFile)fileapi; struct CTABLE *ct; int id_end; @@ -149,9 +151,10 @@ struct CTABLE *nad_ctable_init( projCtx ctx, PAFile fid ) /* Load the data portion of a ctable2 formatted grid. */ /************************************************************************/ -int nad_ctable2_load( projCtx ctx, struct CTABLE *ct, PAFile fid ) +int nad_ctable2_load( projCtx ctx, struct CTABLE *ct, struct projFileAPI_t* fileapi ) { + PAFile fid = (PAFile)fileapi; size_t a_size; pj_ctx_fseek( ctx, fid, 160, SEEK_SET ); @@ -189,8 +192,9 @@ int nad_ctable2_load( projCtx ctx, struct CTABLE *ct, PAFile fid ) /* Read the header portion of a "ctable2" format grid. */ /************************************************************************/ -struct CTABLE *nad_ctable2_init( projCtx ctx, PAFile fid ) +struct CTABLE *nad_ctable2_init( projCtx ctx, struct projFileAPI_t* fileapi ) { + PAFile fid = (PAFile)fileapi; struct CTABLE *ct; int id_end; char header[160]; @@ -275,10 +279,10 @@ struct CTABLE *nad_init(projCtx ctx, char *name) return nullptr; } - ct = nad_ctable_init( ctx, fid ); + ct = nad_ctable_init( ctx, (struct projFileAPI_t*)fid ); if( ct != nullptr ) { - if( !nad_ctable_load( ctx, ct, fid ) ) + if( !nad_ctable_load( ctx, ct, (struct projFileAPI_t*)fid ) ) { nad_free( ct ); ct = nullptr; |