From: Romulo Pinho <romulo.pinho@lyon.unicancer.fr>
Date: Thu, 15 Nov 2012 08:50:48 +0000 (+0100)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~239^2~13^2~1
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=c18ab5232cf7d80c10c0805e9566b54fb8c6f875;hp=c7a6bc15ce7ef75426e8f1db97453635fa430370;p=clitk.git

Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
---

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index efe81ed..4a59384 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -64,8 +64,11 @@ IF(ITK_VERSION_MAJOR LESS "4")
   ENDIF(ITK_USE_SYSTEM_GDCM)
 ELSE(ITK_VERSION_MAJOR LESS "4")
   SET(GDCM_INCLUDE ".*include/gdcm-.*")
+  #SET(GDCM_INCLUDE ".*/Source/Common")
   IF(ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE})
     SET(CLITK_USE_SYSTEM_GDCM TRUE)
+  ELSE(ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE})
+    MESSAGE("NOT USING SYSTEM_GDCM!!!!!!!")
   ENDIF(ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE})
 ENDIF(ITK_VERSION_MAJOR LESS "4")
 
diff --git a/segmentation/clitkExtractLungFilter.txx b/segmentation/clitkExtractLungFilter.txx
index f84a095..a0acdd5 100644
--- a/segmentation/clitkExtractLungFilter.txx
+++ b/segmentation/clitkExtractLungFilter.txx
@@ -658,6 +658,9 @@ SearchForTracheaSeed2(int numberOfSlices)
     opening->Update();
     
     typename SlicerFilterType::Pointer slicer = SlicerFilterType::New();
+#if ITK_VERSION_MAJOR >= 4
+    slicer->SetDirectionCollapseToIdentity();
+#endif
     slicer->SetInput(opening->GetOutput());
     
     // label result