X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkDicomRTDoseIO.h;h=dbcafe1da492a17b6f047d00cc6b5c9ffb357e11;hb=08f7de414957e92b25ca5b299007e941b610d3a8;hp=b5679aa133a056b3a9e517a2c4747ba898628883;hpb=acd847ca23ec3c1213e9e97043d4f99445a25b6c;p=clitk.git

diff --git a/common/clitkDicomRTDoseIO.h b/common/clitkDicomRTDoseIO.h
index b5679aa..dbcafe1 100644
--- a/common/clitkDicomRTDoseIO.h
+++ b/common/clitkDicomRTDoseIO.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 clitkDicomRTDoseIO_h
 #define clitkDicomRTDoseIO_h
 
@@ -24,6 +24,9 @@
 // itk include
 #include <itkImageIOBase.h>
 #include <gdcmFile.h>
+#if GDCM_MAJOR_VERSION >= 2
+  #include <gdcmImageReader.h>
+#endif
 
 // std include
 #include <fstream>
@@ -44,7 +47,9 @@ public:
 
   DicomRTDoseIO():Superclass() {
     mustWriteHeader = false;
+#if GDCM_MAJOR_VERSION < 2
     m_GdcmFile=NULL;
+#endif
   }
 
   /** Method for creation through the object factory. */
@@ -54,17 +59,17 @@ public:
   itkTypeMacro(DicomRTDoseIO, ImageIOBase);
 
   /*-------- This part of the interface deals with reading data. ------ */
-  virtual void ReadImageInformation();
-  virtual bool CanReadFile( const char* FileNameToRead );
-  virtual void Read(void * buffer);
+  virtual void ReadImageInformation() ITK_OVERRIDE;
+  virtual bool CanReadFile( const char* FileNameToRead ) ITK_OVERRIDE;
+  virtual void Read(void * buffer) ITK_OVERRIDE;
 
   /*-------- This part of the interfaces deals with writing data. ----- */
   virtual void WriteImageInformation(bool keepOfStream);
-  virtual void WriteImageInformation() {
+  virtual void WriteImageInformation() ITK_OVERRIDE {
     WriteImageInformation(false);
   }
-  virtual bool CanWriteFile(const char* filename);
-  virtual void Write(const void* buffer);
+  virtual bool CanWriteFile(const char* filename) ITK_OVERRIDE;
+  virtual void Write(const void* buffer) ITK_OVERRIDE;
 
 protected:
   template <class T> void dose_copy_raw (float *img_out, T *img_in, int nvox, float scale);
@@ -72,7 +77,11 @@ protected:
   bool mustWriteHeader;
   int m_HeaderSize;
   std::ofstream file;
+#if GDCM_MAJOR_VERSION >= 2
+  gdcm::ImageReader m_GdcmImageReader;
+#else
   gdcm::File *m_GdcmFile;
+#endif
   float m_DoseScaling;
 }; // end class DicomRTDoseIO