Mercurial > hg > orthanc

comparison OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.cpp @ 4312:6d49e3b6ff77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix abi of DicomImageInformation
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 09 Nov 2020 15:22:43 +0100
parents cb9aef006229
children d9473bd5ed43
comparison
equal deleted inserted replaced
4311:cb9aef006229 4312:6d49e3b6ff77
250 250
251 // See also: http://support.dcmtk.org/wiki/dcmtk/howto/accessing-compressed-data 251 // See also: http://support.dcmtk.org/wiki/dcmtk/howto/accessing-compressed-data
252 252
253 DicomMap m; 253 DicomMap m;
254 std::set<DicomTag> ignoreTagLength; 254 std::set<DicomTag> ignoreTagLength;
255 FromDcmtkBridge::ExtractDicomSummary(m, dataset, DicomImageInformation::USEFUL_TAG_LENGTH, ignoreTagLength); 255 FromDcmtkBridge::ExtractDicomSummary(m, dataset, DicomImageInformation::GetUsefulTagLength(), ignoreTagLength);
256 256
257 /** 257 /**
258 * Create an accessor to the raw values of the DICOM image. 258 * Create an accessor to the raw values of the DICOM image.
259 **/ 259 **/
260 260
323 ImageAccessor* DicomImageDecoder::CreateImage(DcmDataset& dataset, 323 ImageAccessor* DicomImageDecoder::CreateImage(DcmDataset& dataset,
324 bool ignorePhotometricInterpretation) 324 bool ignorePhotometricInterpretation)
325 { 325 {
326 DicomMap m; 326 DicomMap m;
327 std::set<DicomTag> ignoreTagLength; 327 std::set<DicomTag> ignoreTagLength;
328 FromDcmtkBridge::ExtractDicomSummary(m, dataset, DicomImageInformation::USEFUL_TAG_LENGTH, ignoreTagLength); 328 FromDcmtkBridge::ExtractDicomSummary(m, dataset, DicomImageInformation::GetUsefulTagLength(), ignoreTagLength);
329 329
330 DicomImageInformation info(m); 330 DicomImageInformation info(m);
331 PixelFormat format; 331 PixelFormat format;
332 332
333 if (!info.ExtractPixelFormat(format, ignorePhotometricInterpretation)) 333 if (!info.ExtractPixelFormat(format, ignorePhotometricInterpretation))
612 throw OrthancException(ErrorCode_BadFileFormat); 612 throw OrthancException(ErrorCode_BadFileFormat);
613 } 613 }
614 614
615 DicomMap m; 615 DicomMap m;
616 std::set<DicomTag> ignoreTagLength; 616 std::set<DicomTag> ignoreTagLength;
617 FromDcmtkBridge::ExtractDicomSummary(m, dataset, DicomImageInformation::USEFUL_TAG_LENGTH, ignoreTagLength); 617 FromDcmtkBridge::ExtractDicomSummary(m, dataset, DicomImageInformation::GetUsefulTagLength(), ignoreTagLength);
618 DicomImageInformation info(m); 618 DicomImageInformation info(m);
619 619
620 std::unique_ptr<ImageAccessor> target(CreateImage(dataset, true)); 620 std::unique_ptr<ImageAccessor> target(CreateImage(dataset, true));
621 621
622 Uint32 startFragment = 0; // Default 622 Uint32 startFragment = 0; // Default