Bugfixes. --- JPR (with frog)

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index dc8fa2db06873abd07e4737e5af5fed2684eb71b..e57f5dfbc7e9c5f0c206fdbfb73133a5cb64ce33 100644 (file)
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/23 13:02:35 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2004/06/23 15:01:57 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -69,14 +69,13 @@ void gdcmBinEntry::Print(std::ostream &os)
    if (voidArea != NULL)
    {
       s << " [gdcm::Binary data loaded with length is "
-        << GetLength() << "]"
-        << std::endl;
+        << GetLength() << "]";
    }
    else
    {
-      s << " [gdcm::Binary data NOT loaded]"
-        << std::endl;
+      s << " [gdcm::Binary data NOT loaded]";
    }
+   os << s.str();
 }
 
 /*

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index c91e0f0ac3463336f7d99c62bfdde969f314ebc4..e29c08bfc24dd287b2ecbacc27528ac6955d67ea 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/06/23 13:54:56 $
-  Version:   $Revision: 1.28 $
+  Date:      $Date: 2004/06/23 15:01:57 $
+  Version:   $Revision: 1.29 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -1227,9 +1227,16 @@ long gdcmDocument::ParseDES(gdcmDocEntrySet *set, long offset, long l_max, bool
              NewDocEntry->GetElement() == 0x0010 )
          {
              if (NewDocEntry->GetLength()==0xffffffff)
+             {
                 // Broken US.3405.1.dcm
                 Parse7FE0(); // to skip the pixels 
                              // (multipart JPEG/RLE are trouble makers)
+             }
+             else
+             {
+                SkipToNextDocEntry(NewDocEntry);
+                l = NewDocEntry->GetFullLength(); 
+             }
          }
          else
          {

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index a42f7f1670f0384083fa684a6191080f752c937a..6026a867e9b6187746f41fdf49450b7b2355ed2a 100644 (file)
--- a/src/gdcmSeqEntry.cxx
+++ b/src/gdcmSeqEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSeqEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/23 13:02:36 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2004/06/23 15:01:57 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -76,6 +76,7 @@ void gdcmSeqEntry::Print(std::ostream &os){
          os << "   | " ;
       if (seq_term != NULL) {
          seq_term->Print(os);
+         os << std::endl;
       } 
       else 
          os << "      -------------- should have a sequence terminator item";