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=703366e55fe5068ac6b6e023bc5f1b2033a2f4d6;hb=8230f283d05b42a0139611458a7604e6aa10ec6c;hp=26d928e04905630fd6421513f4c31981d74f79d8;hpb=36a131a7d47f451563f40b28047200b038905c92;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkAutoCrop.cxx b/packages/vtk/src/bbvtkAutoCrop.cxx
index 26d928e..703366e 100644
--- a/packages/vtk/src/bbvtkAutoCrop.cxx
+++ b/packages/vtk/src/bbvtkAutoCrop.cxx
@@ -57,7 +57,8 @@ void AutoCrop::Process()
 	int i,j,k;
 	int sizeX,sizeY,sizeZ;
 
-	if (bbGetInputIn()!=NULL){
+	if (bbGetInputIn()!=NULL)
+	{
 		int ext[6];
 
 //EED 2017-01-01 Migration VTK7
@@ -71,35 +72,26 @@ void AutoCrop::Process()
 
 		sizeX=ext[1]-ext[0]+1;
 		sizeY=ext[3]-ext[2]+1;
-		sizeZ=ext[5]-ext[4]+1;
-		
+		sizeZ=ext[5]-ext[4]+1;		
 		sizeX=(sizeX/2)*2;
 		sizeY=(sizeY/2)*2;
-//		if (_newImage==NULL)
-//		{
-			_newImage = vtkImageData::New();
-			_newImage->Initialize();
-			_newImage->SetSpacing( bbGetInputIn()->GetSpacing() );
-			_newImage->SetDimensions(  sizeX,sizeY,sizeZ );
+		_newImage = vtkImageData::New();
+		_newImage->Initialize();
+		_newImage->SetSpacing( bbGetInputIn()->GetSpacing() );
+		_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();
+		_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);
+		_newImage->SetExtent(0,sizeX-1,0,sizeY-1,0,sizeZ-1);
+		_newImage->AllocateScalars(bbGetInputIn()->GetScalarType(),1);
 #endif
-
-
-//		}
-	
-
-		
 		for (i=0; i<sizeX; i++)	
 		{
 			 for (j=0; j<sizeY; j++)
@@ -110,12 +102,9 @@ void AutoCrop::Process()
 					_newImage->SetScalarComponentFromDouble(i,j,k, 0, value );
 				} // for k
 			} // for j
-		} // for i
-			 
-	}// bbGetInputIn
-			 
+		} // for i			
+	}// bbGetInputIn			 
    bbSetOutputOut(_newImage);
-	 	
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)