# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1582225202 -3600
# Node ID 26c6d47467a9cec20da86ea1b480c894465a7b5e
# Parent  4182cde57afba05e367b21430faa7a26c0892620
DicomMap::MergeMainDicomTags()

diff -r 4182cde57afb -r 26c6d47467a9 Core/DicomFormat/DicomMap.cpp
--- a/Core/DicomFormat/DicomMap.cpp	Wed Feb 19 17:17:27 2020 +0100
+++ b/Core/DicomFormat/DicomMap.cpp	Thu Feb 20 20:00:02 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);
   }    
 
 
diff -r 4182cde57afb -r 26c6d47467a9 Core/DicomFormat/DicomMap.h
--- a/Core/DicomFormat/DicomMap.h	Wed Feb 19 17:17:27 2020 +0100
+++ b/Core/DicomFormat/DicomMap.h	Thu Feb 20 20:00:02 2020 +0100
@@ -63,9 +63,6 @@
     static void GetMainDicomTagsInternal(std::set<DicomTag>& result,
                                          ResourceType level);
 
-    void ExtractMainDicomTagsInternal(const DicomMap& other,
-                                      ResourceType level);
-
   public:
     DicomMap()
     {
@@ -215,6 +212,9 @@
 
     void Merge(const DicomMap& other);
 
+    void MergeMainDicomTags(const DicomMap& other,
+                            ResourceType level);
+
     void ExtractMainDicomTags(const DicomMap& other);
 
     bool HasOnlyMainDicomTags() const;