X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOUnMosaicVtkImageData.cpp;h=753691375284437a4715dbfa540eb12efd9973f0;hb=refs%2Fheads%2Fvtk8itk5wx3-macos;hp=61601066a66b2e7bd4a69102fd38ad568bb3587d;hpb=6b7ccc72c2f9cee3979d9360a55eaa65aeea8a17;p=creaImageIO.git

diff --git a/src/creaImageIOUnMosaicVtkImageData.cpp b/src/creaImageIOUnMosaicVtkImageData.cpp
index 6160106..7536913 100644
--- a/src/creaImageIOUnMosaicVtkImageData.cpp
+++ b/src/creaImageIOUnMosaicVtkImageData.cpp
@@ -80,12 +80,18 @@ std::vector<vtkImageData*> creaImageIOUnMosaicVtkImageData::unMosaicVectorVtkIma
 // ------------------------------------------------------------------------
 vtkImageData * creaImageIOUnMosaicVtkImageData::unMosaic(vtkImageData *imageIn, int numberOfImagesInMosaic)
 {
-	int nbImagesPerRow = ceil( sqrt(numberOfImagesInMosaic) );
+	int nbImagesPerRow = ceil( sqrt( (double)numberOfImagesInMosaic) );
    int inputdims[3];
    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());