#3374 crea Bug New Normal - vtk8itk5wx3-mingw64

[crea.git] / src / creaVtk.txx

diff --git a/src/creaVtk.txx b/src/creaVtk.txx
index 5b0ec98c853d7532f12a6cae39835171ac760f5d..c83e758d6bb7ecbdcc5c8da594ff19fb24fbff2f 100644 (file)
--- a/src/creaVtk.txx
+++ b/src/creaVtk.txx
@@ -4,6 +4,8 @@
 # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
 #                        pour la Santé)
 # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
 #
 #  This software is governed by the CeCILL-B license under French law and 
 #  abiding by the rules of distribution of free software. You can  use, 
@@ -20,7 +22,8 @@
 #
 #  The fact that you are presently reading this means that you have had
 #  knowledge of the CeCILL-B license and that you accept its terms.
-# ------------------------------------------------------------------------ */                                                                         
+# ------------------------------------------------------------------------ 
+*/                                                                         
 
 
 
@@ -43,7 +46,7 @@
 #include <creaMessageManager.h>
 namespace crea
 {  
-  template <class T>
+  template <typename T>
   /*CREA_EXPORT*/ vtkImageData* NewVtkImageDataFromRaw( T* data, 
                                                    int nx, 
                                                    int ny,
@@ -56,13 +59,22 @@ namespace crea
 
     // Shouldn't we pass NumberOfScalarComponents to deal with RGB, RGBA images as well? // JPR
 
-    image->SetNumberOfScalarComponents(1);
 
     int vtktype = vtkTypeTraits<T>::VTKTypeID();
-    image->SetScalarType(vtktype);
     image->SetDimensions(nx, ny ,nz);
     image->SetSpacing(1, 1, 1);
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
+    image->SetNumberOfScalarComponents(1);
+    image->SetScalarType(vtktype);
     image->AllocateScalars();
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+    image->AllocateScalars(vtktype,1);
+#endif
+
+
     vtkDataArray* array = 0;
     switch (vtktype)
       {