Mercurial > hg > orthanc

diff OrthancServer/ParsedDicomFile.cpp @ 2126:03b065778fc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleaning up
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 07 Nov 2016 13:47:21 +0100
parents b9bd52c72ba2
children 9329ba17a069
line wrap: on
line diff
--- a/OrthancServer/ParsedDicomFile.cpp	Mon Nov 07 12:38:09 2016 +0100
+++ b/OrthancServer/ParsedDicomFile.cpp	Mon Nov 07 13:47:21 2016 +0100
@@ -1151,16 +1151,15 @@
                                DicomToJsonFlags flags,
                                unsigned int maxStringLength)
   {
-    FromDcmtkBridge::ToJson(target, *pimpl_->file_->getDataset(),
-                            format, flags, maxStringLength,
-                            Configuration::GetDefaultEncoding());
+    FromDcmtkBridge::ExtractDicomAsJson(target, *pimpl_->file_->getDataset(),
+                                        format, flags, maxStringLength);
   }
 
 
   void ParsedDicomFile::HeaderToJson(Json::Value& target, 
                                      DicomToJsonFormat format)
   {
-    FromDcmtkBridge::ToJson(target, *pimpl_->file_->getMetaInfo(), format, DicomToJsonFlags_None, 0);
+    FromDcmtkBridge::ExtractHeaderAsJson(target, *pimpl_->file_->getMetaInfo(), format, DicomToJsonFlags_None, 0);
   }