Mercurial > hg > orthanc

comparison OrthancServer/Internals/StoreScp.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
83 #include "StoreScp.h" 83 #include "StoreScp.h"
84 84
85 #include "../FromDcmtkBridge.h" 85 #include "../FromDcmtkBridge.h"
86 #include "../ServerToolbox.h" 86 #include "../ServerToolbox.h"
87 #include "../ToDcmtkBridge.h" 87 #include "../ToDcmtkBridge.h"
88 #include "../OrthancInitialization.h"
88 #include "../../Core/OrthancException.h" 89 #include "../../Core/OrthancException.h"
89 #include "../../Core/Logging.h" 90 #include "../../Core/Logging.h"
90 91
91 #include <dcmtk/dcmdata/dcfilefo.h> 92 #include <dcmtk/dcmdata/dcfilefo.h>
92 #include <dcmtk/dcmdata/dcmetinf.h> 93 #include <dcmtk/dcmdata/dcmetinf.h>
165 Json::Value dicomJson; 166 Json::Value dicomJson;
166 std::string buffer; 167 std::string buffer;
167 168
168 try 169 try
169 { 170 {
170 FromDcmtkBridge::Convert(summary, **imageDataSet); 171 FromDcmtkBridge::Convert(summary, **imageDataSet,
172 Configuration::GetDefaultEncoding());
171 FromDcmtkBridge::ToJson(dicomJson, **imageDataSet, 173 FromDcmtkBridge::ToJson(dicomJson, **imageDataSet,
172 DicomToJsonFormat_Full, 174 DicomToJsonFormat_Full,
173 DicomToJsonFlags_Default, 175 DicomToJsonFlags_Default,
174 ORTHANC_MAXIMUM_TAG_LENGTH); 176 ORTHANC_MAXIMUM_TAG_LENGTH,
177 Configuration::GetDefaultEncoding());
175 178
176 if (!FromDcmtkBridge::SaveToMemoryBuffer(buffer, **imageDataSet)) 179 if (!FromDcmtkBridge::SaveToMemoryBuffer(buffer, **imageDataSet))
177 { 180 {
178 LOG(ERROR) << "cannot write DICOM file to memory"; 181 LOG(ERROR) << "cannot write DICOM file to memory";
179 rsp->DimseStatus = STATUS_STORE_Refused_OutOfResources; 182 rsp->DimseStatus = STATUS_STORE_Refused_OutOfResources;