X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FitkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h;h=c941b05d37e366de82e192eead7dfc4ccc323963;hb=54de2903ffa1d7f444d2a38609de58f8f2ab0d2d;hp=a31fe349856f97799509af9fe6ce4e328012d5d1;hpb=6194949c0beb1589904e22381b9aba1bbface172;p=clitk.git

diff --git a/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h b/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
index a31fe34..c941b05 100644
--- a/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
+++ b/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
@@ -40,7 +40,7 @@
 // gets integrated into the main directories.
 #include "itkConfigure.h"
 
-#ifdef ITK_USE_OPTIMIZED_REGISTRATION_METHODS
+#if defined(ITK_USE_OPTIMIZED_REGISTRATION_METHODS) || ITK_VERSION_MAJOR >= 4
 #include "itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h"
 #else
 
@@ -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