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

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index efe81edce046f25702940723f46f97c94c47ac5f..4a593847354570f95a7efb3dc9442b7c83061065 100644 (file)
--- 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 f84a0956fb61d1bc48cf202c5481267e132bf2cd..a0acdd5ad2ab48aa3669d58f8d9d22171b74d329 100644 (file)
--- 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