#3109 creaMaracasVisu Bug New Normal - branch vtk7itk4 compilation with vtk7

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / manualPaint / baseFilterManualPaint.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
index 0a9f995c57616ad9292aaf3c9852d7f44b9fdd37..0ca0de29abf6a7a94ab9f68fbfb2d25b696f9970 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
@@ -91,7 +91,12 @@ void baseFilterManualPaint::SetImages(vtkImageData *image, vtkImageData *image2)
        _image2 = image2;
 
        int ext[6];
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _image->GetWholeExtent(ext);
+#else
+       _image->GetExtent(ext);
+#endif
        _minX = 0;
        _minY = 0;
        _minZ = 0;
@@ -99,7 +104,14 @@ void baseFilterManualPaint::SetImages(vtkImageData *image, vtkImageData *image2)
        if (_image2!=NULL)
        {
                int extB[6];
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                _image2->GetWholeExtent(extB);
+#else
+               _image2->GetExtent(extB);
+#endif
+
                _maxX = std::min( ext[1]-ext[0] , extB[1]-extB[0] );
                _maxY = std::min( ext[3]-ext[2] , extB[3]-extB[2] );
                _maxZ = std::min( ext[5]-ext[4] , extB[5]-extB[4] );