Mercurial > hg > orthanc

diff OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp @ 4137:6774605d4341

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keep only one signature for FromDcmtkBridge::ExtractDicomSummary()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 06 Aug 2020 17:38:55 +0200
parents 2724977419fb
children 0ddc5297a8ab
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp	Thu Aug 06 15:55:03 2020 +0200
+++ b/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp	Thu Aug 06 17:38:55 2020 +0200
@@ -470,9 +470,10 @@
   void FromDcmtkBridge::ExtractDicomSummary(DicomMap& target, 
                                             DcmItem& dataset,
                                             unsigned int maxStringLength,
-                                            Encoding defaultEncoding,
                                             const std::set<DicomTag>& ignoreTagLength)
   {
+    const Encoding defaultEncoding = GetDefaultDicomEncoding();
+    
     bool hasCodeExtensions;
     Encoding encoding = DetectEncoding(hasCodeExtensions, dataset, defaultEncoding);
 
@@ -2036,16 +2037,6 @@
   }
 
 
-  void FromDcmtkBridge::ExtractDicomSummary(DicomMap& target, 
-                                            DcmItem& dataset,
-                                            unsigned int maxStringLength,
-                                            const std::set<DicomTag>& ignoreTagLength)
-  {
-    ExtractDicomSummary(target, dataset, maxStringLength,
-                        GetDefaultDicomEncoding(), ignoreTagLength);
-  }
-
-  
   void FromDcmtkBridge::ExtractDicomAsJson(Json::Value& target, 
                                            DcmDataset& dataset,
                                            const std::set<DicomTag>& ignoreTagLength)