* Test/CmakeList.txt: removed the following from black list (to be coherent

     with removal from gdcmData):
      - gdcm-MR-PHILIPS-16-Multi-Seq.fixed.dcm
      - gdcm-MR-PHILIPS-16.dcm
      - US.3405.1.dcm
     Added the following because after last cvs update, they cause
       ctest -R TestReadWriteReadCompare
     to segfault:
      - gdcm-MR-SIEMENS-16-1.acr
      - oldACR00001.ima

diff --git a/ChangeLog b/ChangeLog
index 52fde1bb7562945cd26d6cb9790b9d11165b499d..fb69366c6070125a83cf129b05f5436d7a0b5366 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,14 @@
 2004-06-30 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
+   * Test/CmakeList.txt: removed the following from black list (to be coherent
+     with removal from gdcmData):
+      - gdcm-MR-PHILIPS-16-Multi-Seq.fixed.dcm
+      - gdcm-MR-PHILIPS-16.dcm
+      - US.3405.1.dcm
+     Added the following because after last cvs update, they cause
+       ctest -R TestReadWriteReadCompare 
+     to segfault:
+      - gdcm-MR-SIEMENS-16-1.acr
+      - oldACR00001.ima
    * Test/TestReadWriteReadCompare.cxx was properly written (with a call
      to gdcmFile::SetImageData()) BUT since gdcmFile is brain damaged (see
      new comments in this file) we temporarily (sigh) move to a weaker

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index c20bc31eb433c769de54f77b8677e66aa5ba00fb..676500aacae612a5cda9f867e300f326c51d57ef 100644 (file)
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -106,13 +106,13 @@ ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
 # Black list of images known to break lots of readers (efilm, xmedcon ...):
 SET(BLACK_LIST
   "gdcm-JPEG-LossLessThoravision.dcm" # serial killer
-  "cr172241.dcm"           #temporarily remove as it kills my gnome session (but not kde)
+  "cr172241.dcm"           #temporarily remove as it kills my gnome session
+                           # (but not kde)
   "emptyImage.dcm"         #the png looks ugly...
-  "gdcm-MR-PHILIPS-16-Multi-Seq.fixed.dcm" #weird looks exactly the same as gdcm-MR-PHILIPS-16-Multi-Seq.dcm
-  "gdcm-MR-PHILIPS-16.dcm" #png looks ugly
   "irmPhlipsNew1.dcm"      #png looks ugly
   "mriThruVPRO.dcm"        #png looks ugly
-  "US.3405.1.dcm"          #looks exactly the same as US.1.2.dcm
+  "gdcm-MR-SIEMENS-16-1.acr"   #segfaults TestReadWriteReadCompare
+  "oldACR00001.ima"        #segfaults TestReadWriteReadCompare
   )
 
 #   gdcm-ACR-LibIDO seems to be cut

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 5811719d51502c9dcc619994061183b47dcac29d..2400eb0be298d07778267ce89b383b2ea3a5ad46 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/29 23:43:19 $
-  Version:   $Revision: 1.44 $
+  Date:      $Date: 2004/06/30 00:10:59 $
+  Version:   $Revision: 1.45 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -2530,16 +2530,12 @@ void gdcmDocument::Parse7FE0 (void)
          // Parse fragments of the current Fragment (Frame)    
          //------------------ scanning (not reading) fragment pixels
          guint32 nbRleSegments = ReadInt32();
-         printf("   Nb of RLE Segments : %d\n",nbRleSegments);
  
          //// Reading RLE Segments Offset Table
          guint32 RleSegmentOffsetTable[15];
          for(int k=1; k<=15; k++) {
             ftellRes=ftell(fp);
             RleSegmentOffsetTable[k] = ReadInt32();
-            printf("        at : %x Offset Segment %d : %d (%x)\n",
-                    (unsigned)ftellRes,k,RleSegmentOffsetTable[k],
-                    RleSegmentOffsetTable[k]);
          }
 
          // skipping (not reading) RLE Segments
@@ -2548,9 +2544,6 @@ void gdcmDocument::Parse7FE0 (void)
                 RleSegmentLength[k]=   RleSegmentOffsetTable[k+1]
                                      - RleSegmentOffsetTable[k];
                 ftellRes=ftell(fp);
-                printf ("  Segment %d : Length = %d x(%x) Start at %x\n",
-                        k,(unsigned)RleSegmentLength[k],
-                       (unsigned)RleSegmentLength[k], (unsigned)ftellRes);
                 SkipBytes(RleSegmentLength[k]);    
              }
           }
@@ -2558,9 +2551,6 @@ void gdcmDocument::Parse7FE0 (void)
           RleSegmentLength[nbRleSegments]= fragmentLength 
                                          - RleSegmentOffsetTable[nbRleSegments];
           ftellRes=ftell(fp);
-          printf ("  Segment %d : Length = %d x(%x) Start at %x\n",
-                  nbRleSegments,(unsigned)RleSegmentLength[nbRleSegments],
-                  (unsigned)RleSegmentLength[nbRleSegments],(unsigned)ftellRes);
           SkipBytes(RleSegmentLength[nbRleSegments]); 
       }