Mercurial > hg > orthanc

diff OrthancServer/FromDcmtkBridge.h @ 1928:84c7eaeb5244

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Configuration::GetDefaultEncoding
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 21 Mar 2016 14:12:31 +0100
parents 6c73df12ca51
children cda5b0ab4ce5
line wrap: on
line diff
--- a/OrthancServer/FromDcmtkBridge.h	Mon Mar 21 13:31:56 2016 +0100
+++ b/OrthancServer/FromDcmtkBridge.h	Mon Mar 21 14:12:31 2016 +0100
@@ -54,9 +54,12 @@
                                       unsigned int minMultiplicity,
                                       unsigned int maxMultiplicity);
 
-    static Encoding DetectEncoding(DcmDataset& dataset);
+    static Encoding DetectEncoding(DcmDataset& dataset,
+                                   Encoding defaultEncoding);
 
-    static void Convert(DicomMap& target, DcmDataset& dataset);
+    static void Convert(DicomMap& target, 
+                        DcmDataset& dataset,
+                        Encoding defaultEncoding);
 
     static DicomTag Convert(const DcmTag& tag);
 
@@ -79,7 +82,8 @@
                        DcmDataset& dataset,
                        DicomToJsonFormat format,
                        DicomToJsonFlags flags,
-                       unsigned int maxStringLength);
+                       unsigned int maxStringLength,
+                       Encoding defaultEncoding);
 
     static void ToJson(Json::Value& target, 
                        DcmMetaInfo& header,