#3111 creaImageIO Bug New Normal - branch vtk7itk4 compilation with vtk7

[creaImageIO.git] / src / creaImageIOUnMosaicVtkImageData.cpp

diff --git a/src/creaImageIOUnMosaicVtkImageData.cpp b/src/creaImageIOUnMosaicVtkImageData.cpp
index 7b0064676555edc1c7551165c6175087030c792c..753691375284437a4715dbfa540eb12efd9973f0 100644 (file)
--- a/src/creaImageIOUnMosaicVtkImageData.cpp
+++ b/src/creaImageIOUnMosaicVtkImageData.cpp
@@ -85,7 +85,13 @@ vtkImageData * creaImageIOUnMosaicVtkImageData::unMosaic(vtkImageData *imageIn,
    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;
@@ -96,12 +102,18 @@ vtkImageData * creaImageIOUnMosaicVtkImageData::unMosaic(vtkImageData *imageIn,
     vtkImageOut = vtkImageData::New();
     vtkImageOut->SetDimensions( outputdims );
     vtkImageOut->SetExtent(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());