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

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

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousDilate3D.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousDilate3D.cxx
index 815f0294ac6633309016af80a255583a25e120d1..f7ab4265629b9284018e1a5bd9c2d084385962df 100644 (file)
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousDilate3D.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousDilate3D.cxx
@@ -16,7 +16,12 @@ void ImageContinuousDilate3D::Process()
 vtkImageData* ImageContinuousDilate3D::dilateFilterRecursive(vtkImageData* image, int repetitions, double x, double y, double z)
 {
                vtkImageContinuousDilate3D *dilateFilter = vtkImageContinuousDilate3D ::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     dilateFilter->SetInput (image);
+#else
+    dilateFilter->SetInputData(image);
+#endif
     dilateFilter->SetKernelSize(x, y, z);
                dilateFilter->Modified();               
                dilateFilter->Update();
@@ -25,16 +30,17 @@ vtkImageData* ImageContinuousDilate3D::dilateFilterRecursive(vtkImageData* image
                {
                        resultRec = dilateFilter->GetOutput();
                        return resultRec;
-               }
-               else {
-                       vtkImageData* resultRec = dilateFilterRecursive(dilateFilter->GetOutput(), (repetitions-1), x, y, z);
-               }
+               }else{
+                       dilateFilterRecursive(dilateFilter->GetOutput(), (repetitions-1), x, y, z);
+               }// if repetitions
 }
 
 void ImageContinuousDilate3D::bbUserSetDefaultValues()
 {
-
-
+       bbSetInputX(3); 
+       bbSetInputY(3); 
+       bbSetInputY(3); 
+       bbSetInputRepetitions(0); 
 }
 
 void ImageContinuousDilate3D::bbUserInitializeProcessing()