Mercurial > hg > orthanc
comparison Core/DicomNetworking/DicomUserConnection.cpp @ 3713:56f2397f027a storage-commitment
integration mainline->storage-commitment
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 02 Mar 2020 15:42:17 +0100 |
parents | bd34b6ac5c08 2a170a8f1faf |
children | 4fc24b69446a |
comparison
equal
deleted
inserted
replaced
3711:14b363d972a8 | 3713:56f2397f027a |
---|---|
626 switch (manufacturer) | 626 switch (manufacturer) |
627 { | 627 { |
628 case ModalityManufacturer_GenericNoWildcardInDates: | 628 case ModalityManufacturer_GenericNoWildcardInDates: |
629 case ModalityManufacturer_GenericNoUniversalWildcard: | 629 case ModalityManufacturer_GenericNoUniversalWildcard: |
630 { | 630 { |
631 std::auto_ptr<DicomMap> fix(fields.Clone()); | 631 std::unique_ptr<DicomMap> fix(fields.Clone()); |
632 | 632 |
633 std::set<DicomTag> tags; | 633 std::set<DicomTag> tags; |
634 fix->GetTags(tags); | 634 fix->GetTags(tags); |
635 | 635 |
636 for (std::set<DicomTag>::const_iterator it = tags.begin(); it != tags.end(); ++it) | 636 for (std::set<DicomTag>::const_iterator it = tags.begin(); it != tags.end(); ++it) |
741 const DicomMap& originalFields, | 741 const DicomMap& originalFields, |
742 bool normalize) | 742 bool normalize) |
743 { | 743 { |
744 CheckIsOpen(); | 744 CheckIsOpen(); |
745 | 745 |
746 std::auto_ptr<ParsedDicomFile> query; | 746 std::unique_ptr<ParsedDicomFile> query; |
747 | 747 |
748 if (normalize) | 748 if (normalize) |
749 { | 749 { |
750 DicomMap fields; | 750 DicomMap fields; |
751 NormalizeFindQuery(fields, level, originalFields); | 751 NormalizeFindQuery(fields, level, originalFields); |
854 ResourceType level, | 854 ResourceType level, |
855 const DicomMap& fields) | 855 const DicomMap& fields) |
856 { | 856 { |
857 CheckIsOpen(); | 857 CheckIsOpen(); |
858 | 858 |
859 std::auto_ptr<ParsedDicomFile> query(ConvertQueryFields(fields, manufacturer_)); | 859 std::unique_ptr<ParsedDicomFile> query(ConvertQueryFields(fields, manufacturer_)); |
860 DcmDataset* dataset = query->GetDcmtkObject().getDataset(); | 860 DcmDataset* dataset = query->GetDcmtkObject().getDataset(); |
861 | 861 |
862 const char* sopClass = UID_MOVEStudyRootQueryRetrieveInformationModel; | 862 const char* sopClass = UID_MOVEStudyRootQueryRetrieveInformationModel; |
863 switch (level) | 863 switch (level) |
864 { | 864 { |