From: frog Date: Mon, 20 Sep 2004 12:44:28 +0000 (+0000) Subject: - TestAllEntryVerifyReference.txt, clean up of some documented entries. X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a49165fb7a61861a5a973a07e1a66f287dc23d39;p=gdcmData.git - TestAllEntryVerifyReference.txt, clean up of some documented entries. - dicom-sc_cs-1.dcm renamed to SIEMENS_SOMATOM-12-ACR_NEMA-ZeroLengthUs.acr - CLIP0001-Sequoia-U11.dcm renamed to ACUSON-8-YBR_FULL-JPEG-TrailingInfo.dcm - DicomSampleNastyGEImage.dcm renamed to GE_GENESIS-16-MONO2-WrongLengthItem.dcm - 8BitsJpegLossyGrayScale.dcm renamed to LEADTOOLS_FLOWERS-8-MONO2-JpegLossy.dcm - 8BitsRunLengthColor.dcm renamed to LEADTOOLS_FLOWERS-8-PAL-RLE.dcm - 8BitsRunLengthGrayScale.dcm renamed to LEADTOOLS_FLOWERS-8-MONO2-RLE.dcm - 8BitsUncompressedColor.dcm renamed to LEADTOOLS_FLOWERS-8-PAL-Uncompressed.dcm - 8BitsUncompressedGrayScale.dcm renamed to LEADTOOLS_FLOWERS-8-MONO2-Uncompressed.dcm - 16BitsJpegLosslessGrayScale.dcm renamed to LEADTOOLS_FLOWERS-16-MONO2-JpegLossless.dcm - 16BitsRunLengthGrayScale.dcm renamed to LEADTOOLS_FLOWERS-16-MONO2-RLE.dcm - 16BitsUncompressedGrayScale.dcm renamed to LEADTOOLS_FLOWERS-16-MONO2-Uncompressed.dcm - 24BitsJpegLosslessColor.dcm renamed to LEADTOOLS_FLOWERS-24-RGB-JpegLossless.dcm - 24BitsJpegLossyColor.dcm renamed to LEADTOOLS_FLOWERS-24-RGB-JpegLossy.dcm - 24BitsUncompressedColor.dcm renamed to LEADTOOLS_FLOWERS-24-RGB-Uncompressed.dcm --- diff --git a/16BitsJpegLosslessGrayScale.dcm b/16BitsJpegLosslessGrayScale.dcm deleted file mode 100644 index 1fb5315..0000000 Binary files a/16BitsJpegLosslessGrayScale.dcm and /dev/null differ diff --git a/16BitsRunLengthGrayScale.dcm b/16BitsRunLengthGrayScale.dcm deleted file mode 100644 index 5fa73de..0000000 Binary files a/16BitsRunLengthGrayScale.dcm and /dev/null differ diff --git a/16BitsUncompressedGrayScale.dcm b/16BitsUncompressedGrayScale.dcm deleted file mode 100644 index 9d9bff4..0000000 Binary files a/16BitsUncompressedGrayScale.dcm and /dev/null differ diff --git a/24BitsJpegLosslessColor.dcm b/24BitsJpegLosslessColor.dcm deleted file mode 100644 index 099cd11..0000000 Binary files a/24BitsJpegLosslessColor.dcm and /dev/null differ diff --git a/24BitsJpegLossyColor.dcm b/24BitsJpegLossyColor.dcm deleted file mode 100644 index d55fc13..0000000 Binary files a/24BitsJpegLossyColor.dcm and /dev/null differ diff --git a/24BitsUncompressedColor.dcm b/24BitsUncompressedColor.dcm deleted file mode 100644 index 15410b8..0000000 Binary files a/24BitsUncompressedColor.dcm and /dev/null differ diff --git a/8BitsJpegLossyGrayScale.dcm b/8BitsJpegLossyGrayScale.dcm deleted file mode 100644 index 40c50c9..0000000 Binary files a/8BitsJpegLossyGrayScale.dcm and /dev/null differ diff --git a/8BitsRunLengthColor.dcm b/8BitsRunLengthColor.dcm deleted file mode 100644 index 36bfb0b..0000000 Binary files a/8BitsRunLengthColor.dcm and /dev/null differ diff --git a/8BitsRunLengthGrayScale.dcm b/8BitsRunLengthGrayScale.dcm deleted file mode 100644 index d5d5a4a..0000000 Binary files a/8BitsRunLengthGrayScale.dcm and /dev/null differ diff --git a/8BitsUncompressedColor.dcm b/8BitsUncompressedColor.dcm deleted file mode 100644 index 5dc74b1..0000000 Binary files a/8BitsUncompressedColor.dcm and /dev/null differ diff --git a/8BitsUncompressedGrayScale.dcm b/8BitsUncompressedGrayScale.dcm deleted file mode 100644 index 6232adb..0000000 Binary files a/8BitsUncompressedGrayScale.dcm and /dev/null differ diff --git a/CLIP0001-Sequoia-U11.dcm b/CLIP0001-Sequoia-U11.dcm deleted file mode 100644 index 7e4e4ab..0000000 Binary files a/CLIP0001-Sequoia-U11.dcm and /dev/null differ diff --git a/Changelog b/Changelog index 87be677..facadb6 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,28 @@ +2004-09-20 Eric Boix + - TestAllEntryVerifyReference.txt, clean up of some documented entries. + - dicom-sc_cs-1.dcm renamed to SIEMENS_SOMATOM-12-ACR_NEMA-ZeroLengthUs.acr + - CLIP0001-Sequoia-U11.dcm renamed to ACUSON-8-YBR_FULL-JPEG-TrailingInfo.dcm + - DicomSampleNastyGEImage.dcm renamed to + GE_GENESIS-16-MONO2-WrongLengthItem.dcm + - 8BitsJpegLossyGrayScale.dcm renamed to + LEADTOOLS_FLOWERS-8-MONO2-JpegLossy.dcm + - 8BitsRunLengthColor.dcm renamed to LEADTOOLS_FLOWERS-8-PAL-RLE.dcm + - 8BitsRunLengthGrayScale.dcm renamed to LEADTOOLS_FLOWERS-8-MONO2-RLE.dcm + - 8BitsUncompressedColor.dcm renamed to + LEADTOOLS_FLOWERS-8-PAL-Uncompressed.dcm + - 8BitsUncompressedGrayScale.dcm renamed to + LEADTOOLS_FLOWERS-8-MONO2-Uncompressed.dcm + - 16BitsJpegLosslessGrayScale.dcm renamed to + LEADTOOLS_FLOWERS-16-MONO2-JpegLossless.dcm + - 16BitsRunLengthGrayScale.dcm renamed to LEADTOOLS_FLOWERS-16-MONO2-RLE.dcm + - 16BitsUncompressedGrayScale.dcm renamed to + LEADTOOLS_FLOWERS-16-MONO2-Uncompressed.dcm + - 24BitsJpegLosslessColor.dcm renamed to + LEADTOOLS_FLOWERS-24-RGB-JpegLossless.dcm + - 24BitsJpegLossyColor.dcm renamed to LEADTOOLS_FLOWERS-24-RGB-JpegLossy.dcm + - 24BitsUncompressedColor.dcm renamed to + LEADTOOLS_FLOWERS-24-RGB-Uncompressed.dcm + 2004-09-16 Eric Boix - TestAllEntryVerifyReference.txt: removal of all TABS introduced by version 1.10 and which broke the testsuite. diff --git a/DicomSampleNastyGEImage.dcm b/DicomSampleNastyGEImage.dcm deleted file mode 100644 index c1469f1..0000000 Binary files a/DicomSampleNastyGEImage.dcm and /dev/null differ diff --git a/TestAllEntryVerifyReference.txt b/TestAllEntryVerifyReference.txt index 85fafe7..3b006cc 100644 --- a/TestAllEntryVerifyReference.txt +++ b/TestAllEntryVerifyReference.txt @@ -774,6 +774,7 @@ # * dicom file, with a recognition code of ACR-NEMA1 # * Highly nested sequence (6 sublevels) with an impressive size # of 28808 bytes at tag (0x0029, 0x263d) + # * some sequences have 0 (zero) length # * possesses many sequences in group 0x0029 # * Private BinEntry (DT) 21 1007 0008|0070 "Philips Medical Systems " # Manufacturer @@ -937,6 +938,61 @@ 7fe0|0010 "gdcm::NotLoaded Address:9134 Length:8572928 x(82d000)" ] +[ SIEMENS_SOMATOM-12-ACR_NEMA-ZeroLengthUs.acr + # - Particularities: + # * Has a 'Zero length' integer field at tag 0020|5000 with VR "US" + # [US][Original Image Identification (RET)] + # * Has a lot of private fields, with no VR, see groups 9, 11, 19, 21, + # 29, 31 + 0008|0070 "SIEMENS " # Manufacturer + 0008|1090 "SOMATOM PLUS 4 " # Manufacturer's Model Name + 0028|0101 "12" # Bits Stored + 0028|0004 "MONOCHROME2 " # Photometric Interpretation + 0028|0010 "512" # Rows + 0028|0011 "512" # Columns + 0028|0100 "16" # Bits Allocated + 0028|0102 "11" # High Bit + 0028|0103 "0" # Pixel Representation + 0008|0060 "CT" # Modality + 0009|0010 "gdcm::Loaded (BinEntry)" # Unknown + 7fe0|0010 "gdcm::NotLoaded Address:5064 Length:524288 x(80000)" +] + +[ ACUSON-8-YBR_FULL-JPEG-TrailingInfo.dcm + # - Particularities: + # * has some trailing (after the pixel data) info with tag "fffc|fffc", + # VR of "OB", length = 1722 = 0x6ba + 0008|0070 "ACUSON" # Manufacturer + 0028|0101 "8" # Bits Stored + 0028|0004 "YBR_FULL_422" # Photometric Interpretation + 0028|0010 "576" # Rows + 0028|0011 "768" # Columns + 0028|0100 "8" # Bits Allocated + 0028|0102 "7" # High Bit + 0028|0103 "0" # Pixel Representation + 0002|0010 "1.2.840.10008.1.2.4.50" # Transfer Syntax: jpeg baseline + # process (1) + 0008|0060 "US" # Modality + 7fe0|0010 "gdcm::NotLoaded Address:2288 Length:1513128 x(1716a8)" + fffc|fffc "gdcm::Loaded (BinEntry)" # Trailing info ! +] + +[ GE_GENESIS-16-MONO2-WrongLengthItem.dcm + # - Particularities: + # * Sample of well known GE buggy header: wrong length for some items + 0008|0070 "GE MEDICAL SYSTEMS" # Manufacturer + 0008|1090 "GENESIS_SIGNA " # Manufacturer's Model Name + 0028|0101 "16" # Bits Stored + 0028|0004 "MONOCHROME2 " # Photometric Interpretation + 0028|0010 "256" # Rows + 0028|0011 "256" # Columns + 0028|0100 "16" # Bits Allocated + 0028|0102 "15" # High Bit + 0028|0103 "1" # Pixel Representation + 0002|0010 "1.2.840.10008.1.2" # Transfer Syntax: Implicit VR, LE + 0008|0060 "MR" # Modality + 7fe0|0010 "gdcm::NotLoaded Address:1930 Length:131072 x(20000)" +] ############################################################ ### Jpeg compressed images. @@ -1101,11 +1157,151 @@ 7fe0|0010 "gdcm::NotLoaded Address:5956 Length:46602 x(b60a)" ] +########################################################################### +# All the following files come from the LeadTools site (see +# http://www.leadtools.com/SDK/Medical/DICOM/ltdc19.htm ) +# and (probably) serves as an illustration of many Dicom encoding/compression +# modes. Those "hand made" files were not produced by any acquisition engine +# and hence are not from "real" life, but maybe one day some machine will +# implement it. Some images, allthough using a perfectly "legal" Dicom format, +# seem to be unique in their own encoding/compression category. Worth the +# trial in a test suite! +# All the following files share the same size (535x800), the same pixel +# representation ("0") ; +# 0028|0010 "535" # Rows +# 0028|0011 "800" # Columns +# 0028|0103 "0" # Pixel Representation +# and hold the same picture: some flowers... + +[ LEADTOOLS_FLOWERS-8-MONO2-JpegLossy.dcm + # - Particularities: + 0002|0016 "LEADTOOLS " # Source Application Entity Title + 0028|0101 "8" # Bits Stored + 0028|0004 "MONOCHROME2 " # Photometric Interpretation + 0028|0100 "8" # Bits Allocated + 0028|0102 "7" # High Bit + 0002|0010 "1.2.840.10008.1.2.4.50" # Transfer Syntax: jpeg Baseline, + # ... Process 1 + # No "7fe0|0010" +] + +[ LEADTOOLS_FLOWERS-8-PAL-RLE.dcm + # - Particularities: + 0002|0016 "LEADTOOLS " # Source Application Entity Title + 0028|0101 "8" # Bits Stored + 0028|0004 "PALETTE COLOR " # Photometric Interpretation + 0028|0100 "8" # Bits Allocated + 0028|0102 "7" # High Bit + 0002|0010 "1.2.840.10008.1.2.5" # Transfer Syntax: RLE Lossless + # No "7fe0|0010" +] + +[ LEADTOOLS_FLOWERS-8-MONO2-RLE.dcm + # - Particularities: + 0002|0016 "LEADTOOLS " # Source Application Entity Title + 0028|0101 "8" # Bits Stored + 0028|0004 "MONOCHROME2 " # Photometric Interpretation + 0028|0100 "8" # Bits Allocated + 0028|0102 "7" # High Bit + 0002|0010 "1.2.840.10008.1.2.5" # Transfer Syntax: RLE Lossless + # No "7fe0|0010" +] + +[ LEADTOOLS_FLOWERS-8-PAL-Uncompressed.dcm + # - Particularities: + 0002|0016 "LEADTOOLS " # Source Application Entity Title + 0028|0101 "8" # Bits Stored + 0028|0004 "PALETTE COLOR " # Photometric Interpretation + 0028|0100 "8" # Bits Allocated + 0028|0102 "7" # High Bit + 0002|0010 "1.2.840.10008.1.2.1" # Transfer Syntax: Explicit VR - + # Little Endian + 7fe0|0010 "gdcm::NotLoaded Address:3538 Length:428000 x(687e0)" +] + +[ LEADTOOLS_FLOWERS-8-MONO2-Uncompressed.dcm + # - Particularities: + 0002|0016 "LEADTOOLS " # Source Application Entity Title + 0028|0101 "8" # Bits Stored + 0028|0004 "MONOCHROME2 " # Photometric Interpretation + 0028|0100 "8" # Bits Allocated + 0028|0102 "7" # High Bit + 0002|0010 "1.2.840.10008.1.2.1" # Transfer Syntax: Explicit VR - + # Little Endian + 7fe0|0010 "gdcm::NotLoaded Address:1942 Length:428000 x(687e0)" +] + +[ LEADTOOLS_FLOWERS-16-MONO2-JpegLossless.dcm + # - Particularities: + 0002|0016 "LEADTOOLS " # Source Application Entity Title + 0028|0101 "16" # Bits Stored + 0028|0004 "MONOCHROME2 " # Photometric Interpretation + 0028|0100 "16" # Bits Allocated + 0028|0102 "15" # High Bit + 0002|0010 "1.2.840.10008.1.2.4.70" # Transfer Syntax: jpeg Lossless, + # ... Process 14 [Selection Value 1] + # No "7fe0|0010" +] + +[ LEADTOOLS_FLOWERS-16-MONO2-RLE.dcm + # - Particularities: + 0002|0016 "LEADTOOLS " # Source Application Entity Title + 0028|0101 "16" # Bits Stored + 0028|0004 "MONOCHROME2 " # Photometric Interpretation + 0028|0100 "16" # Bits Allocated + 0028|0102 "15" # High Bit + 0002|0010 "1.2.840.10008.1.2.5" # Transfer Syntax: RLE Lossless + # No "7fe0|0010" +] -# dicom-sc_cs-1.dcm # Has a lot of private fields, with no VR. - # (groups 9, 11, 19, 21, 29, 31) - # Has a 'Zero length' integer field - # 0020|5000 lg :0 [US][Original Image Identification (RET)] +[ LEADTOOLS_FLOWERS-16-MONO2-Uncompressed.dcm + # - Particularities: + 0002|0016 "LEADTOOLS " # Source Application Entity Title + 0028|0101 "16" # Bits Stored + 0028|0004 "MONOCHROME2 " # Photometric Interpretation + 0028|0100 "16" # Bits Allocated + 0028|0102 "15" # High Bit + 0002|0010 "1.2.840.10008.1.2.1" # Explicit VR - Little Endian + 7fe0|0010 "gdcm::NotLoaded Address:1942 Length:856000 x(d0fc0)" +] + +[ LEADTOOLS_FLOWERS-24-RGB-JpegLossless.dcm + # - Particularities: + 0002|0016 "LEADTOOLS " # Source Application Entity Title + 0028|0101 "8" # Bits Stored + 0028|0004 "RGB " # Photometric Interpretation + 0028|0100 "8" # Bits Allocated + 0028|0102 "7" # High Bit + 0028|0002 "3" # Samples per Pixel + 0002|0010 "1.2.840.10008.1.2.4.70" # Transfer Syntax: jpeg Lossless, + # ... Process 14 [Selection Value 1] + # No "7fe0|0010" +] + +[ LEADTOOLS_FLOWERS-24-RGB-JpegLossy.dcm + # - Particularities: + 0002|0016 "LEADTOOLS " # Source Application Entity Title + 0028|0101 "8" # Bits Stored + 0028|0004 "RGB " # Photometric Interpretation + 0028|0100 "8" # Bits Allocated + 0028|0102 "7" # High Bit + 0028|0002 "3" # Samples per Pixel + 0002|0010 "1.2.840.10008.1.2.4.50" # Transfer Syntax: jpeg Baseline, + # ... Process 1 + # No "7fe0|0010" +] + +[ LEADTOOLS_FLOWERS-24-RGB-Uncompressed.dcm + # - Particularities: + 0002|0016 "LEADTOOLS " # Source Application Entity Title + 0028|0101 "8" # Bits Stored + 0028|0004 "RGB " # Photometric Interpretation + 0028|0100 "8" # Bits Allocated + 0028|0102 "7" # High Bit + 0028|0002 "3" # Samples per Pixel + 0002|0010 "1.2.840.10008.1.2.1" # Explicit VR - Little Endian + 7fe0|0010 "gdcm::NotLoaded Address:1934 Length:1284000 x(1397a0)" +] ########################################################################### ### JPR @@ -1113,27 +1309,11 @@ ########################################################################### # 00191113.dcm # 012345.002.050.dcm -# 'hand made' images (flowers), found on the net -# Many of them are the sole sample we have of some compression methods -# 16BitsJpegLosslessGrayScale.dcm -# 16BitsRunLengthGrayScale.dcm -# 16BitsUncompressedGrayScale.dcm -# 24BitsJpegLosslessColor.dcm -# 24BitsJpegLossyColor.dcm -# 24BitsUncompressedColor.dcm -# 8BitsJpegLossyGrayScale.dcm -# 8BitsRunLengthColor.dcm -# 8BitsRunLengthGrayScale.dcm -# 8BitsUncompressedColor.dcm -# 8BitsUncompressedGrayScale.dcm -# # 3E768EB7.dcm # 8078283Leonardo.dcm # Comes from Siemens LEONARDO console, while producing buggy headered images # canadaAloka.dcm -# CLIP0001-Sequoia-U11.dcm #Has trailing info (fffc|fffc OB lg=6ba) # DermaColorLossLess.dcm # DICOMDIR -# DicomSampleNastyGEImage.dcm # Sample of well known GE buggy headered image (wrong length for some Sitems) # emptyImage.dcm # used by Theralys as a template to produce as-little-header-as-possible efilm readable images # FMAG0001.dcm #Has trailing info (fffc|fffc OB lg=4da) # QMAG0001.dcm @@ -1240,9 +1420,6 @@ # Horror Picture Show # ------------------- # -#gdcm-MR-PHILIPS-16-Multi-Seq.dcm # 400 SQ, embedded SQ -# # with O length sequ -# #gdcm-MR-PHILIPS-16-NonRectPix.dcm # 22 SQ, embedded SQ # # with O length sequ # @@ -1348,39 +1525,3 @@ #echo "expected pixelType=8U SamplesPerPixel=3" #echo " PlanarConfiguration=1 PhotometricInterpretation=YBR_FULL" #affim filein=QMAG0001.dcm.raw DIMX=384 DIMY=288 nbit=24; - -# images from : -# http://www.leadtools.com/SDK/Medical/DICOM/ltdc19.htm -#------------------------------------------------------ - -# 8BitsJpegLossyGrayScale.dcm r - -# 8BitsRunLengthColor.dcm r - -# 8BitsRunLengthGrayScale.dcm r - -# 8BitsUncompressedColor.dcm r - -# 8BitsUncompressedGrayScale.dcm r - -# 16BitsJpegLosslessGrayScale.dcm r - -# 16BitsRunLengthGrayScale.dcm r -#echo "expected pixelType=16U SamplesPerPixel=1 PlanarConfiguration=2" -#echo " PhotometricInterpretation=MONOCHROME2" -#affim filein=16BitsRunLengthGrayScale.dcm.raw DIMX=800 DIMY=535 nbit=16 - -# 16BitsUncompressedGrayScale.dcm r -#affim filein=16BitsUncompressedGrayScale.dcm.raw DIMX=800 DIMY=535 nbit=16 - -# 24BitsJpegLosslessColor.dcm r -#echo "expected DIMX=800 DIMY=535 DIMZ=1 " -#echo " pixelType=8U SamplesPerPixel=3 PlanarConfiguration=0" -#echo " PhotometricInterpretation=RGB " -#affim filein=24BitsJpegLosslessColor.dcm.raw DIMX=800 DIMY=535 nbit=24 - -# 24BitsJpegLossyColor.dcm r -#affim filein=24BitsJpegLossyColor.dcm.raw DIMX=800 DIMY=535 nbit=24 - -# 24BitsUncompressedColor.dcm r -#affim filein=24BitsUncompressedColor.dcm.raw DIMX=800 DIMY=535 nbit=24 diff --git a/dicom-sc_cs-1.dcm b/dicom-sc_cs-1.dcm deleted file mode 100644 index badc24a..0000000 Binary files a/dicom-sc_cs-1.dcm and /dev/null differ