diff options
| -rw-r--r-- | src/iso19111/c_api.cpp | 8 | ||||
| -rw-r--r-- | src/proj.h | 2 | ||||
| -rw-r--r-- | test/unit/test_c_api.cpp | 16 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp index 5982da47..c205d039 100644 --- a/src/iso19111/c_api.cpp +++ b/src/iso19111/c_api.cpp @@ -1969,7 +1969,7 @@ void proj_get_crs_list_parameters_destroy(PROJ_CRS_LIST_PARAMETERS *params) { * criteria. * * The returned object is an array of PROJ_CRS_INFO* pointers, whose last - * entry is NULL. This array should be freed with proj_crs_list_destroy() + * entry is NULL. This array should be freed with proj_crs_info_list_destroy() * * When no filter parameters are set, this is functionnaly equivalent to * proj_get_crs_info_list_from_database(), instanciating a PJ* object for each @@ -1985,7 +1985,7 @@ void proj_get_crs_list_parameters_destroy(PROJ_CRS_LIST_PARAMETERS *params) { * @param out_result_count Output parameter pointing to an integer to receive * the size of the result list. Might be NULL * @return an array of PROJ_CRS_INFO* pointers to be freed with - * proj_crs_list_destroy(), or NULL in case of error. + * proj_crs_info_list_destroy(), or NULL in case of error. */ PROJ_CRS_INFO ** proj_get_crs_info_list_from_database(PJ_CONTEXT *ctx, const char *auth_name, @@ -2115,7 +2115,7 @@ proj_get_crs_info_list_from_database(PJ_CONTEXT *ctx, const char *auth_name, proj_log_error(ctx, __FUNCTION__, e.what()); if (ret) { ret[i + 1] = nullptr; - proj_crs_list_destroy(ret); + proj_crs_info_list_destroy(ret); } if (out_result_count) *out_result_count = 0; @@ -2128,7 +2128,7 @@ proj_get_crs_info_list_from_database(PJ_CONTEXT *ctx, const char *auth_name, /** \brief Destroy the result returned by * proj_get_crs_info_list_from_database(). */ -void proj_crs_list_destroy(PROJ_CRS_INFO **list) { +void proj_crs_info_list_destroy(PROJ_CRS_INFO **list) { if (list) { for (int i = 0; list[i] != nullptr; i++) { pj_dalloc(list[i]->auth_name); @@ -853,7 +853,7 @@ PROJ_CRS_INFO PROJ_DLL **proj_get_crs_info_list_from_database( const PROJ_CRS_LIST_PARAMETERS* params, int *out_result_count); -void PROJ_DLL proj_crs_list_destroy(PROJ_CRS_INFO** list); +void PROJ_DLL proj_crs_info_list_destroy(PROJ_CRS_INFO** list); /* ------------------------------------------------------------------------- */ diff --git a/test/unit/test_c_api.cpp b/test/unit/test_c_api.cpp index be43f715..8ef426ac 100644 --- a/test/unit/test_c_api.cpp +++ b/test/unit/test_c_api.cpp @@ -3025,7 +3025,7 @@ TEST_F(CApi, proj_create_cartesian_2D_cs) { // --------------------------------------------------------------------------- TEST_F(CApi, proj_get_crs_info_list_from_database) { - { proj_crs_list_destroy(nullptr); } + { proj_crs_info_list_destroy(nullptr); } { proj_get_crs_list_parameters_destroy(nullptr); } @@ -3038,7 +3038,7 @@ TEST_F(CApi, proj_get_crs_info_list_from_database) { EXPECT_NE(list[0]->auth_name, nullptr); EXPECT_NE(list[0]->code, nullptr); EXPECT_NE(list[0]->name, nullptr); - proj_crs_list_destroy(list); + proj_crs_info_list_destroy(list); } // Default parameters @@ -3098,7 +3098,7 @@ TEST_F(CApi, proj_get_crs_info_list_from_database) { EXPECT_TRUE(found32631); EXPECT_TRUE(found3855); EXPECT_TRUE(found3901); - proj_crs_list_destroy(list); + proj_crs_info_list_destroy(list); } // Filter on only geodetic crs @@ -3125,7 +3125,7 @@ TEST_F(CApi, proj_get_crs_info_list_from_database) { EXPECT_TRUE(foundGeog3D); EXPECT_TRUE(foundGeocentric); proj_get_crs_list_parameters_destroy(params); - proj_crs_list_destroy(list); + proj_crs_info_list_destroy(list); } // Filter on only geographic crs @@ -3148,7 +3148,7 @@ TEST_F(CApi, proj_get_crs_info_list_from_database) { EXPECT_TRUE(foundGeog2D); EXPECT_TRUE(foundGeog3D); proj_get_crs_list_parameters_destroy(params); - proj_crs_list_destroy(list); + proj_crs_info_list_destroy(list); } // Filter on only geographic 2D crs and projected CRS @@ -3172,7 +3172,7 @@ TEST_F(CApi, proj_get_crs_info_list_from_database) { EXPECT_TRUE(foundGeog2D); EXPECT_TRUE(foundProjected); proj_get_crs_list_parameters_destroy(params); - proj_crs_list_destroy(list); + proj_crs_info_list_destroy(list); } // Filter on bbox (inclusion) @@ -3198,7 +3198,7 @@ TEST_F(CApi, proj_get_crs_info_list_from_database) { EXPECT_GE(list[i]->north_lat_degree, params->north_lat_degree); } proj_get_crs_list_parameters_destroy(params); - proj_crs_list_destroy(list); + proj_crs_info_list_destroy(list); } // Filter on bbox (intersection) @@ -3225,7 +3225,7 @@ TEST_F(CApi, proj_get_crs_info_list_from_database) { EXPECT_GE(list[i]->north_lat_degree, params->south_lat_degree); } proj_get_crs_list_parameters_destroy(params); - proj_crs_list_destroy(list); + proj_crs_info_list_destroy(list); } } } // namespace |