Mercurial > hg > orthanc
diff Core/DicomFormat/DicomMap.cpp @ 3681:9dac85e807c2 storage-commitment
integration mainline->storage-commitment
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 20 Feb 2020 20:36:47 +0100 |
| parents | cccd97333e3d 26c6d47467a9 |
| children | 898903022836 |
line wrap: on
line diff
--- a/Core/DicomFormat/DicomMap.cpp Mon Feb 17 17:54:40 2020 +0100 +++ b/Core/DicomFormat/DicomMap.cpp Thu Feb 20 20:36:47 2020 +0100 @@ -1059,8 +1059,8 @@ } - void DicomMap::ExtractMainDicomTagsInternal(const DicomMap& other, - ResourceType level) + void DicomMap::MergeMainDicomTags(const DicomMap& other, + ResourceType level) { const MainDicomTag* tags = NULL; size_t size = 0; @@ -1085,10 +1085,10 @@ void DicomMap::ExtractMainDicomTags(const DicomMap& other) { Clear(); - ExtractMainDicomTagsInternal(other, ResourceType_Patient); - ExtractMainDicomTagsInternal(other, ResourceType_Study); - ExtractMainDicomTagsInternal(other, ResourceType_Series); - ExtractMainDicomTagsInternal(other, ResourceType_Instance); + MergeMainDicomTags(other, ResourceType_Patient); + MergeMainDicomTags(other, ResourceType_Study); + MergeMainDicomTags(other, ResourceType_Series); + MergeMainDicomTags(other, ResourceType_Instance); }