Mathieu Malaterre :

[clitk.git] / common / clitkImageCommon.h

diff --git a/common/clitkImageCommon.h b/common/clitkImageCommon.h
index d3fefb3228b153928429a1bbb2c3e486f1feec7b..38800c4c8e4796aae31254da5ac0cf6b9578b5bc 100644 (file)
--- a/common/clitkImageCommon.h
+++ b/common/clitkImageCommon.h
@@ -19,16 +19,19 @@
 #define CLITKIMAGECOMMON_H
 
 // clitk
-#include "clitkCommon.h"
+//#include "clitkCommon.h"
 
 // itk
 #include "itkImage.h"
 #include "itkImageFileReader.h"
 #include "itkImageSeriesReader.h"
 #include "itkImageFileWriter.h"
-//#include "gdcmFile.h"
-//#include "gdcmFileHelper.h"
-
+#include "gdcmFile.h"
+#if GDCM_MAJOR_VERSION == 2
+  #include "gdcmReader.h"
+#else
+  #include "gdcmFileHelper.h"
+#endif
 
 namespace clitk {
   
@@ -81,7 +84,7 @@ namespace clitk {
 
   //--------------------------------------------------------------------
   // Read a dicom header  
-//  gdcm::File * readDicomHeader(const std::string & filename, const bool verbose=false);
+  gdcm::File * readDicomHeader(const std::string & filename, const bool verbose=false);
 
   //--------------------------------------------------------------------
   template<class ImageType>