changeset 6708:7757956d909e

fix HTJ2K namings to match DCMTK namings
author Alain Mazy <am@orthanc.team>
date Mon, 13 Apr 2026 18:41:39 +0200
parents 688f0f78ddfc
children bb03a8c9a8c2
files NEWS OrthancFramework/Resources/CodeGeneration/DicomTransferSyntaxes.json OrthancFramework/Sources/DicomParsing/FromDcmtkBridge_TransferSyntaxes.impl.h OrthancFramework/Sources/Enumerations.h OrthancFramework/Sources/Enumerations_TransferSyntaxes.impl.h OrthancServer/Resources/DicomConformanceStatement.txt
diffstat 6 files changed, 73 insertions(+), 73 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Mon Apr 13 18:29:35 2026 +0200
+++ b/NEWS	Mon Apr 13 18:41:39 2026 +0200
@@ -19,7 +19,7 @@
 * New configuration option "MaximumFileSizeInArchiveMB" to limit the file size in ZIP/gzip archives.
   Default value is set to 4GB.
 * New experimental configuration "PatientLevelEnabled".
-* Added basic support for HTJ2K transfer syntaxes. Orthanc is
+* Added basic support for High Throughput JPEG 2000 transfer syntaxes. Orthanc is
   currently not able to compress/decompress or preview these images.
 
 REST API
--- a/OrthancFramework/Resources/CodeGeneration/DicomTransferSyntaxes.json	Mon Apr 13 18:29:35 2026 +0200
+++ b/OrthancFramework/Resources/CodeGeneration/DicomTransferSyntaxes.json	Mon Apr 13 18:41:39 2026 +0200
@@ -401,7 +401,7 @@
   {
     "UID" : "1.2.840.10008.1.2.4.201",
     "Name" : "HTJ2K Lossless",
-    "Value" : "HT2JKLossless",
+    "Value" : "HighThroughputJPEG2000LosslessOnly",
     "DCMTK" : "EXS_HighThroughputJPEG2000LosslessOnly",
     "SinceDCMTK" : "369"
   },
@@ -409,7 +409,7 @@
   {
     "UID" : "1.2.840.10008.1.2.4.202",
     "Name" : "HTJ2K with RPCL Options Lossless",
-    "Value" : "HT2JKWithRPCLOptionsLossless",
+    "Value" : "HighThroughputJPEG2000withRPCLOptionsLosslessOnly",
     "DCMTK" : "EXS_HighThroughputJPEG2000withRPCLOptionsLosslessOnly",
     "SinceDCMTK" : "369"
   },
@@ -417,7 +417,7 @@
   {
     "UID" : "1.2.840.10008.1.2.4.203",
     "Name" : "HTJ2K",
-    "Value" : "HT2JK",
+    "Value" : "HighThroughputJPEG2000",
     "DCMTK" : "EXS_HighThroughputJPEG2000",
     "SinceDCMTK" : "369"
   }
--- a/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge_TransferSyntaxes.impl.h	Mon Apr 13 18:29:35 2026 +0200
+++ b/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge_TransferSyntaxes.impl.h	Mon Apr 13 18:41:39 2026 +0200
@@ -295,19 +295,19 @@
 #endif
 
 #if DCMTK_VERSION_NUMBER >= 369
-      case DicomTransferSyntax_HT2JKLossless:
+      case DicomTransferSyntax_HighThroughputJPEG2000LosslessOnly:
         target = EXS_HighThroughputJPEG2000LosslessOnly;
         return true;
 #endif
 
 #if DCMTK_VERSION_NUMBER >= 369
-      case DicomTransferSyntax_HT2JKWithRPCLOptionsLossless:
+      case DicomTransferSyntax_HighThroughputJPEG2000withRPCLOptionsLosslessOnly:
         target = EXS_HighThroughputJPEG2000withRPCLOptionsLosslessOnly;
         return true;
 #endif
 
 #if DCMTK_VERSION_NUMBER >= 369
-      case DicomTransferSyntax_HT2JK:
+      case DicomTransferSyntax_HighThroughputJPEG2000:
         target = EXS_HighThroughputJPEG2000;
         return true;
 #endif
