X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fsrc%2FbbcreaVtkImageContinuousErode3D.cxx;h=debccc0b0f0cbe37c6732d0567e4430eee67ecd4;hb=6b5dabc10fd9780f19f7ce0ee287a9f8d9a09267;hp=95fd998886d33a2b18c3cef2813331fd64f1db73;hpb=cc46a640a6898f86ff194670b6c41bdc4398971a;p=creaVtk.git

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.cxx
index 95fd998..debccc0 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.cxx
@@ -1,6 +1,10 @@
 
 #include "bbcreaVtkImageContinuousErode3D.h"
 #include "bbcreaVtkPackage.h"
+
+#include "vtkImageContinuousErode3D.h"
+
+
 namespace bbcreaVtk
 {
 
@@ -16,7 +20,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,22 +34,23 @@ 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()
 {
-
+ 	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)
 //===== 
 void ImageContinuousErode3D::bbUserInitializeProcessing()
 {
-  
 }
 //===== 
 // 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)