* CLEANUP_ROUND (3) for gdcmPixelConvert (nightmare stage)

[gdcm.git] / src / gdcmElementSet.h

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index a7b8b672b4976e3f09d816c05f80b2d8092b3f32..4123aaeefd7d1f0db08152fbaf451658ff045756 100644 (file)
--- a/src/gdcmElementSet.h
+++ b/src/gdcmElementSet.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.h,v $
   Language:  C++
-  Date:      $Date: 2004/06/22 13:47:33 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2004/09/27 08:39:07 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -29,7 +29,7 @@ class gdcmBinEntry;
 class gdcmSeqEntry;
 
 
-typedef std::map<TagKey, gdcmDocEntry *> TagDocEntryHT;
+typedef std::map<gdcmTagKey, gdcmDocEntry *> TagDocEntryHT;
 
 //-----------------------------------------------------------------------------
 
@@ -37,21 +37,31 @@ class GDCM_EXPORT gdcmElementSet : public gdcmDocEntrySet
 {
 public:
    gdcmElementSet(int);
-   ~gdcmElementSet(void);
+   ~gdcmElementSet();
    virtual bool AddEntry(gdcmDocEntry *Entry);
-   virtual bool RemoveEntry(gdcmDocEntry *EntryToRemove);
-
+   bool RemoveEntry(gdcmDocEntry *EntryToRemove);
+   bool RemoveEntryNoDestroy(gdcmDocEntry *EntryToRemove);
+   
    virtual void Print(std::ostream &os = std::cout); 
    virtual void Write(FILE *fp, FileType filetype); 
 
-    
+   /// Accessor to \ref TagHT
+   // Do not expose this to user (public API) !
+   // I re-add it temporaryly JPRx
+   TagDocEntryHT &GetEntry() { return TagHT; };
+
+
 protected:
 // Variables
    /// Hash Table (map), to provide fast access
-   TagDocEntryHT tagHT; 
+   TagDocEntryHT TagHT; 
      
 private:
-   
+   /// Just for following ::GetTagHT()
+   friend class gdcmDocument;
+
+   /// Accessor to \ref TagHT
+   TagDocEntryHT* GetTagHT() { return &TagHT; };
 };
 
 //-----------------------------------------------------------------------------