X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tools%2FclitkPadImage.cxx;h=ad93eaa4b56e160c6ce1a58a52eb43c523d52bac;hb=0d94c6c40728776ea1db6347a14606b044e25abc;hp=188442e6e812072717d30a2ff55883547042ad6e;hpb=c504dab2ce9dc023cc3df156088ebc066215ace5;p=clitk.git

diff --git a/tools/clitkPadImage.cxx b/tools/clitkPadImage.cxx
index 188442e..ad93eaa 100644
--- 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
 {
@@ -40,17 +41,18 @@ int pad_like(typename ImageType::Pointer input, const std::string& likeFile, Pad
   
   SizeType size = input->GetLargestPossibleRegion().GetSize(), like_size = like_image->GetLargestPossibleRegion().GetSize();
   PointType origin = input->GetOrigin(), like_origin = like_image->GetOrigin();
+  
   PointType lower_bound, like_lower_bound;
   PointType upper_bound, like_upper_bound;
   PointValueType auxl = 0, auxu = 0;
   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;
@@ -72,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) {
@@ -96,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();