From: Vivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Date: Tue, 9 Aug 2011 08:37:52 +0000 (+0200)
Subject: itkv4 migration: Rename itkBSplineDeformableTransform to itkBSplineTransform
X-Git-Tag: v1.3.0~240^2~6
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ba207d8b674671e4e3e1ce6d4171e84474c4cfd9;p=clitk.git

itkv4 migration: Rename itkBSplineDeformableTransform to itkBSplineTransform
---

diff --git a/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h b/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
index 091e36c..a31fe34 100644
--- a/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
+++ b/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
@@ -52,7 +52,11 @@
 #include "itkBSplineDerivativeKernelFunction.h"
 #include "itkCentralDifferenceImageFunction.h"
 #include "itkBSplineInterpolateImageFunction.h"
-#include "itkBSplineDeformableTransform.h"
+#if ITK_VERSION_MAJOR >= 4
+  #include "itkBSplineTransform.h"
+#else
+  #include "itkBSplineDeformableTransform.h"
+#endif
 #include "itkArray2D.h"
 
 namespace itk
@@ -471,10 +475,17 @@ 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 f13fe2a..852583b 100644
--- a/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx
+++ b/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx
@@ -54,7 +54,11 @@
 #include "itkImageRegionIterator.h"
 #include "itkImageIterator.h"
 #include "vnl/vnl_math.h"
-#include "itkBSplineDeformableTransform.h"
+#if ITK_VERSION_MAJOR >= 4
+  #include "itkBSplineTransform.h"
+#else
+  #include "itkBSplineDeformableTransform.h"
+#endif
 
 namespace itk
 {