From gdcm 1.x to gdcm 2.0

[clitk.git] / common / clitkImageCommon.cxx

diff --git a/common/clitkImageCommon.cxx b/common/clitkImageCommon.cxx
index cfcbbe34225b3034adab9770bf127e92bfeb1f69..f5a8d3c813fbdc1e873693369e29f032e4ae6117 100644 (file)
--- a/common/clitkImageCommon.cxx
+++ b/common/clitkImageCommon.cxx
@@ -63,6 +63,13 @@ void clitk::ReadImageDimensionAndPixelType(const std::string & filename,
 gdcm::File * clitk::readDicomHeader(const std::string & filename,
                                     const bool verbose)
 {
+#if GDCM_MAJOR_VERSION == 2
+  gdcm::Reader hreader;
+  hreader.SetFileName(filename.c_str());
+  hreader.Read();
+  gdcm::SmartPointer<gdcm::File> p = hreader.GetFile();
+  return p;
+#else
   if (verbose) {
     std::cout << "Reading DICOM <" << filename << ">" << std::endl;
   }
@@ -71,6 +78,7 @@ gdcm::File * clitk::readDicomHeader(const std::string & filename,
   header->SetMaxSizeLoadEntry(16384); // required ?
   header->Load();
   return header;
+#endif
 }
 ///--------------------------------------------------------------------