@@ -589,19 +589,19 @@
 
 #if DCMTK_VERSION_NUMBER >= 369
       case EXS_HighThroughputJPEG2000LosslessOnly:
-        target = DicomTransferSyntax_HT2JKLossless;
+        target = DicomTransferSyntax_HighThroughputJPEG2000LosslessOnly;
         return true;
 #endif
 
 #if DCMTK_VERSION_NUMBER >= 369
       case EXS_HighThroughputJPEG2000withRPCLOptionsLosslessOnly:
-        target = DicomTransferSyntax_HT2JKWithRPCLOptionsLossless;
+        target = DicomTransferSyntax_HighThroughputJPEG2000withRPCLOptionsLosslessOnly;
         return true;
 #endif
 
 #if DCMTK_VERSION_NUMBER >= 369
       case EXS_HighThroughputJPEG2000:
-        target = DicomTransferSyntax_HT2JK;
+        target = DicomTransferSyntax_HighThroughputJPEG2000;
         return true;
 #endif
 
--- a/OrthancFramework/Sources/Enumerations.h	Mon Apr 13 18:29:35 2026 +0200
+++ b/OrthancFramework/Sources/Enumerations.h	Mon Apr 13 18:41:39 2026 +0200
@@ -288,9 +288,9 @@
     DicomTransferSyntax_JPEGXLLossless    /*!< JPEG XL Lossless */,
     DicomTransferSyntax_JPEGXLJPEGRecompression    /*!< JPEG XL JPEG Recompression */,
     DicomTransferSyntax_JPEGXL    /*!< JPEG XL */,
-    DicomTransferSyntax_HT2JKLossless    /*!< HTJ2K Lossless */,
-    DicomTransferSyntax_HT2JKWithRPCLOptionsLossless    /*!< HTJ2K with RPCL Options Lossless */,
-    DicomTransferSyntax_HT2JK    /*!< HTJ2K */
+    DicomTransferSyntax_HighThroughputJPEG2000LosslessOnly    /*!< HTJ2K Lossless */,
+    DicomTransferSyntax_HighThroughputJPEG2000withRPCLOptionsLosslessOnly    /*!< HTJ2K with RPCL Options Lossless */,
+    DicomTransferSyntax_HighThroughputJPEG2000    /*!< HTJ2K */
   };
 
 
--- a/OrthancFramework/Sources/Enumerations_TransferSyntaxes.impl.h	Mon Apr 13 18:29:35 2026 +0200
+++ b/OrthancFramework/Sources/Enumerations_TransferSyntaxes.impl.h	Mon Apr 13 18:41:39 2026 +0200
@@ -164,13 +164,13 @@
       case DicomTransferSyntax_JPEGXL:
         return "1.2.840.10008.1.2.4.112";
 
-      case DicomTransferSyntax_HT2JKLossless:
+      case DicomTransferSyntax_HighThroughputJPEG2000LosslessOnly:
         return "1.2.840.10008.1.2.4.201";
 
-      case DicomTransferSyntax_HT2JKWithRPCLOptionsLossless:
+      case DicomTransferSyntax_HighThroughputJPEG2000withRPCLOptionsLosslessOnly:
         return "1.2.840.10008.1.2.4.202";
 
-      case DicomTransferSyntax_HT2JK:
+      case DicomTransferSyntax_HighThroughputJPEG2000:
         return "1.2.840.10008.1.2.4.203";
 
       default:
@@ -318,13 +318,13 @@
       case DicomTransferSyntax_JPEGXL:
         return false;
 
-      case DicomTransferSyntax_HT2JKLossless:
+      case DicomTransferSyntax_HighThroughputJPEG2000LosslessOnly:
         return false;
 
-      case DicomTransferSyntax_HT2JKWithRPCLOptionsLossless:
+      case DicomTransferSyntax_HighThroughputJPEG2000withRPCLOptionsLosslessOnly:
         return false;
 
-      case DicomTransferSyntax_HT2JK:
+      case DicomTransferSyntax_HighThroughputJPEG2000:
         return false;
 
       default:
