Should work both with vtk4 and vtk 5.

[gdcm.git] / src / gdcmDictSet.h

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index e49e859eb35924669fe10eb9c8fe37269fa9c38e..3c196d9ced6072d1e7c04bfccae4fec964bc162c 100644 (file)
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.h,v $
   Language:  C++
-  Date:      $Date: 2005/10/25 14:52:34 $
-  Version:   $Revision: 1.49 $
+  Date:      $Date: 2007/05/23 14:18:09 $
+  Version:   $Revision: 1.54 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,11 +21,12 @@
 
 #include "gdcmRefCounter.h"
 #include "gdcmDict.h"
+#include "gdcmGlobal.h"
 
 #include <map>
 #include <list>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 typedef std::map<DictKey, Dict*> DictSetHT;
@@ -34,8 +35,8 @@ typedef std::map<DictKey, Dict*> DictSetHT;
 /**
  * \brief  Container for managing a set of loaded dictionaries (Dict).
  * \note   Hopefully, sharing dictionaries should avoid
- * \par    reloading an already loaded dictionary (saving time)
- * \par    having many in memory representations of the same dictionary
+ *         - reloading an already loaded dictionary (saving time)
+ *         - having many in memory representations of the same dictionary
  *        (saving memory).
  */
 class GDCM_EXPORT DictSet : public RefCounter
@@ -43,6 +44,7 @@ class GDCM_EXPORT DictSet : public RefCounter
    gdcmTypeMacro(DictSet);
 
 public:
+/// \brief Contructs a DictSet with a RefCounter
    static DictSet *New() {return new DictSet();}
 
    void Print(std::ostream &os = std::cout, std::string const &indent = "" );
@@ -57,8 +59,9 @@ public:
    Dict *GetDict( DictKey const &DictName );
 
    /// \brief   Returns the default reference DICOM V3 public dictionary.
-   Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); }
-
+   //Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); }
+   Dict* GetDefaultPubDict() { return Global::DefaultPubDict; } 
+   
    // \ brief   Returns the virtual references DICOM dictionary.
    // \ warning : not end user intended
    // Dict *GetVirtualDict() { return &VirtualEntries; }