Mercurial > hg > orthanc

comparison OrthancServer/Internals/DicomImageDecoder.cpp @ 2125:b9bd52c72ba2

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 12:38:09 +0100
parents 88831c3edd8f
children bb199bccdc45
comparison
equal deleted inserted replaced
2124:2b1520efa282 2125:b9bd52c72ba2
248 slowAccessor_.reset(NULL); 248 slowAccessor_.reset(NULL);
249 249
250 // See also: http://support.dcmtk.org/wiki/dcmtk/howto/accessing-compressed-data 250 // See also: http://support.dcmtk.org/wiki/dcmtk/howto/accessing-compressed-data
251 251
252 DicomMap m; 252 DicomMap m;
253 FromDcmtkBridge::Convert(m, dataset, ORTHANC_MAXIMUM_TAG_LENGTH, 253 FromDcmtkBridge::ExtractDicomSummary(m, dataset);
254 Configuration::GetDefaultEncoding());
255 254
256 /** 255 /**
257 * Create an accessor to the raw values of the DICOM image. 256 * Create an accessor to the raw values of the DICOM image.
258 **/ 257 **/
259 258
321 320
322 ImageAccessor* DicomImageDecoder::CreateImage(DcmDataset& dataset, 321 ImageAccessor* DicomImageDecoder::CreateImage(DcmDataset& dataset,
323 bool ignorePhotometricInterpretation) 322 bool ignorePhotometricInterpretation)
324 { 323 {
325 DicomMap m; 324 DicomMap m;
326 FromDcmtkBridge::Convert(m, dataset, ORTHANC_MAXIMUM_TAG_LENGTH, 325 FromDcmtkBridge::ExtractDicomSummary(m, dataset);
327 Configuration::GetDefaultEncoding());
328 326
329 DicomImageInformation info(m); 327 DicomImageInformation info(m);
330 PixelFormat format; 328 PixelFormat format;
331 329
332 if (!info.ExtractPixelFormat(format, ignorePhotometricInterpretation)) 330 if (!info.ExtractPixelFormat(format, ignorePhotometricInterpretation))