From: Vivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Date: Mon, 14 Jan 2013 15:50:02 +0000 (+0100)
Subject: itk4.3 compatibility
X-Git-Tag: v1.4.0~236^2~11
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0cd215b92821b63abf5e781c56cd8fc0c503a42b;p=clitk.git

itk4.3 compatibility

- itkCompose3DVectorImageFilter is now itkComposeImageFilter
---

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<itk::Vector<PixelType,3>, Dimension> OutputImageType;
     
     // Filter
+#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 2)
     typedef itk::Compose3DVectorImageFilter<InputImageType,OutputImageType> ComposeFilterType;
+#else
+    typedef itk::ComposeImageFilter<InputImageType,OutputImageType> ComposeFilterType;
+#endif
     typename ComposeFilterType::Pointer composeFilter=ComposeFilterType::New();
 
     // Read the inputs