X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkCSVReader.cxx;h=e7db21ea400e158b50d43b562d8c3ecdc3e6865c;hb=208df598c5aeefbd6a683a5c6da00598a4a3d9ea;hp=bc30305ae34680af1568c0c08895ad9ecf4b0976;hpb=5383f06c991adc435baefd87d970100b9cf6042e;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkCSVReader.cxx b/packages/vtk/src/bbvtkCSVReader.cxx
index bc30305..e7db21e 100755
--- a/packages/vtk/src/bbvtkCSVReader.cxx
+++ b/packages/vtk/src/bbvtkCSVReader.cxx
@@ -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.
+ # ------------------------------------------------------------------------ */
+
+
 #include "bbvtkCSVReader.h"
 #include "bbvtkPackage.h"
 namespace bbvtk
@@ -84,7 +111,7 @@ vtkImageData* CSVReader::createImage(std::vector< std::vector<double> > info, in
 {
 	vtkImageData* final = vtkImageData::New();
 
-	int ext[6];
+	//int ext[6];
 	int newDim[3];
 	//double space[3];
 	double origin[3];
@@ -94,7 +121,6 @@ vtkImageData* CSVReader::createImage(std::vector< std::vector<double> > info, in
 	//original->GetOrigin(origin);
 	//original->GetDimensions(newDim);
 
-	final->SetScalarType(scalar_type);
 
 	//final->SetSpacing(space);
 	newDim[0] = x;
@@ -106,8 +132,17 @@ vtkImageData* CSVReader::createImage(std::vector< std::vector<double> > info, in
 	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++){