X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkAutoCrop.cxx;fp=packages%2Fvtk%2Fsrc%2FbbvtkAutoCrop.cxx;h=26d928e04905630fd6421513f4c31981d74f79d8;hb=088ed2b7bdbe14eb85a7245afaa693ddb7a53a97;hp=00635e9c4db318a9be60f7af24b44f693e53b223;hpb=79d06fa7c6441e99291ad3a1949d241f336573d5;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkAutoCrop.cxx b/packages/vtk/src/bbvtkAutoCrop.cxx
index 00635e9..26d928e 100644
--- a/packages/vtk/src/bbvtkAutoCrop.cxx
+++ b/packages/vtk/src/bbvtkAutoCrop.cxx
@@ -58,9 +58,17 @@ void AutoCrop::Process()
 	int sizeX,sizeY,sizeZ;
 
 	if (bbGetInputIn()!=NULL){
-		bbGetInputIn()->Update();
 		int ext[6];
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
+		bbGetInputIn()->Update();
 		bbGetInputIn()->GetWholeExtent(ext);
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+		bbGetInputIn()->GetExtent(ext);
+#endif
+
 		sizeX=ext[1]-ext[0]+1;
 		sizeY=ext[3]-ext[2]+1;
 		sizeZ=ext[5]-ext[4]+1;
@@ -71,12 +79,23 @@ void AutoCrop::Process()
 //		{
 			_newImage = vtkImageData::New();
 			_newImage->Initialize();
-			_newImage->SetScalarType( bbGetInputIn()->GetScalarType() );
 			_newImage->SetSpacing( bbGetInputIn()->GetSpacing() );
-			_newImage->SetNumberOfScalarComponents( bbGetInputIn()->GetNumberOfScalarComponents() );
 			_newImage->SetDimensions(  sizeX,sizeY,sizeZ );
+
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 		    _newImage->SetWholeExtent(0,sizeX-1,0,sizeY-1,0,sizeZ-1);
+			_newImage->SetNumberOfScalarComponents( bbGetInputIn()->GetNumberOfScalarComponents() );
+			_newImage->SetScalarType( bbGetInputIn()->GetScalarType() );
 			_newImage->AllocateScalars();
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+		    _newImage->SetExtent(0,sizeX-1,0,sizeY-1,0,sizeZ-1);
+			_newImage->AllocateScalars(bbGetInputIn()->GetScalarType(),1);
+#endif
+
+
 //		}