diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-03-17 14:56:50 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2021-03-17 14:56:50 +0100 |
| commit | cbbf3d60407ba4e9ed4c8586b4cce9c421e08f16 (patch) | |
| tree | fd3d555479ea516a10d04c5bd5ea772b2496511f /src/4D_api.cpp | |
| parent | 1b07ef00c55525420cfbc9467016959e709e6862 (diff) | |
| download | PROJ-cbbf3d60407ba4e9ed4c8586b4cce9c421e08f16.tar.gz PROJ-cbbf3d60407ba4e9ed4c8586b4cce9c421e08f16.zip | |
Fix proj_clone() to work on 'meta' coordinate operation PJ* objects that can be returned by proj_create_crs_to_crs()
Diffstat (limited to 'src/4D_api.cpp')
| -rw-r--r-- | src/4D_api.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/4D_api.cpp b/src/4D_api.cpp index 9c5b45f5..4ef9b616 100644 --- a/src/4D_api.cpp +++ b/src/4D_api.cpp @@ -203,7 +203,7 @@ double proj_roundtrip (PJ *P, PJ_DIRECTION direction, int n, PJ_COORD *coord) { /**************************************************************************************/ int pj_get_suggested_operation(PJ_CONTEXT*, - const std::vector<CoordOperation>& opList, + const std::vector<PJCoordOperation>& opList, const int iExcluded[2], PJ_DIRECTION direction, PJ_COORD coord) @@ -1034,7 +1034,7 @@ static PJ* add_coord_op_to_list( PJ* pjGeogToSrc, PJ* pjGeogToDst, bool isOffshore, - std::vector<CoordOperation>& altCoordOps) { + std::vector<PJCoordOperation>& altCoordOps) { /*****************************************************************************/ double minxSrc; @@ -1193,7 +1193,7 @@ PJ *proj_create_crs_to_crs (PJ_CONTEXT *ctx, const char *source_crs, const char /*****************************************************************************/ -std::vector<CoordOperation> pj_create_prepared_operations(PJ_CONTEXT *ctx, +std::vector<PJCoordOperation> pj_create_prepared_operations(PJ_CONTEXT *ctx, const PJ *source_crs, const PJ *target_crs, PJ_OBJ_LIST* op_list) @@ -1218,7 +1218,7 @@ std::vector<CoordOperation> pj_create_prepared_operations(PJ_CONTEXT *ctx, try { - std::vector<CoordOperation> preparedOpList; + std::vector<PJCoordOperation> preparedOpList; // Iterate over source->target candidate transformations and reproject // their long-lat bounding box into the source CRS. @@ -1407,6 +1407,7 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons P->alternativeCoordinateOperations = std::move(preparedOpList); // The returned P is rather dummy + P->descr = "Set of coordinate operations"; P->iso_obj = nullptr; P->fwd = nullptr; P->inv = nullptr; |