From 231c9bd30d993ac7cf4712ac835d3aee4af82389 Mon Sep 17 00:00:00 2001
From: malaterre <malaterre>
Date: Wed, 15 Nov 2006 22:34:02 +0000
Subject: [PATCH] ENH: Yes we handle j2k and lossless now

---
 Doc/Website/ConformanceSummary.html | 64 ++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 23 deletions(-)

diff --git a/Doc/Website/ConformanceSummary.html b/Doc/Website/ConformanceSummary.html
index 90b9c310..122e68f8 100644
--- a/Doc/Website/ConformanceSummary.html
+++ b/Doc/Website/ConformanceSummary.html
@@ -89,6 +89,14 @@ The Transfer Syntax UID is in the file DICOM Tag field (0002,0010).
    <TD> JPEG Lossless, Hierarchical, First-Order
         Prediction (Process 14, [Selection Value 1]) </TD>
 </TR>
+<TR>
+   <TD> 1.2.840.10008.1.2.4.90 </TD>
+   <TD> JPEG 2000 Image Compression (Lossless Only) </TD>
+</TR>
+<TR>
+   <TD> 1.2.840.10008.1.2.4.91 </TD>
+   <TD> JPEG 2000 Image Compression </TD>
+</TR>
 </TABLE>
 
 <!##############################################>
@@ -110,6 +118,36 @@ The Transfer Syntax UID is in the file DICOM Tag field (0002,0010).
    <TD> 1.2.840.10008.1.2.1 </TD>
    <TD> Explicit VR - Little Endian</TD>
 </TR>
+<!####### JPEG #########>
+<TR BGCOLOR="#99ccff">
+   <TD> JPEG Transfer Syntax </TD>
+   <TD></TD>
+</TR>
+<TR>
+   <TD> 1.2.840.10008.1.2.4.50 </TD>
+   <TD> JPEG Baseline (Process 1)</TD>
+</TR>
+<TR>
+   <TD> 1.2.840.10008.1.2.4.51 </TD>
+   <TD> JPEG Extended (Process 2 & 4) </TD>
+</TR>
+<TR>
+   <TD> 1.2.840.10008.1.2.4.57 </TD>
+   <TD> JPEG Lossless, Non-Hierarchical (Process 14) </TD>
+</TR>
+<TR>
+   <TD> 1.2.840.10008.1.2.4.70 </TD>
+   <TD> JPEG Lossless, Hierarchical, First-Order
+        Prediction (Process 14, [Selection Value 1]) </TD>
+</TR>
+<TR>
+   <TD> 1.2.840.10008.1.2.4.90 </TD>
+   <TD> JPEG 2000 Image Compression (Lossless Only) </TD>
+</TR>
+<TR>
+   <TD> 1.2.840.10008.1.2.4.91 </TD>
+   <TD> JPEG 2000 Image Compression </TD>
+</TR>
 </TABLE>
 <!##############################################>
 <H2>Supported "Photometric Interpretation" pixel format (Reading)</H2>
@@ -288,10 +326,6 @@ The Transfer Syntax UID is in the file DICOM Tag field (0002,0010).
    <TD> 1.2.840.10008.1.2.4.56 </TD>
    <TD> JPEG Full Progression, Non-Hierarchical (Process 11 & 13) </TD>
 </TR>
-<TR>
-   <TD> 1.2.840.10008.1.2.4.58 </TD>
-   <TD> JPEG Lossless, Non-Hierarchical (Process 15) </TD>
-</TR>
 <TR>
    <TD> 1.2.840.10008.1.2.4.59 </TD>
    <TD> JPEG Extended, Hierarchical (Process 16 & 18) </TD>
@@ -317,31 +351,15 @@ The Transfer Syntax UID is in the file DICOM Tag field (0002,0010).
    <TD> JPEG Full Progression, Hierarchical (Process 25 & 27) </TD>
 </TR>
 <TR>
-   <TD> 1.2.840.10008.1.2.4.65 </TD>
-   <TD> JPEG Lossless, Hierarchical (Process 28)</TD>
-</TR>
-<TR>
-   <TD> 1.2.840.10008.1.2.4.66 </TD>
-   <TD> JPEG Lossless, Hierarchical (Process 29) </TD>
-</TR>
-<TR>
-   <TD> 1.2.840.10008.1.2.4.80 </TD>
+   <TD> 1.2.840.10008.1.2.4.80 (partial)</TD>
    <TD> JPEG-LS Lossless Image Compression </TD>
 </TR>
 <TR>
-   <TD> 1.2.840.10008.1.2.4.81 </TD>
+   <TD> 1.2.840.10008.1.2.4.81 (partial)</TD>
    <TD> JPEG-LS Lossy (Near-Lossless) Image Compression </TD>
 </TR>
 <TR>
-   <TD> 1.2.840.10008.1.2.4.90 </TD>
-   <TD> JPEG 2000 Image Compression (Lossless Only) </TD>
-</TR>
-<TR>
-   <TD> 1.2.840.10008.1.2.4.91 </TD>
-   <TD> JPEG 2000 Image Compression </TD>
-</TR>
-<TR>
-   <TD> 1.2.840.10008.1.2.4.100 </TD>
+   <TD> 1.2.840.10008.1.2.4.100 (partial)</TD>
    <TD> MPEG2 Main Profile @ Main Level </TD>
 </TR>
 
-- 
2.45.0