#3107 BBTK Bug New Normal - branch vtk7itk4 compilation with vtk7

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

diff --git a/packages/vtk/src/bbvtkFlip.cxx b/packages/vtk/src/bbvtkFlip.cxx
index a252888c5a04d9bffdaddef6a76f19e3dab1f7b8..8ec173cf705ed77ca42c8608d625389b9cb9db6e 100644 (file)
--- a/packages/vtk/src/bbvtkFlip.cxx
+++ b/packages/vtk/src/bbvtkFlip.cxx
@@ -100,16 +100,31 @@ void Flip::Process()
        
                mImageOut = vtkImageData::New();  // Alloc depends on  bbGetInputIn().size()  
                mImageOut->Initialize();
-               mImageOut->SetScalarType(  bbGetInputIn()->GetScalarType() );
                mImageOut->SetSpacing(   bbGetInputIn()->GetSpacing()  );
                mImageOut->SetDimensions(   bbGetInputIn()->GetDimensions()  );
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
+               mImageOut->SetScalarType(  bbGetInputIn()->GetScalarType() );
                mImageOut->SetNumberOfScalarComponents( bbGetInputIn()->GetNumberOfScalarComponents() );
                mImageOut->AllocateScalars();
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+               mImageOut->AllocateScalars(bbGetInputIn()->GetScalarType() , bbGetInputIn()->GetNumberOfScalarComponents());
+#endif
        
                int inputdims[3];
                //   int outputdims[3];
                bbGetInputIn()->GetDimensions (inputdims);
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
                bbGetInputIn()->Update();
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+               // ..
+#endif
+
                int nbScalComp  = bbGetInputIn()->GetNumberOfScalarComponents();
                int scalarSize  = bbGetInputIn()->GetScalarSize();
                int lineSize    = inputdims[0]*scalarSize*nbScalComp;