itk4.3 compatibility

- itkCompose3DVectorImageFilter is now itkComposeImageFilter

diff --git a/tools/clitkImageToVectorImageGenericFilter.h b/tools/clitkImageToVectorImageGenericFilter.h
index 546ae96a81ace35b426d157db02bc9d70aa231c2..726186db75646fff5f516a864db4bc494cb16689 100644 (file)
--- 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 b26863ed731232bc81edd23808c12ba27d385bb2..8bbeab86ab3bc53853ce0554dc247edaeb44e3c8 100644 (file)
--- 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