X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmTS.cxx;h=d300668f6a2bbfd98310eb37449c312ffc4f8558;hb=659604feaaaf9519d03d59d66711f6b4b8290804;hp=8ed38d0ba186ac16905aa923526bb87fbd9d8b5b;hpb=d44cb38c3275dc302d9b523c17d346810f0e6644;p=gdcm.git

diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index 8ed38d0b..d300668f 100644
--- a/src/gdcmTS.cxx
+++ b/src/gdcmTS.cxx
@@ -1,15 +1,5 @@
 // gdcmTS.cxx
 
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
-
 #include <stdio.h>
 
 #include "gdcmTS.h"
@@ -24,21 +14,21 @@ gdcmTS::gdcmTS(void) {
    ts["1.2.840.10008.1.2.4.52"] = "JPEG Extended (Process 3 & 5) (Retired)"; 
    ts["1.2.840.10008.1.2.4.53"] = "JPEG Spectral Selection, Non-Hierarchical (Process 6 & 8) (Retired)"; 
    ts["1.2.840.10008.1.2.4.54"] = "JPEG Spectral Selection, Non-Hierarchical (Process 7 & 9) (Retired)";        
-   ts["1.2.840.10008.1.2.4.55"] = "JPEG Spectral Selection, Non-Hierarchical (Process 10 & 12) (Retired)";           
-   ts["1.2.840.10008.1.2.4.56"] = "JPEG Spectral Selection, Non-Hierarchical (Process 11 & 13) (Retired)";             
-   ts["1.2.840.10008.1.2.4.57"] = "JPEG Baseline (Process 14)";     
-   ts["1.2.840.10008.1.2.4.58"] = "JPEG Baseline (Process 15) (Retired)";     
-   ts["1.2.840.10008.1.2.4.59"] = "JPEG Spectral Selection, Non-Hierarchical (Process 16 & 18) (Retired)";           
+   ts["1.2.840.10008.1.2.4.55"] = "JPEG Full Progression, Non-Hierarchical (Process 10 & 12) (Retired)";           
+   ts["1.2.840.10008.1.2.4.56"] = "JPEG Full Progression, Non-Hierarchical (Process 11 & 13) (Retired)";             
+   ts["1.2.840.10008.1.2.4.57"] = "JPEG Lossless Non-Hierarchical (Process 14)";     
+   ts["1.2.840.10008.1.2.4.58"] = "JPEG Lossless Non-Hierarchical (Process 15) (Retired)";     
+   ts["1.2.840.10008.1.2.4.59"] = "JPEG Extended Hierarchical (Process 16 & 18) (Retired)";           
    ts["1.2.840.10008.1.2.4.60"] = "JPEG Spectral Selection, Non-Hierarchical (Process 17 & 19) (Retired)";          
-   ts["1.2.840.10008.1.2.4.61"] = "JPEG Spectral Selection, Non-Hierarchical (Process 20 & 22) (Retired)";           
-   ts["1.2.840.10008.1.2.4.62"] = "JPEG Spectral Selection, Non-Hierarchical (Process 21 & 23) (Retired)";          
-   ts["1.2.840.10008.1.2.4.63"] = "JPEG Spectral Selection, Non-Hierarchical (Process 24 & 26) (Retired)";   
-   ts["1.2.840.10008.1.2.4.64"] = "JPEG Spectral Selection, Non-Hierarchical (Process 25 & 27) (Retired)";   
+   ts["1.2.840.10008.1.2.4.61"] = "JPEG Spectral Selection, Hierarchical (Process 20 & 22) (Retired)";           
+   ts["1.2.840.10008.1.2.4.62"] = "JPEG Spectral Selection, Hierarchical (Process 21 & 23) (Retired)";          
+   ts["1.2.840.10008.1.2.4.63"] = "JPEG Full Progression, Hierarchical (Process 24 & 26) (Retired)";   
+   ts["1.2.840.10008.1.2.4.64"] = "JPEG Full Progression, Hierarchical (Process 25 & 27) (Retired)";   
    ts["1.2.840.10008.1.2.4.65"] = "JPEG Lossless, Hierarchical (Process 28) (Retired)";   
    ts["1.2.840.10008.1.2.4.66"] = "JPEG Lossless, Hierarchical (Process 29) (Retired))";   
-   ts["1.2.840.10008.1.2.4.70"] = "Non-Hierarchical, First-Order Prediction (Process 14 [Selection Value 1])"; 
-   ts["1.2.840.10008.1.2.4.80"] = "JPEG Lossless Image Compression";
-   ts["1.2.840.10008.1.2.4.81"] = "JPEG Lossy (Near-Lossless) Image Compression";
+   ts["1.2.840.10008.1.2.4.70"] = "JPEG Lossless, Non-Hierarchical, First-Order Prediction (Process 14 [Selection Value 1])"; 
+   ts["1.2.840.10008.1.2.4.80"] = "JPEG-LS Lossless Image Compression";
+   ts["1.2.840.10008.1.2.4.81"] = "JPEG-LS Lossy (Near-Lossless) Image Compression";
    ts["1.2.840.10008.1.2.4.90"] = "JPEG 2000 Image Compression (Lossless Only)";   
    ts["1.2.840.10008.1.2.4.91"] = "JPEG 2000 Image Compression";   
    ts["1.2.840.10008.1.2.5"]    = "RLE Lossless";