X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkExtractVtkImageFilter.cxx;h=30ca25a508d7d6005997cf524b2e614fef4124ca;hb=fc44a74636803d2efca46c6e66562a839e9d52f1;hp=7f6f7b305e5119f6da5717e28fd42d33f540e529;hpb=560f6b3560c3d4062d4f2413d5202a1318acb801;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkExtractVtkImageFilter.cxx b/packages/vtk/src/bbvtkExtractVtkImageFilter.cxx
index 7f6f7b3..30ca25a 100644
--- a/packages/vtk/src/bbvtkExtractVtkImageFilter.cxx
+++ b/packages/vtk/src/bbvtkExtractVtkImageFilter.cxx
@@ -40,7 +40,6 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ExtractVtkImageFilter,bbtk::AtomicBlackBox);
 //===== 
 void ExtractVtkImageFilter::Process()
 {
-printf("EED ExtractVtkImageFilter::Process Start\n");
 	int voi[6];
 
 	voi[0] = bbGetInputIndex()[0];
@@ -50,13 +49,19 @@ printf("EED ExtractVtkImageFilter::Process Start\n");
 	voi[4] = bbGetInputIndex()[2];
 	voi[5] = bbGetInputIndex()[2]+bbGetInputSize()[2]-1;
 	
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 	_extract->SetInput( bbGetInputIn() );
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+	_extract->SetInputData( bbGetInputIn() );
+#endif
+
 	_extract->SetVOI(voi);	
 	_extract->UpdateWholeExtent();
 	_extract->Modified();
 	_extract->Update();
 	bbSetOutputOut(_extract->GetOutput());
-printf("EED ExtractVtkImageFilter::Process End\n");
 }
 	
 //===== 
@@ -83,7 +88,7 @@ void ExtractVtkImageFilter::bbUserSetDefaultValues()
 	bbSetInputIndex(tmpIndex);
 	bbSetInputSize(tmpSize);
 	
-	bbSetOutputOut(0);
+	bbSetOutputOut(NULL);
   
 }
 //=====