Mercurial > hg > orthanc
diff OrthancServer/Internals/DicomImageDecoder.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 |
line wrap: on
line diff
--- a/OrthancServer/Internals/DicomImageDecoder.cpp Mon Mar 21 13:31:56 2016 +0100 +++ b/OrthancServer/Internals/DicomImageDecoder.cpp Mon Mar 21 14:12:31 2016 +0100 @@ -76,10 +76,6 @@ =========================================================================*/ - -#include "../PrecompiledHeadersServer.h" -#include "DicomImageDecoder.h" - #include "../../Core/Logging.h" #include "../../Core/OrthancException.h" #include "../../Core/Images/Image.h" @@ -90,6 +86,7 @@ #include "../ToDcmtkBridge.h" #include "../FromDcmtkBridge.h" #include "../ParsedDicomFile.h" +#include "../OrthancInitialization.h" #include <boost/lexical_cast.hpp> @@ -245,7 +242,8 @@ // See also: http://support.dcmtk.org/wiki/dcmtk/howto/accessing-compressed-data DicomMap m; - FromDcmtkBridge::Convert(m, dataset); + FromDcmtkBridge::Convert(m, dataset, + Configuration::GetDefaultEncoding()); /** * Create an accessor to the raw values of the DICOM image. @@ -317,7 +315,8 @@ bool ignorePhotometricInterpretation) { DicomMap m; - FromDcmtkBridge::Convert(m, dataset); + FromDcmtkBridge::Convert(m, dataset, + Configuration::GetDefaultEncoding()); DicomImageInformation info(m); PixelFormat format;