Mercurial > hg > orthanc

comparison OrthancServer/Internals/DicomImageDecoder.cpp @ 2381:b8969010b534

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uncoupling DCMTK primitives from Orthanc::Configuration
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 29 Aug 2017 19:59:01 +0200
parents 96b3ec054b69
children
comparison
equal deleted inserted replaced
2380:96b3ec054b69 2381:b8969010b534
83 #include "../../Core/Images/ImageProcessing.h" 83 #include "../../Core/Images/ImageProcessing.h"
84 #include "../../Core/DicomFormat/DicomIntegerPixelAccessor.h" 84 #include "../../Core/DicomFormat/DicomIntegerPixelAccessor.h"
85 #include "../ToDcmtkBridge.h" 85 #include "../ToDcmtkBridge.h"
86 #include "../FromDcmtkBridge.h" 86 #include "../FromDcmtkBridge.h"
87 #include "../ParsedDicomFile.h" 87 #include "../ParsedDicomFile.h"
88 #include "../OrthancInitialization.h"
89 88
90 #if ORTHANC_ENABLE_PNG == 1 89 #if ORTHANC_ENABLE_PNG == 1
91 # include "../../Core/Images/PngWriter.h" 90 # include "../../Core/Images/PngWriter.h"
92 #endif 91 #endif
93 92
255 slowAccessor_.reset(NULL); 254 slowAccessor_.reset(NULL);
256 255
257 // See also: http://support.dcmtk.org/wiki/dcmtk/howto/accessing-compressed-data 256 // See also: http://support.dcmtk.org/wiki/dcmtk/howto/accessing-compressed-data
258 257
259 DicomMap m; 258 DicomMap m;
260 Configuration::ExtractDicomSummary(m, dataset); 259 FromDcmtkBridge::ExtractDicomSummary(m, dataset);
261 260
262 /** 261 /**
263 * Create an accessor to the raw values of the DICOM image. 262 * Create an accessor to the raw values of the DICOM image.
264 **/ 263 **/
265 264
327 326
328 ImageAccessor* DicomImageDecoder::CreateImage(DcmDataset& dataset, 327 ImageAccessor* DicomImageDecoder::CreateImage(DcmDataset& dataset,
329 bool ignorePhotometricInterpretation) 328 bool ignorePhotometricInterpretation)
330 { 329 {
331 DicomMap m; 330 DicomMap m;
332 Configuration::ExtractDicomSummary(m, dataset); 331 FromDcmtkBridge::ExtractDicomSummary(m, dataset);
333 332
334 DicomImageInformation info(m); 333 DicomImageInformation info(m);
335 PixelFormat format; 334 PixelFormat format;
336 335
337 if (!info.ExtractPixelFormat(format, ignorePhotometricInterpretation)) 336 if (!info.ExtractPixelFormat(format, ignorePhotometricInterpretation))