From a2fd4206924fedc96c3fd12607fb61e84c4841c0 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 26 Dec 2018 12:34:47 +0100 Subject: Remove PJ_OBJ type since it is now merged into PJ --- src/init.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/init.cpp') diff --git a/src/init.cpp b/src/init.cpp index 4274f5b4..bc5f6dcb 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -272,7 +272,7 @@ Expand key from buffer or (if not in buffer) from init file if( !exists ) { const char* const optionsProj4Mode[] = { "USE_PROJ4_INIT_RULES=YES", nullptr }; char szInitStr[7 + 64]; - PJ_OBJ* src; + PJ* src; const char* proj_string; pj_ctx_set_errno( ctx, 0 ); @@ -294,7 +294,7 @@ Expand key from buffer or (if not in buffer) from init file proj_string = proj_obj_as_proj_string(ctx, src, PJ_PROJ_4, nullptr); if( !proj_string ) { - proj_obj_destroy(src); + proj_destroy(src); return nullptr; } definition = (char*)calloc(1, strlen(proj_string)+1); @@ -302,7 +302,7 @@ Expand key from buffer or (if not in buffer) from init file strcpy(definition, proj_string); } - proj_obj_destroy(src); + proj_destroy(src); } } -- 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/init.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/init.cpp') diff --git a/src/init.cpp b/src/init.cpp index bc5f6dcb..85c59d58 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -40,7 +40,7 @@ #include "proj.h" #include "proj_internal.h" #include "proj_math.h" -#include "projects.h" +#include "proj_internal.h" /**************************************************************************************/ -- cgit v1.2.3 From 0e0e0e475414ddeb75e0e140d8a3381a431036d9 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 28 Dec 2018 11:00:50 +0100 Subject: Rename proj_obj_XXX as proj_XXX and PJ_OBJ_XXX as PJ_XXX --- src/init.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/init.cpp') diff --git a/src/init.cpp b/src/init.cpp index 85c59d58..2ed34a09 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -287,12 +287,12 @@ Expand key from buffer or (if not in buffer) from init file strcpy(szInitStr, "+init="); strcat(szInitStr, xkey); - src = proj_obj_create_from_user_input(ctx, szInitStr, optionsProj4Mode); + src = proj_create_from_user_input(ctx, szInitStr, optionsProj4Mode); if( !src ) { return nullptr; } - proj_string = proj_obj_as_proj_string(ctx, src, PJ_PROJ_4, nullptr); + proj_string = proj_as_proj_string(ctx, src, PJ_PROJ_4, nullptr); if( !proj_string ) { proj_destroy(src); return nullptr; -- cgit v1.2.3