X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FrtkEdfImageIO.h;h=f88b2b7043df90c479eb502fdc6d15c91183fe5b;hb=bffde3a7ae834139793d8c00f73986879146b0e0;hp=e86501433884ce92ade5d956a109755f5284f1b7;hpb=ce8987fa603ce1591d6d595273761d092467575d;p=clitk.git diff --git a/common/rtkEdfImageIO.h b/common/rtkEdfImageIO.h index e865014..f88b2b7 100644 --- a/common/rtkEdfImageIO.h +++ b/common/rtkEdfImageIO.h @@ -23,6 +23,8 @@ #include #include +#include "clitkCommon.h" + namespace rtk { /** \class EdfImageIO @@ -51,22 +53,22 @@ public: itkTypeMacro(EdfImageIO, ImageIOBase); /*-------- This part of the interface deals with reading data. ------ */ - virtual void ReadImageInformation(); + virtual void ReadImageInformation() ITK_OVERRIDE; - virtual bool CanReadFile( const char* FileNameToRead ); + virtual bool CanReadFile( const char* FileNameToRead ) ITK_OVERRIDE; - virtual void Read(void * buffer); + 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 bool CanWriteFile(const char* filename) ITK_OVERRIDE; - virtual void Write(const void* buffer); + virtual void Write(const void* buffer) ITK_OVERRIDE; protected: std::string m_BinaryFileName; @@ -86,9 +88,9 @@ protected: }; /* Note - compatibility: - Unsigned8 = 1, Signed8, Unsigned16, Signed16, - Unsigned32, Signed32, Unsigned64, Signed64, - FloatIEEE32, DoubleIEEE64 + Unsigned8 = 1,Signed8, Unsigned16, Signed16, + Unsigned32, Signed32, Unsigned64, Signed64, + FloatIEEE32, DoubleIEEE64 */ /*************************************************************************** @@ -138,8 +140,8 @@ protected: // * of the matrix in the data file.) // */ //enum EdfRasterAxes { - // RASTER_AXES_XrightYdown, // matricial format: rows, columns - // RASTER_AXES_XrightYup // cartesian coordinate system + //RASTER_AXES_XrightYdown, // matricial format: rows, columns + //RASTER_AXES_XrightYup // cartesian coordinate system // // other 6 combinations not available (not needed until now) //};