From c1ee83b78979477fd7a1ee8a9d9bc322a842b535 Mon Sep 17 00:00:00 2001
From: Ken Martin <ken.martin@kitware.com>
Date: Thu, 27 Oct 2016 10:57:18 -0400
Subject: [PATCH] The viewport to * transforms are off
The viewport coordinates were pixel centered
which casues a number of issues including missing
border pixels etc. This patch fixes the math
so that viewport coordinates range from the
lower left to the upper right which the origin
being lower left. e.g. pixel 0,0 is the lower
left of the pixel.
This topic addresses issue:
https://gitlab.kitware.com/vtk/vtk/issues/15565
---
.../Testing/Python/TestParametricFunctions.py | 2 +-
.../Data/Baseline/TestLabeledGeoView2D.png.md5 | 2 +-
.../Baseline/TestLabeledGeoView2D_1.png.md5 | 2 +-
.../Baseline/TestLabeledGeoView2D_2.png.md5 | 2 +-
.../Data/Baseline/TestGL2PSScalarBar.png.md5 | 2 +-
.../TestImageCroppingRegionsWidget.png.md5 | 2 +-
.../Baseline/TestRectilinearWipeWidget.png.md5 | 2 +-
.../Data/Baseline/TestTextWidget.png.md5 | 2 +-
.../Data/Baseline/TestLegendBoxActor.png.md5 | 2 +-
.../Data/Baseline/TestLegendBoxActor2.png.md5 | 2 +-
.../Baseline/TestLegendBoxActor2_1.png.md5 | 2 +-
.../Data/Baseline/TestLegendBoxActor_1.png.md5 | 2 +-
.../Data/Baseline/TestScalarBar.png.md5 | 2 +-
.../Data/Baseline/TestScalarBar_1.png.md5 | 2 +-
.../Data/Baseline/TestScalarBar_2.png.md5 | 1 +
.../Data/Baseline/TestXYPlotActor.png.md5 | 2 +-
.../Data/Baseline/TestXYPlotActor_1.png.md5 | 2 +-
.../Testing/Data/Baseline/xyPlot.png.md5 | 2 +-
.../Testing/Data/Baseline/xyPlot2.png.md5 | 2 +-
.../Testing/Data/Baseline/xyPlot2_1.png.md5 | 2 +-
.../Testing/Data/Baseline/xyPlot4.png.md5 | 2 +-
.../Testing/Data/Baseline/xyPlot4_1.png.md5 | 2 +-
.../Testing/Data/Baseline/xyPlot_1.png.md5 | 1 +
.../Testing/Data/Baseline/ScalarBar.png.md5 | 2 +-
.../Testing/Data/Baseline/ScalarBar_1.png.md5 | 1 +
...orByStringArrayDefaultLookupTable2D.png.md5 | 2 +-
.../Data/Baseline/TestTilingCxx.png.md5 | 2 +-
.../TestTransformCoordinateUseDouble.png.md5 | 2 +-
Rendering/Core/vtkCoordinate.h | 8 ++++++++
Rendering/Core/vtkViewport.cxx | 18 ++++++++----------
.../TestLabelPlacementMapper2D.png.md5 | 2 +-
.../TestLabelPlacementMapper2D_1.png.md5 | 2 +-
...abelPlacementMapperCoincidentPoints.png.md5 | 2 +-
.../Data/Baseline/TestLabelPlacer2D.png.md5 | 2 +-
.../Data/Baseline/TestLabelPlacer2D_1.png.md5 | 2 +-
.../Baseline/TestConeLayoutStrategy.png.md5 | 2 +-
.../TestParallelCoordinatesView.png.md5 | 2 +-
.../Data/Baseline/TestTreeMapView.png.md5 | 2 +-
38 files changed, 52 insertions(+), 43 deletions(-)
create mode 100644 Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_2.png.md5
create mode 100644 Rendering/Annotation/Testing/Data/Baseline/xyPlot_1.png.md5
create mode 100644 Rendering/Core/Testing/Data/Baseline/ScalarBar_1.png.md5
diff --git a/Common/ComputationalGeometry/Testing/Python/TestParametricFunctions.py b/Common/ComputationalGeometry/Testing/Python/TestParametricFunctions.py
index a87c10051b..59ae81c928 100755
--- a/Common/ComputationalGeometry/Testing/Python/TestParametricFunctions.py
+++ b/Common/ComputationalGeometry/Testing/Python/TestParametricFunctions.py
@@ -554,7 +554,7 @@ class TestParametricFunctions(vtk.test.Testing.vtkTest):
# NOTE: this test has a companion .tcl test. The threshold set
# here should be the same as the threshold in the .tcl
# test. Both tests should produce exactly the same results.
- vtk.test.Testing.compareImage(iren.GetRenderWindow(), vtk.test.Testing.getAbsImagePath(img_file), threshold=10)
+ vtk.test.Testing.compareImage(iren.GetRenderWindow(), vtk.test.Testing.getAbsImagePath(img_file), threshold=11)
vtk.test.Testing.interact()
if __name__ == "__main__":
diff --git a/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D.png.md5 b/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D.png.md5
index b38bb09b01..86d6727b30 100644
--- a/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D.png.md5
+++ b/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D.png.md5
@@ -1 +1 @@
-2462f5b7ef1bfef2d2f4665f16504ef6
+8a0a6438e072540702295b2b477e2e1d
diff --git a/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D_1.png.md5 b/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D_1.png.md5
index 2ba66a0663..ad8d027a03 100644
--- a/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D_1.png.md5
+++ b/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D_1.png.md5
@@ -1 +1 @@
-afc643c12bbe41776ff27c0a3cafba08
+995c31b96c98a3e853b699d6ff5d8f6a
diff --git a/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D_2.png.md5 b/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D_2.png.md5
index 9aa4eaf32f..82b09dc55f 100644
--- a/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D_2.png.md5
+++ b/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D_2.png.md5
@@ -1 +1 @@
-809560b4906411568b3f1217b962c12c
+b862aef500f42f5552189542617c3d0d
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar.png.md5
index 518fdb1726..5a43a2584d 100644
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar.png.md5
@@ -1 +1 @@
-c647e9e29b22908b01a4747d635b2ef3
+4e9c54b054c266069e6426e886f43806
diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestImageCroppingRegionsWidget.png.md5 b/Interaction/Widgets/Testing/Data/Baseline/TestImageCroppingRegionsWidget.png.md5
index 220c1bc5dc..10ea1af3d1 100644
--- a/Interaction/Widgets/Testing/Data/Baseline/TestImageCroppingRegionsWidget.png.md5
+++ b/Interaction/Widgets/Testing/Data/Baseline/TestImageCroppingRegionsWidget.png.md5
@@ -1 +1 @@
-da5b79b5748b9a77d3ad6bbb6637fde0
+6e50fd4908ad049ec7e1a035c756cb7a
diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestRectilinearWipeWidget.png.md5 b/Interaction/Widgets/Testing/Data/Baseline/TestRectilinearWipeWidget.png.md5
index 59f70f815f..e800c2b7c3 100644
--- a/Interaction/Widgets/Testing/Data/Baseline/TestRectilinearWipeWidget.png.md5
+++ b/Interaction/Widgets/Testing/Data/Baseline/TestRectilinearWipeWidget.png.md5
@@ -1 +1 @@
-272ff485196c33c326ff2a0526aaf37d
+4c735b75211c19b2eb3e10e761ef8e50
diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestTextWidget.png.md5 b/Interaction/Widgets/Testing/Data/Baseline/TestTextWidget.png.md5
index 4d4bb49c18..28819ae029 100644
--- a/Interaction/Widgets/Testing/Data/Baseline/TestTextWidget.png.md5
+++ b/Interaction/Widgets/Testing/Data/Baseline/TestTextWidget.png.md5
@@ -1 +1 @@
-78336893af3e6cef40f12e3d2ba4f941
+1b85ea73388ee6a29a1aafc242fe9609
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor.png.md5
index 3570bf1c89..559fafcb53 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor.png.md5
@@ -1 +1 @@
-9f2864989fe1f4a549c7b4e611f2dbd8
+a47504e556bf6e86017566a9330b248a
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2.png.md5
index 8a3557de82..1135529259 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2.png.md5
@@ -1 +1 @@
-ed4cc472f60c9f34af778675e9cc404f
+1f9b5950a8745915e663eafe0efde4b7
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2_1.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2_1.png.md5
index fa684463cf..bea062f9df 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2_1.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2_1.png.md5
@@ -1 +1 @@
-205a05d3b45f199095dd74c504a32f3d
+11bbcd89424f738c54a8317c6a994624
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor_1.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor_1.png.md5
index 3f10edaf67..740510735e 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor_1.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor_1.png.md5
@@ -1 +1 @@
-291666621990da1c26cc57ec0676af01
+ed0b06c0b1e75ef628675b28d318d681
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar.png.md5
index 4ef194523c..cd9f7ff040 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar.png.md5
@@ -1 +1 @@
-813864a9dfbae02d0d6d2b919caa3a6b
+d12526d02dfe9e1d0f0f361859cf7a1e
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_1.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_1.png.md5
index e45e0fd41a..5a43a2584d 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_1.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_1.png.md5
@@ -1 +1 @@
-b5ec06f6a53b2a000f81ddcedbadca67
+4e9c54b054c266069e6426e886f43806
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_2.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_2.png.md5
new file mode 100644
index 0000000000..6ff6d6e1a6
--- /dev/null
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_2.png.md5
@@ -0,0 +1 @@
+bdf1801c1b67c4dfe5957de8ab5eb57b
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor.png.md5
index e58f235519..a1ecb8bdb4 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor.png.md5
@@ -1 +1 @@
-6984ec6dfa94123bab19400236729c9e
+c5ed635a0d7da41d5e55cce4c8265ef7
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor_1.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor_1.png.md5
index bc67aecec3..43e141a56a 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor_1.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor_1.png.md5
@@ -1 +1 @@
-28a793082d452258373a87359d1d234c
+c45bd2023cdcb3969c8c0e8e14e5e625
diff --git a/Rendering/Annotation/Testing/Data/Baseline/xyPlot.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/xyPlot.png.md5
index eee34468b1..fcfbc39610 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/xyPlot.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/xyPlot.png.md5
@@ -1 +1 @@
-de898d9a86b55cddb7eff607f758f272
+c442a355c6b954bac97bccb8418966a7
diff --git a/Rendering/Annotation/Testing/Data/Baseline/xyPlot2.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/xyPlot2.png.md5
index 808846e203..fcfbc39610 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/xyPlot2.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/xyPlot2.png.md5
@@ -1 +1 @@
-1cf0e6c359e27d4de076fd23e7bd3e79
+c442a355c6b954bac97bccb8418966a7
diff --git a/Rendering/Annotation/Testing/Data/Baseline/xyPlot2_1.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/xyPlot2_1.png.md5
index c303192d6f..f04bfd1035 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/xyPlot2_1.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/xyPlot2_1.png.md5
@@ -1 +1 @@
-9fbfd4e4ed7399c4da79ee7d834929eb
+d1e0e2ddf667ed9f64120c50312711e8
diff --git a/Rendering/Annotation/Testing/Data/Baseline/xyPlot4.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/xyPlot4.png.md5
index 808846e203..fcfbc39610 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/xyPlot4.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/xyPlot4.png.md5
@@ -1 +1 @@
-1cf0e6c359e27d4de076fd23e7bd3e79
+c442a355c6b954bac97bccb8418966a7
diff --git a/Rendering/Annotation/Testing/Data/Baseline/xyPlot4_1.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/xyPlot4_1.png.md5
index c303192d6f..f04bfd1035 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/xyPlot4_1.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/xyPlot4_1.png.md5
@@ -1 +1 @@
-9fbfd4e4ed7399c4da79ee7d834929eb
+d1e0e2ddf667ed9f64120c50312711e8
diff --git a/Rendering/Annotation/Testing/Data/Baseline/xyPlot_1.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/xyPlot_1.png.md5
new file mode 100644
index 0000000000..e223564608
--- /dev/null
+++ b/Rendering/Annotation/Testing/Data/Baseline/xyPlot_1.png.md5
@@ -0,0 +1 @@
+de876d4311c616affcad8cb80f38a6da
diff --git a/Rendering/Core/Testing/Data/Baseline/ScalarBar.png.md5 b/Rendering/Core/Testing/Data/Baseline/ScalarBar.png.md5
index d42339ca5c..2b89077faf 100644
--- a/Rendering/Core/Testing/Data/Baseline/ScalarBar.png.md5
+++ b/Rendering/Core/Testing/Data/Baseline/ScalarBar.png.md5
@@ -1 +1 @@
-1bf50ed5b1333fbfe623a59c7528d82f
+59542e592b519fc0dba0eb819fda62d6
diff --git a/Rendering/Core/Testing/Data/Baseline/ScalarBar_1.png.md5 b/Rendering/Core/Testing/Data/Baseline/ScalarBar_1.png.md5
new file mode 100644
index 0000000000..c1abf1f98b
--- /dev/null
+++ b/Rendering/Core/Testing/Data/Baseline/ScalarBar_1.png.md5
@@ -0,0 +1 @@
+21c0c5062f479141b25bc9d98d3b3b3e
diff --git a/Rendering/Core/Testing/Data/Baseline/TestColorByStringArrayDefaultLookupTable2D.png.md5 b/Rendering/Core/Testing/Data/Baseline/TestColorByStringArrayDefaultLookupTable2D.png.md5
index 709696c1c1..d3f3f46a17 100644
--- a/Rendering/Core/Testing/Data/Baseline/TestColorByStringArrayDefaultLookupTable2D.png.md5
+++ b/Rendering/Core/Testing/Data/Baseline/TestColorByStringArrayDefaultLookupTable2D.png.md5
@@ -1 +1 @@
-9e0cb465399da2dc7df3c24fea8e73e8
+2d21e294f10f925ce0d42ab75417188e
diff --git a/Rendering/Core/Testing/Data/Baseline/TestTilingCxx.png.md5 b/Rendering/Core/Testing/Data/Baseline/TestTilingCxx.png.md5
index 59f49a5804..47d323358a 100644
--- a/Rendering/Core/Testing/Data/Baseline/TestTilingCxx.png.md5
+++ b/Rendering/Core/Testing/Data/Baseline/TestTilingCxx.png.md5
@@ -1 +1 @@
-5eb5bd7c308aeaf01473aa235fe1d335
+a204c7349e82e16ad87c3cf424d0c51f
diff --git a/Rendering/Core/Testing/Data/Baseline/TestTransformCoordinateUseDouble.png.md5 b/Rendering/Core/Testing/Data/Baseline/TestTransformCoordinateUseDouble.png.md5
index d936169b68..83f973d6a3 100644
--- a/Rendering/Core/Testing/Data/Baseline/TestTransformCoordinateUseDouble.png.md5
+++ b/Rendering/Core/Testing/Data/Baseline/TestTransformCoordinateUseDouble.png.md5
@@ -1 +1 @@
-3e299c8036ed2e0d6bc5da21e0e15028
+5c3fcde5fe0201bac7845823ce37d65c
diff --git a/Rendering/Core/vtkCoordinate.h b/Rendering/Core/vtkCoordinate.h
index 276ad98fa9..280e51fd33 100644
--- a/Rendering/Core/vtkCoordinate.h
+++ b/Rendering/Core/vtkCoordinate.h
@@ -28,9 +28,17 @@
* The coordinate systems in vtk are as follows:
* <PRE>
* DISPLAY - x-y pixel values in window
+ * 0, 0 is the lower left of the first pixel,
+ * size, size is the upper right of the last pixel
* NORMALIZED DISPLAY - x-y (0,1) normalized values
+ * 0, 0 is the lower left of the first pixel,
+ * 1, 1 is the upper right of the last pixel
* VIEWPORT - x-y pixel values in viewport
+ * 0, 0 is the lower left of the first pixel,
+ * size, size is the upper right of the last pixel
* NORMALIZED VIEWPORT - x-y (0,1) normalized value in viewport
+ * 0, 0 is the lower left of the first pixel,
+ * 1, 1 is the upper right of the last pixel
* VIEW - x-y-z (-1,1) values in camera coordinates. (z is depth)
* WORLD - x-y-z global coordinate values
* USERDEFINED - x-y-z in User defined space
diff --git a/Rendering/Core/vtkViewport.cxx b/Rendering/Core/vtkViewport.cxx
index 29411005ec..481e65adf0 100644
--- a/Rendering/Core/vtkViewport.cxx
+++ b/Rendering/Core/vtkViewport.cxx
@@ -485,8 +485,8 @@ void vtkViewport::NormalizedDisplayToViewport(double &u, double &v)
this->NormalizedDisplayToDisplay(u,v);
// subtract the vpo
- u = u - vpou - 0.5;
- v = v - vpov - 0.5;
+ u = u - vpou;
+ v = v - vpov;
}
}
@@ -512,8 +512,8 @@ void vtkViewport::ViewportToNormalizedViewport(double &u, double &v)
size[0] != 0 &&
size[1] != 0)
{
- u = u/(size[0] - 1.0);
- v = v/(size[1] - 1.0);
+ u = u/size[0];
+ v = v/size[1];
}
}
}
@@ -591,10 +591,8 @@ void vtkViewport::ViewportToNormalizedDisplay(double &u, double &v)
this->NormalizedDisplayToDisplay(vpou,vpov);
// add the vpo
- // the 0.5 offset is here because the viewport uses pixel centers
- // while the display uses pixel edges.
- u = u + vpou + 0.5;
- v = v + vpov + 0.5;
+ u = u + vpou;
+ v = v + vpov;
// get the pixel value for the coordinate
this->DisplayToNormalizedDisplay(u,v);
@@ -620,8 +618,8 @@ void vtkViewport::NormalizedViewportToViewport(double &u, double &v)
size = this->GetSize();
if (size)
{
- u = u * (size[0] - 1.0);
- v = v * (size[1] - 1.0);
+ u = u * size[0];
+ v = v * size[1];
}
}
}
diff --git a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D.png.md5 b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D.png.md5
index 7b1e5d837e..5c003c3b1a 100644
--- a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D.png.md5
+++ b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D.png.md5
@@ -1 +1 @@
-2a4813c4d6f2e658ed24c2f5a6500ad3
+44be0aa4dd4ba452045cba2c101206d2
diff --git a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D_1.png.md5 b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D_1.png.md5
index dd0adb91ba..512cbf4564 100644
--- a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D_1.png.md5
+++ b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D_1.png.md5
@@ -1 +1 @@
-136c16379b73e7df61001cb523c5210f
+0f34ffb8fc4eed0abebf226963fed4f2
diff --git a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapperCoincidentPoints.png.md5 b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapperCoincidentPoints.png.md5
index 94cde45281..d1b2b38542 100644
--- a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapperCoincidentPoints.png.md5
+++ b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapperCoincidentPoints.png.md5
@@ -1 +1 @@
-dfc823bf18d41d3185b19c7543b08d24
+1f35999b4036662f45f694bf5ec7fa99
diff --git a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D.png.md5 b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D.png.md5
index 82773d5ce8..f4cad3f6d3 100644
--- a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D.png.md5
+++ b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D.png.md5
@@ -1 +1 @@
-efbda8b7ad61a767866485f25d9b8f7f
+eb31f3a7ec1e78b05df508312388738e
diff --git a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D_1.png.md5 b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D_1.png.md5
index de47e3329e..8616ce8502 100644
--- a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D_1.png.md5
+++ b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D_1.png.md5
@@ -1 +1 @@
-08b0f849da843b527a9a499c6b03edba
+7d0e0bbf1872dee6fdbcc2bac591cc69
diff --git a/Views/Infovis/Testing/Data/Baseline/TestConeLayoutStrategy.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestConeLayoutStrategy.png.md5
index a9cb8b19a4..8c5388a10d 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestConeLayoutStrategy.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestConeLayoutStrategy.png.md5
@@ -1 +1 @@
-d73394b4fd1901cb6b4ad3256d54f6f5
+ea8d04ce36aec358365312dd3a2d2a3a
diff --git a/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView.png.md5
index 6a4092ee99..4956219f12 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView.png.md5
@@ -1 +1 @@
-600c6f02a49876dfff49e39c3213a92b
+6408c6144a93b47aa09c2d54e386ff34
diff --git a/Views/Infovis/Testing/Data/Baseline/TestTreeMapView.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestTreeMapView.png.md5
index 6b15cba1d1..108c8c1d2d 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestTreeMapView.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestTreeMapView.png.md5
@@ -1 +1 @@
-b86a8bf579880471d4fbca52f356fe4f
+67370dd4cf130277443f1fc05c3f60cc
--
GitLab