replaces round by itk:Math:Round (because round not found in Msvc2008)

replaces uint by clitk::uint because uint not available in windows
replaces typename outside template declaration (msvc compilation error)

diff --git a/itk/itkRayCastInterpolateImageFunctionWithOrigin.txx b/itk/itkRayCastInterpolateImageFunctionWithOrigin.txx
index 72dcc3109611b5259ded1f59f8bc30833430e783..e89579e0f7d5500f98958542417c4871dac0249a 100644 (file)
--- a/itk/itkRayCastInterpolateImageFunctionWithOrigin.txx
+++ b/itk/itkRayCastInterpolateImageFunctionWithOrigin.txx
@@ -1,4 +1,4 @@
-/*=========================================================================
+/*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
   Authors belong to:
@@ -20,7 +20,7 @@
 #include "itkRayCastInterpolateImageFunctionWithOrigin.h"
 
 #include "vnl/vnl_math.h"
-
+#include "clitkCommon.h"
 
 // Put the helper class in an anonymous namespace so that it is not
 // exposed to the user
@@ -498,8 +498,8 @@ RayCastHelper<TInputImage, TCoordRep>
 {
   double maxInterDist, interDist;
   double cornerVect[4][3];
-  for(uint i=0; i<4; i++)
-    for(uint j=0; j<3; j++)
+  for(clitk::uint i=0; i<4; i++)
+    for(clitk::uint j=0; j<3; j++)
       cornerVect[i][j] = 0.0; // to avoid warning
   int cross[4][3], noInterFlag[6];
   int nSidesCrossed, crossFlag, c[4];

diff --git a/registration/clitkBSplineDeformableRegistrationGenericFilter.txx b/registration/clitkBSplineDeformableRegistrationGenericFilter.txx
index 5de043f9b497de3deb013f9b435a50594546f9fa..0c05e0ae988ef64bf11e74662b9474172239b5e8 100644 (file)
--- a/registration/clitkBSplineDeformableRegistrationGenericFilter.txx
+++ b/registration/clitkBSplineDeformableRegistrationGenericFilter.txx
@@ -1,4 +1,4 @@
-/*=========================================================================
+/*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
   Authors belong to: 
@@ -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; 

diff --git a/registration/clitkBSplineDeformableTransformInitializer.txx b/registration/clitkBSplineDeformableTransformInitializer.txx
index 340ccb915606ac88299e0e8250ff4bc2c371e717..59af63c7d211c98d4b4e8a40c29a1b5de3a91f4e 100644 (file)
--- a/registration/clitkBSplineDeformableTransformInitializer.txx
+++ b/registration/clitkBSplineDeformableTransformInitializer.txx
@@ -1,4 +1,4 @@
-/*=========================================================================
+/*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
   Authors belong to: 
@@ -18,6 +18,7 @@
 #ifndef __clitkBSplineDeformableTransformInitializer_txx
 #define __clitkBSplineDeformableTransformInitializer_txx
 #include "clitkBSplineDeformableTransformInitializer.h"
+#include "itkMath.h"
 
 namespace clitk
 {
@@ -80,7 +81,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] ) )

diff --git a/registration/clitkMultipleBSplineDeformableTransformInitializer.txx b/registration/clitkMultipleBSplineDeformableTransformInitializer.txx
index 7c9bd5a31ee67c846637308822552cf72f1c0ae5..1b75fbbdd0d813b98aa349008845119fed3c4ae9 100644 (file)
--- a/registration/clitkMultipleBSplineDeformableTransformInitializer.txx
+++ b/registration/clitkMultipleBSplineDeformableTransformInitializer.txx
@@ -1,4 +1,4 @@
-/*=========================================================================
+/*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
   Authors belong to:
@@ -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] ) )

diff --git a/registration/clitkShapedBLUTSpatioTemporalDeformableTransformInitializer.txx b/registration/clitkShapedBLUTSpatioTemporalDeformableTransformInitializer.txx
index 17ff27ce51fc9865dab242e601aae21456141830..5ff25320b84bdd22151f1130ab99cc24ec36088b 100644 (file)
--- a/registration/clitkShapedBLUTSpatioTemporalDeformableTransformInitializer.txx
+++ b/registration/clitkShapedBLUTSpatioTemporalDeformableTransformInitializer.txx
@@ -1,4 +1,4 @@
-/*=========================================================================
+/*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
   Authors belong to: 
@@ -85,7 +85,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] ) )

diff --git a/tools/clitkPadImage.cxx b/tools/clitkPadImage.cxx
index 6f263500279852a358dfd51ea759e27c4f4fd981..ad93eaa4b56e160c6ce1a58a52eb43c523d52bac 100644 (file)
--- a/tools/clitkPadImage.cxx
+++ b/tools/clitkPadImage.cxx
@@ -5,6 +5,7 @@
 #include "clitkCommon.h"
 #include "clitkPadImage_ggo.h"
 #include <string>
+#include "itkMath.h"
 
 enum
 {
@@ -47,11 +48,11 @@ int pad_like(typename ImageType::Pointer input, const std::string& likeFile, Pad
   for (DimType i = 0; i < dim; i++) {
     lower_bound[i] = origin[i];
     like_lower_bound[i] = like_origin[i];
-    auxl = round(((lower_bound[i] - like_lower_bound[i])/spacing[i]));
+    auxl = itk::Math::Round<PointValueType>(((lower_bound[i] - like_lower_bound[i])/spacing[i]));
     
     upper_bound[i] = (lower_bound[i] + size[i]*spacing[i]);
     like_upper_bound[i] = (like_lower_bound[i] + like_size[i]*spacing[i]);
-    auxu = round(((like_upper_bound[i] - upper_bound[i])/spacing[i]));
+    auxu = itk::Math::Round<PointValueType>(((like_upper_bound[i] - upper_bound[i])/spacing[i]));
 
     if (auxl < 0 || auxu < 0) {
       std::cerr << "Like-image's bounding box must be larger than input's" << std::endl;
@@ -73,16 +74,16 @@ int main(int argc, char** argv)
   typedef itk::ImageFileReader<ImageType> ImageReaderType;
   typedef itk::ImageFileWriter<ImageType> ImageWriterType;
   typedef itk::ConstantPadImageFilter<ImageType, ImageType> PadFilterType;
-  typedef typename PadFilterType::SizeValueType PadBoundType;
+  typedef PadFilterType::SizeValueType PadBoundType;
   
   GGO(clitkPadImage, args_info);
   
-  typename ImageReaderType::Pointer reader = ImageReaderType::New();
+  ImageReaderType::Pointer reader = ImageReaderType::New();
   reader->SetFileName(args_info.input_arg);
   reader->Update();
   
   PadBoundType pad_lower[dim], pad_upper[dim];
-  typename ImageType::Pointer input = reader->GetOutput();
+  ImageType::Pointer input = reader->GetOutput();
   if (args_info.like_given) {
     int err = pad_like<ImageType, PadBoundType, dim>(input, args_info.like_arg, pad_lower, pad_upper);
     if (err) {
@@ -97,15 +98,15 @@ int main(int argc, char** argv)
     }
   }
   
-  typename PadFilterType::Pointer filter = PadFilterType::New();
+  PadFilterType::Pointer filter = PadFilterType::New();
   filter->SetPadLowerBound(pad_lower);
   filter->SetPadUpperBound(pad_upper);
   filter->SetInput(input);
   filter->SetConstant(args_info.value_arg);
   filter->Update();
   
-  typename ImageType::Pointer output = filter->GetOutput();
-  typename ImageWriterType::Pointer writer = ImageWriterType::New();
+  ImageType::Pointer output = filter->GetOutput();
+  ImageWriterType::Pointer writer = ImageWriterType::New();
   writer->SetInput(output);
   writer->SetFileName(args_info.output_arg);
   writer->Update();