# HG changeset patch # User Sebastien Jodogne # Date 1776091410 -7200 # Node ID 7740f66ad5f8b57adec434617fd896b00ff2b84f # Parent 83411d1e402269f5dd016abf2b84023723734602 executing DicomConformanceStatement.py diff -r 83411d1e4022 -r 7740f66ad5f8 OrthancServer/Resources/DicomConformanceStatement.py --- a/OrthancServer/Resources/DicomConformanceStatement.py Mon Apr 13 16:05:10 2026 +0200 +++ b/OrthancServer/Resources/DicomConformanceStatement.py Mon Apr 13 16:43:30 2026 +0200 @@ -40,12 +40,17 @@ # Read the current version of DCMTK with open(os.path.join(BASE, 'OrthancFramework', 'Resources', 'CMake', 'OrthancFrameworkParameters.cmake'), 'r') as f: version = None - for match in re.findall(r'set\(DCMTK_STATIC_VERSION_DEFAULT "([0-9.]+)"\)', f.read()): + for match in re.findall(r'^set\(DCMTK_STATIC_VERSION "([0-9.]+)"', f.read(), re.MULTILINE): if version != None: raise Exception('Two versions of DCMTK were found') elif match != '3.6.9': # Ignore the version for Windows XP version = match + if version == None: + raise Exception('Unable to detect the DCMTK version') + + print('Detected DCMTK version: %s' % version) + url = 'https://orthanc.uclouvain.be/downloads/third-party-downloads/dcmtk-%s.tar.gz' % version r = requests.get(url) r.raise_for_status() diff -r 83411d1e4022 -r 7740f66ad5f8 OrthancServer/Resources/DicomConformanceStatement.txt --- a/OrthancServer/Resources/DicomConformanceStatement.txt Mon Apr 13 16:05:10 2026 +0200 +++ b/OrthancServer/Resources/DicomConformanceStatement.txt Mon Apr 13 16:43:30 2026 +0200 @@ -324,9 +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 + 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