itkv4 migration:

        + itk::Math::Round and itk::Math::Ceil need an explicit template when
        used.

diff --git a/itk/itkBSplineInterpolateImageFunctionWithLUT.txx b/itk/itkBSplineInterpolateImageFunctionWithLUT.txx
index 35c1664f6ef82e37fcd7963a8844be75e9df5631..873b31cc87b290fba2e06e44ada07b12768e3be2 100644 (file)
--- a/itk/itkBSplineInterpolateImageFunctionWithLUT.txx
+++ b/itk/itkBSplineInterpolateImageFunctionWithLUT.txx
@@ -17,6 +17,7 @@
 ======================================================================-====*/
 #ifndef _ITKINTERPOLATEIMAGEFUNCTIONWITHLUT_TXX
 #define _ITKINTERPOLATEIMAGEFUNCTIONWITHLUT_TXX
+#include <itkMath.h>
 
 namespace itk
 {
@@ -190,7 +191,7 @@ namespace itk
     
        // 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
@@ -240,7 +241,7 @@ namespace itk
        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;
          evaluateIndex[l] = indx;

diff --git a/vv/vvSlicer.cxx b/vv/vvSlicer.cxx
index abed78cc58b9fdf8444ff039f8c466762455fdc6..89ea9786e61598739c934d84dc06e31632e7e2df 100644 (file)
--- a/vv/vvSlicer.cxx
+++ b/vv/vvSlicer.cxx
@@ -748,7 +748,7 @@ void vvSlicer::AdjustResliceToSliceOrientation(vtkImageReslice *reslice)
   origin[this->SliceOrientation] -= mImageReslice->GetOutput()->GetOrigin()[this->SliceOrientation];
   origin[this->SliceOrientation] /= mImageReslice->GetOutput()->GetSpacing()[this->SliceOrientation];
   // Step 2: round to superior grid positionInc
-  origin[this->SliceOrientation] = itk::Math::Ceil(origin[this->SliceOrientation]);
+  origin[this->SliceOrientation] = itk::Math::Ceil<double>(origin[this->SliceOrientation]);
   // Step 3: back to world coordinates
   origin[this->SliceOrientation] *= mImageReslice->GetOutput()->GetSpacing()[this->SliceOrientation];
   origin[this->SliceOrientation] += mImageReslice->GetOutput()->GetOrigin()[this->SliceOrientation];
@@ -896,7 +896,7 @@ void vvSlicer::ConvertImageToImageDisplayExtent(vtkImageData *sourceImage, const
     dExtents[i] = (dExtents[i]- targetImage->GetOrigin()[i/2]) / targetImage->GetSpacing()[i/2];
     
     // Round to nearest
-    targetExtent[i] = itk::Math::Round(dExtents[i]);
+    targetExtent[i] = itk::Math::Round<double>(dExtents[i]);
   }
 }
 //----------------------------------------------------------------------------