comparison Core/DicomNetworking/Internals/CommandDispatcher.cpp @ 3769:eb044cc49d51

compatibility with DCMTK 3.6.0
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 17 Mar 2020 16:36:14 +0100
parents c6658187e4b1
children 4f78da5613a1
comparison
equal deleted inserted replaced
3768:6110a4995ace 3769:eb044cc49d51
476 { 476 {
477 storageTransferSyntaxes.push_back(UID_MPEG2MainProfileAtMainLevelTransferSyntax); 477 storageTransferSyntaxes.push_back(UID_MPEG2MainProfileAtMainLevelTransferSyntax);
478 storageTransferSyntaxes.push_back(UID_MPEG2MainProfileAtHighLevelTransferSyntax); 478 storageTransferSyntaxes.push_back(UID_MPEG2MainProfileAtHighLevelTransferSyntax);
479 } 479 }
480 480
481 #if DCMTK_VERSION_NUMBER >= 361
481 // New in Orthanc 1.6.0 482 // New in Orthanc 1.6.0
482 if (!server.HasApplicationEntityFilter() || 483 if (!server.HasApplicationEntityFilter() ||
483 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Mpeg4)) 484 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Mpeg4))
484 { 485 {
485 storageTransferSyntaxes.push_back(UID_MPEG4BDcompatibleHighProfileLevel4_1TransferSyntax); 486 storageTransferSyntaxes.push_back(UID_MPEG4BDcompatibleHighProfileLevel4_1TransferSyntax);
486 storageTransferSyntaxes.push_back(UID_MPEG4HighProfileLevel4_1TransferSyntax); 487 storageTransferSyntaxes.push_back(UID_MPEG4HighProfileLevel4_1TransferSyntax);
487 storageTransferSyntaxes.push_back(UID_MPEG4HighProfileLevel4_2_For2DVideoTransferSyntax); 488 storageTransferSyntaxes.push_back(UID_MPEG4HighProfileLevel4_2_For2DVideoTransferSyntax);
488 storageTransferSyntaxes.push_back(UID_MPEG4HighProfileLevel4_2_For3DVideoTransferSyntax); 489 storageTransferSyntaxes.push_back(UID_MPEG4HighProfileLevel4_2_For3DVideoTransferSyntax);
489 storageTransferSyntaxes.push_back(UID_MPEG4StereoHighProfileLevel4_2TransferSyntax); 490 storageTransferSyntaxes.push_back(UID_MPEG4StereoHighProfileLevel4_2TransferSyntax);
490 } 491 }
492 #endif
491 493
492 if (!server.HasApplicationEntityFilter() || 494 if (!server.HasApplicationEntityFilter() ||
493 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Rle)) 495 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Rle))
494 { 496 {
495 storageTransferSyntaxes.push_back(UID_RLELosslessTransferSyntax); 497 storageTransferSyntaxes.push_back(UID_RLELosslessTransferSyntax);