@@ -608,19 +608,19 @@
     
     if (uid == "1.2.840.10008.1.2.4.201")
     {
-      target = DicomTransferSyntax_HT2JKLossless;
+      target = DicomTransferSyntax_HighThroughputJPEG2000LosslessOnly;
       return true;
     }
     
     if (uid == "1.2.840.10008.1.2.4.202")
     {
-      target = DicomTransferSyntax_HT2JKWithRPCLOptionsLossless;
+      target = DicomTransferSyntax_HighThroughputJPEG2000withRPCLOptionsLosslessOnly;
       return true;
     }
     
     if (uid == "1.2.840.10008.1.2.4.203")
     {
-      target = DicomTransferSyntax_HT2JK;
+      target = DicomTransferSyntax_HighThroughputJPEG2000;
       return true;
     }
     
@@ -676,8 +676,8 @@
     target.insert(DicomTransferSyntax_JPEGXLLossless);
     target.insert(DicomTransferSyntax_JPEGXLJPEGRecompression);
     target.insert(DicomTransferSyntax_JPEGXL);
-    target.insert(DicomTransferSyntax_HT2JKLossless);
-    target.insert(DicomTransferSyntax_HT2JKWithRPCLOptionsLossless);
-    target.insert(DicomTransferSyntax_HT2JK);
+    target.insert(DicomTransferSyntax_HighThroughputJPEG2000LosslessOnly);
+    target.insert(DicomTransferSyntax_HighThroughputJPEG2000withRPCLOptionsLosslessOnly);
+    target.insert(DicomTransferSyntax_HighThroughputJPEG2000);
   }
 }
--- a/OrthancServer/Resources/DicomConformanceStatement.txt	Mon Apr 13 18:29:35 2026 +0200
+++ b/OrthancServer/Resources/DicomConformanceStatement.txt	Mon Apr 13 18:41:39 2026 +0200
@@ -308,54 +308,54 @@
 abovementioned supported SOP Classes using any of the following
 transfer syntaxes:
 
