X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxSimpleDlg.cpp;h=2e9a9c557993b0057c846e250ac8c97cbe82736f;hb=688c28613d4d3f54fb74d55adb653a4a26cebf13;hp=ca984309b7eaf5d5e5cb27d8f3110c929317dd28;hpb=56e12662d134e9c80989719e6295d7c913cf7af0;p=creaImageIO.git

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index ca98430..2e9a9c5 100644
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -232,12 +232,14 @@ namespace creaImageIO
 			  	first->GetDimensions(dim);
 			  	if (dim[2]==1)
 				{
-					vtkImageData *out;
-				  	out  = vtkImageData::New();
-				  	out->SetScalarType(first->GetScalarType());
-				  	out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
+					vtkImageData *out = vtkImageData::New();
 				  	int ext[6];
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 				  	first->GetWholeExtent(ext); 
+#else
+				  	first->GetExtent(ext); 
+#endif
 				  	if(ext[5] == 0)
 				  	{
 				 	   ext[5] = getImagesSelected().size()-1;
@@ -254,8 +256,18 @@ namespace creaImageIO
 		          	}
 					out->SetSpacing(spac);
 					out->SetDimensions(dim[0], dim[1], getImagesSelected().size() );
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+
+				  	out->SetScalarType(first->GetScalarType());
+				  	out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
 					out->AllocateScalars();
 					out->Update();
+#else
+					out->AllocateScalars(first->GetScalarType(),first->GetNumberOfScalarComponents());
+#endif
+
+
 					unsigned long imsize = dim[0] * dim[1];
 					imsize = imsize * dim[2];  // deal with multiframes here
 					// differents formats char , short, etc...