From: Vivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Date: Mon, 5 Sep 2011 10:01:35 +0000 (+0200)
Subject: Revert "itkv4 migration: Rename itkBSplineDeformableTransform to itkBSplineTransform"
X-Git-Tag: v1.3.0~236^2~5
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=cff1bb0cd9b0850379e20c0594ccd511a3a38133;p=clitk.git

Revert "itkv4 migration: Rename itkBSplineDeformableTransform to itkBSplineTransform"

This reverts commit ba207d8b674671e4e3e1ce6d4171e84474c4cfd9.
---

diff --git a/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h b/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
index a31fe34..091e36c 100644
--- 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 1b38cae..7e50dc9 100644
--- 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
 {