Merge remote-tracking branch 'origin/vtk7itk4' into vtk7itk4wx3

[creaVtk.git] / bbtk_creaVtk_PKG / src / bbcreaVtkImageContinuousErode3D.cxx

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.cxx
index 95fd998886d33a2b18c3cef2813331fd64f1db73..4784991cf9ed9f611ffcd211d7289875e704b66f 100644 (file)
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.cxx
@@ -16,7 +16,12 @@ void ImageContinuousErode3D::Process()
 vtkImageData* ImageContinuousErode3D::erodeFilterRecursive(vtkImageData* image, int repetitions, double x, double y, double z)
 {
                vtkImageContinuousErode3D *erodeFilter = vtkImageContinuousErode3D ::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     erodeFilter->SetInput (image);
+#else
+    erodeFilter->SetInputData(image);
+#endif
     erodeFilter->SetKernelSize(x, y, z);
                erodeFilter->Modified();                
                erodeFilter->Update();
@@ -25,10 +30,9 @@ vtkImageData* ImageContinuousErode3D::erodeFilterRecursive(vtkImageData* image,
                {
                        resultRec = erodeFilter->GetOutput();
                        return resultRec;
-               }
-               else {
-                       vtkImageData* resultRec = erodeFilterRecursive(erodeFilter->GetOutput(), (repetitions-1), x, y, z);
-               }
+               }else{
+                       erodeFilterRecursive(erodeFilter->GetOutput(), (repetitions-1), x, y, z);
+               } // if repetitions
 }
 
 void ImageContinuousErode3D::bbUserSetDefaultValues()
@@ -40,7 +44,10 @@ void ImageContinuousErode3D::bbUserSetDefaultValues()
 //===== 
 void ImageContinuousErode3D::bbUserInitializeProcessing()
 {
-  
+       bbSetInputX(3); 
+       bbSetInputY(3); 
+       bbSetInputY(3); 
+       bbSetInputRepetitions(0); 
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)