aboutsummaryrefslogtreecommitdiff
path: root/src/init.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2018-12-26 12:34:47 +0100
committerEven Rouault <even.rouault@spatialys.com>2018-12-30 17:37:56 +0100
commita2fd4206924fedc96c3fd12607fb61e84c4841c0 (patch)
tree23c39e6d29526ce7532ba8c97181640c74b6a12c /src/init.cpp
parent53a81c447114ee34b744c01ae2656cce0f250a9c (diff)
downloadPROJ-a2fd4206924fedc96c3fd12607fb61e84c4841c0.tar.gz
PROJ-a2fd4206924fedc96c3fd12607fb61e84c4841c0.zip
Remove PJ_OBJ type since it is now merged into PJ
Diffstat (limited to 'src/init.cpp')
-rw-r--r--src/init.cpp6
1 files changed, 3 insertions, 3 deletions
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);
}
}