Mercurial > hg > orthanc
changeset 5089:80ac0955e4e7
Store SCU now gives priority to the preferred TransferSyntax proposed by the receiving SCP instead of Orthanc own AcceptedTransferSyntaxes
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Wed, 28 Sep 2022 12:15:27 +0200 |
| parents | 8d2c39e8880b |
| children | cc1a8b3ff319 |
| files | NEWS OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Mon Sep 26 19:08:03 2022 +0200 +++ b/NEWS Wed Sep 28 12:15:27 2022 +0200 @@ -1,6 +1,11 @@ Pending changes in the mainline =============================== +General +------- +* C-Store SCU now gives priority to the preferred TransferSyntax proposed by the receiving SCP + instead of Orthanc own AcceptedTransferSyntaxes. + REST API --------
--- a/OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp Mon Sep 26 19:08:03 2022 +0200 +++ b/OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp Wed Sep 28 12:15:27 2022 +0200 @@ -521,10 +521,12 @@ * Accept in the order "least wanted" to "most wanted" * transfer syntax. Accepting a transfer syntax will * override previously accepted transfer syntaxes. + * Since Orthanc 1.11.2+, we give priority to the transfer + * syntaxes proposed in the presentation context. **/ - for (int k = static_cast<int>(storageTransferSyntaxesC.size()) - 1; k >= 0; k--) + for (int j = static_cast<int>(pc.transferSyntaxCount)-1; j >=0; j--) { - for (int j = 0; j < static_cast<int>(pc.transferSyntaxCount); j++) + for (int k = static_cast<int>(storageTransferSyntaxesC.size()) - 1; k >= 0; k--) { /** * If the transfer syntax was proposed then we can accept it