From 8eefde5c8b68a46b1cc666ef9c07ff5645261a19 Mon Sep 17 00:00:00 2001
From: Ken Martin <ken.martin@kitware.com>
Date: Tue, 28 Apr 2015 10:50:19 -0400
Subject: [PATCH] Added valid images for cases where line width is over 1.0
OpenGL 3.2 does not support line width greater than 1 although
many drivers do support it. This adds valid images for cases
where line width is greater than 1.0
Also minor VisualStudio error check
---
Charts/Core/Testing/Data/Baseline/TestLinePlot3D_1.png.md5 | 2 +-
.../Testing/Data/Baseline/TestKdTreeRepresentation_1.png.md5 | 1 +
.../Data/Baseline/BoxClipTriangulateAndInterpolate_1.png.md5 | 1 +
.../Testing/Data/Baseline/TestPolyDataSilhouette_1.png.md5 | 1 +
.../Data/Baseline/TestQuadRotationalExtrusion_1.png.md5 | 1 +
.../Testing/Data/Baseline/TestRotationalExtrusion_1.png.md5 | 1 +
.../Testing/Data/Baseline/TestBrokenLineWidget_2.png.md5 | 1 +
.../Testing/Data/Baseline/TestRectilinearWipeWidget_2.png.md5 | 1 +
Rendering/ContextOpenGL2/vtkOpenGLContextDevice2D.cxx | 4 ++--
Rendering/Core/Testing/Data/Baseline/TestEdgeFlags_1.png.md5 | 1 +
.../Data/Baseline/TestParallelCoordinatesView_1.png.md5 | 2 +-
.../Data/Baseline/TestParallelCoordinatesView_2.png.md5 | 1 +
12 files changed, 13 insertions(+), 4 deletions(-)
create mode 100644 Common/DataModel/Testing/Data/Baseline/TestKdTreeRepresentation_1.png.md5
create mode 100644 Filters/General/Testing/Data/Baseline/BoxClipTriangulateAndInterpolate_1.png.md5
create mode 100644 Filters/Hybrid/Testing/Data/Baseline/TestPolyDataSilhouette_1.png.md5
create mode 100644 Filters/Modeling/Testing/Data/Baseline/TestQuadRotationalExtrusion_1.png.md5
create mode 100644 Filters/Modeling/Testing/Data/Baseline/TestRotationalExtrusion_1.png.md5
create mode 100644 Interaction/Widgets/Testing/Data/Baseline/TestBrokenLineWidget_2.png.md5
create mode 100644 Interaction/Widgets/Testing/Data/Baseline/TestRectilinearWipeWidget_2.png.md5
create mode 100644 Rendering/Core/Testing/Data/Baseline/TestEdgeFlags_1.png.md5
create mode 100644 Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView_2.png.md5
diff --git a/Charts/Core/Testing/Data/Baseline/TestLinePlot3D_1.png.md5 b/Charts/Core/Testing/Data/Baseline/TestLinePlot3D_1.png.md5
index b466187a8f..7e5ed17c52 100644
--- a/Charts/Core/Testing/Data/Baseline/TestLinePlot3D_1.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestLinePlot3D_1.png.md5
@@ -1 +1 @@
-af24804916f9f6054597dd44b07f975c
+1e922aa0006fcc2ce09f80cca1bc79a8
diff --git a/Common/DataModel/Testing/Data/Baseline/TestKdTreeRepresentation_1.png.md5 b/Common/DataModel/Testing/Data/Baseline/TestKdTreeRepresentation_1.png.md5
new file mode 100644
index 0000000000..78835dedfd
--- /dev/null
+++ b/Common/DataModel/Testing/Data/Baseline/TestKdTreeRepresentation_1.png.md5
@@ -0,0 +1 @@
+edb81e27370b08c631311e615c842b59
diff --git a/Filters/General/Testing/Data/Baseline/BoxClipTriangulateAndInterpolate_1.png.md5 b/Filters/General/Testing/Data/Baseline/BoxClipTriangulateAndInterpolate_1.png.md5
new file mode 100644
index 0000000000..286c8938ae
--- /dev/null
+++ b/Filters/General/Testing/Data/Baseline/BoxClipTriangulateAndInterpolate_1.png.md5
@@ -0,0 +1 @@
+752b060eee64a6cc7412169f97668f74
diff --git a/Filters/Hybrid/Testing/Data/Baseline/TestPolyDataSilhouette_1.png.md5 b/Filters/Hybrid/Testing/Data/Baseline/TestPolyDataSilhouette_1.png.md5
new file mode 100644
index 0000000000..4783a43602
--- /dev/null
+++ b/Filters/Hybrid/Testing/Data/Baseline/TestPolyDataSilhouette_1.png.md5
@@ -0,0 +1 @@
+33cd4a45a6fbfaec5b573d9dda67810d
diff --git a/Filters/Modeling/Testing/Data/Baseline/TestQuadRotationalExtrusion_1.png.md5 b/Filters/Modeling/Testing/Data/Baseline/TestQuadRotationalExtrusion_1.png.md5
new file mode 100644
index 0000000000..0c5800ac5a
--- /dev/null
+++ b/Filters/Modeling/Testing/Data/Baseline/TestQuadRotationalExtrusion_1.png.md5
@@ -0,0 +1 @@
+ba07aca8ada7bb4e187fd27ce0114ec3
diff --git a/Filters/Modeling/Testing/Data/Baseline/TestRotationalExtrusion_1.png.md5 b/Filters/Modeling/Testing/Data/Baseline/TestRotationalExtrusion_1.png.md5
new file mode 100644
index 0000000000..ac8c4fb9b6
--- /dev/null
+++ b/Filters/Modeling/Testing/Data/Baseline/TestRotationalExtrusion_1.png.md5
@@ -0,0 +1 @@
+3fffd5733482983d5a4daf4806db9693
diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestBrokenLineWidget_2.png.md5 b/Interaction/Widgets/Testing/Data/Baseline/TestBrokenLineWidget_2.png.md5
new file mode 100644
index 0000000000..f0e185777b
--- /dev/null
+++ b/Interaction/Widgets/Testing/Data/Baseline/TestBrokenLineWidget_2.png.md5
@@ -0,0 +1 @@
+64bb950e86f358099daf3294da6a36db
diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestRectilinearWipeWidget_2.png.md5 b/Interaction/Widgets/Testing/Data/Baseline/TestRectilinearWipeWidget_2.png.md5
new file mode 100644
index 0000000000..6cbc35daa5
--- /dev/null
+++ b/Interaction/Widgets/Testing/Data/Baseline/TestRectilinearWipeWidget_2.png.md5
@@ -0,0 +1 @@
+dbaf7b1c8b5c0c3caeea0dc326214603
diff --git a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2D.cxx b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2D.cxx
index 711da7baa6..1e2228a477 100644
--- a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2D.cxx
+++ b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2D.cxx
@@ -623,7 +623,7 @@ void vtkOpenGLContextDevice2D::DrawPoly(float *f, int n, unsigned char *colors,
}
this->BuildVBO(cbo, &(newVerts[0]), newVerts.size()/2,
- &(newColors[0]), nc, NULL);
+ colors ? &(newColors[0]) : NULL, nc, NULL);
glDrawArrays(GL_TRIANGLES, 0, newVerts.size()/2);
}
else
@@ -717,7 +717,7 @@ void vtkOpenGLContextDevice2D::DrawLines(float *f, int n, unsigned char *colors,
}
this->BuildVBO(cbo, &(newVerts[0]), newVerts.size()/2,
- &(newColors[0]), nc, NULL);
+ colors ? &(newColors[0]) : NULL, nc, NULL);
glDrawArrays(GL_TRIANGLES, 0, newVerts.size()/2);
}
else
diff --git a/Rendering/Core/Testing/Data/Baseline/TestEdgeFlags_1.png.md5 b/Rendering/Core/Testing/Data/Baseline/TestEdgeFlags_1.png.md5
new file mode 100644
index 0000000000..4009afe6c0
--- /dev/null
+++ b/Rendering/Core/Testing/Data/Baseline/TestEdgeFlags_1.png.md5
@@ -0,0 +1 @@
+6f06f45af82c561636b7725bef9e0323
diff --git a/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView_1.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView_1.png.md5
index 500fe14e20..189035044d 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView_1.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView_1.png.md5
@@ -1 +1 @@
-81c8d5be8e823133170e11b7951aa50c
+eaa7d738a968bb9393252bbba26ea5c6
diff --git a/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView_2.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView_2.png.md5
new file mode 100644
index 0000000000..500fe14e20
--- /dev/null
+++ b/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView_2.png.md5
@@ -0,0 +1 @@
+81c8d5be8e823133170e11b7951aa50c
--
GitLab