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

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

diff --git a/packages/vtk/src/bbvtkUnMosaic.cxx b/packages/vtk/src/bbvtkUnMosaic.cxx
index 49c617ea587792beed30ad61a878c206874b230e..5e2209f171f5d12157a61c4c2acaeca4b85aed91 100644 (file)
--- a/packages/vtk/src/bbvtkUnMosaic.cxx
+++ b/packages/vtk/src/bbvtkUnMosaic.cxx
@@ -113,7 +113,13 @@ vtkImageData * UnMosaic::unMosaic(vtkImageData *imageIn, int nbImagesPerRow, int
    int outputdims[3];
    imageIn->GetDimensions (inputdims);
    unsigned short *input = (unsigned short *)(imageIn->GetScalarPointer());
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
    imageIn->Update();
+#else
+       // .. 
+#endif
      
    unsigned int div = (unsigned int)ceil(sqrt( (double)numberOfImagesInMosaic ) );
    outputdims[0] = inputdims[0] / div;
@@ -124,12 +130,21 @@ vtkImageData * UnMosaic::unMosaic(vtkImageData *imageIn, int nbImagesPerRow, int
     vtkImageOut = vtkImageData::New();
     vtkImageOut->SetDimensions( outputdims );
     vtkImageOut->SetExtent(0,outputdims[0]-1,0,outputdims[1]-1,0,outputdims[2]-1);
-    vtkImageOut->SetWholeExtent(0,outputdims[0]-1,0,outputdims[1]-1,0,outputdims[2]-1);
+ 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+   vtkImageOut->SetWholeExtent(0,outputdims[0]-1,0,outputdims[1]-1,0,outputdims[2]-1);
     vtkImageOut->SetNumberOfScalarComponents(1);
 //vtkImageOut->SetSpacing( blabla );
     vtkImageOut->SetScalarType( VTK_UNSIGNED_SHORT );
     vtkImageOut->AllocateScalars();
     vtkImageOut->Update();
+#else
+    vtkImageOut->AllocateScalars(VTK_UNSIGNED_SHORT,1);
+#endif
+
+
+
     
     unsigned short *output =(unsigned short *)(vtkImageOut->GetScalarPointer());