Inline some methods

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 22670611d27a12c6d00d84631c9269cab1cb7a6e..e6fe536cfefbe26102d80df0927479607b38ff84 100644 (file)
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/29 17:21:34 $
-  Version:   $Revision: 1.177 $
+  Date:      $Date: 2005/11/30 10:58:27 $
+  Version:   $Revision: 1.178 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -438,7 +438,7 @@ bool DicomDir::Anonymize()
 /**
  * \brief Copies all the attributes from an other DocEntrySet 
  * @param set entry to copy from
- * @remarks The contained DocEntries a not copied, only referenced
+ * @remarks The contained DocEntries are not copied, only referenced
  */
 void DicomDir::Copy(DocEntrySet *set)
 {

diff --git a/src/gdcmGlobal.cxx b/src/gdcmGlobal.cxx
index 6f98bbfe9ff8f6436d37f3cf6b06238f60131940..f3196560ae64c03642b114993a3d1ba1c3e9f860 100644 (file)
--- a/src/gdcmGlobal.cxx
+++ b/src/gdcmGlobal.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmGlobal.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/28 15:20:33 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2005/11/30 10:58:27 $
+  Version:   $Revision: 1.30 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -65,9 +65,9 @@ Global Glob;
  */
 Global::Global()
 {
-   if (ValRes || TranSyn || Dicts || ddElem)
+   if (ValRes || TranSyn || Dicts || ddElem || GroupName )
    {
-      gdcmStaticWarningMacro( "VR or TS or Dicts already allocated");
+      gdcmStaticWarningMacro( "VR or TS or Dicts or ... already allocated");
       return;
    }
    Dicts     = DictSet::New();
@@ -91,45 +91,6 @@ Global::~Global()
 
 //-----------------------------------------------------------------------------
 // Public
-/**
- * \brief   returns a pointer to Dictionaries Table 
- */
-DictSet *Global::GetDicts()
-{
-   return Dicts;
-}
-
-/**
- * \brief   returns a pointer to the 'Value Representation Table' 
- */
-VR *Global::GetVR()
-{
-   return ValRes;
-}
-
-/**
- * \brief   returns a pointer to the 'Transfer Syntax Table' 
- */
-TS *Global::GetTS()
-{
-   return TranSyn;
-}
-
-/**
- * \brief   returns a pointer to the Group name correspondance table
- */
-DictGroupName *Global::GetDictGroupName()
-{
-   return GroupName;
-}
-
-/**
- * \brief   returns a pointer to the DicomDir related elements Table 
- */
-DicomDirElement *Global::GetDicomDirElements()
-{
-   return ddElem;
-}
 
 //-----------------------------------------------------------------------------
 // Protected

diff --git a/src/gdcmGlobal.h b/src/gdcmGlobal.h
index 74997e6395fd1d179750e9d8beef6d59ce107980..4a68c6397a5656ba9a6e820222540bdcb558da9a 100644 (file)
--- a/src/gdcmGlobal.h
+++ b/src/gdcmGlobal.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmGlobal.h,v $
   Language:  C++
-  Date:      $Date: 2005/04/05 10:56:25 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2005/11/30 10:58:28 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -33,17 +33,23 @@ class DicomDirElement;
  * \brief   This class contains all globals elements that might be
  *          instanciated only once (singletons).
  */
+class Dict;
 class GDCM_EXPORT Global
 {
 public:
    Global();
    ~Global();
 
-   static DictSet *GetDicts();
-   static VR *GetVR();
-   static TS *GetTS();
-   static DictGroupName *GetDictGroupName();
-   static DicomDirElement *GetDicomDirElements();
+   /// \brief   returns a pointer to Dictionaries Table 
+   static DictSet *GetDicts() { return Dicts;}
+   /// \brief   returns a pointer to the 'Value Representation Table' 
+   static VR *GetVR(){ return ValRes; }
+   /// \brief   returns a pointer to the 'Transfer Syntax Table'
+   static TS *GetTS(){ return TranSyn; }
+   /// \brief   returns a pointer to the Group name correspondance table
+   static DictGroupName *GetDictGroupName() { return GroupName; }
+   /// \brief   returns a pointer to the DicomDir related elements Table 
+   static DicomDirElement *GetDicomDirElements(){ return ddElem; }
 
 private:
    /// Pointer to a container, holding _all_ the Dicom Dictionaries.