comparison OrthancServer/ParsedDicomFile.h @ 1824:b530c3dfe2a6

refactoring image decoding
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 25 Nov 2015 14:14:32 +0100
parents 1065401501fb
children ac5b0b4e2434
comparison
equal deleted inserted replaced
1823:0ef4e6e66b56 1824:b530c3dfe2a6
31 31
32 32
33 #pragma once 33 #pragma once
34 34
35 #include "../Core/DicomFormat/DicomInstanceHasher.h" 35 #include "../Core/DicomFormat/DicomInstanceHasher.h"
36 #include "../Core/IDynamicObject.h"
36 #include "../Core/RestApi/RestApiOutput.h" 37 #include "../Core/RestApi/RestApiOutput.h"
38 #include "IDicomImageDecoder.h"
37 #include "ServerEnumerations.h" 39 #include "ServerEnumerations.h"
38 #include "../Core/Images/ImageAccessor.h"
39 #include "../Core/Images/ImageBuffer.h"
40 #include "../Core/IDynamicObject.h"
41 40
42 class DcmDataset; 41 class DcmDataset;
43 class DcmFileFormat; 42 class DcmFileFormat;
44 43
45 namespace Orthanc 44 namespace Orthanc
75 74
76 ParsedDicomFile(DcmFileFormat& dicom); 75 ParsedDicomFile(DcmFileFormat& dicom);
77 76
78 ~ParsedDicomFile(); 77 ~ParsedDicomFile();
79 78
80 DcmFileFormat& GetDcmtkObject(); 79 DcmFileFormat& GetDcmtkObject() const;
81 80
82 ParsedDicomFile* Clone(); 81 ParsedDicomFile* Clone();
83 82
84 void SendPathValue(RestApiOutput& output, 83 void SendPathValue(RestApiOutput& output,
85 const UriComponents& uri); 84 const UriComponents& uri);
126 125
127 void EmbedImage(const std::string& mime, 126 void EmbedImage(const std::string& mime,
128 const std::string& content); 127 const std::string& content);
129 128
130 void ExtractImage(ImageBuffer& result, 129 void ExtractImage(ImageBuffer& result,
130 IDicomImageDecoder& decoder,
131 unsigned int frame); 131 unsigned int frame);
132 132
133 void ExtractImage(ImageBuffer& result, 133 void ExtractImage(ImageBuffer& result,
134 IDicomImageDecoder& decoder,
134 unsigned int frame, 135 unsigned int frame,
135 ImageExtractionMode mode); 136 ImageExtractionMode mode);
136 137
137 void ExtractPngImage(std::string& result, 138 void ExtractPngImage(std::string& result,
139 IDicomImageDecoder& decoder,
138 unsigned int frame, 140 unsigned int frame,
139 ImageExtractionMode mode); 141 ImageExtractionMode mode);
140 142
141 void ExtractJpegImage(std::string& result, 143 void ExtractJpegImage(std::string& result,
144 IDicomImageDecoder& decoder,
142 unsigned int frame, 145 unsigned int frame,
143 ImageExtractionMode mode, 146 ImageExtractionMode mode,
144 uint8_t quality); 147 uint8_t quality);
145 148
146 Encoding GetEncoding() const; 149 Encoding GetEncoding() const;