* src/gdcmFile.h : fix compilation errors on zorglub linuc computer

   -- BeNours

diff --git a/ChangeLog b/ChangeLog
index 4c0d5b36e1652e10c838414ca9f95b22bf4097e2..15d4ca7dec720833ed092082f20b2d9bcbdead0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2004-11-22 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
+   * src/gdcmFile.h : fix compilation errors on zorglub linuc computer
+
 2004-11-19 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
    * src/gdcmDocEntry.cxx : remove the copy of the DictEntry... there isn't
      correct to copy it. The DictEntry is specified at the DocEntry creation,

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index c03b0fcd38c27708254209018abd52c1bcb878a3..4d90b031569654014f12dfaaa05d20efa42ec387 100644 (file)
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/19 18:49:39 $
-  Version:   $Revision: 1.70 $
+  Date:      $Date: 2004/11/22 08:58:12 $
+  Version:   $Revision: 1.71 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -35,19 +35,19 @@ namespace gdcm
 class GDCM_EXPORT File
 {
 public:
-   typedef enum 
+   enum TWriteMode
    {
       WMODE_NATIVE,
       WMODE_DECOMPRESSED,
       WMODE_RGB,
-   } TWriteMode;
+   };
      
-   typedef enum 
+   enum TWriteType
    {
       WTYPE_IMPL_VR,
       WTYPE_EXPL_VR,
       WTYPE_ACR,
-   } TWriteType;
+   };
      
 public:
    File( Header* header );
@@ -92,18 +92,18 @@ public:
    uint8_t* GetLutRGBA();
 
    // Write mode
-   void SetWriteModeToNative()        { SetWriteMode(WMODE_NATIVE); };
-   void SetWriteModeToDecompressed()  { SetWriteMode(WMODE_DECOMPRESSED); };
-   void SetWriteModeToRGB()           { SetWriteMode(WMODE_RGB); };
-   void SetWriteMode(TWriteMode mode) { WriteMode = mode; };
-   TWriteMode GetWriteMode()          { return WriteMode; };
+   void SetWriteModeToNative()          { SetWriteMode(WMODE_NATIVE); };
+   void SetWriteModeToDecompressed()    { SetWriteMode(WMODE_DECOMPRESSED); };
+   void SetWriteModeToRGB()             { SetWriteMode(WMODE_RGB); };
+   void SetWriteMode(unsigned int mode) { WriteMode = mode; };
+   unsigned int GetWriteMode()          { return WriteMode; };
 
    // Write format
-   void SetWriteTypeToDcmImplVR()       { SetWriteType(WTYPE_EXPL_VR); };
-   void SetWriteTypeToDcmExplVR()       { SetWriteType(WTYPE_EXPL_VR); };
-   void SetWriteTypeToAcr()             { SetWriteType(WTYPE_ACR); };
-   void SetWriteType(TWriteType format) { WriteType = format; };
-   TWriteType GetWriteType()            { return WriteType; };
+   void SetWriteTypeToDcmImplVR()         { SetWriteType(WTYPE_EXPL_VR); };
+   void SetWriteTypeToDcmExplVR()         { SetWriteType(WTYPE_EXPL_VR); };
+   void SetWriteTypeToAcr()               { SetWriteType(WTYPE_ACR); };
+   void SetWriteType(unsigned int format) { WriteType = format; };
+   unsigned int GetWriteType()            { return WriteType; };
 
 protected:
    bool WriteBase(std::string const& fileName, FileType type);
@@ -147,8 +147,8 @@ private:
    DocEntryArchive *Archive;
 
    // Write variables
-   TWriteMode WriteMode;
-   TWriteType WriteType;
+   unsigned int WriteMode;
+   unsigned int WriteType;
 
 /// FIXME
 // --------------- Will be moved to a PixelData class