From d6b6699d3df0af4e4ae3d4d21d88b289ad95efbc Mon Sep 17 00:00:00 2001 From: frog Date: Tue, 21 Sep 2004 10:46:09 +0000 Subject: [PATCH] * Test/CMakeLists.txt: update to follow gdcmData renamings. --- ChangeLog | 3 +++ Testing/CMakeLists.txt | 53 +++++++++++++++++++++--------------------- src/gdcmDocument.cxx | 6 ++--- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2f2ca87..72598e17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2004-09-21 Eric Boix + * Test/CMakeLists.txt: update to follow gdcmData renamings. + 2004-09-17 Eric Boix * ENH: added some utility method that builds a flat dictionnary holding all the Dicom entries contained in the recursive structure diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt index 7156c9e2..2c1bfb84 100644 --- a/Testing/CMakeLists.txt +++ b/Testing/CMakeLists.txt @@ -106,37 +106,34 @@ SET(BLACK_LIST # serial killer (also segfaults vtkgdcmViewer, but NOT PrintFile) "gdcm-JPEG-LossLessThoravision.dcm" - #temporarily remove as it kills my gnome session (but not kde) - # + breaks TestReadWriteReadCompare : Pixel differ (as expanded in memory) + # Mathieu: temporarily remove as it kills my gnome session (but not kde) + # JPR: also breaks TestReadWriteReadCompare : Pixel differ (as expanded + # in memory) "KODAK-12-MONO1-Odd_Terminated_Sequence.dcm" - #png looks ugly - "emptyImage.dcm" - - #png looks ugly. so What ? ctest compliant --> un-black listed - #"PHILIPS_Gyroscan-8-MONO2-Odd_Sequence.dcm" - - #png looks ugly - "mriThruVPRO.dcm" - #segfaults TestReadWriteReadCompare (same pb as below) --> Fixed #segfaults ShowDicom "gdcm-MR-SIEMENS-16-1.acr" - + + #Break ShowDicom + "TestReadWriteReadCompare.dcm" + # see comments in gdcmData ref file TestAllEntryVerifyReference.txt - # doesn't break TestReadWriteReadCompare + # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore #"SIEMENS_GBS_III-16-ACR_NEMA_1.acr" - #segfaults TestReadWriteReadCompare (pixels not parsed properly): - # doesn't break TestReadWriteReadCompare - #"I9000001.dcm" + # Frog 2004/07/29: segfaults TestReadWriteReadCompare (pixels not + # parsed properly): + # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore + # "GE_DLX-8-MONO2-Multiframe-Jpeg_Lossless.dcm" - # doesn't break TestReadWriteReadCompare + # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore #"PICKER-16-MONO2-Nested_icon.dcm" - # doesn't break TestReadWriteReadCompare + # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore #"SIEMENS_Sonata-16-MONO2-Value_Multiplicity.dcm" + # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore # Fails on TestAllReadCompareDicom at the RE-reading stage with message: # Big trouble : Pixel Element (7fe0,10) NOT found # The temporary file GDCMDATAHOME/BaselineDicom/SIEMENS_Sonata-12-MONO2-SQ.dcm @@ -146,22 +143,24 @@ SET(BLACK_LIST # and effectively the pixels are missing (as well as all the entries # after tag 0029|1010) # Note: this file was previously known as E00001S03I0015.dcm - # doesn't break TestReadWriteReadCompare #"SIEMENS_Sonata-12-MONO2-SQ.dcm" + # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore # As of 14/09 this image creates a crash: - #Program received signal SIGSEGV, Segmentation fault. - #0x4032bc4b in gdcmHeader::GetLUTRGBA (this=0x8149228) at /home/malaterre/Creatis/gdcm/src/gdcmHeader.cxx:1170 - #1170 *a = lutR[i*mult+1]; - # doesn't break TestReadWriteReadCompare + # Program received signal SIGSEGV, Segmentation fault. + # 0x4032bc4b in gdcmHeader::GetLUTRGBA (this=0x8149228) + # at /home/malaterre/Creatis/gdcm/src/gdcmHeader.cxx:1170 + # 1170 *a = lutR[i*mult+1]; #"OT-PAL-8-face.dcm" - #Break ShowDicom - "TestReadWriteReadCompare.dcm" + # Files which won't break the test suite but whose png dump looks ugly. + # JPR: png looks ugly. so What ? ctest compliant --> un-black listed + # "THERALYS-12-MONO2-Uncompressed-E_Film_Template.dcm" + # "PHILIPS_Gyroscan-8-MONO2-Odd_Sequence.dcm" + # "PHILIPS_Gyroscan-12-MONO2-Jpeg_Lossless.dcm" + ) -# gdcm-ACR-LibIDO seems to be cut -# test.acr is very bright # This is a GLOB expression, change it into a list separated with a comma and \n SET(GDCM_DATA_IMAGES) diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index cd17312c..543315b9 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2004/09/20 18:14:23 $ - Version: $Revision: 1.82 $ + Date: $Date: 2004/09/21 10:46:10 $ + Version: $Revision: 1.83 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -2991,7 +2991,7 @@ void gdcmDocument::BuildFlatHashTableRecurse( TagDocEntryHT& builtHT, * a Dicom header will need to dig in the gdcm internals (which * implies exposing all the internal data structures to the API). * In order to avoid this burden to the user, \ref BuildFlatHashTable - * recursively builds a temporary hash table, which olds all the + * recursively builds a temporary hash table, which holds all the * Dicom entries in a flat structure (a \ref TagDocEntryHT i.e. a * std::map<>). * \warning Of course there is NO integrity constrain between the -- 2.48.1