aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-09-05 14:23:07 +0200
committerGitHub <noreply@github.com>2019-09-05 14:23:07 +0200
commit87c90fcaa8d6963aa1a85f3cb2360e49b76da09e (patch)
treedc1ba41205fe3c78eef6bda0400f35b8c9576f4a /src
parentba0c3c3bf8c565b6a672659cb372da89a6b9bcb6 (diff)
parent75aa2e9d036b8039880e48f2dbaf8dba7e2b3f15 (diff)
downloadPROJ-87c90fcaa8d6963aa1a85f3cb2360e49b76da09e.tar.gz
PROJ-87c90fcaa8d6963aa1a85f3cb2360e49b76da09e.zip
Merge pull request #1586 from OSGeo/backport-1583-to-6.2
[Backport 6.2] proj_create_crs_to_crs_from_pj(): make the PJ* arguments const PJ*
Diffstat (limited to 'src')
-rw-r--r--src/4D_api.cpp4
-rw-r--r--src/proj.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/4D_api.cpp b/src/4D_api.cpp
index 3a9582e6..ffef8d81 100644
--- a/src/4D_api.cpp
+++ b/src/4D_api.cpp
@@ -946,7 +946,7 @@ static PJ* add_coord_op_to_list(PJ* op,
}
/*****************************************************************************/
-static PJ* create_operation_to_base_geog_crs(PJ_CONTEXT* ctx, PJ* crs) {
+static PJ* create_operation_to_base_geog_crs(PJ_CONTEXT* ctx, const PJ* crs) {
/*****************************************************************************/
// Create a geographic 2D long-lat degrees CRS that is related to the
// CRS
@@ -1052,7 +1052,7 @@ PJ *proj_create_crs_to_crs (PJ_CONTEXT *ctx, const char *source_crs, const char
}
/*****************************************************************************/
-PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, PJ *source_crs, PJ *target_crs, PJ_AREA *area, const char* const *) {
+PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, const PJ *target_crs, PJ_AREA *area, const char* const *) {
/******************************************************************************
Create a transformation pipeline between two known coordinate reference
systems.
diff --git a/src/proj.h b/src/proj.h
index 14d315b5..7a47f043 100644
--- a/src/proj.h
+++ b/src/proj.h
@@ -358,8 +358,8 @@ PJ PROJ_DLL *proj_create (PJ_CONTEXT *ctx, const char *definition);
PJ PROJ_DLL *proj_create_argv (PJ_CONTEXT *ctx, int argc, char **argv);
PJ PROJ_DLL *proj_create_crs_to_crs(PJ_CONTEXT *ctx, const char *source_crs, const char *target_crs, PJ_AREA *area);
PJ PROJ_DLL *proj_create_crs_to_crs_from_pj(PJ_CONTEXT *ctx,
- PJ *source_crs,
- PJ *target_crs,
+ const PJ *source_crs,
+ const PJ *target_crs,
PJ_AREA *area,
const char* const *options);
PJ PROJ_DLL *proj_normalize_for_visualization(PJ_CONTEXT *ctx, const PJ* obj);