X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkBLUTDIRGenericFilter.cxx;h=6c80fd911859199d28b36f618e2d01472c0d8eaa;hb=103778ec7e0d03e32d9ecfa1306312d32d72ad4c;hp=9f7b84f456f36496f1be156400a0c43441dd2983;hpb=c234e07e4ef90bb8b08c75ca4f1b3a76055e7859;p=clitk.git diff --git a/registration/clitkBLUTDIRGenericFilter.cxx b/registration/clitkBLUTDIRGenericFilter.cxx index 9f7b84f..6c80fd9 100644 --- a/registration/clitkBLUTDIRGenericFilter.cxx +++ b/registration/clitkBLUTDIRGenericFilter.cxx @@ -30,14 +30,10 @@ It is distributed under dual licence #include "clitkBLUTDIRGenericFilter.h" #include "clitkBLUTDIRCommandIterationUpdateDVF.h" #include "itkCenteredTransformInitializer.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 "itkTransformToDeformationFieldSource.h" +# include "itkTransformToDisplacementFieldFilter.h" #endif namespace clitk @@ -789,12 +785,10 @@ namespace clitk //======================================================= typedef itk::Vector< float, SpaceDimension > DisplacementType; typedef itk::Image< DisplacementType, InputImageType::ImageDimension > DisplacementFieldType; -#if ITK_VERSION_MAJOR >= 4 -# if ITK_VERSION_MINOR < 6 +#if (ITK_VERSION_MAJOR == 4) && (ITK_VERSION_MINOR < 6) typedef itk::TransformToDisplacementFieldSource ConvertorType; -# else +#else typedef itk::TransformToDisplacementFieldFilter ConvertorType; -# endif #endif typename ConvertorType::Pointer filter= ConvertorType::New(); filter->SetNumberOfThreads(1);