aboutsummaryrefslogtreecommitdiff
path: root/src/ctx.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-11-12 13:33:47 +0100
committerEven Rouault <even.rouault@spatialys.com>2019-11-12 13:33:47 +0100
commit9a23a23ef20f6f5bd10e5dd4b16fa6c03ba40895 (patch)
tree8f6c70734731108d66e6219d0ef4ab27e23d328a /src/ctx.cpp
parentca2ab9ed24101b6bd4bdec6791deca3f7d5ad204 (diff)
downloadPROJ-9a23a23ef20f6f5bd10e5dd4b16fa6c03ba40895.tar.gz
PROJ-9a23a23ef20f6f5bd10e5dd4b16fa6c03ba40895.zip
Fix proj_assign_context()/pj_set_ctx() with pipelines and alternative coord operations
Fixes https://github.com/OSGeo/gdal/issues/1989 pj_set_ctx() only changes the context to the main object. It should also recurse down to the steps of the pipeline and the alternative coordinate operations hold in alternativeCoordinateOperations In the GDAL use case with multithreaded reprojection, and objects being transferred between thread, this would cause a failed coordinate transformation to affect an unrelated transformation of another thread...
Diffstat (limited to 'src/ctx.cpp')
-rw-r--r--src/ctx.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ctx.cpp b/src/ctx.cpp
index 622a814d..bcb6e1cc 100644
--- a/src/ctx.cpp
+++ b/src/ctx.cpp
@@ -60,6 +60,14 @@ void pj_set_ctx( projPJ pj, projCtx ctx )
if (pj==nullptr)
return;
pj->ctx = ctx;
+ if( pj->is_pipeline )
+ {
+ pj_pipeline_assign_context_to_steps(pj, ctx);
+ }
+ for( const auto &alt: pj->alternativeCoordinateOperations )
+ {
+ pj_set_ctx(alt.pj, ctx);
+ }
}
/************************************************************************/