X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkMultipleBSplineDeformableTransformInitializer.txx;h=607df3dbe4c3113b7e27d41308a65338ab3c4bcc;hb=ef03fc34db849c864b1ae7f50c8442e125834f84;hp=1ee4be96f7d42740e6072131c3cde21a103167aa;hpb=46e15948191b583a7333683663c3975a279274a6;p=clitk.git

diff --git a/registration/clitkMultipleBSplineDeformableTransformInitializer.txx b/registration/clitkMultipleBSplineDeformableTransformInitializer.txx
index 1ee4be9..607df3d 100644
--- a/registration/clitkMultipleBSplineDeformableTransformInitializer.txx
+++ b/registration/clitkMultipleBSplineDeformableTransformInitializer.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 __clitkMultipleBSplineDeformableTransformInitializer_txx
 #define __clitkMultipleBSplineDeformableTransformInitializer_txx
 #include "clitkMultipleBSplineDeformableTransformInitializer.h"
@@ -79,7 +79,7 @@ namespace clitk
 	  {
 	    // JV
 	    m_ChosenSpacing[r]= m_ControlPointSpacing[r];
-	    m_ControlPointSpacing[r]= ( round(m_ChosenSpacing[r]/fixedImageSpacing[r]) *fixedImageSpacing[r] ) ;
+	    m_ControlPointSpacing[r]= ( itk::Math::Round<double>(m_ChosenSpacing[r]/fixedImageSpacing[r]) *fixedImageSpacing[r] ) ;
 	    m_NumberOfControlPointsInsideTheImage[r] = ceil( (double)fixedImageSize[r]*fixedImageSpacing[r]/ m_ControlPointSpacing[r] );
 	    if (  ( ceil( (double)fixedImageSize[r]*fixedImageSpacing[r]/ m_ControlPointSpacing[r] ) )
 		 == ( (double)fixedImageSize[r]*fixedImageSpacing[r]/ m_ControlPointSpacing[r] ) )
@@ -197,6 +197,7 @@ namespace clitk
     typename CoefficientReaderType::Pointer coeffReader = CoefficientReaderType::New();
     std::vector<typename CoefficientImageType::Pointer> coefficientImages;
     unsigned nLabels = m_Transform->GetnLabels();
+    coefficientImages.resize(nLabels);
 
     int dotpos = s.length() - 1;
     while (dotpos >= 0 && s[dotpos] != '.')
@@ -208,7 +209,7 @@ namespace clitk
       osfname << s.substr(0, dotpos) << '_' << i << s.substr(dotpos);
       coeffReader->SetFileName(osfname.str());
       if (m_Verbose)
-        std::cout << "Reading initial coefficients from file: " << osfname << "..." << std::endl;
+        std::cout << "Reading initial coefficients from file: " << osfname.str() << "..." << std::endl;
       coeffReader->Update();
       coefficientImages[i] = coeffReader->GetOutput();
     }