diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-12-14 12:43:49 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-12-14 12:43:49 +0100 |
| commit | b2aa77f811dc0dd257afe3fccac49c62fcf039b2 (patch) | |
| tree | 11079887422b8de732df38ca9fb678edd8cfb568 /src/proj_4D_api.c | |
| parent | 93d0daa96287e14ec7fa38c9185fe8e3866243db (diff) | |
| download | PROJ-b2aa77f811dc0dd257afe3fccac49c62fcf039b2.tar.gz PROJ-b2aa77f811dc0dd257afe3fccac49c62fcf039b2.zip | |
C API: rename recently added _unref and _free functions as _destroy (fixes #1198)
Diffstat (limited to 'src/proj_4D_api.c')
| -rw-r--r-- | src/proj_4D_api.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/proj_4D_api.c b/src/proj_4D_api.c index 6ba56764..75a061a0 100644 --- a/src/proj_4D_api.c +++ b/src/proj_4D_api.c @@ -758,14 +758,14 @@ PJ *proj_create_crs_to_crs (PJ_CONTEXT *ctx, const char *source_crs, const char dst = proj_obj_create_from_user_input(ctx, target_crs, optionsImportCRS); if( !dst ) { - proj_obj_unref(src); + proj_obj_destroy(src); return NULL; } operation_ctx = proj_create_operation_factory_context(ctx, NULL); if( !operation_ctx ) { - proj_obj_unref(src); - proj_obj_unref(dst); + proj_obj_destroy(src); + proj_obj_destroy(dst); return NULL; } @@ -784,28 +784,28 @@ PJ *proj_create_crs_to_crs (PJ_CONTEXT *ctx, const char *source_crs, const char op_list = proj_obj_create_operations(ctx, src, dst, operation_ctx); - proj_operation_factory_context_unref(operation_ctx); - proj_obj_unref(src); - proj_obj_unref(dst); + proj_operation_factory_context_destroy(operation_ctx); + proj_obj_destroy(src); + proj_obj_destroy(dst); if( !op_list ) { return NULL; } if( proj_obj_list_get_count(op_list) == 0 ) { - proj_obj_list_unref(op_list); + proj_obj_list_destroy(op_list); return NULL; } op = proj_obj_list_get(ctx, op_list, 0); - proj_obj_list_unref(op_list); + proj_obj_list_destroy(op_list); if( !op ) { return NULL; } proj_string = proj_obj_as_proj_string(ctx, op, PJ_PROJ_5, NULL); if( !proj_string) { - proj_obj_unref(op); + proj_obj_destroy(op); return NULL; } @@ -816,7 +816,7 @@ PJ *proj_create_crs_to_crs (PJ_CONTEXT *ctx, const char *source_crs, const char P = proj_create(ctx, proj_string); } - proj_obj_unref(op); + proj_obj_destroy(op); return P; } |
