Mercurial > hg > orthanc

diff Core/DicomNetworking/Internals/CommandDispatcher.cpp @ 2786:e7a10626645f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix incoming DICOM C-Store filtering for JPEG-LS transfer syntaxes
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 25 Jul 2018 13:15:11 +0200
parents 878b59270859
children 4e43e67f8ecf
line wrap: on
line diff
--- a/Core/DicomNetworking/Internals/CommandDispatcher.cpp	Tue Jul 24 20:11:02 2018 +0200
+++ b/Core/DicomNetworking/Internals/CommandDispatcher.cpp	Wed Jul 25 13:15:11 2018 +0200
@@ -527,8 +527,6 @@
         transferSyntaxes.push_back(UID_JPEGProcess28TransferSyntax);
         transferSyntaxes.push_back(UID_JPEGProcess29TransferSyntax);
         transferSyntaxes.push_back(UID_JPEGProcess14SV1TransferSyntax);
-        transferSyntaxes.push_back(UID_JPEGLSLosslessTransferSyntax);
-        transferSyntaxes.push_back(UID_JPEGLSLossyTransferSyntax);
       }
 
       if (!server.HasApplicationEntityFilter() ||
@@ -536,15 +534,17 @@
       {
         transferSyntaxes.push_back(UID_JPEG2000LosslessOnlyTransferSyntax);
         transferSyntaxes.push_back(UID_JPEG2000TransferSyntax);
+        transferSyntaxes.push_back(UID_JPEG2000LosslessOnlyTransferSyntax);
+        transferSyntaxes.push_back(UID_JPEG2000TransferSyntax);
+        transferSyntaxes.push_back(UID_JPEG2000Part2MulticomponentImageCompressionLosslessOnlyTransferSyntax);
+        transferSyntaxes.push_back(UID_JPEG2000Part2MulticomponentImageCompressionTransferSyntax);
       }
 
       if (!server.HasApplicationEntityFilter() ||
           server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_JpegLossless))
       {
-        transferSyntaxes.push_back(UID_JPEG2000LosslessOnlyTransferSyntax);
-        transferSyntaxes.push_back(UID_JPEG2000TransferSyntax);
-        transferSyntaxes.push_back(UID_JPEG2000Part2MulticomponentImageCompressionLosslessOnlyTransferSyntax);
-        transferSyntaxes.push_back(UID_JPEG2000Part2MulticomponentImageCompressionTransferSyntax);
+        transferSyntaxes.push_back(UID_JPEGLSLosslessTransferSyntax);
+        transferSyntaxes.push_back(UID_JPEGLSLossyTransferSyntax);
       }
 
       if (!server.HasApplicationEntityFilter() ||