Mercurial > hg > orthanc
changeset 6682:299a925d3006
Added basic support for HTJ2K transfer syntaxes.
| author | Alain Mazy <am@orthanc.team> |
|---|---|
| date | Wed, 08 Apr 2026 11:26:46 +0200 |
| parents | 8c6580e9b5f6 |
| children | 765f1ac2baf1 |
| files | NEWS OrthancFramework/Resources/CodeGeneration/DicomTransferSyntaxes.json OrthancFramework/Resources/CodeGeneration/GenerateTransferSyntaxes.py OrthancFramework/Sources/DicomParsing/FromDcmtkBridge_TransferSyntaxes.impl.h OrthancFramework/Sources/Enumerations.h OrthancFramework/Sources/Enumerations_TransferSyntaxes.impl.h OrthancServer/Resources/DicomConformanceStatement.txt |
| diffstat | 7 files changed, 111 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Tue Apr 07 18:17:56 2026 +0200 +++ b/NEWS Wed Apr 08 11:26:46 2026 +0200 @@ -41,6 +41,8 @@ * 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 currently not able to compress/decompress + or preview these images. REST API
--- a/OrthancFramework/Resources/CodeGeneration/DicomTransferSyntaxes.json Tue Apr 07 18:17:56 2026 +0200 +++ b/OrthancFramework/Resources/CodeGeneration/DicomTransferSyntaxes.json Wed Apr 08 11:26:46 2026 +0200 @@ -396,5 +396,31 @@ "Value" : "JPEGXL", "DCMTK" : "EXS_JPEGXL", "SinceDCMTK" : "369" + }, + + { + "UID" : "1.2.840.10008.1.2.4.201", + "Name" : "HTJ2K Lossless", + "Value" : "HT2JKLossless", + "DCMTK" : "EXS_HighThroughputJPEG2000LosslessOnly", + "SinceDCMTK" : "369" + }, + + { + "UID" : "1.2.840.10008.1.2.4.202", + "Name" : "HTJ2K with RPCL Options Lossless", + "Value" : "HT2JKWithRPCLOptionsLossless", + "DCMTK" : "EXS_HighThroughputJPEG2000withRPCLOptionsLosslessOnly", + "SinceDCMTK" : "369" + }, + + { + "UID" : "1.2.840.10008.1.2.4.203", + "Name" : "HTJ2K", + "Value" : "HT2JK", + "DCMTK" : "EXS_HighThroughputJPEG2000", + "SinceDCMTK" : "369" } + + ]
--- a/OrthancFramework/Resources/CodeGeneration/GenerateTransferSyntaxes.py Tue Apr 07 18:17:56 2026 +0200 +++ b/OrthancFramework/Resources/CodeGeneration/GenerateTransferSyntaxes.py Wed Apr 08 11:26:46 2026 +0200 @@ -51,7 +51,7 @@ s = ',\n'.join(map(lambda x: ' DicomTransferSyntax_%s /*!< %s */' % (x['Value'], x['Name']), SYNTAXES)) -a = re.sub('(enum DicomTransferSyntax\s*{)[^}]*?(\s*};)', r'\1\n%s\2' % s, a, re.DOTALL) +a = re.sub(r'(enum DicomTransferSyntax\s*{)[^}]*?(\s*};)', r'\1\n%s\2' % s, a, re.DOTALL) with open(path, 'w') as f: f.write(a)
--- a/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge_TransferSyntaxes.impl.h Tue Apr 07 18:17:56 2026 +0200 +++ b/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge_TransferSyntaxes.impl.h Wed Apr 08 11:26:46 2026 +0200 @@ -294,6 +294,24 @@ return true; #endif +#if DCMTK_VERSION_NUMBER >= 369 + case DicomTransferSyntax_HT2JKLossless: + target = EXS_HighThroughputJPEG2000LosslessOnly; + return true; +#endif + +#if DCMTK_VERSION_NUMBER >= 369 + case DicomTransferSyntax_HT2JKWithRPCLOptionsLossless: + target = EXS_HighThroughputJPEG2000withRPCLOptionsLosslessOnly; + return true; +#endif + +#if DCMTK_VERSION_NUMBER >= 369 + case DicomTransferSyntax_HT2JK: + target = EXS_HighThroughputJPEG2000; + return true; +#endif + default: return false; } @@ -569,6 +587,24 @@ return true; #endif +#if DCMTK_VERSION_NUMBER >= 369 + case EXS_HighThroughputJPEG2000LosslessOnly: + target = DicomTransferSyntax_HT2JKLossless; + return true; +#endif + +#if DCMTK_VERSION_NUMBER >= 369 + case EXS_HighThroughputJPEG2000withRPCLOptionsLosslessOnly: + target = DicomTransferSyntax_HT2JKWithRPCLOptionsLossless; + return true; +#endif + +#if DCMTK_VERSION_NUMBER >= 369 + case EXS_HighThroughputJPEG2000: + target = DicomTransferSyntax_HT2JK; + return true; +#endif + default: return false; }
--- a/OrthancFramework/Sources/Enumerations.h Tue Apr 07 18:17:56 2026 +0200 +++ b/OrthancFramework/Sources/Enumerations.h Wed Apr 08 11:26:46 2026 +0200 @@ -287,7 +287,10 @@ DicomTransferSyntax_XML /*!< XML Encoding */, DicomTransferSyntax_JPEGXLLossless /*!< JPEG XL Lossless */, DicomTransferSyntax_JPEGXLJPEGRecompression /*!< JPEG XL JPEG Recompression */, - DicomTransferSyntax_JPEGXL /*!< JPEG XL */ + DicomTransferSyntax_JPEGXL /*!< JPEG XL */, + DicomTransferSyntax_HT2JKLossless /*!< HTJ2K Lossless */, + DicomTransferSyntax_HT2JKWithRPCLOptionsLossless /*!< HTJ2K with RPCL Options Lossless */, + DicomTransferSyntax_HT2JK /*!< HTJ2K */ };
--- a/OrthancFramework/Sources/Enumerations_TransferSyntaxes.impl.h Tue Apr 07 18:17:56 2026 +0200 +++ b/OrthancFramework/Sources/Enumerations_TransferSyntaxes.impl.h Wed Apr 08 11:26:46 2026 +0200 @@ -164,6 +164,15 @@ case DicomTransferSyntax_JPEGXL: return "1.2.840.10008.1.2.4.112"; + case DicomTransferSyntax_HT2JKLossless: + return "1.2.840.10008.1.2.4.201"; + + case DicomTransferSyntax_HT2JKWithRPCLOptionsLossless: + return "1.2.840.10008.1.2.4.202"; + + case DicomTransferSyntax_HT2JK: + return "1.2.840.10008.1.2.4.203"; + default: throw OrthancException(ErrorCode_ParameterOutOfRange); } @@ -309,6 +318,15 @@ case DicomTransferSyntax_JPEGXL: return false; + case DicomTransferSyntax_HT2JKLossless: + return false; + + case DicomTransferSyntax_HT2JKWithRPCLOptionsLossless: + return false; + + case DicomTransferSyntax_HT2JK: + return false; + default: throw OrthancException(ErrorCode_ParameterOutOfRange); } @@ -588,6 +606,24 @@ return true; } + if (uid == "1.2.840.10008.1.2.4.201") + { + target = DicomTransferSyntax_HT2JKLossless; + return true; + } + + if (uid == "1.2.840.10008.1.2.4.202") + { + target = DicomTransferSyntax_HT2JKWithRPCLOptionsLossless; + return true; + } + + if (uid == "1.2.840.10008.1.2.4.203") + { + target = DicomTransferSyntax_HT2JK; + return true; + } + return false; } @@ -640,5 +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); } }
--- a/OrthancServer/Resources/DicomConformanceStatement.txt Tue Apr 07 18:17:56 2026 +0200 +++ b/OrthancServer/Resources/DicomConformanceStatement.txt Wed Apr 08 11:26:46 2026 +0200 @@ -324,6 +324,9 @@ 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 + HTJPEG2000LosslessOnlyTransferSyntax | 1.2.840.10008.1.2.4.201 + HTJPEG2000WithRPCLLosslessOnlyTransferSyntax | 1.2.840.10008.1.2.4.202 + HTJPEG2000TransferSyntax | 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
