Update label test masks following sort algorithm change

std::sort is returning a slightly different sort order when label z order (or label cost) is equal Given that the order in these cases is effectively arbitrary I've updated the test masks to accept either order.
qgis · Feb 7, 2017 · 61523c81249b5fb6329c9e0daf8974fafdc6b24b · 61523c8
1 parent 57d6f6d
commit 61523c81249b5fb6329c9e0daf8974fafdc6b24b
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 0 deletions.
diff --git a/...stdata/control_images/diagrams/expected_piediagram/expected_piediagram_mask.png b/...stdata/control_images/diagrams/expected_piediagram/expected_piediagram_mask.png
diff --git a/...gram_datadefined_alwaysshow/expected_piediagram_datadefined_alwaysshow_mask.png b/...gram_datadefined_alwaysshow/expected_piediagram_datadefined_alwaysshow_mask.png
diff --git a/...piediagram_datadefined_outline/expected_piediagram_datadefined_outline_mask.png b/...piediagram_datadefined_outline/expected_piediagram_datadefined_outline_mask.png
diff --git a/...ediagram_datadefined_position/expected_piediagram_datadefined_position_mask.png b/...ediagram_datadefined_position/expected_piediagram_datadefined_position_mask.png
diff --git a/...ected_piediagram_datadefined_show/expected_piediagram_datadefined_show_mask.png b/...ected_piediagram_datadefined_show/expected_piediagram_datadefined_show_mask.png
diff --git a/...gram_datadefined_startangle/expected_piediagram_datadefined_startangle_mask.png b/...gram_datadefined_startangle/expected_piediagram_datadefined_startangle_mask.png
diff --git a/...ram_datadefined_background/expected_textdiagram_datadefined_background_mask.png b/...ram_datadefined_background/expected_textdiagram_datadefined_background_mask.png
diff --git a/...ed_pal_placement/sp_polygon_multiple_labels/sp_polygon_multiple_labels_mask.png b/...ed_pal_placement/sp_polygon_multiple_labels/sp_polygon_multiple_labels_mask.png
diff --git a/...acement/sp_polygon_placement_perimeter/above/sp_polygon_placement_perimeter.png b/...acement/sp_polygon_placement_perimeter/above/sp_polygon_placement_perimeter.png
diff --git a/...r/sp_polygon_placement_perimeter_mask.png → ...e/sp_polygon_placement_perimeter_mask.png b/...r/sp_polygon_placement_perimeter_mask.png → ...e/sp_polygon_placement_perimeter_mask.png
diff --git a/...imeter/sp_polygon_placement_perimeter.png → .../below/sp_polygon_placement_perimeter.png b/...imeter/sp_polygon_placement_perimeter.png → .../below/sp_polygon_placement_perimeter.png
diff --git a/...nt/sp_polygon_placement_perimeter/below/sp_polygon_placement_perimeter_mask.png b/...nt/sp_polygon_placement_perimeter/below/sp_polygon_placement_perimeter_mask.png