+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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 "bbvtkCSVReader.h"
#include "bbvtkPackage.h"
namespace bbvtk
{
vtkImageData* final = vtkImageData::New();
- int ext[6];
+ //int ext[6];
int newDim[3];
//double space[3];
double origin[3];
//original->GetOrigin(origin);
//original->GetDimensions(newDim);
- final->SetScalarType(scalar_type);
//final->SetSpacing(space);
newDim[0] = x;
origin[2] = 0;
final->SetOrigin(origin);
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5)
+ final->SetScalarType(scalar_type);
final->AllocateScalars();
final->Update();
+#endif
+#if (VTK_MAJOR_VERSION >= 6)
+ final->AllocateScalars(scalar_type,1);
+#endif
+
for (int i=0; i<newDim[0]; i++){
for (int j=0; j<newDim[1]; j++){