Mercurial > hg > orthanc

diff OrthancServer/FromDcmtkBridge.cpp @ 2131:bb199bccdc45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reorganization
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 08 Nov 2016 10:49:45 +0100
parents 0c09d1af22f3
children 5a8840920121
line wrap: on
line diff
--- a/OrthancServer/FromDcmtkBridge.cpp	Tue Nov 08 10:06:16 2016 +0100
+++ b/OrthancServer/FromDcmtkBridge.cpp	Tue Nov 08 10:49:45 2016 +0100
@@ -882,9 +882,10 @@
                                            DcmDataset& dataset,
                                            DicomToJsonFormat format,
                                            DicomToJsonFlags flags,
-                                           unsigned int maxStringLength)
+                                           unsigned int maxStringLength,
+                                           Encoding defaultEncoding)
   {
-    Encoding encoding = DetectEncoding(dataset, Configuration::GetDefaultEncoding());
+    Encoding encoding = DetectEncoding(dataset, defaultEncoding);
 
     target = Json::objectValue;
     DatasetToJson(target, dataset, format, flags, maxStringLength, encoding);