* src/gdcmDocEntry.[h|cxx] : now the ReadLength is the length of the datas

[gdcm.git] / src / gdcmDocument.h

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index e7233eb029fff390ccb7fe075d98c43e2b01e406..1c8447954049944c81214c34e70fd96c080e32eb 100644 (file)
--- a/src/gdcmDocument.h
+++ b/src/gdcmDocument.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/06 20:03:27 $
-  Version:   $Revision: 1.75 $
+  Date:      $Date: 2005/01/07 16:45:51 $
+  Version:   $Revision: 1.77 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -110,8 +110,7 @@ public:
    void WriteContent( std::ofstream *fp, FileType type );
 
 // Content entries
-   virtual bool SetEntryByName  (std::string const &content, 
-                                 TagName const &tagName );
+
    virtual bool SetEntryByNumber(std::string const &content,
                                  uint16_t group, uint16_t element);
    virtual bool SetEntryByNumber(uint8_t *content, int lgth,
@@ -121,14 +120,11 @@ public:
 
    virtual void *GetEntryBinAreaByNumber(uint16_t group, uint16_t elem);   
 
-   virtual std::string GetEntryByName    (TagName const &tagName);
-   virtual std::string GetEntryVRByName  (TagName const &tagName);
    virtual std::string GetEntryByNumber  (uint16_t group, uint16_t elem);
    virtual std::string GetEntryVRByNumber(uint16_t group, uint16_t elem);
    virtual int GetEntryLengthByNumber(uint16_t group, uint16_t elem);
 
    DocEntry *GetDocEntryByNumber(uint16_t group, uint16_t element); 
-   DocEntry *GetDocEntryByName  (TagName const &tagName);
    ValEntry *GetValEntryByNumber(uint16_t group, uint16_t element); 
    BinEntry *GetBinEntryByNumber(uint16_t group, uint16_t element); 
 
@@ -212,20 +208,19 @@ private:
 
    void LoadDocEntry         (DocEntry *e);
    void FindDocEntryLength   (DocEntry *e) throw ( FormatError );
+   uint32_t FindDocEntryLengthOBOrOW() throw( FormatUnexpected );
    std::string FindDocEntryVR();
    bool CheckDocEntryVR      (VRKey k);
 
-   std::string GetDocEntryValue  (DocEntry *e);
-   std::string GetDocEntryUnvalue(DocEntry *e);
-
+   std::string GetDocEntryValue  (DocEntry *entry);
+   std::string GetDocEntryUnvalue(DocEntry *entry);
 
-   void SkipDocEntry          (DocEntry *e);
-   void SkipToNextDocEntry    (long offset,long readLgth);
 
-   void FixDocEntryFoundLength(DocEntry *e, uint32_t l);
-   bool IsDocEntryAnInteger   (DocEntry *e);
+   void SkipDocEntry          (DocEntry *entry);
+   void SkipToNextDocEntry    (DocEntry *entry);
 
-   uint32_t FindDocEntryLengthOB() throw( FormatUnexpected );
+   void FixDocEntryFoundLength(DocEntry *entry,uint32_t l);
+   bool IsDocEntryAnInteger   (DocEntry *entry);
 
    uint16_t ReadInt16() throw ( FormatError );
    uint32_t ReadInt32() throw ( FormatError );