diff --git a/src/core/labeling/qgslabelingengine.cpp b/src/core/labeling/qgslabelingengine.cpp index e7b59589f172..92ef738fa2b0 100644 --- a/src/core/labeling/qgslabelingengine.cpp +++ b/src/core/labeling/qgslabelingengine.cpp @@ -270,8 +270,8 @@ void QgsLabelingEngine::registerLabels( QgsRenderContext &context ) mPal = qgis::make_unique< pal::Pal >(); - mPal->setMaximumLineCandidatesPerMapUnit( context.labelingEngine()->engineSettings().maximumLineCandidatesPerCm() / context.convertToMapUnits( 10, QgsUnitTypes::RenderMillimeters ) ); - mPal->setMaximumPolygonCandidatesPerMapUnitSquared( context.labelingEngine()->engineSettings().maximumPolygonCandidatesPerCmSquared() / std::pow( context.convertToMapUnits( 10, QgsUnitTypes::RenderMillimeters ), 2 ) ); + mPal->setMaximumLineCandidatesPerMapUnit( settings.maximumLineCandidatesPerCm() / context.convertToMapUnits( 10, QgsUnitTypes::RenderMillimeters ) ); + mPal->setMaximumPolygonCandidatesPerMapUnitSquared( settings.maximumPolygonCandidatesPerCmSquared() / std::pow( context.convertToMapUnits( 10, QgsUnitTypes::RenderMillimeters ), 2 ) ); mPal->setShowPartialLabels( settings.testFlag( QgsLabelingEngineSettings::UsePartialCandidates ) ); mPal->setPlacementVersion( settings.placementVersion() ); diff --git a/tests/src/python/test_qgsproject.py b/tests/src/python/test_qgsproject.py index 44a55ee17150..356c8b38da6c 100644 --- a/tests/src/python/test_qgsproject.py +++ b/tests/src/python/test_qgsproject.py @@ -1125,7 +1125,7 @@ def testPalPropertiesReadWrite(self): tmpFile = "{}/project.qgs".format(tmpDir.path()) s0 = QgsLabelingEngineSettings() - s0.setNumCandidatePositions(3, 33, 333) + s0.setMaximumLineCandidatesPerCm(33) p0 = QgsProject() p0.setFileName(tmpFile) @@ -1136,11 +1136,7 @@ def testPalPropertiesReadWrite(self): p1.read(tmpFile) s1 = p1.labelingEngineSettings() - candidates = s1.numCandidatePositions() - - self.assertEqual(candidates[0], 3) - self.assertEqual(candidates[1], 33) - self.assertEqual(candidates[2], 333) + self.assertEqual(s1.maximumLineCandidatesPerCm(), 33) def testLayerChangeDirtiesProject(self): """ diff --git a/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_above/sp_curved_placement_above.png b/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_above/v1/sp_curved_placement_above.png similarity index 100% rename from tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_above/sp_curved_placement_above.png rename to tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_above/v1/sp_curved_placement_above.png diff --git a/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_above/v2/sp_curved_placement_above.png b/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_above/v2/sp_curved_placement_above.png new file mode 100644 index 000000000000..ce1a9d972610 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_above/v2/sp_curved_placement_above.png differ diff --git a/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_below/sp_curved_placement_below.png b/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_below/v1/sp_curved_placement_below.png similarity index 100% rename from tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_below/sp_curved_placement_below.png rename to tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_below/v1/sp_curved_placement_below.png diff --git a/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_below/v2/sp_curved_placement_below.png b/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_below/v2/sp_curved_placement_below.png new file mode 100644 index 000000000000..f50c2107b6bd Binary files /dev/null and b/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_below/v2/sp_curved_placement_below.png differ diff --git a/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_online/sp_curved_placement_online.png b/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_online/v1/sp_curved_placement_online.png similarity index 100% rename from tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_online/sp_curved_placement_online.png rename to tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_online/v1/sp_curved_placement_online.png diff --git a/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_online/v2/sp_curved_placement_online.png b/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_online/v2/sp_curved_placement_online.png new file mode 100644 index 000000000000..e6c5bb259610 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_online/v2/sp_curved_placement_online.png differ diff --git a/tests/testdata/control_images/expected_pal_canvas_line/sp_length_expression/sp_length_expression.png b/tests/testdata/control_images/expected_pal_canvas_line/sp_length_expression/v1/sp_length_expression.png similarity index 100% rename from tests/testdata/control_images/expected_pal_canvas_line/sp_length_expression/sp_length_expression.png rename to tests/testdata/control_images/expected_pal_canvas_line/sp_length_expression/v1/sp_length_expression.png diff --git a/tests/testdata/control_images/expected_pal_canvas_line/sp_length_expression/v2/sp_length_expression.png b/tests/testdata/control_images/expected_pal_canvas_line/sp_length_expression/v2/sp_length_expression.png new file mode 100644 index 000000000000..9385ac3966a4 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_canvas_line/sp_length_expression/v2/sp_length_expression.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_above/sp_img_curved_placement_above.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_above/v1/sp_img_curved_placement_above.png similarity index 100% rename from tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_above/sp_img_curved_placement_above.png rename to tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_above/v1/sp_img_curved_placement_above.png diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_above/v2/sp_img_curved_placement_above.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_above/v2/sp_img_curved_placement_above.png new file mode 100644 index 000000000000..ce1a9d972610 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_above/v2/sp_img_curved_placement_above.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_below/sp_img_curved_placement_below.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_below/v1/sp_img_curved_placement_below.png similarity index 100% rename from tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_below/sp_img_curved_placement_below.png rename to tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_below/v1/sp_img_curved_placement_below.png diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_below/v2/sp_img_curved_placement_below.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_below/v2/sp_img_curved_placement_below.png new file mode 100644 index 000000000000..f50c2107b6bd Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_below/v2/sp_img_curved_placement_below.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_online/sp_img_curved_placement_online.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_online/v1/sp_img_curved_placement_online.png similarity index 100% rename from tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_online/sp_img_curved_placement_online.png rename to tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_online/v1/sp_img_curved_placement_online.png diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_online/v2/sp_img_curved_placement_online.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_online/v2/sp_img_curved_placement_online.png new file mode 100644 index 000000000000..e6c5bb259610 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_online/v2/sp_img_curved_placement_online.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_length_expression/sp_img_length_expression.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_length_expression/v1/sp_img_length_expression.png similarity index 100% rename from tests/testdata/control_images/expected_pal_composer_line/sp_img_length_expression/sp_img_length_expression.png rename to tests/testdata/control_images/expected_pal_composer_line/sp_img_length_expression/v1/sp_img_length_expression.png diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_length_expression/v2/sp_img_length_expression.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_length_expression/v2/sp_img_length_expression.png new file mode 100644 index 000000000000..9385ac3966a4 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_length_expression/v2/sp_img_length_expression.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_above/sp_pdf_curved_placement_above.png b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_above/v1/sp_pdf_curved_placement_above.png similarity index 100% rename from tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_above/sp_pdf_curved_placement_above.png rename to tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_above/v1/sp_pdf_curved_placement_above.png diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_above/v2/sp_pdf_curved_placement_above.png b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_above/v2/sp_pdf_curved_placement_above.png new file mode 100644 index 000000000000..8aa337ec82bd Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_above/v2/sp_pdf_curved_placement_above.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_below/sp_pdf_curved_placement_below.png b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_below/v1/sp_pdf_curved_placement_below.png similarity index 100% rename from tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_below/sp_pdf_curved_placement_below.png rename to tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_below/v1/sp_pdf_curved_placement_below.png diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_below/v2/sp_pdf_curved_placement_below.png b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_below/v2/sp_pdf_curved_placement_below.png new file mode 100644 index 000000000000..b3b5cfafc4ab Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_below/v2/sp_pdf_curved_placement_below.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_online/sp_pdf_curved_placement_online.png b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_online/v1/sp_pdf_curved_placement_online.png similarity index 100% rename from tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_online/sp_pdf_curved_placement_online.png rename to tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_online/v1/sp_pdf_curved_placement_online.png diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_online/v2/sp_pdf_curved_placement_online.png b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_online/v2/sp_pdf_curved_placement_online.png new file mode 100644 index 000000000000..926ae9a9e52b Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_online/v2/sp_pdf_curved_placement_online.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_length_expression/sp_pdf_length_expression.png b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_length_expression/v1/sp_pdf_length_expression.png similarity index 100% rename from tests/testdata/control_images/expected_pal_composer_line/sp_pdf_length_expression/sp_pdf_length_expression.png rename to tests/testdata/control_images/expected_pal_composer_line/sp_pdf_length_expression/v1/sp_pdf_length_expression.png diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_length_expression/v2/sp_pdf_length_expression.png b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_length_expression/v2/sp_pdf_length_expression.png new file mode 100644 index 000000000000..e74ff48fad12 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_length_expression/v2/sp_pdf_length_expression.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_above/sp_svg_curved_placement_above.png b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_above/v1/sp_svg_curved_placement_above.png similarity index 100% rename from tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_above/sp_svg_curved_placement_above.png rename to tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_above/v1/sp_svg_curved_placement_above.png diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_above/v2/sp_svg_curved_placement_above.png b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_above/v2/sp_svg_curved_placement_above.png new file mode 100644 index 000000000000..0fa7d751a9a2 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_above/v2/sp_svg_curved_placement_above.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_below/sp_svg_curved_placement_below.png b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_below/v1/sp_svg_curved_placement_below.png similarity index 100% rename from tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_below/sp_svg_curved_placement_below.png rename to tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_below/v1/sp_svg_curved_placement_below.png diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_below/v2/sp_svg_curved_placement_below.png b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_below/v2/sp_svg_curved_placement_below.png new file mode 100644 index 000000000000..00068f33fa33 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_below/v2/sp_svg_curved_placement_below.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_online/sp_svg_curved_placement_online.png b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_online/v1/sp_svg_curved_placement_online.png similarity index 100% rename from tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_online/sp_svg_curved_placement_online.png rename to tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_online/v1/sp_svg_curved_placement_online.png diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_online/v2/sp_svg_curved_placement_online.png b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_online/v2/sp_svg_curved_placement_online.png new file mode 100644 index 000000000000..b296a7267d80 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_online/v2/sp_svg_curved_placement_online.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_svg_length_expression/sp_svg_length_expression.png b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_length_expression/v1/sp_svg_length_expression.png similarity index 100% rename from tests/testdata/control_images/expected_pal_composer_line/sp_svg_length_expression/sp_svg_length_expression.png rename to tests/testdata/control_images/expected_pal_composer_line/sp_svg_length_expression/v1/sp_svg_length_expression.png diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_svg_length_expression/v2/sp_svg_length_expression.png b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_length_expression/v2/sp_svg_length_expression.png new file mode 100644 index 000000000000..fc673d71fe35 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_length_expression/v2/sp_svg_length_expression.png differ diff --git a/tests/testdata/control_images/expected_pal_placement/sp_label_curved_zero_width_char/sp_label_curved_zero_width_char_mask.png b/tests/testdata/control_images/expected_pal_placement/sp_label_curved_zero_width_char/sp_label_curved_zero_width_char_mask.png new file mode 100644 index 000000000000..df5d4fe1b851 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_placement/sp_label_curved_zero_width_char/sp_label_curved_zero_width_char_mask.png differ diff --git a/tests/testdata/control_images/expected_pal_placement/sp_label_line_toward_center/sp_label_line_toward_center_mask.png b/tests/testdata/control_images/expected_pal_placement/sp_label_line_toward_center/sp_label_line_toward_center_mask.png index fc2b3a2d1e46..5b0d2e2ba1e7 100644 Binary files a/tests/testdata/control_images/expected_pal_placement/sp_label_line_toward_center/sp_label_line_toward_center_mask.png and b/tests/testdata/control_images/expected_pal_placement/sp_label_line_toward_center/sp_label_line_toward_center_mask.png differ diff --git a/tests/testdata/control_images/expected_pal_placement/sp_line_line_obstacle_obstacle_factor_less/sp_line_line_obstacle_obstacle_factor_less_mask.png b/tests/testdata/control_images/expected_pal_placement/sp_line_line_obstacle_obstacle_factor_less/sp_line_line_obstacle_obstacle_factor_less_mask.png new file mode 100644 index 000000000000..6d8479f89482 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_placement/sp_line_line_obstacle_obstacle_factor_less/sp_line_line_obstacle_obstacle_factor_less_mask.png differ diff --git a/tests/testdata/control_images/expected_pal_placement/sp_line_point_obstacle_obstacle_factor_less/sp_line_point_obstacle_obstacle_factor_less_mask.png b/tests/testdata/control_images/expected_pal_placement/sp_line_point_obstacle_obstacle_factor_less/sp_line_point_obstacle_obstacle_factor_less_mask.png new file mode 100644 index 000000000000..ae37f8230078 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_placement/sp_line_point_obstacle_obstacle_factor_less/sp_line_point_obstacle_obstacle_factor_less_mask.png differ diff --git a/tests/testdata/control_images/expected_pal_placement/sp_line_polygon_obstacle_obstacle_factor_less/sp_line_polygon_obstacle_obstacle_factor_less_mask.png b/tests/testdata/control_images/expected_pal_placement/sp_line_polygon_obstacle_obstacle_factor_less/sp_line_polygon_obstacle_obstacle_factor_less_mask.png new file mode 100644 index 000000000000..5690e9cd2b3e Binary files /dev/null and b/tests/testdata/control_images/expected_pal_placement/sp_line_polygon_obstacle_obstacle_factor_less/sp_line_polygon_obstacle_obstacle_factor_less_mask.png differ diff --git a/tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/below/sp_polygon_placement_perimeter_mask.png b/tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/below/sp_polygon_placement_perimeter_mask.png index 34b0bf675db4..b98e327dab8a 100644 Binary files a/tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/below/sp_polygon_placement_perimeter_mask.png and b/tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/below/sp_polygon_placement_perimeter_mask.png differ diff --git a/tests/testdata/control_images/expected_pal_placement/sp_prefer_line_curved_above_instead_of_below/sp_prefer_line_curved_above_instead_of_below_mask.png b/tests/testdata/control_images/expected_pal_placement/sp_prefer_line_curved_above_instead_of_below/sp_prefer_line_curved_above_instead_of_below_mask.png index 48e669ea314a..da9ead9acdfb 100644 Binary files a/tests/testdata/control_images/expected_pal_placement/sp_prefer_line_curved_above_instead_of_below/sp_prefer_line_curved_above_instead_of_below_mask.png and b/tests/testdata/control_images/expected_pal_placement/sp_prefer_line_curved_above_instead_of_below/sp_prefer_line_curved_above_instead_of_below_mask.png differ diff --git a/tests/testdata/control_images/expected_pal_placement/sp_prefer_line_curved_above_instead_of_online/sp_prefer_line_curved_above_instead_of_online_mask.png b/tests/testdata/control_images/expected_pal_placement/sp_prefer_line_curved_above_instead_of_online/sp_prefer_line_curved_above_instead_of_online_mask.png index d328a95699ea..da9ead9acdfb 100644 Binary files a/tests/testdata/control_images/expected_pal_placement/sp_prefer_line_curved_above_instead_of_online/sp_prefer_line_curved_above_instead_of_online_mask.png and b/tests/testdata/control_images/expected_pal_placement/sp_prefer_line_curved_above_instead_of_online/sp_prefer_line_curved_above_instead_of_online_mask.png differ diff --git a/tests/testdata/control_images/expected_pal_placement/sp_prefer_line_curved_below_instead_of_online/sp_prefer_line_curved_below_instead_of_online_mask.png b/tests/testdata/control_images/expected_pal_placement/sp_prefer_line_curved_below_instead_of_online/sp_prefer_line_curved_below_instead_of_online_mask.png index ee8e133878ac..8dd85307d1ef 100644 Binary files a/tests/testdata/control_images/expected_pal_placement/sp_prefer_line_curved_below_instead_of_online/sp_prefer_line_curved_below_instead_of_online_mask.png and b/tests/testdata/control_images/expected_pal_placement/sp_prefer_line_curved_below_instead_of_online/sp_prefer_line_curved_below_instead_of_online_mask.png differ diff --git a/tests/testdata/control_images/expected_pal_placement/sp_prefer_longer_lines_over_shorter/sp_prefer_longer_lines_over_shorter_mask.png b/tests/testdata/control_images/expected_pal_placement/sp_prefer_longer_lines_over_shorter/sp_prefer_longer_lines_over_shorter_mask.png index 051a1f590059..4ac210891f9d 100644 Binary files a/tests/testdata/control_images/expected_pal_placement/sp_prefer_longer_lines_over_shorter/sp_prefer_longer_lines_over_shorter_mask.png and b/tests/testdata/control_images/expected_pal_placement/sp_prefer_longer_lines_over_shorter/sp_prefer_longer_lines_over_shorter_mask.png differ diff --git a/tests/testdata/control_images/expected_pal_placement/sp_prefer_more_horizontal_lines/sp_prefer_more_horizontal_lines_mask.png b/tests/testdata/control_images/expected_pal_placement/sp_prefer_more_horizontal_lines/sp_prefer_more_horizontal_lines_mask.png index 69de22d69bdd..ee74b5688d0b 100644 Binary files a/tests/testdata/control_images/expected_pal_placement/sp_prefer_more_horizontal_lines/sp_prefer_more_horizontal_lines_mask.png and b/tests/testdata/control_images/expected_pal_placement/sp_prefer_more_horizontal_lines/sp_prefer_more_horizontal_lines_mask.png differ diff --git a/tests/testdata/control_images/expected_pal_placement/sp_small_polygon_placement_perimeter/sp_small_polygon_placement_perimeter_mask.png b/tests/testdata/control_images/expected_pal_placement/sp_small_polygon_placement_perimeter/sp_small_polygon_placement_perimeter_mask.png index ba1244e1025a..c4bc2085b43c 100644 Binary files a/tests/testdata/control_images/expected_pal_placement/sp_small_polygon_placement_perimeter/sp_small_polygon_placement_perimeter_mask.png and b/tests/testdata/control_images/expected_pal_placement/sp_small_polygon_placement_perimeter/sp_small_polygon_placement_perimeter_mask.png differ