#3472 merge vtk8itk5wx3-mingw64

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

diff --git a/packages/vtk/src/bbvtkExtractVtkImageFilter.cxx b/packages/vtk/src/bbvtkExtractVtkImageFilter.cxx
index efbbe227e7eb91a17ed86c540eda84e5d8d409dc..30ca25a508d7d6005997cf524b2e614fef4124ca 100644 (file)
--- a/packages/vtk/src/bbvtkExtractVtkImageFilter.cxx
+++ b/packages/vtk/src/bbvtkExtractVtkImageFilter.cxx
@@ -49,7 +49,14 @@ void ExtractVtkImageFilter::Process()
        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();
@@ -81,7 +88,7 @@ void ExtractVtkImageFilter::bbUserSetDefaultValues()
        bbSetInputIndex(tmpIndex);
        bbSetInputSize(tmpSize);
        
-       bbSetOutputOut(0);
+       bbSetOutputOut(NULL);
   
 }
 //=====