X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkConvertBLUTCoeffsToVFFilter.h;h=7ae33eb084baf8d057309d7f38e46ffe064c2f85;hb=afd2671211668e6106886aa59c7bb13a82c48a94;hp=dc85c7a445db478bf15294d68870d80b9d26decf;hpb=c04a50a5ebb1e8f6e50e737725ded6fae58345fa;p=clitk.git diff --git a/registration/clitkConvertBLUTCoeffsToVFFilter.h b/registration/clitkConvertBLUTCoeffsToVFFilter.h index dc85c7a..7ae33eb 100644 --- a/registration/clitkConvertBLUTCoeffsToVFFilter.h +++ b/registration/clitkConvertBLUTCoeffsToVFFilter.h @@ -7,12 +7,10 @@ #include "clitkImageCommon.h" #include "clitkBSplineDeformableTransform.h" #include "itkBSplineDeformableTransform.h" -#if ITK_VERSION_MAJOR >= 4 -# if ITK_VERSION_MINOR < 6 -# include "itkTransformToDisplacementFieldSource.h" -# else -# include "itkTransformToDisplacementFieldFilter.h" -# endif +#if (ITK_VERSION_MAJOR == 4) && (ITK_VERSION_MINOR < 6) +# include "itkTransformToDisplacementFieldSource.h" +#else +# include "itkTransformToDisplacementFieldFilter.h" #endif namespace clitk @@ -51,12 +49,10 @@ namespace clitk typedef itk::Transform< double, TDVFType::ImageDimension, TDVFType::ImageDimension> GenericTransformType; -#if ITK_VERSION_MAJOR >= 4 -# if ITK_VERSION_MINOR < 6 - typedef itk::TransformToDisplacementFieldSource ConvertorType; -# else - typedef itk::TransformToDisplacementFieldFilter ConvertorType; -# endif +#if (ITK_VERSION_MAJOR == 4) && (ITK_VERSION_MINOR < 6) + typedef itk::TransformToDisplacementFieldSource ConvertorType; +#else + typedef itk::TransformToDisplacementFieldFilter ConvertorType; #endif itkNewMacro(Self);