Remove warnings with VTK8

diff --git a/vv/vtkVOXImageWriter.cxx b/vv/vtkVOXImageWriter.cxx
index 911091e0a7958abdb7cd3c9b7b04192bb07c8fcc..b703e96b4d5da7436ff024654d292c3936924837 100644 (file)
--- a/vv/vtkVOXImageWriter.cxx
+++ b/vv/vtkVOXImageWriter.cxx
@@ -144,7 +144,7 @@ void vtkVOXImageWriter::Write( )
                                     ext[2], ext[3],
                                     ext[4], ext[5]);
   this->GetInput()->UpdateData();
-#elif VTK_MAJOR_VERSION >= 7 && VTK_MINOR_VERSION >= 1
+#elif VTK_MAJOR_VERSION >= 8 || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION >= 1)
   this->UpdateExtent(ext);
   this->Update();
 #else

diff --git a/vv/vvAnimatedGIFWriter.cxx b/vv/vvAnimatedGIFWriter.cxx
index 026ebe091dd877b5f3547d6c1f6f6df85e2153f9..d72f253ecfa4f4d397eef6207faead81fb82bd45 100644 (file)
--- a/vv/vvAnimatedGIFWriter.cxx
+++ b/vv/vvAnimatedGIFWriter.cxx
@@ -47,7 +47,7 @@ void vvAnimatedGIFWriter::Write()
   int *wExtent = this->GetInput()->GetWholeExtent();
   this->GetInput()->SetUpdateExtent(wExtent);
   this->GetInput()->Update();
-#elif VTK_MAJOR_VERSION >= 7 && VTK_MINOR_VERSION >= 1
+#elif VTK_MAJOR_VERSION >= 8 || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION >= 1)
   this->UpdateInformation();
   int *wExtent = this->GetInput()->GetInformation()->Get(vtkDataObject::DATA_EXTENT());
   this->UpdateExtent(wExtent);

diff --git a/vv/vvGlyph2D.cxx b/vv/vvGlyph2D.cxx
index 9fde11d92ee34bc842d0f7986d9824e1bd703329..ae1a6b1f3229321f2d176ae548e16f7f47090ff7 100644 (file)
--- a/vv/vvGlyph2D.cxx
+++ b/vv/vvGlyph2D.cxx
@@ -175,7 +175,7 @@ int vvGlyph2D::RequestData(
 #if VTK_MAJOR_VERSION <= 5
     defaultSource->SetUpdateExtent(0, 1, 0);
     this->SetSource(defaultSource);
-#elif VTK_MAJOR_VERSION >= 7 && VTK_MINOR_VERSION >= 1
+#elif VTK_MAJOR_VERSION >= 8 || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION >= 1)
     int extentTemp[3] = {0, 1, 0};
     this->UpdateExtent(extentTemp);
     this->SetSourceData(defaultSource);

diff --git a/vv/vvSlicer.cxx b/vv/vvSlicer.cxx
index 847909568e94c2f1551edbd07e3c75be4777801f..10396a6a94fe5f29200d5ccb4e340a372a21364f 100644 (file)
--- a/vv/vvSlicer.cxx
+++ b/vv/vvSlicer.cxx
@@ -393,7 +393,7 @@ void vvSlicer::SetImage(vvImage::Pointer image)
 #if VTK_MAJOR_VERSION <= 5
     mImageReslice->GetOutput()->SetUpdateExtent(extent);
     mImageReslice->GetOutput()->Update();
-#elif VTK_MAJOR_VERSION >= 7 && VTK_MINOR_VERSION >= 1
+#elif VTK_MAJOR_VERSION >= 8 || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION >= 1)
     mImageReslice->UpdateExtent(extent);
     mImageReslice->Update();
 #else
@@ -1793,7 +1793,7 @@ void vvSlicer::Render()
     }
 #if VTK_MAJOR_VERSION <= 5
     mOverlayMapper->GetOutput()->SetUpdateExtent(mOverlayActor->GetDisplayExtent());
-#elif VTK_MAJOR_VERSION >= 7 && VTK_MINOR_VERSION >= 1
+#elif VTK_MAJOR_VERSION >= 8 || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION >= 1)
     mOverlayMapper->UpdateExtent(mOverlayActor->GetDisplayExtent());
 #else
     mOverlayMapper->SetUpdateExtent(mOverlayActor->GetDisplayExtent());
@@ -1803,7 +1803,7 @@ void vvSlicer::Render()
   if (mFusion && mFusionActor->GetVisibility()) {
 #if VTK_MAJOR_VERSION <= 5
     mFusionMapper->GetOutput()->SetUpdateExtent(mFusionActor->GetDisplayExtent());
-#elif VTK_MAJOR_VERSION >= 7 && VTK_MINOR_VERSION >= 1
+#elif VTK_MAJOR_VERSION >= 8 || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION >= 1)
     mFusionMapper->UpdateExtent(mFusionActor->GetDisplayExtent());
 #else
     mFusionMapper->SetUpdateExtent(mFusionActor->GetDisplayExtent());

diff --git a/vv/vvToolProfile.cxx b/vv/vvToolProfile.cxx
index c6b44b6f15792d861a13014759b8a9d0483a09ed..baf34f86bc35daa0e393d35388bd50633aa11ba8 100644 (file)
--- a/vv/vvToolProfile.cxx
+++ b/vv/vvToolProfile.cxx
@@ -615,7 +615,7 @@ void vvToolProfile::InitializeLine()
       unsigned char red[3] = { 255, 0, 0 };
       vtkSmartPointer<vtkUnsignedCharArray> colors = vtkSmartPointer<vtkUnsignedCharArray>::New();
       colors->SetNumberOfComponents(3);
-#if VTK_MAJOR_VERSION >= 7 && VTK_MINOR_VERSION >= 1
+#if VTK_MAJOR_VERSION >= 8 || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION >= 1)
       colors->InsertNextTypedTuple(red);
 #else
       colors->InsertNextTupleValue(red);