X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.cxx;h=f95f8d5469439fb9fc2f3290d3a1c31530cd1dba;hb=b0f62020f3423bf7663fdf856000dc245e417d9a;hp=97d0eb7102d85d2e2944b3a3328bb38001990859;hpb=a7b06006e972ee6ebc04f177a1461d4d5ae2089a;p=gdcm.git

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index 97d0eb71..f95f8d54 100644
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDict.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/05/11 15:01:47 $
-  Version:   $Revision: 1.75 $
+  Date:      $Date: 2005/07/11 14:53:16 $
+  Version:   $Revision: 1.78 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -54,7 +54,7 @@ Dict::Dict(std::string const &filename)
    TagName name;
 
    std::ifstream from( filename.c_str() );
-   if( !from )
+   if ( !from )
    {
       gdcmWarningMacro( "Can't open dictionary" << filename.c_str());
       // Using default embeded one:
@@ -62,7 +62,7 @@ Dict::Dict(std::string const &filename)
    }
    else
    {
-      while (!from.eof())
+      while (!from.eof() && from)
       {
          from >> std::hex;
          from >> group;
@@ -100,9 +100,9 @@ bool Dict::AddEntry(DictEntry const &newEntry)
 {
    const TagKey &key = newEntry.GetKey();
 
-   if(KeyHt.count(key) == 1)
+   if ( KeyHt.count(key) == 1 )
    {
-      gdcmWarningMacro( "Already present" << key.c_str());
+      gdcmErrorMacro( "Already present:" << key );
       return false;
    } 
    else 
@@ -136,7 +136,7 @@ bool Dict::ReplaceEntry(DictEntry const &newEntry)
 bool Dict::RemoveEntry(TagKey const &key) 
 {
    TagKeyHT::const_iterator it = KeyHt.find(key);
-   if(it != KeyHt.end()) 
+   if ( it != KeyHt.end() ) 
    {
       KeyHt.erase(key);
 
@@ -144,7 +144,7 @@ bool Dict::RemoveEntry(TagKey const &key)
    } 
    else 
    {
-      gdcmWarningMacro( "Unfound entry" << key.c_str());
+      gdcmWarningMacro( "Unfound entry" << key );
       return false;
   }
 }
@@ -172,9 +172,8 @@ void Dict::ClearEntry()
 }
 
 /**
- * \brief   Get the dictionary entry identified by a given tag (group,element)
- * @param   group   group of the entry to be found
- * @param   elem element of the entry to be found
+ * \brief   Get the dictionary entry identified by a given tag ("group|element")
+ * @param   key   tag of the entry to be found
  * @return  the corresponding dictionary entry when existing, NULL otherwise
  */
 DictEntry *Dict::GetEntry(TagKey const &key)
@@ -205,7 +204,7 @@ DictEntry *Dict::GetEntry(uint16_t group, uint16_t elem)
 DictEntry *Dict::GetFirstEntry()
 {
    ItKeyHt = KeyHt.begin();
-   if( ItKeyHt != KeyHt.end() )
+   if ( ItKeyHt != KeyHt.end() )
       return &(ItKeyHt->second);
    return NULL;
 }