Fix selective masking causes features to bleed outside layout map

Fixes qgis#53542
nyalldawson · Jun 28, 2024 · e746797 · e746797
1 parent 76a12b9
commit e746797
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 0 deletions.
diff --git a/src/core/maprenderer/qgsmaprendererjob.cpp b/src/core/maprenderer/qgsmaprendererjob.cpp
@@ -878,6 +878,12 @@ std::vector< LayerRenderJob > QgsMapRendererJob::prepareSecondPassJobs( std::vec
     {
       PictureAndPainter pictureAndPainter = allocatePictureAndPainter( job.context() );
       job.picture = std::move( pictureAndPainter.first );
+      if ( job.context()->painter()->hasClipping() )
+      {
+        // need to copy clipping paths from original painter, so that e.g. the layout map bounds clipping path is respected
+        pictureAndPainter.second->setClipping( true );
+        pictureAndPainter.second->setClipPath( job.context()->painter()->clipPath() );
+      }
       job.context()->setPainter( pictureAndPainter.second );
       // force recreation of layer renderer so it initialize correctly the renderer
       // especially the RasterLayerRender that need logicalDpiX from painting device
@@ -955,6 +961,12 @@ std::vector< LayerRenderJob > QgsMapRendererJob::prepareSecondPassJobs( std::vec
     else
     {
       PictureAndPainter pictureAndPainter = allocatePictureAndPainter( job2.context() );
+      if ( job.context()->painter()->hasClipping() )
+      {
+        // need to copy clipping paths from original painter, so that e.g. the layout map bounds clipping path is respected
+        pictureAndPainter.second->setClipping( true );
+        pictureAndPainter.second->setClipPath( job.context()->painter()->clipPath() );
+      }
       job2.picture = std::move( pictureAndPainter.first );
       job2.context()->setPainter( pictureAndPainter.second );
     }

diff --git a/tests/testdata/control_images/selective_masking/layout_export/layout_export.png b/tests/testdata/control_images/selective_masking/layout_export/layout_export.png
diff --git a/.../testdata/control_images/selective_masking/layout_export/layout_export_mask.png b/.../testdata/control_images/selective_masking/layout_export/layout_export_mask.png
diff --git a/...ive_masking/layout_export_2_sources_masking/layout_export_2_sources_masking.png b/...ive_masking/layout_export_2_sources_masking/layout_export_2_sources_masking.png
diff --git a/...asking/layout_export_2_sources_masking/layout_export_2_sources_masking_mask.png b/...asking/layout_export_2_sources_masking/layout_export_2_sources_masking_mask.png
diff --git a/...masking/layout_export_force_raster_render/layout_export_force_raster_render.png b/...masking/layout_export_force_raster_render/layout_export_force_raster_render.png
diff --git a/...ng/layout_export_force_raster_render/layout_export_force_raster_render_mask.png b/...ng/layout_export_force_raster_render/layout_export_force_raster_render_mask.png
diff --git a/...selective_masking/layout_export_marker_masking/layout_export_marker_masking.png b/...selective_masking/layout_export_marker_masking/layout_export_marker_masking.png
diff --git a/...tive_masking/layout_export_marker_masking/layout_export_marker_masking_mask.png b/...tive_masking/layout_export_marker_masking/layout_export_marker_masking_mask.png
diff --git a/...e_masking/layout_export_svg_marker_masking/layout_export_svg_marker_masking.png b/...e_masking/layout_export_svg_marker_masking/layout_export_svg_marker_masking.png
diff --git a/...king/layout_export_svg_marker_masking/layout_export_svg_marker_masking_mask.png b/...king/layout_export_svg_marker_masking/layout_export_svg_marker_masking_mask.png
diff --git a/...images/selective_masking/layout_export_w_raster/layout_export_w_raster_mask.png b/...images/selective_masking/layout_export_w_raster/layout_export_w_raster_mask.png