X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FclitkVectorBSplineDecompositionImageFilterWithOBD.txx;h=51e636155290316166c67d8d8dbe9591cda8c0bf;hb=5578995d9a82792833333eeb3dd5c8ecac967293;hp=c29c6ef888be4d9cbc6c5416754d93ab6ed03100;hpb=573d80d0f7a17607d2ee883c21c940c0ba020282;p=clitk.git

diff --git a/itk/clitkVectorBSplineDecompositionImageFilterWithOBD.txx b/itk/clitkVectorBSplineDecompositionImageFilterWithOBD.txx
index c29c6ef..51e6361 100644
--- a/itk/clitkVectorBSplineDecompositionImageFilterWithOBD.txx
+++ b/itk/clitkVectorBSplineDecompositionImageFilterWithOBD.txx
@@ -138,7 +138,7 @@ VectorBSplineDecompositionImageFilterWithOBD<TInputImage, TOutputImage>
   switch (m_SplineOrder) {
   case 3:
     m_NumberOfPoles = 1;
-    m_SplinePoles[0] = vcl_sqrt(3.0) - 2.0;
+    m_SplinePoles[0] = std::sqrt(3.0) - 2.0;
     break;
   case 0:
     m_NumberOfPoles = 0;
@@ -148,18 +148,18 @@ VectorBSplineDecompositionImageFilterWithOBD<TInputImage, TOutputImage>
     break;
   case 2:
     m_NumberOfPoles = 1;
-    m_SplinePoles[0] = vcl_sqrt(8.0) - 3.0;
+    m_SplinePoles[0] = std::sqrt(8.0) - 3.0;
     break;
   case 4:
     m_NumberOfPoles = 2;
-    m_SplinePoles[0] = vcl_sqrt(664.0 - vcl_sqrt(438976.0)) + vcl_sqrt(304.0) - 19.0;
-    m_SplinePoles[1] = vcl_sqrt(664.0 + vcl_sqrt(438976.0)) - vcl_sqrt(304.0) - 19.0;
+    m_SplinePoles[0] = std::sqrt(664.0 - std::sqrt(438976.0)) + std::sqrt(304.0) - 19.0;
+    m_SplinePoles[1] = std::sqrt(664.0 + std::sqrt(438976.0)) - std::sqrt(304.0) - 19.0;
     break;
   case 5:
     m_NumberOfPoles = 2;
-    m_SplinePoles[0] = vcl_sqrt(135.0 / 2.0 - vcl_sqrt(17745.0 / 4.0)) + vcl_sqrt(105.0 / 4.0)
+    m_SplinePoles[0] = std::sqrt(135.0 / 2.0 - std::sqrt(17745.0 / 4.0)) + std::sqrt(105.0 / 4.0)
                        - 13.0 / 2.0;
-    m_SplinePoles[1] = vcl_sqrt(135.0 / 2.0 + vcl_sqrt(17745.0 / 4.0)) - vcl_sqrt(105.0 / 4.0)
+    m_SplinePoles[1] = std::sqrt(135.0 / 2.0 + std::sqrt(17745.0 / 4.0)) - std::sqrt(105.0 / 4.0)
                        - 13.0 / 2.0;
     break;
   default:
@@ -189,7 +189,7 @@ VectorBSplineDecompositionImageFilterWithOBD<TInputImage, TOutputImage>
   horizon = m_DataLength[m_IteratorDirection];
   zn = z;
   if (m_Tolerance > 0.0) {
-    horizon = (long)vcl_ceil(log(m_Tolerance) / vcl_log(fabs(z)));
+    horizon = (long)std::ceil(log(m_Tolerance) / std::log(fabs(z)));
   }
   if (horizon < m_DataLength[m_IteratorDirection]) {
     /* accelerated loop */
@@ -202,7 +202,7 @@ VectorBSplineDecompositionImageFilterWithOBD<TInputImage, TOutputImage>
   } else {
     /* full loop */
     iz = 1.0 / z;
-    z2n = vcl_pow(z, (double)(m_DataLength[m_IteratorDirection] - 1L));
+    z2n = std::pow(z, (double)(m_DataLength[m_IteratorDirection] - 1L));
     sum = m_Scratch[0] + z2n * m_Scratch[m_DataLength[m_IteratorDirection] - 1L];
     z2n *= z2n * iz;
     for (unsigned int n = 1; n <= (m_DataLength[m_IteratorDirection] - 2); n++) {
@@ -291,8 +291,8 @@ VectorBSplineDecompositionImageFilterWithOBD<TInputImage, TOutputImage>
   InputIterator inIt( this->GetInput(), this->GetInput()->GetBufferedRegion() );
   OutputIterator outIt( this->GetOutput(), this->GetOutput()->GetBufferedRegion() );
 
-  inIt = inIt.Begin();
-  outIt = outIt.Begin();
+  inIt.GoToBegin();
+  outIt.GoToBegin();
   OutputPixelType v;
   while ( !outIt.IsAtEnd() ) {
     for (unsigned int i=0; i< VectorDimension; i++) {