X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkBSplineDeformableRegistrationGenericFilter.txx;h=0c05e0ae988ef64bf11e74662b9474172239b5e8;hb=2061b9e1d00ffe188af506917c2d3fa4f65121ca;hp=f76c8fad71d484ba61c27b1e1cbef75132394976;hpb=657652a78c2e2717a6f77e027049173442ca29f0;p=clitk.git

diff --git a/registration/clitkBSplineDeformableRegistrationGenericFilter.txx b/registration/clitkBSplineDeformableRegistrationGenericFilter.txx
old mode 100755
new mode 100644
index f76c8fa..0c05e0a
--- a/registration/clitkBSplineDeformableRegistrationGenericFilter.txx
+++ b/registration/clitkBSplineDeformableRegistrationGenericFilter.txx
@@ -1,9 +1,9 @@
-/*=========================================================================
+/*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
   Authors belong to: 
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef __clitkBSplineDeformableRegistrationGenericFilter_txx
 #define __clitkBSplineDeformableRegistrationGenericFilter_txx
 #include "clitkBSplineDeformableRegistrationGenericFilter.h"
@@ -354,8 +354,8 @@ namespace clitk
 	    for(unsigned int r=0; r<ImageDimension; r++) 
 	      {
 		chosenSpacing[r]= m_ArgsInfo.spacing_arg[r];
-		gridSizeOnImage[r] = ceil( (double) transformRegion.GetSize()[r] / ( round(chosenSpacing[r]/fixedImageSpacing[r]) ) );
-		adaptedSpacing[r]= ( round(chosenSpacing[r]/fixedImageSpacing[r]) *fixedImageSpacing[r] ) ;
+		gridSizeOnImage[r] = ceil( (double) transformRegion.GetSize()[r] / ( itk::Math::Round<double>(chosenSpacing[r]/fixedImageSpacing[r]) ) );
+		adaptedSpacing[r]= ( itk::Math::Round<double>(chosenSpacing[r]/fixedImageSpacing[r]) *fixedImageSpacing[r] ) ;
 	      }
 	    if (m_Verbose) std::cout<<"The chosen control point spacing "<<chosenSpacing<<"..."<<std::endl;
 	    if (m_Verbose) std::cout<<"The control points spacing was adapted to "<<adaptedSpacing<<"..."<<std::endl; 
@@ -677,7 +677,11 @@ namespace clitk
 	  {
 	    BSplineTransformPointer bsplineTransform=dynamic_cast<BSplineTransformPointer>(registration->GetTransform());
 	    typedef  itk::Image<TCoordRep, ImageDimension> CoefficientImageType;
+#if ITK_VERSION_MAJOR > 3
+            typename BSplineTransformType::CoefficientImageArray coefficientImages = bsplineTransform->GetCoefficientImage();
+#else
 	    typename CoefficientImageType::Pointer *coefficientImages =bsplineTransform->GetCoefficientImage();
+#endif
 	    typedef itk::ImageFileWriter<CoefficientImageType> CoeffWriterType;
 	    for (unsigned int i=0;i<SpaceDimension; i ++)
 	      {