Mercurial > hg > orthanc

diff OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h @ 4140:0ddc5297a8ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
centralization of default parameters for JSON/DicomMap conversions from DCMTK
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 07 Aug 2020 10:46:50 +0200
parents 6774605d4341
children 785a2713323e
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h	Thu Aug 06 18:25:47 2020 +0200
+++ b/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h	Fri Aug 07 10:46:50 2020 +0200
@@ -80,14 +80,6 @@
                               bool hasCodeExtensions,
                               const std::set<DicomTag>& ignoreTagLength);
 
-    static void ExtractDicomAsJson(Json::Value& target, 
-                                   DcmDataset& dataset,
-                                   DicomToJsonFormat format,
-                                   DicomToJsonFlags flags,
-                                   unsigned int maxStringLength,
-                                   Encoding defaultEncoding,
-                                   const std::set<DicomTag>& ignoreTagLength);
-
     static void ChangeStringEncoding(DcmItem& dataset,
                                      Encoding source,
                                      bool hasSourceCodeExtensions,
@@ -226,6 +218,9 @@
 
     static void ExtractDicomAsJson(Json::Value& target, 
                                    DcmDataset& dataset,
+                                   DicomToJsonFormat format,
+                                   DicomToJsonFlags flags,
+                                   unsigned int maxStringLength,
                                    const std::set<DicomTag>& ignoreTagLength);
 
     static void InitializeCodecs();