Merge branch 'master' of /home/dsarrut/clitk3.server

[clitk.git] / common / vvFromITK.h

diff --git a/common/vvFromITK.h b/common/vvFromITK.h
index bd075731304eeb0ed735093edef484d45e3541d5..c089816ad785085026eb9a594ef3ad6d476df808 100644 (file)
--- a/common/vvFromITK.h
+++ b/common/vvFromITK.h
@@ -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 VVIMAGEFROMITK_H
 #define VVIMAGEFROMITK_H
 
@@ -54,7 +54,9 @@ template<unsigned int Dim, class PixelType> vvImage::Pointer vvImageFromITK(type
             extractedRegion.SetIndex(start);
 
             typename FilterType::Pointer filter = FilterType::New();
+#if ITK_VERSION_MAJOR == 4
             filter->SetDirectionCollapseToSubmatrix();
+#endif
             filter->SetExtractionRegion(extractedRegion);
             filter->SetInput(input);
             filter->ReleaseDataFlagOn();