Mercurial > hg > orthanc

comparison OrthancServer/Sources/DicomInstanceToStore.cpp @ 4137:6774605d4341

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keep only one signature for FromDcmtkBridge::ExtractDicomSummary()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 06 Aug 2020 17:38:55 +0200
parents 2724977419fb
children 0ddc5297a8ab
comparison
equal deleted inserted replaced
4136:2724977419fb 4137:6774605d4341
239 239
240 ParseDicomFile(); 240 ParseDicomFile();
241 assert(parsed_.HasContent()); 241 assert(parsed_.HasContent());
242 242
243 // At this point, we have parsed the DICOM file 243 // At this point, we have parsed the DICOM file
244 std::set<DicomTag> ignoreTagLength;
244 245
245 if (!summary_.HasContent()) 246 if (!summary_.HasContent())
246 { 247 {
247 summary_.Allocate(); 248 summary_.Allocate();
248 FromDcmtkBridge::ExtractDicomSummary(summary_.GetContent(), 249 FromDcmtkBridge::ExtractDicomSummary(summary_.GetContent(),
249 *parsed_.GetContent().GetDcmtkObject().getDataset(), 250 *parsed_.GetContent().GetDcmtkObject().getDataset(),
250 ORTHANC_MAXIMUM_TAG_LENGTH); 251 ORTHANC_MAXIMUM_TAG_LENGTH, ignoreTagLength);
251 } 252 }
252 253
253 if (!json_.HasContent()) 254 if (!json_.HasContent())
254 { 255 {
255 json_.Allocate(); 256 json_.Allocate();
256
257 std::set<DicomTag> ignoreTagLength;
258 FromDcmtkBridge::ExtractDicomAsJson(json_.GetContent(), 257 FromDcmtkBridge::ExtractDicomAsJson(json_.GetContent(),
259 *parsed_.GetContent().GetDcmtkObject().getDataset(), 258 *parsed_.GetContent().GetDcmtkObject().getDataset(),
260 ignoreTagLength); 259 ignoreTagLength);
261 } 260 }
262 } 261 }