From 0cd215b92821b63abf5e781c56cd8fc0c503a42b Mon Sep 17 00:00:00 2001 From: Vivien Delmon Date: Mon, 14 Jan 2013 16:50:02 +0100 Subject: [PATCH] itk4.3 compatibility - itkCompose3DVectorImageFilter is now itkComposeImageFilter --- tools/clitkImageToVectorImageGenericFilter.h | 1 - tools/clitkImageToVectorImageGenericFilter.txx | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/clitkImageToVectorImageGenericFilter.h b/tools/clitkImageToVectorImageGenericFilter.h index 546ae96..726186d 100644 --- a/tools/clitkImageToVectorImageGenericFilter.h +++ b/tools/clitkImageToVectorImageGenericFilter.h @@ -36,7 +36,6 @@ //itk include #include "itkLightObject.h" -#include "itkCompose3DVectorImageFilter.h" namespace clitk { diff --git a/tools/clitkImageToVectorImageGenericFilter.txx b/tools/clitkImageToVectorImageGenericFilter.txx index b26863e..8bbeab8 100644 --- a/tools/clitkImageToVectorImageGenericFilter.txx +++ b/tools/clitkImageToVectorImageGenericFilter.txx @@ -26,7 +26,11 @@ * @brief * ===================================================*/ - +#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 2) +# include "itkCompose3DVectorImageFilter.h" +#else +# include "itkComposeImageFilter.h" +#endif namespace clitk { @@ -78,7 +82,11 @@ namespace clitk typedef itk::Image, Dimension> OutputImageType; // Filter +#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 2) typedef itk::Compose3DVectorImageFilter ComposeFilterType; +#else + typedef itk::ComposeImageFilter ComposeFilterType; +#endif typename ComposeFilterType::Pointer composeFilter=ComposeFilterType::New(); // Read the inputs -- 2.47.1