BUG: Remove demangle code this was seg faulting on some linux gcc 3.3.2 machine

[gdcm.git] / src / gdcmDocument.cxx

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index d6006ab5e2e4c948772f45b354ddebbe75825c92..615f8acd32386d3703f8d1e159e26483061d2c54 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/25 03:35:20 $
-  Version:   $Revision: 1.113 $
+  Date:      $Date: 2004/11/04 18:14:34 $
+  Version:   $Revision: 1.116 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -729,7 +729,7 @@ bool Document::ReplaceIfExistByNumber(std::string const & value,
 bool Document::CheckIfEntryExistByNumber(uint16_t group, uint16_t element )
 {
    const std::string &key = DictEntry::TranslateToKey(group, element );
-   return TagHT.count(key);
+   return TagHT.count(key) != 0;
 }
 
 /**
@@ -2292,7 +2292,7 @@ uint16_t Document::ReadInt16()
    Fp->read ((char*)&g, (size_t)2);
    if ( Fp->fail() )
    {
-          throw FormatError( "Document::ReadInt16()", " file error." );
+      throw FormatError( "Document::ReadInt16()", " file error." );
    }
    if( Fp->eof() )
    {
@@ -2685,8 +2685,18 @@ bool Document::ReadTag(uint16_t testGroup, uint16_t testElement)
 
    //// Read the Item Tag group and element, and make
    // sure they are what we expected:
-   uint16_t itemTagGroup   = ReadInt16();
-   uint16_t itemTagElement = ReadInt16();
+   uint16_t itemTagGroup;
+   uint16_t itemTagElement;
+   try
+   {
+      itemTagGroup   = ReadInt16();
+      itemTagElement = ReadInt16();
+   }
+   catch ( FormatError e )
+   {
+      //std::cerr << e << std::endl;
+      return false;
+   }
    if ( itemTagGroup != testGroup || itemTagElement != testElement )
    {
       std::ostringstream s;
@@ -2932,9 +2942,9 @@ void Document::BuildFlatHashTableRecurse( TagDocEntryHT& builtHT,
 { 
    if (ElementSet* elementSet = dynamic_cast< ElementSet* > ( set ) )
    {
-      TagDocEntryHT* currentHT = elementSet->GetTagHT();
-      for( TagDocEntryHT::const_iterator i  = currentHT->begin();
-                                         i != currentHT->end();
+      TagDocEntryHT const & currentHT = elementSet->GetTagHT();
+      for( TagDocEntryHT::const_iterator i  = currentHT.begin();
+                                         i != currentHT.end();
                                        ++i)
       {
          DocEntry* entry = i->second;