From 9a23a23ef20f6f5bd10e5dd4b16fa6c03ba40895 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 12 Nov 2019 13:33:47 +0100 Subject: 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... --- src/pipeline.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/pipeline.cpp') diff --git a/src/pipeline.cpp b/src/pipeline.cpp index a82fce31..847f8194 100644 --- a/src/pipeline.cpp +++ b/src/pipeline.cpp @@ -136,7 +136,11 @@ static PJ_LPZ pipeline_reverse_3d (PJ_XYZ xyz, PJ *P); static PJ_XY pipeline_forward (PJ_LP lp, PJ *P); static PJ_LP pipeline_reverse (PJ_XY xy, PJ *P); - +void pj_pipeline_assign_context_to_steps( PJ* P, PJ_CONTEXT* ctx ) +{ + for (int i = 1; i <= static_cast(P->opaque)->steps; i++) + proj_assign_context(static_cast(P->opaque)->pipeline[i], ctx); +} static PJ_COORD pipeline_forward_4d (PJ_COORD point, PJ *P) { -- cgit v1.2.3