X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkCSVReader.cxx;h=e7db21ea400e158b50d43b562d8c3ecdc3e6865c;hb=dfcd0b84f01eb96e43c2180a35d626cc123a7231;hp=6db94bb551ef20b5a29c65a184556565d6c1b137;hpb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkCSVReader.cxx b/packages/vtk/src/bbvtkCSVReader.cxx
index 6db94bb..e7db21e 100755
--- a/packages/vtk/src/bbvtkCSVReader.cxx
+++ b/packages/vtk/src/bbvtkCSVReader.cxx
@@ -121,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;
@@ -133,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++){