Merge branch 'vtk8itk5wx3-mingw64' of ssh://git.creatis.insa-lyon.fr/bbtk into vtk8it...

[bbtk.git] / packages / vtk / src / bbvtkExtractVtkImageFilter.cxx

diff --git a/packages/vtk/src/bbvtkExtractVtkImageFilter.cxx b/packages/vtk/src/bbvtkExtractVtkImageFilter.cxx
index 7f6f7b305e5119f6da5717e28fd42d33f540e529..30ca25a508d7d6005997cf524b2e614fef4124ca 100644 (file)
--- 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);
   
 }
 //=====