Jean-Pierre Roux

Some brain damaged headers have Zero-Lenght fields for 'Transfert Syntax UID', or
'Media Stored SOP Class UID', etc. :-(
Fixed

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 2ad09079b7ee68a6d3f4c48bbe2afae5e9f0ab2b..a13de9d0e014a32d8e9e08533f37730c50c0ee40 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/07/19 15:16:18 $
-  Version:   $Revision: 1.55 $
+  Date:      $Date: 2004/07/20 08:29:13 $
+  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
@@ -317,10 +317,12 @@ bool gdcmDocument::IsGivenTransferSyntax(std::string const & syntaxToCheck)
    if (gdcmValEntry* valEntry = dynamic_cast< gdcmValEntry* >(entry) )
    {
       std::string transfer = valEntry->GetValue();
-
       // The actual transfer (as read from disk) might be padded. We
       // first need to remove the potential padding. We can make the
       // weak assumption that padding was not executed with digits...
+      if  ( transfer.length() == 0 ) { // for brain damaged headers
+         return false;
+      }
       while ( ! isdigit(transfer[transfer.length()-1]) )
       {
          transfer.erase(transfer.length()-1, 1);

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index f8732073cca8c9328b998b0f09cb1beb6f2332ba..36bdca4f6fa6926b9acd2a6a57bb2d6442c50ee9 100644 (file)
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/07/19 15:16:19 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2004/07/20 08:29:13 $
+  Version:   $Revision: 1.18 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -103,22 +103,25 @@ void gdcmValEntry::Print(std::ostream & os)
    // First 'clean' trailing character (space or zero) 
    if (g == 0x0002) {  // Any more to be displayed ?
       if ( (e == 0x0010) || (e == 0x0002) ) {
-         if ( ! isdigit(v[v.length()-1]) )
-            v.erase(v.length()-1, 1);
+         if ( v.length() != 0 )  // for brain damaged headers
+            if ( ! isdigit(v[v.length()-1]) )
+               v.erase(v.length()-1, 1);
          s << "  ==>\t[" << ts->GetValue(v) << "]";
       }
    } else {
       if (g == 0x0008) {
          if ( (e == 0x0016) || (e == 0x1150)  ) {
-            if ( ! isdigit(v[v.length()-1]) )
-               v.erase(v.length()-1, 1);
+            if ( v.length() != 0 )  // for brain damaged headers
+               if ( ! isdigit(v[v.length()-1]) )
+                  v.erase(v.length()-1, 1);
             s << "  ==>\t[" << ts->GetValue(v) << "]";
          }
       } else {
          if (g == 0x0004) {
            if ( (e == 0x1510) || (e == 0x1512)  ) {
-              if ( ! isdigit(v[v.length()-1]) )
-                 v.erase(v.length()-1, 1);  
+              if ( v.length() != 0 )  // for brain damaged headers  
+                 if ( ! isdigit(v[v.length()-1]) )
+                    v.erase(v.length()-1, 1);  
               s << "  ==>\t[" << ts->GetValue(v) << "]";
             }
          }