Mercurial > hg > orthanc
comparison OrthancServer/Internals/DicomFrameIndex.cpp @ 1928:84c7eaeb5244
Configuration::GetDefaultEncoding
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 21 Mar 2016 14:12:31 +0100 |
parents | 6c73df12ca51 |
children | cda5b0ab4ce5 |
comparison
equal
deleted
inserted
replaced
1927:b60f27664b8f | 1928:84c7eaeb5244 |
---|---|
34 #include "DicomFrameIndex.h" | 34 #include "DicomFrameIndex.h" |
35 | 35 |
36 #include "../../Core/OrthancException.h" | 36 #include "../../Core/OrthancException.h" |
37 #include "../../Core/DicomFormat/DicomImageInformation.h" | 37 #include "../../Core/DicomFormat/DicomImageInformation.h" |
38 #include "../FromDcmtkBridge.h" | 38 #include "../FromDcmtkBridge.h" |
39 #include "../OrthancInitialization.h" | |
39 #include "DicomImageDecoder.h" | 40 #include "DicomImageDecoder.h" |
40 | 41 |
41 #include <boost/lexical_cast.hpp> | 42 #include <boost/lexical_cast.hpp> |
42 | 43 |
43 #include <dcmtk/dcmdata/dcdeftag.h> | 44 #include <dcmtk/dcmdata/dcdeftag.h> |
374 return; | 375 return; |
375 } | 376 } |
376 | 377 |
377 // Extract information about the image structure | 378 // Extract information about the image structure |
378 DicomMap tags; | 379 DicomMap tags; |
379 FromDcmtkBridge::Convert(tags, dataset); | 380 FromDcmtkBridge::Convert(tags, dataset, |
381 Configuration::GetDefaultEncoding()); | |
380 | 382 |
381 DicomImageInformation information(tags); | 383 DicomImageInformation information(tags); |
382 | 384 |
383 // Access to the raw pixel data | 385 // Access to the raw pixel data |
384 if (DicomImageDecoder::IsPsmctRle1(dataset)) | 386 if (DicomImageDecoder::IsPsmctRle1(dataset)) |