Mercurial > hg > orthanc-stone
comparison OrthancStone/Sources/Loaders/SeriesThumbnailsLoader.cpp @ 1564:e731e62692a9
upgrading Orthanc framework
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 17 Sep 2020 15:18:21 +0200 |
parents | 244ad1e4e76a |
children | 85e117739eca |
comparison
equal
deleted
inserted
replaced
1563:e0045462a25c | 1564:e731e62692a9 |
---|---|
35 | 35 |
36 #include <boost/algorithm/string/predicate.hpp> | 36 #include <boost/algorithm/string/predicate.hpp> |
37 | 37 |
38 #if ORTHANC_ENABLE_DCMTK == 1 | 38 #if ORTHANC_ENABLE_DCMTK == 1 |
39 # include <DicomParsing/ParsedDicomFile.h> | 39 # include <DicomParsing/ParsedDicomFile.h> |
40 # include <DicomParsing/Internals/DicomImageDecoder.h> | |
41 #endif | 40 #endif |
42 | 41 |
43 | 42 |
44 static const unsigned int JPEG_QUALITY = 70; // Only used for Orthanc source | 43 static const unsigned int JPEG_QUALITY = 70; // Only used for Orthanc source |
45 | 44 |
553 new ThumbnailInformation( | 552 new ThumbnailInformation( |
554 origin.GetSource(), info.GetStudyInstanceUid(), info.GetSeriesInstanceUid()))); | 553 origin.GetSource(), info.GetStudyInstanceUid(), info.GetSeriesInstanceUid()))); |
555 } | 554 } |
556 else | 555 else |
557 { | 556 { |
558 std::unique_ptr<Orthanc::ImageAccessor> frame( | 557 std::unique_ptr<Orthanc::ImageAccessor> frame(message.GetDicom().DecodeFrame(0)); |
559 Orthanc::DicomImageDecoder::Decode(message.GetDicom(), 0)); | |
560 | 558 |
561 std::unique_ptr<Orthanc::ImageAccessor> thumbnail; | 559 std::unique_ptr<Orthanc::ImageAccessor> thumbnail; |
562 | 560 |
563 if (frame->GetFormat() == Orthanc::PixelFormat_RGB24) | 561 if (frame->GetFormat() == Orthanc::PixelFormat_RGB24) |
564 { | 562 { |