From 1b1d60e83a20412aeca3e440705df820979af03b Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 26 Dec 2018 14:22:34 +0100 Subject: projects.h: remove deprecated XY, XYZ, LP, LPZ, UV, UVW, projUV and projUVW structures --- src/nad_init.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nad_init.cpp') diff --git a/src/nad_init.cpp b/src/nad_init.cpp index 1e2b150d..695fa973 100644 --- a/src/nad_init.cpp +++ b/src/nad_init.cpp @@ -33,6 +33,7 @@ #include #include +#include "proj.h" #include "projects.h" /************************************************************************/ -- cgit v1.2.3 From 8ab6f683cd316acf57bb89ed83932a267c5aa3c2 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 26 Dec 2018 14:58:26 +0100 Subject: Merge projects.h into proj_internal.h --- src/nad_init.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nad_init.cpp') diff --git a/src/nad_init.cpp b/src/nad_init.cpp index 695fa973..b29f7f0e 100644 --- a/src/nad_init.cpp +++ b/src/nad_init.cpp @@ -34,7 +34,7 @@ #include #include "proj.h" -#include "projects.h" +#include "proj_internal.h" /************************************************************************/ /* swap_words() */ -- cgit v1.2.3 From 62b9e04cd32587b10bfac2051d3b259f3233e7b2 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 26 Dec 2018 15:16:46 +0100 Subject: proj_internal.h: remove use of proj_api.h specific structures --- src/nad_init.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/nad_init.cpp') 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; -- cgit v1.2.3