X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbtkSimpleUtilities.h;h=484ec0aa8d31a93413139c32543d2b7feb2cd20d;hb=edb8e9b8948e7216e06b3ef5228b16f18417ca52;hp=067af425a2743d138bdd84c447aa921d08c5b9b9;hpb=427d8c0ac838ab789a57b28f62a7f9ff243e7b60;p=bbtk.git

diff --git a/packages/vtk/src/bbtkSimpleUtilities.h b/packages/vtk/src/bbtkSimpleUtilities.h
index 067af42..484ec0a 100755
--- a/packages/vtk/src/bbtkSimpleUtilities.h
+++ b/packages/vtk/src/bbtkSimpleUtilities.h
@@ -28,6 +28,9 @@
 #ifndef _BBTKSIMPLEUTILITIES_H_
 #define _BBTKSIMPLEUTILITIES_H_
 
+
+#include "vtkVersion.h"
+
 #include <time.h>
 #include <vtkType.h>
 #include <vtkImageData.h>
@@ -68,11 +71,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)
 	{