X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkDicomRTDoseIO.h;h=dbcafe1da492a17b6f047d00cc6b5c9ffb357e11;hb=HEAD;hp=f233f3a4619cf5f8c4f25d2cd48c43d7cf2914c3;hpb=765020625fbc092d283e221e36c83e60a1844cb7;p=clitk.git diff --git a/common/clitkDicomRTDoseIO.h b/common/clitkDicomRTDoseIO.h index f233f3a..dbcafe1 100644 --- a/common/clitkDicomRTDoseIO.h +++ b/common/clitkDicomRTDoseIO.h @@ -24,7 +24,7 @@ // itk include #include #include -#if GDCM_MAJOR_VERSION == 2 +#if GDCM_MAJOR_VERSION >= 2 #include #endif @@ -59,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 void dose_copy_raw (float *img_out, T *img_in, int nvox, float scale); @@ -77,7 +77,7 @@ protected: bool mustWriteHeader; int m_HeaderSize; std::ofstream file; -#if GDCM_MAJOR_VERSION == 2 +#if GDCM_MAJOR_VERSION >= 2 gdcm::ImageReader m_GdcmImageReader; #else gdcm::File *m_GdcmFile;