X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkXdrImageIO.h;h=3458898fdf99a1405699bf52653e9096ddee068d;hb=d55f025b18f68066a52b8f33c2dc6481e82c2580;hp=ce27d11f66fab412236ae4ea955a918707f7133f;hpb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;p=clitk.git

diff --git a/common/clitkXdrImageIO.h b/common/clitkXdrImageIO.h
index ce27d11..3458898 100644
--- a/common/clitkXdrImageIO.h
+++ b/common/clitkXdrImageIO.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 CLITKXDRIMAGEIO_H
 #define CLITKXDRIMAGEIO_H
 
@@ -34,6 +34,8 @@
 #define AVSerror(v)   itkGenericExceptionMacro(<< "Error in clitk::XdrImageIO. Message:" << v);
 #define AVSwarning(v) itkWarningMacro(<< "Error in clitk::XdrImageIO. Message:" << v);
 
+#include "clitkCommon.h"
+
 namespace clitk {
 
 //====================================================================
@@ -61,21 +63,21 @@ public:
     /*-------- This part of the interface deals with reading data. ------ */
     virtual int ReadImageInformationWithError();
     virtual int ReadWithError(void * buffer);
-    virtual void ReadImageInformation();
-    virtual void Read(void * buffer);
-    virtual bool CanReadFile( const char* FileNameToRead );
+    virtual void ReadImageInformation() ITK_OVERRIDE;
+    virtual void Read(void * buffer) ITK_OVERRIDE;
+    virtual bool CanReadFile( const char* FileNameToRead ) ITK_OVERRIDE;
 
     /*-------- This part of the interfaces deals with writing data. ----- */
     virtual void WriteImageInformation(bool keepOfStream) {;}
-    virtual void WriteImageInformation() { WriteImageInformation(false); }
-    virtual bool CanWriteFile(const char* FileNameToWrite);
-    virtual void Write(const void* buffer);
+    virtual void WriteImageInformation() ITK_OVERRIDE { WriteImageInformation(false); }
+    virtual bool CanWriteFile(const char* FileNameToWrite) ITK_OVERRIDE;
+    virtual void Write(const void* buffer) ITK_OVERRIDE;
 
 protected:
     void ITKError(std::string funcName, int msgID);
-    void WriteImage(const char* file, char* headerinfo, char* headerfile, int raw,
-                    int offset, char bLittleEndian, int iNkiCompression,
-                    int wcoords, int append, int getsize, char *tobuffer, const void* data);
+    void WriteImage(const char* file, char* headerinfo, char* headerfile, int raw,
+                    int offset, char bLittleEndian, int iNkiCompression,
+                    int wcoords, int append, int getsize, char *tobuffer, const void* data);
 
     int m_HeaderSize;
     int forcenoswap;
@@ -84,7 +86,7 @@ protected:
 } // end namespace
 
 // explicit template instantiation
-template class itk::CreateObjectFunction<clitk::XdrImageIO>;
+//template class itk::CreateObjectFunction<clitk::XdrImageIO>;
 
 #endif /* end #define CLITKXDRIMAGEIO_H */