* src/gdcmFile.cxx, gdcmDocument.cxx : fix the bug on the group|element

[gdcm.git] / src / gdcmDictSet.cxx

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index f8bb4f35d036407c104bd480d9c91ad632ff521b..c9cdfbcfb66a3544144ce1871779e8c3883f52d0 100644 (file)
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/18 07:50:58 $
-  Version:   $Revision: 1.52 $
+  Date:      $Date: 2005/01/23 10:12:33 $
+  Version:   $Revision: 1.56 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -43,7 +43,7 @@ DictSet::DictSet()
  */
 DictSet::~DictSet() 
 {
-   // Remove dictionnaries
+   // Remove dictionaries
    for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag) 
    {
       Dict *entryToDelete = tag->second;
@@ -65,6 +65,7 @@ DictSet::~DictSet()
  * \brief   Print, in an informal fashion, the list of all the dictionaries
  *          contained is this DictSet, along with their respective content.
  * @param   os Output stream used for printing.
+ * @param indent Indentation string to be prepended during printing
  */
 void DictSet::Print(std::ostream &os, std::string const & )
 {
@@ -195,10 +196,10 @@ DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
 
 /**
  * \brief   Obtain from the GDCM_DICT_PATH environnement variable the
- *          path to directory containing the dictionnaries. When
+ *          path to directory containing the dictionaries. When
  *          the environnement variable is absent the path is defaulted
  *          to "../Dicts/".
- * @return  path to directory containing the dictionnaries
+ * @return  path to directory containing the dictionaries
  */
 std::string DictSet::BuildDictPath() 
 {
@@ -231,7 +232,9 @@ std::string DictSet::BuildDictPath()
 Dict *DictSet::GetFirstEntry()
 {
    ItDictHt = Dicts.begin();
-   return ItDictHt->second;
+   if( ItDictHt != Dicts.end() )
+      return ItDictHt->second;
+   return NULL;
 }
 
 /**
@@ -241,17 +244,12 @@ Dict *DictSet::GetFirstEntry()
  */
 Dict *DictSet::GetNextEntry()
 {
-   if (ItDictHt != Dicts.end())
-   {
-      Dict *tmp = ItDictHt->second;
-      ++ItDictHt;
-
-      return tmp;
-   }
-   else
-   {
-      return NULL;
-   }
+   gdcmAssertMacro (ItDictHt != Dicts.end());
+  
+   ++ItDictHt;
+   if ( ItDictHt != Dicts.end() )
+      return ItDictHt->second;
+   return NULL;
 }
 
 //-----------------------------------------------------------------------------