Mercurial > hg > orthanc
comparison OrthancServer/Internals/StoreScp.cpp @ 2125:b9bd52c72ba2
cleaning up
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 07 Nov 2016 12:38:09 +0100 |
parents | 4b02ec79728a |
children | 03b065778fc3 |
comparison
equal
deleted
inserted
replaced
2124:2b1520efa282 | 2125:b9bd52c72ba2 |
---|---|
166 Json::Value dicomJson; | 166 Json::Value dicomJson; |
167 std::string buffer; | 167 std::string buffer; |
168 | 168 |
169 try | 169 try |
170 { | 170 { |
171 const Encoding defaultEncoding = Configuration::GetDefaultEncoding(); | 171 FromDcmtkBridge::ExtractDicomSummary(summary, **imageDataSet); |
172 FromDcmtkBridge::Convert(summary, **imageDataSet, | |
173 ORTHANC_MAXIMUM_TAG_LENGTH, | |
174 defaultEncoding); | |
175 FromDcmtkBridge::ToJson(dicomJson, **imageDataSet, | 172 FromDcmtkBridge::ToJson(dicomJson, **imageDataSet, |
176 DicomToJsonFormat_Full, | 173 DicomToJsonFormat_Full, |
177 DicomToJsonFlags_Default, | 174 DicomToJsonFlags_Default, |
178 ORTHANC_MAXIMUM_TAG_LENGTH, | 175 ORTHANC_MAXIMUM_TAG_LENGTH, |
179 defaultEncoding); | 176 Configuration::GetDefaultEncoding()); |
180 | 177 |
181 if (!FromDcmtkBridge::SaveToMemoryBuffer(buffer, **imageDataSet)) | 178 if (!FromDcmtkBridge::SaveToMemoryBuffer(buffer, **imageDataSet)) |
182 { | 179 { |
183 LOG(ERROR) << "cannot write DICOM file to memory"; | 180 LOG(ERROR) << "cannot write DICOM file to memory"; |
184 rsp->DimseStatus = STATUS_STORE_Refused_OutOfResources; | 181 rsp->DimseStatus = STATUS_STORE_Refused_OutOfResources; |