X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkConvertBLUTCoeffsToVFFilter.h;h=7ae33eb084baf8d057309d7f38e46ffe064c2f85;hb=e751b47051ae80ecd388418ae39b388f15e627eb;hp=3cd1e676b0acdf9d23c37f194fd09f5363cbc227;hpb=4f2fb7a9394563fd56582639232a9fe12492c5d6;p=clitk.git diff --git a/registration/clitkConvertBLUTCoeffsToVFFilter.h b/registration/clitkConvertBLUTCoeffsToVFFilter.h index 3cd1e67..7ae33eb 100644 --- a/registration/clitkConvertBLUTCoeffsToVFFilter.h +++ b/registration/clitkConvertBLUTCoeffsToVFFilter.h @@ -7,10 +7,10 @@ #include "clitkImageCommon.h" #include "clitkBSplineDeformableTransform.h" #include "itkBSplineDeformableTransform.h" -#if ITK_VERSION_MAJOR >= 4 -#include "itkTransformToDisplacementFieldSource.h" +#if (ITK_VERSION_MAJOR == 4) && (ITK_VERSION_MINOR < 6) +# include "itkTransformToDisplacementFieldSource.h" #else -#include "itkTransformToDeformationFieldSource.h" +# include "itkTransformToDisplacementFieldFilter.h" #endif namespace clitk @@ -41,14 +41,18 @@ namespace clitk typedef clitk::BSplineDeformableTransform BLUTTransformType; typedef typename BLUTTransformType::CoefficientImageType BLUTCoefficientImageType; - typedef itk::BSplineDeformableTransform ITKTransformType; + typedef itk::BSplineDeformableTransform ITKTransformType; + typedef itk::BSplineDeformableTransform ITKTransformTypeZero; + typedef itk::BSplineDeformableTransform ITKTransformTypeOne; + typedef itk::BSplineDeformableTransform ITKTransformTypeTwo; + typedef itk::BSplineDeformableTransform ITKTransformTypeFour; typedef itk::Transform< double, TDVFType::ImageDimension, TDVFType::ImageDimension> GenericTransformType; -#if ITK_VERSION_MAJOR >= 4 - typedef itk::TransformToDisplacementFieldSource ConvertorType; +#if (ITK_VERSION_MAJOR == 4) && (ITK_VERSION_MINOR < 6) + typedef itk::TransformToDisplacementFieldSource ConvertorType; #else - typedef itk::TransformToDeformationFieldSource ConvertorType; + typedef itk::TransformToDisplacementFieldFilter ConvertorType; #endif itkNewMacro(Self); @@ -90,4 +94,4 @@ namespace clitk #include "clitkConvertBLUTCoeffsToVFFilter.txx" -#endif // clitkConvertBLUTCoeffsToVFFilter_h \ No newline at end of file +#endif // clitkConvertBLUTCoeffsToVFFilter_h