Revert "itkv4 migration: Rename itkBSplineDeformableTransform to itkBSplineTransform"

This reverts commit ba207d8b674671e4e3e1ce6d4171e84474c4cfd9.

diff --git a/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h b/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
index a31fe349856f97799509af9fe6ce4e328012d5d1..091e36cb57f5eac7a56e58a381475806e97a88e2 100644 (file)
--- a/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
+++ b/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
@@ -52,11 +52,7 @@
 #include "itkBSplineDerivativeKernelFunction.h"
 #include "itkCentralDifferenceImageFunction.h"
 #include "itkBSplineInterpolateImageFunction.h"
-#if ITK_VERSION_MAJOR >= 4
-  #include "itkBSplineTransform.h"
-#else
-  #include "itkBSplineDeformableTransform.h"
-#endif
+#include "itkBSplineDeformableTransform.h"
 #include "itkArray2D.h"
 
 namespace itk
@@ -475,17 +471,10 @@ private:
   /**
    * Typedefs for the BSplineDeformableTransform.
    */
-#if ITK_VERSION_MAJOR >= 4
-  typedef BSplineTransform<
-  CoordinateRepresentationType,
-  ::itk::GetImageDimension<FixedImageType>::ImageDimension,
-  DeformationSplineOrder> BSplineTransformType;
-#else
   typedef BSplineDeformableTransform<
   CoordinateRepresentationType,
   ::itk::GetImageDimension<FixedImageType>::ImageDimension,
   DeformationSplineOrder> BSplineTransformType;
-#endif
   typedef typename BSplineTransformType::WeightsType
   BSplineTransformWeightsType;
   typedef typename BSplineTransformType::ParameterIndexArrayType

diff --git a/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx b/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx
index 1b38cae012c10569ca6d8add8bcf8ab490d6fb0c..7e50dc9cdd7a452ca3dc6f5d148668362d202bc6 100644 (file)
--- a/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx
+++ b/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx
@@ -54,11 +54,7 @@
 #include "itkImageRegionIterator.h"
 #include "itkImageIterator.h"
 #include "vnl/vnl_math.h"
-#if ITK_VERSION_MAJOR >= 4
-  #include "itkBSplineTransform.h"
-#else
-  #include "itkBSplineDeformableTransform.h"
-#endif
+#include "itkBSplineDeformableTransform.h"
 
 namespace itk
 {