X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fvtk%2Fsrc%2FbbtkSimpleUtilities.h;h=f0b0372b60487c58ef9d7d73fe3b005b9ff072df;hb=19dda39fbfb4f8e1019c4f0dd37aa3afc8a3d1d6;hp=91d2d9762dd88a88559563ab0bc0f8aeeb149a2c;hpb=8e268d2e62786e66cf2833a4be734ac725bfe762;p=bbtk.git

diff --git a/packages/vtk/src/bbtkSimpleUtilities.h b/packages/vtk/src/bbtkSimpleUtilities.h
index 91d2d97..f0b0372 100755
--- a/packages/vtk/src/bbtkSimpleUtilities.h
+++ b/packages/vtk/src/bbtkSimpleUtilities.h
@@ -1,3 +1,30 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
 #ifndef _BBTKSIMPLEUTILITIES_H_
 #define _BBTKSIMPLEUTILITIES_H_
 
@@ -41,11 +68,20 @@ public:
 		//Se pregunta al OS el tamanio de la palabra de un apuntador
 		int palabra = sizeof(T);
 		db = vtkImageData::New();
-		db->SetScalarType(Memcache::darTipo(palabra));
 		db->SetDimensions(x,y,z);
 		db->SetOrigin(0, 0, 0);
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
+		db->SetScalarType(Memcache::darTipo(palabra));
 		db->AllocateScalars();
 		db->Update();
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+		db->AllocateScalars(Memcache::darTipo(palabra),1);
+#endif
+
+
 	}
 	void* get(int x, int y, int z)
 	{
@@ -339,4 +375,4 @@ class sorts
 
 }
 
-#endif /* _DLL_H_ */
+#endif // _BBTKSIMPLEUTILITIES_H_