Merge remote-tracking branch 'origin/changeWx28to30' into vtk7itk4wx3

[creaImageIO.git] / src / creaImageIOWxSimpleDlg.cpp

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index 09f7e022d348a298c2e5f276e98f83f8bbba7f28..297ac110ea7a69d75c5cd0174c8e2dfbe0aeff31 100644 (file)
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -237,12 +237,14 @@ namespace creaImageIO
                                first->GetDimensions(dim);
                                if (dim[2]==1)
                                {
-                                       vtkImageData *out;
-                                       out  = vtkImageData::New();
-                                       out->SetScalarType(first->GetScalarType());
-                                       out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
+                                       vtkImageData *out = vtkImageData::New();
                                        int ext[6];
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                                        first->GetWholeExtent(ext); 
+#else
+                                       first->GetExtent(ext); 
+#endif
                                        if(ext[5] == 0)
                                        {
                                           ext[5] = getImagesSelected().size()-1;
@@ -259,8 +261,18 @@ namespace creaImageIO
                                }
                                        out->SetSpacing(spac);
                                        out->SetDimensions(dim[0], dim[1], getImagesSelected().size() );
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+
+                                       out->SetScalarType(first->GetScalarType());
+                                       out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
                                        out->AllocateScalars();
                                        out->Update();
+#else
+                                       out->AllocateScalars(first->GetScalarType(),first->GetNumberOfScalarComponents());
+#endif
+
+
                                        unsigned long imsize = dim[0] * dim[1];
                                        imsize = imsize * dim[2];  // deal with multiframes here
                                        // differents formats char , short, etc...