From ba207d8b674671e4e3e1ce6d4171e84474c4cfd9 Mon Sep 17 00:00:00 2001 From: Vivien Delmon Date: Tue, 9 Aug 2011 10:37:52 +0200 Subject: [PATCH] itkv4 migration: Rename itkBSplineDeformableTransform to itkBSplineTransform --- ...utualInformationImageToImageMetricFor3DBLUTFFD.h | 13 ++++++++++++- ...ualInformationImageToImageMetricFor3DBLUTFFD.txx | 6 +++++- 2 files changed, 17 insertions(+), 2 deletions(-) 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::ImageDimension, + DeformationSplineOrder> BSplineTransformType; +#else typedef BSplineDeformableTransform< CoordinateRepresentationType, ::itk::GetImageDimension::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 { -- 2.47.1