X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FitkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h;h=a31fe349856f97799509af9fe6ce4e328012d5d1;hb=6194949c0beb1589904e22381b9aba1bbface172;hp=d2f6f5313b627839efcfdb74f2ab5b24198c0847;hpb=c18059db4f507fd31b5898667f57eced7d48c5f7;p=clitk.git diff --git a/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h b/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h index d2f6f53..a31fe34 100644 --- a/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h +++ b/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h @@ -3,7 +3,7 @@ Authors belong to: - University of LYON http://www.universite-lyon.fr/ - - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr + - Léon Bérard cancer center http://www.centreleonberard.fr - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr This software is distributed WITHOUT ANY WARRANTY; without even @@ -14,7 +14,7 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -======================================================================-====*/ +===========================================================================**/ /*========================================================================= @@ -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