-  LittleEndianImplicitTransferSyntax                 | 1.2.840.10008.1.2
-  LittleEndianExplicitTransferSyntax                 | 1.2.840.10008.1.2.1
-  DeflatedLittleEndianExplicitTransferSyntax         | 1.2.840.10008.1.2.1.99
-  BigEndianExplicitTransferSyntax                    | 1.2.840.10008.1.2.2
-  MPEG2MainProfileAtMainLevelTransferSyntax          | 1.2.840.10008.1.2.4.100
-  MPEG2MainProfileAtHighLevelTransferSyntax          | 1.2.840.10008.1.2.4.101
-  MPEG4HighProfileLevel4_1TransferSyntax             | 1.2.840.10008.1.2.4.102
-  MPEG4BDcompatibleHighProfileLevel4_1TransferSyntax | 1.2.840.10008.1.2.4.103
-  MPEG4HighProfileLevel4_2_For2DVideoTransferSyntax  | 1.2.840.10008.1.2.4.104
-  MPEG4HighProfileLevel4_2_For3DVideoTransferSyntax  | 1.2.840.10008.1.2.4.105
-  MPEG4StereoHighProfileLevel4_2TransferSyntax       | 1.2.840.10008.1.2.4.106
-  HEVCMainProfileLevel5_1TransferSyntax              | 1.2.840.10008.1.2.4.107
-  HEVCMain10ProfileLevel5_1TransferSyntax            | 1.2.840.10008.1.2.4.108
-  JPEGXLLosslessTransferSyntax                       | 1.2.840.10008.1.2.4.110
-  JPEGXLJPEGRecompressionTransferSyntax              | 1.2.840.10008.1.2.4.111
-  JPEGXLTransferSyntax                               | 1.2.840.10008.1.2.4.112
-  HT2JKLosslessTransferSyntax                        | 1.2.840.10008.1.2.4.201
-  HT2JKWithRPCLOptionsLosslessTransferSyntax         | 1.2.840.10008.1.2.4.202
-  HT2JKTransferSyntax                                | 1.2.840.10008.1.2.4.203
-  JPEGProcess1TransferSyntax                         | 1.2.840.10008.1.2.4.50
-  JPEGProcess2_4TransferSyntax                       | 1.2.840.10008.1.2.4.51
-  JPEGProcess3_5TransferSyntax                       | 1.2.840.10008.1.2.4.52
-  JPEGProcess6_8TransferSyntax                       | 1.2.840.10008.1.2.4.53
-  JPEGProcess7_9TransferSyntax                       | 1.2.840.10008.1.2.4.54
-  JPEGProcess10_12TransferSyntax                     | 1.2.840.10008.1.2.4.55
-  JPEGProcess11_13TransferSyntax                     | 1.2.840.10008.1.2.4.56
-  JPEGProcess14TransferSyntax                        | 1.2.840.10008.1.2.4.57
-  JPEGProcess15TransferSyntax                        | 1.2.840.10008.1.2.4.58
-  JPEGProcess16_18TransferSyntax                     | 1.2.840.10008.1.2.4.59
-  JPEGProcess17_19TransferSyntax                     | 1.2.840.10008.1.2.4.60
-  JPEGProcess20_22TransferSyntax                     | 1.2.840.10008.1.2.4.61
-  JPEGProcess21_23TransferSyntax                     | 1.2.840.10008.1.2.4.62
-  JPEGProcess24_26TransferSyntax                     | 1.2.840.10008.1.2.4.63
-  JPEGProcess25_27TransferSyntax                     | 1.2.840.10008.1.2.4.64
-  JPEGProcess28TransferSyntax                        | 1.2.840.10008.1.2.4.65
-  JPEGProcess29TransferSyntax                        | 1.2.840.10008.1.2.4.66
-  JPEGProcess14SV1TransferSyntax                     | 1.2.840.10008.1.2.4.70
-  JPEGLSLosslessTransferSyntax                       | 1.2.840.10008.1.2.4.80
-  JPEGLSLossyTransferSyntax                          | 1.2.840.10008.1.2.4.81
-  JPEG2000LosslessOnlyTransferSyntax                 | 1.2.840.10008.1.2.4.90
-  JPEG2000TransferSyntax                             | 1.2.840.10008.1.2.4.91
-  JPEG2000MulticomponentLosslessOnlyTransferSyntax   | 1.2.840.10008.1.2.4.92
-  JPEG2000MulticomponentTransferSyntax               | 1.2.840.10008.1.2.4.93
-  JPIPReferencedTransferSyntax                       | 1.2.840.10008.1.2.4.94
-  JPIPReferencedDeflateTransferSyntax                | 1.2.840.10008.1.2.4.95
-  RLELosslessTransferSyntax                          | 1.2.840.10008.1.2.5
-  RFC2557MimeEncapsulationTransferSyntax             | 1.2.840.10008.1.2.6.1
-  XMLTransferSyntax                                  | 1.2.840.10008.1.2.6.2
+  LittleEndianImplicitTransferSyntax                              | 1.2.840.10008.1.2
+  LittleEndianExplicitTransferSyntax                              | 1.2.840.10008.1.2.1
+  DeflatedLittleEndianExplicitTransferSyntax                      | 1.2.840.10008.1.2.1.99
+  BigEndianExplicitTransferSyntax                                 | 1.2.840.10008.1.2.2
+  MPEG2MainProfileAtMainLevelTransferSyntax                       | 1.2.840.10008.1.2.4.100
+  MPEG2MainProfileAtHighLevelTransferSyntax                       | 1.2.840.10008.1.2.4.101
+  MPEG4HighProfileLevel4_1TransferSyntax                          | 1.2.840.10008.1.2.4.102
+  MPEG4BDcompatibleHighProfileLevel4_1TransferSyntax              | 1.2.840.10008.1.2.4.103
+  MPEG4HighProfileLevel4_2_For2DVideoTransferSyntax               | 1.2.840.10008.1.2.4.104
+  MPEG4HighProfileLevel4_2_For3DVideoTransferSyntax               | 1.2.840.10008.1.2.4.105
+  MPEG4StereoHighProfileLevel4_2TransferSyntax                    | 1.2.840.10008.1.2.4.106
+  HEVCMainProfileLevel5_1TransferSyntax                           | 1.2.840.10008.1.2.4.107
+  HEVCMain10ProfileLevel5_1TransferSyntax                         | 1.2.840.10008.1.2.4.108
+  JPEGXLLosslessTransferSyntax                                    | 1.2.840.10008.1.2.4.110
+  JPEGXLJPEGRecompressionTransferSyntax                           | 1.2.840.10008.1.2.4.111
+  JPEGXLTransferSyntax                                            | 1.2.840.10008.1.2.4.112
+  HighThroughputJPEG2000LosslessOnlyTransferSyntax                | 1.2.840.10008.1.2.4.201
+  HighThroughputJPEG2000withRPCLOptionsLosslessOnlyTransferSyntax | 1.2.840.10008.1.2.4.202
+  HighThroughputJPEG2000TransferSyntax                            | 1.2.840.10008.1.2.4.203
+  JPEGProcess1TransferSyntax                                      | 1.2.840.10008.1.2.4.50
+  JPEGProcess2_4TransferSyntax                                    | 1.2.840.10008.1.2.4.51
+  JPEGProcess3_5TransferSyntax                                    | 1.2.840.10008.1.2.4.52
+  JPEGProcess6_8TransferSyntax                                    | 1.2.840.10008.1.2.4.53
+  JPEGProcess7_9TransferSyntax                                    | 1.2.840.10008.1.2.4.54
+  JPEGProcess10_12TransferSyntax                                  | 1.2.840.10008.1.2.4.55
+  JPEGProcess11_13TransferSyntax                                  | 1.2.840.10008.1.2.4.56
+  JPEGProcess14TransferSyntax                                     | 1.2.840.10008.1.2.4.57
+  JPEGProcess15TransferSyntax                                     | 1.2.840.10008.1.2.4.58
+  JPEGProcess16_18TransferSyntax                                  | 1.2.840.10008.1.2.4.59
+  JPEGProcess17_19TransferSyntax                                  | 1.2.840.10008.1.2.4.60
+  JPEGProcess20_22TransferSyntax                                  | 1.2.840.10008.1.2.4.61
+  JPEGProcess21_23TransferSyntax                                  | 1.2.840.10008.1.2.4.62
+  JPEGProcess24_26TransferSyntax                                  | 1.2.840.10008.1.2.4.63
+  JPEGProcess25_27TransferSyntax                                  | 1.2.840.10008.1.2.4.64
+  JPEGProcess28TransferSyntax                                     | 1.2.840.10008.1.2.4.65
+  JPEGProcess29TransferSyntax                                     | 1.2.840.10008.1.2.4.66
+  JPEGProcess14SV1TransferSyntax                                  | 1.2.840.10008.1.2.4.70
+  JPEGLSLosslessTransferSyntax                                    | 1.2.840.10008.1.2.4.80
+  JPEGLSLossyTransferSyntax                                       | 1.2.840.10008.1.2.4.81
+  JPEG2000LosslessOnlyTransferSyntax                              | 1.2.840.10008.1.2.4.90
+  JPEG2000TransferSyntax                                          | 1.2.840.10008.1.2.4.91
+  JPEG2000MulticomponentLosslessOnlyTransferSyntax                | 1.2.840.10008.1.2.4.92
+  JPEG2000MulticomponentTransferSyntax                            | 1.2.840.10008.1.2.4.93
+  JPIPReferencedTransferSyntax                                    | 1.2.840.10008.1.2.4.94
+  JPIPReferencedDeflateTransferSyntax                             | 1.2.840.10008.1.2.4.95
+  RLELosslessTransferSyntax                                       | 1.2.840.10008.1.2.5
+  RFC2557MimeEncapsulationTransferSyntax                          | 1.2.840.10008.1.2.6.1
+  XMLTransferSyntax                                               | 1.2.840.10008.1.2.6.2
 
 It is possible to disable a subset of these transfer syntaxes thanks
 to the "AcceptedTransferSyntaxes" and "*TransferSyntaxAccepted"