* src/gdcmFile.cxx : now delete the PixelConvert instance.

[gdcm.git] / src / gdcmElementSet.h

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index 4bf25ae86b7d91c97741c16a27b61d0676c1b1b1..c1da9457d10441695996b84172e2d9ab9b02dccf 100644 (file)
--- a/src/gdcmElementSet.h
+++ b/src/gdcmElementSet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/12 04:35:46 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2004/10/25 04:47:43 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,10 +27,9 @@
 class ValEntry;
 class BinEntry;
 class SeqEntry;
+
 namespace gdcm 
 {
-
-
 typedef std::map<TagKey, DocEntry *> TagDocEntryHT;
 
 //-----------------------------------------------------------------------------
@@ -40,30 +39,28 @@ class GDCM_EXPORT ElementSet : public DocEntrySet
 public:
    ElementSet(int);
    ~ElementSet();
-   virtual bool AddEntry(DocEntry *Entry);
+
+   bool AddEntry(DocEntry *Entry);
    bool RemoveEntry(DocEntry *EntryToRemove);
    bool RemoveEntryNoDestroy(DocEntry *EntryToRemove);
    
-   virtual void Print(std::ostream &os = std::cout); 
-   virtual void Write(FILE *fp, FileType filetype); 
-
+   void Print(std::ostream &os = std::cout); 
+   void Write(std::ofstream *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; };
-
+   // Do not expose this to user (public API) ! 
+   // A test is using it thus put it in public (matt)
+   TagDocEntryHT const & GetTagHT() const { return TagHT; };
 
 protected:
+    
+private:
 // Variables
    /// Hash Table (map), to provide fast access
    TagDocEntryHT TagHT; 
-     
-private:
-   /// Just for following ::GetTagHT()
+ 
    friend class Document;
-
-   /// Accessor to \ref TagHT
-   TagDocEntryHT* GetTagHT() { return &TagHT; };
+   friend class DicomDir; //For accessing private TagHT
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------