Add clitkMergeRootFiles

[clitk.git] / tools / clitkImageToVectorImageGenericFilter.txx

diff --git a/tools/clitkImageToVectorImageGenericFilter.txx b/tools/clitkImageToVectorImageGenericFilter.txx
old mode 100755 (executable)
new mode 100644 (file)
index b6d7a85..8bbeab8
--- a/tools/clitkImageToVectorImageGenericFilter.txx
+++ b/tools/clitkImageToVectorImageGenericFilter.txx
@@ -3,7 +3,7 @@
 
   Authors belong to: 
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef clitkImageToVectorImageGenericFilter_txx
 #define 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