With ITKv5, change VectorResample and VectorCast Image Filter to Resample and Cast...

[clitk.git] / tools / clitkVFResampleGenericFilter.cxx

diff --git a/tools/clitkVFResampleGenericFilter.cxx b/tools/clitkVFResampleGenericFilter.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 1339c89..d60b8d0
--- a/tools/clitkVFResampleGenericFilter.cxx
+++ b/tools/clitkVFResampleGenericFilter.cxx
@@ -41,7 +41,7 @@ void clitk::VFResampleGenericFilter::InitializeImageType()
 {
   //typedef itk::Vector<float,Dim> v3f;
   //ADD_IMAGE_TYPE(Dim, v3f);
-  ADD_VEC_IMAGE_TYPE(Dim, Dim, float)
+  ADD_DEFAULT_VEC_IMAGE_TYPES
 }
 //--------------------------------------------------------------------
 
@@ -92,17 +92,17 @@ clitk::VFResampleGenericFilter::ComputeImage(typename ImageType::Pointer inputIm
   static unsigned int dim = ImageType::ImageDimension;
   if (mOutputSize.size() != dim) {
     std::cerr << "Please set size with " << dim << " dimensions." << std::endl;
-    return NULL;
+    return ITK_NULLPTR;
   }
   if (mOutputSpacing.size() != dim) {
     std::cerr << "Please set spacing with " << dim << " dimensions." << std::endl;
-    return NULL;
+    return ITK_NULLPTR;
   }
   mOutputOrigin.resize(dim);
 
   if (mApplyGaussianFilterBefore && mSigma.size() != dim) {
     std::cerr << "Please set sigma with " << dim << " dimensions." << std::endl;
-    return NULL;
+    return ITK_NULLPTR;
   }
 
   // Some typedefs
@@ -111,7 +111,11 @@ clitk::VFResampleGenericFilter::ComputeImage(typename ImageType::Pointer inputIm
   typedef typename ImageType::PointType PointType;
 
   // Create Image Filter
+#if ( ITK_VERSION_MAJOR < 5 )
   typedef itk::VectorResampleImageFilter<ImageType,ImageType> FilterType;
+#else
+  typedef itk::ResampleImageFilter<ImageType,ImageType> FilterType;
+#endif
   typename FilterType::Pointer filter = FilterType::New();
 
   // Instance of the transform object to be passed to the resample
@@ -137,12 +141,20 @@ clitk::VFResampleGenericFilter::ComputeImage(typename ImageType::Pointer inputIm
 
   // Select interpolator
   if (mInterpolatorName == "nn") {
+#if ( ITK_VERSION_MAJOR < 5 )
     typedef itk::VectorNearestNeighborInterpolateImageFunction<ImageType, double> InterpolatorType;
+#else
+    typedef itk::NearestNeighborInterpolateImageFunction<ImageType, double> InterpolatorType;
+#endif
     typename InterpolatorType::Pointer interpolator = InterpolatorType::New();
     filter->SetInterpolator(interpolator);
   } else {
     if (mInterpolatorName == "linear") {
+#if ( ITK_VERSION_MAJOR < 5 )
       typedef itk::VectorLinearInterpolateImageFunction<ImageType, double> InterpolatorType;
+#else
+      typedef itk::LinearInterpolateImageFunction<ImageType, double> InterpolatorType;
+#endif
       typename InterpolatorType::Pointer interpolator =  InterpolatorType::New();
       filter->SetInterpolator(interpolator);
     } else {