X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Doc%2FWebsite%2FConformanceSummary.html;h=122e68f871f5cf6580641b3514e4acb2fc0a04ff;hb=8bcc29f4b38b0a81e6ca731248b8d41b4606984d;hp=c9948ab636f4012e6f464a121c30ee3937bf5352;hpb=ba2ea83f67d798dfa2efae2fb21d3b5858c9c95c;p=gdcm.git

diff --git a/Doc/Website/ConformanceSummary.html b/Doc/Website/ConformanceSummary.html
index c9948ab6..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>
@@ -232,7 +270,8 @@ element's VR to be UN (unknown).
 Each time it's possible to assume a 'reasonable' default value for missing
 'mandatory' tag, gdcm does it. <br>
 For instance if the Tag 'Samples Per Pixels' is missing, we assume its value is
-'1' (Grey pixels, as opposite to RGB); <br>if the tag 'High Bit' is missing, we
+'1' (Grey pixels, as opposite to RGB); <br>
+if the tag 'High Bit' is missing, we
 assume its value is 'Bits stored -1' (i.e. : no bad trick inside the pixels)<br>
 As gdcm wants to read *as well* old ACR-NEMA files, it has to be widely
 tolerant.
@@ -287,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>
@@ -316,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>