X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FitkBSplineInterpolateImageFunctionWithLUT.txx;h=58a173a10cea02189c190a61ec9458b226e9d44c;hb=378ee630dce37a3e15baf3a8027542c2f8cf43de;hp=35c1664f6ef82e37fcd7963a8844be75e9df5631;hpb=6512df02372cfb3507bf1799115511a68ab5036e;p=clitk.git

diff --git a/itk/itkBSplineInterpolateImageFunctionWithLUT.txx b/itk/itkBSplineInterpolateImageFunctionWithLUT.txx
index 35c1664..58a173a 100644
--- a/itk/itkBSplineInterpolateImageFunctionWithLUT.txx
+++ b/itk/itkBSplineInterpolateImageFunctionWithLUT.txx
@@ -3,7 +3,7 @@
 
   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,9 +14,10 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef _ITKINTERPOLATEIMAGEFUNCTIONWITHLUT_TXX
 #define _ITKINTERPOLATEIMAGEFUNCTIONWITHLUT_TXX
+#include <itkMath.h>
 
 namespace itk
 {
@@ -186,11 +187,11 @@ namespace itk
     for(int l=0; l<TImageType::ImageDimension; l++) 
       {
 	// Compute t1 = distance to floor 
-	TCoefficientType t1 = x[l]- vcl_floor(x[l]);
+	TCoefficientType t1 = x[l]- std::floor(x[l]);
     
 	// Compute index in precomputed weights table
 	TCoefficientType t2 = mSamplingFactors[l]*t1;
-	index[l] = (IndexValueType)Math::Round(t2);
+	index[l] = (IndexValueType)Math::Round<TCoefficientType>(t2);
 
 	// For even order : test if too close to 0.5 (but lower). In this
 	// case : take the next coefficient
@@ -236,13 +237,13 @@ namespace itk
     long indx;
     for (unsigned int l=0; l<d; l++)  {
       if (mSplineOrders[l] & 1) {  // Use this index calculation for odd splineOrder (like cubic)
-	indx = (long)vcl_floor(x[l]) - mSplineOrders[l] / 2 ; //this->m_SplineOrder / 2;
+	indx = (long)std::floor(x[l]) - mSplineOrders[l] / 2 ; //this->m_SplineOrder / 2;
 	evaluateIndex[l] = indx;
       }
       else { // Use this index calculation for even splineOrder
-	if (mSplineOrders[l] == 0) evaluateIndex[l] = Math::Round(x[l]);
+	if (mSplineOrders[l] == 0) evaluateIndex[l] = Math::Round<typename ContinuousIndexType::ValueType>(x[l]);
 	else {
-	  indx = (long)vcl_floor((x[l]+ 0.5)) - mSplineOrders[l] / 2; //this->m_SplineOrder / 2;
+	  indx = (long)std::floor((x[l]+ 0.5)) - mSplineOrders[l] / 2; //this->m_SplineOrder / 2;
 	  evaluateIndex[l] = indx;
 	}
       }