#3394 wxwidgets 3.2 macOS

[crea.git] / src / creaVtk.txx

diff --git a/src/creaVtk.txx b/src/creaVtk.txx
index c4e7167747d135f05c2d48269e4b445efb39bc82..a53111f95b7b55bc1da81a6c82e147bcebfe47ed 100644 (file)
--- a/src/creaVtk.txx
+++ b/src/creaVtk.txx
@@ -1,4 +1,35 @@
-#include <vtkDataArrayTemplate.h>
+/*
+# ---------------------------------------------------------------------
+#
+# 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, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  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.
+# ------------------------------------------------------------------------ 
+*/                                                                         
+
+
+//EED 2022-07-21
+// https://www.slicer.org/wiki/Documentation/Labs/VTK7
+// #include <vtkDataArrayTemplate.h>
+ #include <vtkAOSDataArrayTemplate.h>
 
 #include <vtkCharArray.h>
 #include <vtkSignedCharArray.h>
@@ -17,7 +48,7 @@
 #include <creaMessageManager.h>
 namespace crea
 {  
-  template <class T>
+  template <typename T>
   /*CREA_EXPORT*/ vtkImageData* NewVtkImageDataFromRaw( T* data, 
                                                    int nx, 
                                                    int ny,
@@ -30,13 +61,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)
       {
@@ -67,8 +107,12 @@ namespace crea
                  <<vtkTypeTraits<T>::SizedName()
                  <<" non implemented");
       }
-    vtkDataArrayTemplate<T>* tarray 
-               = dynamic_cast<vtkDataArrayTemplate<T>*>(array);
+    
+//EED 2022-07-21
+// https://www.slicer.org/wiki/Documentation/Labs/VTK7
+//    vtkDataArrayTemplate<T>* tarray = dynamic_cast<vtkDataArrayTemplate<T>*>(array);
+    vtkAOSDataArrayTemplate<T>* tarray = dynamic_cast<vtkAOSDataArrayTemplate<T>*>(array);
+    
     array->SetNumberOfComponents( 1 );
     size_t size = (long)nx*(long)ny*(long)nz;
     // The last param of SetArray is set to 1 to keep the class from deleting the array