* src/gdcmFile.h : bug fix. Variable type and variable name had same name

[gdcm.git] / src / gdcmFile.h

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index f87a1a9e548a05420957fc491514d984ed0c3962..f72484188d77d0a8363eaa7d4f457398996aed20 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/12/03 14:22:40 $
-  Version:   $Revision: 1.82 $
+  Date:      $Date: 2004/12/04 09:41:02 $
+  Version:   $Revision: 1.84 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,13 +20,15 @@
 #define GDCMFILE_H
 
 #include "gdcmCommon.h"
-#include "gdcmHeader.h"
-#include "gdcmPixelReadConvert.h"
-#include "gdcmPixelWriteConvert.h"
-#include "gdcmDocEntryArchive.h"
 
 namespace gdcm 
 {
+class Header;
+class ValEntry;
+class BinEntry;
+class PixelReadConvert;
+class PixelWriteConvert;
+class DocEntryArchive;
 //-----------------------------------------------------------------------------
 /*
  * In addition to Dicom header exploration, this class is designed
@@ -36,7 +38,7 @@ namespace gdcm
 class GDCM_EXPORT File
 {
 public:
-   enum WriteMode
+   enum FileMode
    {
       WMODE_DECOMPRESSED,
       WMODE_RGB
@@ -69,19 +71,15 @@ public:
    bool WriteAcr      (std::string const& fileName);
    bool Write(std::string const& fileName);
 
-   virtual bool SetEntryByNumber(std::string const& content,
-                                 uint16_t group, uint16_t element)
-   { 
-      HeaderInternal->SetEntryByNumber(content,group,element);
-      return true;
-   }
+   bool SetEntryByNumber(std::string const& content,
+                                uint16_t group, uint16_t element);
    uint8_t* GetLutRGBA();
 
    // Write mode
    void SetWriteModeToDecompressed() { SetWriteMode(WMODE_DECOMPRESSED); };
    void SetWriteModeToRGB()          { SetWriteMode(WMODE_RGB); };
-   void SetWriteMode(WriteMode mode) { WriteMode = mode; };
-   WriteMode GetWriteMode()          { return WriteMode; };
+   void SetWriteMode(FileMode mode)  { WriteMode = mode; };
+   FileMode GetWriteMode()           { return WriteMode; };
 
    // Write format
    void SetWriteTypeToDcmImplVR()     { SetWriteType(ImplicitVR); };
@@ -139,7 +137,7 @@ private:
    DocEntryArchive *Archive;
 
    // Write variables
-   WriteMode WriteMode;
+   FileMode WriteMode;
    FileType WriteType;
 };
 } // end namespace gdcm