Mercurial > hg > orthanc

comparison OrthancServer/DicomInstanceToStore.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 b1291df2f780
children cda5b0ab4ce5
comparison
equal deleted inserted replaced
1927:b60f27664b8f 1928:84c7eaeb5244
32 32
33 #include "PrecompiledHeadersServer.h" 33 #include "PrecompiledHeadersServer.h"
34 #include "DicomInstanceToStore.h" 34 #include "DicomInstanceToStore.h"
35 35
36 #include "FromDcmtkBridge.h" 36 #include "FromDcmtkBridge.h"
37 #include "OrthancInitialization.h"
37 #include "../Core/Logging.h" 38 #include "../Core/Logging.h"
38 39
39 #include <dcmtk/dcmdata/dcfilefo.h> 40 #include <dcmtk/dcmdata/dcfilefo.h>
40 41
41 42
102 103
103 if (!summary_.HasContent()) 104 if (!summary_.HasContent())
104 { 105 {
105 summary_.Allocate(); 106 summary_.Allocate();
106 FromDcmtkBridge::Convert(summary_.GetContent(), 107 FromDcmtkBridge::Convert(summary_.GetContent(),
107 *parsed_.GetContent().GetDcmtkObject().getDataset()); 108 *parsed_.GetContent().GetDcmtkObject().getDataset(),
109 Configuration::GetDefaultEncoding());
108 } 110 }
109 111
110 if (!json_.HasContent()) 112 if (!json_.HasContent())
111 { 113 {
112 json_.Allocate(); 114 json_.Allocate();
113 FromDcmtkBridge::ToJson(json_.GetContent(), 115 FromDcmtkBridge::ToJson(json_.GetContent(),
114 *parsed_.GetContent().GetDcmtkObject().getDataset(), 116 *parsed_.GetContent().GetDcmtkObject().getDataset(),
115 DicomToJsonFormat_Full, 117 DicomToJsonFormat_Full,
116 DicomToJsonFlags_Default, 118 DicomToJsonFlags_Default,
117 ORTHANC_MAXIMUM_TAG_LENGTH); 119 ORTHANC_MAXIMUM_TAG_LENGTH,
120 Configuration::GetDefaultEncoding());
118 } 121 }
119 } 122 }
120 123
121 124
122 125