+/*
+# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------
+*/
+
+
+
#include <vtkDataArrayTemplate.h>
#include <vtkCharArray.h>
#include <creaMessageManager.h>
namespace crea
{
- template <class T>
+ template <typename T>
/*CREA_EXPORT*/ vtkImageData* NewVtkImageDataFromRaw( T* data,
int nx,
int ny,
// 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)
{