Mercurial > hg > orthanc

comparison 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
comparison
equal deleted inserted replaced
2785:a16ad34d46f1 2786:e7a10626645f
525 transferSyntaxes.push_back(UID_JPEGProcess24_26TransferSyntax); 525 transferSyntaxes.push_back(UID_JPEGProcess24_26TransferSyntax);
526 transferSyntaxes.push_back(UID_JPEGProcess25_27TransferSyntax); 526 transferSyntaxes.push_back(UID_JPEGProcess25_27TransferSyntax);
527 transferSyntaxes.push_back(UID_JPEGProcess28TransferSyntax); 527 transferSyntaxes.push_back(UID_JPEGProcess28TransferSyntax);
528 transferSyntaxes.push_back(UID_JPEGProcess29TransferSyntax); 528 transferSyntaxes.push_back(UID_JPEGProcess29TransferSyntax);
529 transferSyntaxes.push_back(UID_JPEGProcess14SV1TransferSyntax); 529 transferSyntaxes.push_back(UID_JPEGProcess14SV1TransferSyntax);
530 transferSyntaxes.push_back(UID_JPEGLSLosslessTransferSyntax);
531 transferSyntaxes.push_back(UID_JPEGLSLossyTransferSyntax);
532 } 530 }
533 531
534 if (!server.HasApplicationEntityFilter() || 532 if (!server.HasApplicationEntityFilter() ||
535 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Jpeg2000)) 533 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Jpeg2000))
536 { 534 {
537 transferSyntaxes.push_back(UID_JPEG2000LosslessOnlyTransferSyntax); 535 transferSyntaxes.push_back(UID_JPEG2000LosslessOnlyTransferSyntax);
538 transferSyntaxes.push_back(UID_JPEG2000TransferSyntax); 536 transferSyntaxes.push_back(UID_JPEG2000TransferSyntax);
539 }
540
541 if (!server.HasApplicationEntityFilter() ||
542 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_JpegLossless))
543 {
544 transferSyntaxes.push_back(UID_JPEG2000LosslessOnlyTransferSyntax); 537 transferSyntaxes.push_back(UID_JPEG2000LosslessOnlyTransferSyntax);
545 transferSyntaxes.push_back(UID_JPEG2000TransferSyntax); 538 transferSyntaxes.push_back(UID_JPEG2000TransferSyntax);
546 transferSyntaxes.push_back(UID_JPEG2000Part2MulticomponentImageCompressionLosslessOnlyTransferSyntax); 539 transferSyntaxes.push_back(UID_JPEG2000Part2MulticomponentImageCompressionLosslessOnlyTransferSyntax);
547 transferSyntaxes.push_back(UID_JPEG2000Part2MulticomponentImageCompressionTransferSyntax); 540 transferSyntaxes.push_back(UID_JPEG2000Part2MulticomponentImageCompressionTransferSyntax);
541 }
542
543 if (!server.HasApplicationEntityFilter() ||
544 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_JpegLossless))
545 {
546 transferSyntaxes.push_back(UID_JPEGLSLosslessTransferSyntax);
547 transferSyntaxes.push_back(UID_JPEGLSLossyTransferSyntax);
548 } 548 }
549 549
550 if (!server.HasApplicationEntityFilter() || 550 if (!server.HasApplicationEntityFilter() ||
551 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Jpip)) 551 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Jpip))
552 { 552 {