3219 creaMaracasVisu Feature New Normal - vtk8itk4wx3-mingw64

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
index c1ac0be4a34e87cf4ff9be9940b921a9a507cada..e2ea0232c6d32dee6a2ab282706ce8d8da9b5f2c 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
@@ -49,7 +49,9 @@ FillFilter::~FillFilter()
 //---------------------------------------------------------------------------
 void FillFilter::SetImages(vtkImageData *image,vtkImageData *image2) // virtual
 {
-       baseFilterManualPaint::SetImages(image,image2);
+       
+       
+               baseFilterManualPaint::SetImages(image,image2);
        
        if ((_maxX!=_maxXback) || (_maxY!=_maxYback) || (_maxZ!=_maxZback)) 
        {
@@ -61,31 +63,20 @@ void FillFilter::SetImages(vtkImageData *image,vtkImageData *image2) // virtual
                _auxImageFill->SetDimensions(_maxX + 1, _maxY + 1, _maxZ + 1);
                _auxImageFill->SetOrigin(0, 0, 0);
                _auxImageFill->SetExtent(0, _maxX, 0, _maxY, 0, _maxZ);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                _auxImageFill->SetWholeExtent(0, _maxX, 0, _maxY, 0, _maxZ);
                _auxImageFill->SetScalarTypeToUnsignedChar();
                _auxImageFill->AllocateScalars();
+#else
+               _auxImageFill->AllocateScalars(VTK_UNSIGNED_CHAR,1);
+#endif
                _ptrAuxImageFill = (unsigned char       *)_auxImageFill->GetScalarPointer();
                memset(_ptrAuxImageFill, 0, (_maxX+1) * (_maxY+1) * (_maxZ+1) );
        }
-
-       _auxImageFill = vtkImageData::New();
-       _auxImageFill->SetDimensions(_maxX + 1, _maxY + 1, _maxZ + 1);
-       _auxImageFill->SetOrigin(0, 0, 0);
-       _auxImageFill->SetExtent(0, _maxX, 0, _maxY, 0, _maxZ);
-
-
-//EED 2017-01-01 Migration VTK7
-#if VTK_MAJOR_VERSION <= 5
-       _auxImageFill->SetWholeExtent(0, _maxX, 0, _maxY, 0, _maxZ);
-       _auxImageFill->SetScalarTypeToUnsignedChar();
-       _auxImageFill->AllocateScalars();
-#else
-       _auxImageFill->AllocateScalars(VTK_UNSIGNED_CHAR,1);
-#endif
-
        _maxXback=_maxX;
        _maxYback=_maxY;
-       _maxYback=_maxZ;
+       _maxYback=_maxZ;        
 }