* Test/PrintAllDocument.cxx: looping on files is now effective. It used to

     loop on the same image until memory went out.
     Note: this means we still have gobs of memory loss in PrintDocument
   * src/gdcmDocument.cxx: fixes problem on parsing on file
     gdcmData/16BitsJpegLosslessGrayScale.dcm.

diff --git a/ChangeLog b/ChangeLog
index c657b819bc27330c33816cb9f7228c0406c8b3b6..eb732c6c24418c923226f41d25093475735ccb63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-23 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
+   * Test/PrintAllDocument.cxx: looping on files is now effective. It used to
+     loop on the same image until memory went out. 
+     Note: this means we still have gobs of memory loss in PrintDocument
+   * src/gdcmDocument.cxx: fixes problem on parsing on file
+     gdcmData/16BitsJpegLosslessGrayScale.dcm.
 2004-06-24 Jean-Pierre Roux
 FIX : Write - All the Sequences and Sequence Item are now written 
             as 'no length' stuff, and a Sequence Delimitor aor an Item Delimitor

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 5a71e670ea2c37d3ee12af5eb75f70513a85d4fa..e0d531a7e382d6cb1268fb6741a96759cf59d497 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/24 18:03:14 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2004/06/25 12:56:39 $
+  Version:   $Revision: 1.33 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -1249,7 +1249,7 @@ long gdcmDocument::ParseDES(gdcmDocEntrySet *set, long offset, long l_max, bool
          if (NewDocEntry->GetGroup()   == 0x7fe0 && 
              NewDocEntry->GetElement() == 0x0010 )
          {
-             if (NewDocEntry->GetLength()==0xffffffff)
+             if (NewDocEntry->GetReadLength()==0xffffffff)
              {
                 // Broken US.3405.1.dcm
                 Parse7FE0(); // to skip the pixels 
@@ -1417,9 +1417,9 @@ void gdcmDocument::LoadDocEntry(gdcmDocEntry *Entry)
 
    // When we find a BinEntry not very much can be done :
    if (gdcmBinEntry* BinEntryPtr = dynamic_cast< gdcmBinEntry* >(Entry) ) {
-       
+
       LoadEntryVoidArea(BinEntryPtr);
-      s << "gdcm::Loaded (BinEntry)";          
+      s << "gdcm::Loaded (BinEntry)";
       BinEntryPtr->SetValue(s.str());
       return;
    }