Mercurial > hg > orthanc

diff OrthancServer/ParsedDicomFile.cpp @ 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/ParsedDicomFile.cpp	Mon Mar 21 13:31:56 2016 +0100
+++ b/OrthancServer/ParsedDicomFile.cpp	Mon Mar 21 14:12:31 2016 +0100
@@ -1059,7 +1059,8 @@
   
   Encoding ParsedDicomFile::GetEncoding() const
   {
-    return FromDcmtkBridge::DetectEncoding(*pimpl_->file_->getDataset());
+    return FromDcmtkBridge::DetectEncoding(*pimpl_->file_->getDataset(),
+                                           Configuration::GetDefaultEncoding());
   }
 
 
@@ -1081,7 +1082,9 @@
                                DicomToJsonFlags flags,
                                unsigned int maxStringLength)
   {
-    FromDcmtkBridge::ToJson(target, *pimpl_->file_->getDataset(), format, flags, maxStringLength);
+    FromDcmtkBridge::ToJson(target, *pimpl_->file_->getDataset(),
+                            format, flags, maxStringLength,
+                            Configuration::GetDefaultEncoding());
   }
 
 
@@ -1184,7 +1187,8 @@
 
   void ParsedDicomFile::Convert(DicomMap& tags)
   {
-    FromDcmtkBridge::Convert(tags, *pimpl_->file_->getDataset());
+    FromDcmtkBridge::Convert(tags, *pimpl_->file_->getDataset(),
+                             Configuration::GetDefaultEncoding());
   }