modify vtkExtras to account for multiple versions

eeccccb0 · Kurt Sansom · 2ae87c1f · eeccccb0
Commit eeccccb0 authored Mar 05, 2018 by Kurt Sansom
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

utilities/Extras/VtkToPng.cpp utilities/Extras/VtkToPng.cpp +6 -3

No files found.
--- a/utilities/Extras/VtkToPng.cpp
+++ b/utilities/Extras/VtkToPng.cpp
@@ -103,8 +103,9 @@ int main(int argc, char * argv[])
 #else
    mapper->SetInputData(data);
 #endif
-    
-#if (VTK_MAJOR_VERSION <= 8 && VTK_MINOR_VERSION <= 1) //deprecated as of vtk 8.1
+
+#if VTK_MAJOR_VERSION < 8 || (VTK_MAJOR_VERSION == 8 && VTK_MINOR_VERSION <= 1)
+    //deprecated as of vtk 8.1
    mapper->ImmediateModeRenderingOn();
 #endif
    
@@ -144,7 +145,9 @@ int main(int argc, char * argv[])
    vtkSmartPointer<vtkWindowToImageFilter> windowToImageFilter =
            vtkSmartPointer<vtkWindowToImageFilter>::New();
    windowToImageFilter->SetInput(renderWindow);
-#if (VTK_MAJOR_VERSION <= 8 && VTK_MINOR_VERSION <= 1) //deprecated as of vtk 8.1
+
+#if VTK_MAJOR_VERSION < 8 || (VTK_MAJOR_VERSION == 8 && VTK_MINOR_VERSION <= 1)
+    //deprecated as of vtk 8.1
    windowToImageFilter->SetMagnification(4);
 #else
    windowToImageFilter->SetScale(4, 4);