X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=registration%2FclitkRecursiveSpatioTemporalMultiResolutionPyramidImageFilter.txx;h=822c4ef7710b9385611f8e9f3969b52569d78886;hb=349758beccea2d028231dbf847dafccbccb44be1;hp=b6c2abb0783ed9d3d05e09f335e0c9b6e53820b0;hpb=657652a78c2e2717a6f77e027049173442ca29f0;p=clitk.git

diff --git a/registration/clitkRecursiveSpatioTemporalMultiResolutionPyramidImageFilter.txx b/registration/clitkRecursiveSpatioTemporalMultiResolutionPyramidImageFilter.txx
index b6c2abb..822c4ef 100644
--- a/registration/clitkRecursiveSpatioTemporalMultiResolutionPyramidImageFilter.txx
+++ b/registration/clitkRecursiveSpatioTemporalMultiResolutionPyramidImageFilter.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,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef __clitkRecursiveSpatioTemporalMultiResolutionPyramidImageFilter_txx
 #define __clitkRecursiveSpatioTemporalMultiResolutionPyramidImageFilter_txx
 #include "clitkRecursiveSpatioTemporalMultiResolutionPyramidImageFilter.h"
@@ -27,8 +27,6 @@
 #include "itkShrinkImageFilter.h"
 #include "itkIdentityTransform.h"
 
-#include "vnl/vnl_math.h"
-
 namespace clitk
 {
 
@@ -147,7 +145,7 @@ RecursiveSpatioTemporalMultiResolutionPyramidImageFilter<TInputImage, TOutputIma
         factors[idim] = this->GetSchedule()[ilevel][idim] /
           this->GetSchedule()[ilevel+1][idim];
         }
-      variance[idim] = vnl_math_sqr( 0.5 * 
+      variance[idim] = std::sqr( 0.5 *
                                      static_cast<float>( factors[idim] ) );
       if( factors[idim] != 1 ) 
         { 
@@ -314,7 +312,7 @@ RecursiveSpatioTemporalMultiResolutionPyramidImageFilter<TInputImage, TOutputIma
       if( factors[idim] > 1 )
         {
         oper->SetDirection( idim );
-        oper->SetVariance( vnl_math_sqr( 0.5 * 
+        oper->SetVariance( std::sqr( 0.5 *
                                          static_cast<float>( factors[idim] ) ) );
         oper->CreateDirectional();
         radius[idim] = oper->GetRadius()[idim];
@@ -352,7 +350,7 @@ RecursiveSpatioTemporalMultiResolutionPyramidImageFilter<TInputImage, TOutputIma
       if( factors[idim] > 1 )
         {
         oper->SetDirection( idim );
-        oper->SetVariance( vnl_math_sqr( 0.5 * 
+        oper->SetVariance( std::sqr( 0.5 *
                                          static_cast<float>( factors[idim] ) ) );
         oper->CreateDirectional();
         radius[idim] = oper->GetRadius()[idim];
@@ -367,14 +365,14 @@ RecursiveSpatioTemporalMultiResolutionPyramidImageFilter<TInputImage, TOutputIma
       requestedIndex[idim] += radius[idim];
       
       // take into account shrink component
-      requestedSize[idim] = static_cast<SizeValueType>( vcl_floor(
+      requestedSize[idim] = static_cast<SizeValueType>( std::floor(
                                                           static_cast<double>(requestedSize[idim]) / 
                                                           static_cast<double>(factors[idim]) ) );
       if( requestedSize[idim] < 1 )
         {
         requestedSize[idim] = 1;
         }
-      requestedIndex[idim] = static_cast<IndexValueType>( vcl_ceil(
+      requestedIndex[idim] = static_cast<IndexValueType>( std::ceil(
                                                             static_cast<double>(requestedIndex[idim]) /
                                                             static_cast<double>(factors[idim]) ) );
 
@@ -450,7 +448,7 @@ RecursiveSpatioTemporalMultiResolutionPyramidImageFilter<TInputImage, TOutputIma
   for( idim = 0; idim < TInputImage::ImageDimension; idim++ )
     {
     oper->SetDirection(idim);
-    oper->SetVariance( vnl_math_sqr( 0.5 * static_cast<float>(
+    oper->SetVariance( std::sqr( 0.5 * static_cast<float>(
                                        this->GetSchedule()[refLevel][idim] ) ) );
     oper->SetMaximumError( this->GetMaximumError() );
     oper->CreateDirectional();