* Fix compilation warnings

[gdcm.git] / src / gdcmDocEntry.h

diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index cf12bdfadf5a6396e062931f832e34f5df7d68fb..ee5c7eb64aecd8c565d239b5c72e87e9ba313cdf 100644 (file)
--- a/src/gdcmDocEntry.h
+++ b/src/gdcmDocEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.h,v $
   Language:  C++
-  Date:      $Date: 2005/10/19 13:17:04 $
-  Version:   $Revision: 1.52 $
+  Date:      $Date: 2005/11/29 12:48:46 $
+  Version:   $Revision: 1.59 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,7 +19,7 @@
 #ifndef GDCMDOCENTRY_H
 #define GDCMDOCENTRY_H
 
-#include "gdcmBase.h"
+#include "gdcmRefCounter.h"
 #include "gdcmDictEntry.h"
 
 #include <iostream>
@@ -35,13 +35,11 @@ class SeqEntry;
  * \brief   The dicom header of a Dicom file contains a set of such entries
  *          (when successfuly parsed against a given Dicom dictionary)
  */
-class GDCM_EXPORT DocEntry : public Base
+class GDCM_EXPORT DocEntry : public RefCounter
 {
-public:
-   DocEntry(DictEntry*);
-   /// \brief Canonical Destructor
-   virtual ~DocEntry() {}
+   gdcmTypeMacro(DocEntry);
 
+public:
    virtual void Print (std::ostream &os = std::cout, std::string const &indent = ""); 
    virtual void WriteContent(std::ofstream *fp, FileType filetype);
 
@@ -67,7 +65,7 @@ public:
    /// Dictionnary, of the current Dicom entry
    VRKey const &GetVR() const { return DicomDict->GetVR(); }
 
-   /// \brief Returns the 'Value Multiplicity' (e.g. "1", "1-n", "6"),
+   /// \brief Returns the 'Value Multiplicity' (e.g. "1", 6", "1-n", "3-n"),
    /// found in the Dicom entry or in the Dicom Dictionnary
    /// of the current Dicom entry
    std::string const &GetVM() const { return DicomDict->GetVM(); }
@@ -94,10 +92,11 @@ public:
    virtual void SetLength(uint32_t l) { Length = l; }
    /// \brief Returns the actual value length of the current Dicom entry
    /// \warning this value is not *always* the one stored in the Dicom header
-   ///          in case of well knowned bugs
+   ///          in case of well known bugs
    const uint32_t &GetLength() const { return Length; }
 
    uint32_t GetFullLength();
+   virtual uint32_t ComputeFullLength() = 0;
 
 // The following 3 members, for internal use only ! 
    /// \brief   Sets the offset of the Dicom entry
@@ -123,10 +122,13 @@ public:
    bool IsItemDelimitor();
    bool IsItemStarter();
    bool IsSequenceDelimitor();   
-   
-   virtual void Copy(DocEntry *e);
+
+   virtual void Copy(DocEntry *doc);
 
 protected:
+   DocEntry(DictEntry*);
+   virtual ~DocEntry();
+
    /// \brief pointer to the underlying Dicom dictionary element
    DictEntry *DicomDict;