Mercurial > hg > orthanc-webviewer
annotate Plugin/DecodedImageAdapter.cpp @ 233:e866849335fd transcoding
integration mainline->transcoding
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 11 May 2020 15:38:39 +0200 |
parents | cce89307af28 |
children | 083d0cbcbac4 |
rev | line source |
---|---|
0 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
122 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
0 | 4 * Department, University Hospital of Liege, Belgium |
226
aee499712ac4
upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
216
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
0 | 6 * |
7 * This program is free software: you can redistribute it and/or | |
8 * modify it under the terms of the GNU Affero General Public License | |
9 * as published by the Free Software Foundation, either version 3 of | |
10 * the License, or (at your option) any later version. | |
11 * | |
12 * This program is distributed in the hope that it will be useful, but | |
13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Affero General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Affero General Public License | |
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
19 **/ | |
20 | |
21 | |
22 #include "DecodedImageAdapter.h" | |
23 | |
24 #include "ViewerToolbox.h" | |
25 | |
191
993dd140bd30
Resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
174
diff
changeset
|
26 #include <Core/Images/ImageBuffer.h> |
993dd140bd30
Resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
174
diff
changeset
|
27 #include <Core/Images/ImageProcessing.h> |
993dd140bd30
Resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
174
diff
changeset
|
28 #include <Core/OrthancException.h> |
993dd140bd30
Resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
174
diff
changeset
|
29 #include <Core/Toolbox.h> |
993dd140bd30
Resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
174
diff
changeset
|
30 |
0 | 31 #include <boost/lexical_cast.hpp> |
32 #include <boost/algorithm/string/predicate.hpp> | |
33 #include <json/writer.h> | |
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
34 #include <boost/regex.hpp> |
0 | 35 |
103 | 36 |
0 | 37 namespace OrthancPlugins |
38 { | |
160 | 39 static bool GetStringTag(std::string& value, |
40 const Json::Value& tags, | |
41 const std::string& tag) | |
42 { | |
43 if (tags.type() == Json::objectValue && | |
44 tags.isMember(tag) && | |
45 tags[tag].type() == Json::objectValue && | |
46 tags[tag].isMember("Type") && | |
47 tags[tag].isMember("Value") && | |
48 tags[tag]["Type"].type() == Json::stringValue && | |
49 tags[tag]["Value"].type() == Json::stringValue && | |
50 tags[tag]["Type"].asString() == "String") | |
51 { | |
52 value = tags[tag]["Value"].asString(); | |
53 return true; | |
54 } | |
55 else | |
56 { | |
57 return false; | |
58 } | |
59 } | |
60 | |
61 | |
62 static float GetFloatTag(const Json::Value& tags, | |
63 const std::string& tag, | |
64 float defaultValue) | |
65 { | |
66 std::string tmp; | |
67 if (GetStringTag(tmp, tags, tag)) | |
68 { | |
69 try | |
70 { | |
71 return boost::lexical_cast<float>(Orthanc::Toolbox::StripSpaces(tmp)); | |
72 } | |
73 catch (boost::bad_lexical_cast&) | |
74 { | |
75 } | |
76 } | |
77 | |
78 return defaultValue; | |
79 } | |
80 | |
81 | |
0 | 82 bool DecodedImageAdapter::ParseUri(CompressionType& type, |
83 uint8_t& compressionLevel, | |
84 std::string& instanceId, | |
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
85 unsigned int& frameIndex, |
0 | 86 const std::string& uri) |
87 { | |
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
88 boost::regex pattern("^([a-z0-9]+)-([a-z0-9-]+)_([0-9]+)$"); |
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
89 |
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
90 boost::cmatch what; |
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
91 if (!regex_match(uri.c_str(), what, pattern)) |
0 | 92 { |
93 return false; | |
94 } | |
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
95 |
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
96 std::string compression(what[1]); |
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
97 instanceId = what[2]; |
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
98 frameIndex = boost::lexical_cast<unsigned int>(what[3]); |
0 | 99 |
100 if (compression == "deflate") | |
101 { | |
102 type = CompressionType_Deflate; | |
103 } | |
104 else if (boost::starts_with(compression, "jpeg")) | |
105 { | |
106 type = CompressionType_Jpeg; | |
107 int level = boost::lexical_cast<int>(compression.substr(4)); | |
108 if (level <= 0 || level > 100) | |
109 { | |
110 return false; | |
111 } | |
112 | |
113 compressionLevel = static_cast<uint8_t>(level); | |
114 } | |
115 else | |
116 { | |
117 return false; | |
118 } | |
119 | |
120 return true; | |
121 } | |
122 | |
123 | |
124 | |
125 bool DecodedImageAdapter::Create(std::string& content, | |
126 const std::string& uri) | |
127 { | |
128 std::string message = "Decoding DICOM instance: " + uri; | |
129 OrthancPluginLogInfo(context_, message.c_str()); | |
130 | |
131 CompressionType type; | |
132 uint8_t level; | |
133 std::string instanceId; | |
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
134 unsigned int frameIndex; |
0 | 135 |
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
97
diff
changeset
|
136 if (!ParseUri(type, level, instanceId, frameIndex, uri)) |
0 | 137 { |
138 return false; | |
139 } | |
140 | |
96 | 141 |
142 bool ok = false; | |
143 | |
144 Json::Value tags; | |
145 std::string dicom; | |
146 if (!GetStringFromOrthanc(dicom, context_, "/instances/" + instanceId + "/file") || | |
147 !GetJsonFromOrthanc(tags, context_, "/instances/" + instanceId + "/tags")) | |
148 { | |
149 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); | |
150 } | |
151 | |
230
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
152 std::unique_ptr<OrthancImage> image( |
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
153 new OrthancImage(OrthancPluginDecodeDicomImage( |
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
154 context_, dicom.c_str(), dicom.size(), frameIndex))); |
96 | 155 |
156 Json::Value json; | |
157 if (GetCornerstoneMetadata(json, tags, *image)) | |
158 { | |
159 if (type == CompressionType_Deflate) | |
160 { | |
173
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
161 ok = EncodeUsingDeflate(json, *image); |
96 | 162 } |
163 else if (type == CompressionType_Jpeg) | |
164 { | |
165 ok = EncodeUsingJpeg(json, *image, level); | |
166 } | |
167 } | |
168 | |
31 | 169 if (ok) |
170 { | |
160 | 171 std::string photometric; |
172 if (GetStringTag(photometric, tags, "0028,0004")) | |
173 { | |
174 json["Orthanc"]["PhotometricInterpretation"] = photometric; | |
175 } | |
176 | |
31 | 177 Json::FastWriter writer; |
178 content = writer.write(json); | |
179 return true; | |
0 | 180 } |
181 else | |
182 { | |
31 | 183 char msg[1024]; |
184 sprintf(msg, "Unable to decode the following instance: %s", uri.c_str()); | |
185 OrthancPluginLogWarning(context_, msg); | |
0 | 186 return false; |
187 } | |
188 } | |
96 | 189 |
190 | |
191 bool DecodedImageAdapter::GetCornerstoneMetadata(Json::Value& result, | |
192 const Json::Value& tags, | |
230
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
193 OrthancImage& image) |
96 | 194 { |
195 using namespace Orthanc; | |
196 | |
197 float windowCenter, windowWidth; | |
198 | |
199 Orthanc::ImageAccessor accessor; | |
230
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
200 accessor.AssignReadOnly(OrthancPlugins::Convert(image.GetPixelFormat()), image.GetWidth(), |
96 | 201 image.GetHeight(), image.GetPitch(), image.GetBuffer()); |
202 | |
203 switch (accessor.GetFormat()) | |
204 { | |
205 case PixelFormat_Grayscale8: | |
206 case PixelFormat_Grayscale16: | |
207 case PixelFormat_SignedGrayscale16: | |
208 { | |
209 int64_t a, b; | |
172 | 210 Orthanc::ImageProcessing::GetMinMaxIntegerValue(a, b, accessor); |
96 | 211 result["minPixelValue"] = (a < 0 ? static_cast<int32_t>(a) : 0); |
212 result["maxPixelValue"] = (b > 0 ? static_cast<int32_t>(b) : 1); | |
213 result["color"] = false; | |
214 | |
215 windowCenter = static_cast<float>(a + b) / 2.0f; | |
216 | |
217 if (a == b) | |
218 { | |
219 windowWidth = 256.0f; // Arbitrary value | |
220 } | |
221 else | |
222 { | |
223 windowWidth = static_cast<float>(b - a) / 2.0f; | |
224 } | |
225 | |
226 break; | |
227 } | |
228 | |
229 case PixelFormat_RGB24: | |
173
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
230 case PixelFormat_RGB48: |
96 | 231 result["minPixelValue"] = 0; |
232 result["maxPixelValue"] = 255; | |
233 result["color"] = true; | |
234 windowCenter = 127.5f; | |
235 windowWidth = 256.0f; | |
236 break; | |
237 | |
238 default: | |
239 return false; | |
240 } | |
241 | |
102 | 242 float slope = GetFloatTag(tags, "0028,1053", 1.0f); |
103 | 243 float intercept = GetFloatTag(tags, "0028,1052", 0.0f); |
102 | 244 |
245 result["slope"] = slope; | |
246 result["intercept"] = intercept; | |
96 | 247 result["rows"] = image.GetHeight(); |
248 result["columns"] = image.GetWidth(); | |
249 result["height"] = image.GetHeight(); | |
250 result["width"] = image.GetWidth(); | |
251 | |
102 | 252 bool ok = false; |
253 std::string pixelSpacing; | |
254 if (GetStringTag(pixelSpacing, tags, "0028,0030")) | |
96 | 255 { |
102 | 256 std::vector<std::string> tokens; |
257 Orthanc::Toolbox::TokenizeString(tokens, pixelSpacing, '\\'); | |
258 | |
259 if (tokens.size() >= 2) | |
96 | 260 { |
102 | 261 try |
262 { | |
103 | 263 result["columnPixelSpacing"] = boost::lexical_cast<float>(Orthanc::Toolbox::StripSpaces(tokens[1])); |
264 result["rowPixelSpacing"] = boost::lexical_cast<float>(Orthanc::Toolbox::StripSpaces(tokens[0])); | |
102 | 265 ok = true; |
266 } | |
267 catch (boost::bad_lexical_cast&) | |
268 { | |
269 } | |
96 | 270 } |
271 } | |
102 | 272 |
273 if (!ok) | |
96 | 274 { |
102 | 275 result["columnPixelSpacing"] = 1.0f; |
276 result["rowPixelSpacing"] = 1.0f; | |
96 | 277 } |
278 | |
102 | 279 result["windowCenter"] = GetFloatTag(tags, "0028,1050", windowCenter * slope + intercept); |
280 result["windowWidth"] = GetFloatTag(tags, "0028,1051", windowWidth * slope); | |
281 | |
96 | 282 return true; |
283 } | |
284 | |
285 | |
173
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
286 static void ConvertRGB48ToRGB24(Orthanc::ImageAccessor& target, |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
287 const Orthanc::ImageAccessor& source) |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
288 { |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
289 if (source.GetWidth() != target.GetWidth() || |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
290 source.GetHeight() != target.GetHeight()) |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
291 { |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
292 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageSize); |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
293 } |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
294 |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
295 for (unsigned int y = 0; y < source.GetHeight(); y++) |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
296 { |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
297 const uint16_t* p = reinterpret_cast<const uint16_t*>(source.GetConstRow(y)); |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
298 uint8_t* q = reinterpret_cast<uint8_t*>(target.GetRow(y)); |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
299 |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
300 for (unsigned int x = 0; x < source.GetWidth(); x++) |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
301 { |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
302 q[0] = p[0] >> 8; |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
303 q[1] = p[1] >> 8; |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
304 q[2] = p[2] >> 8; |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
305 p += 3; |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
306 q += 3; |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
307 } |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
308 } |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
309 } |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
310 |
96 | 311 |
312 bool DecodedImageAdapter::EncodeUsingDeflate(Json::Value& result, | |
230
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
313 OrthancImage& image) |
96 | 314 { |
315 Orthanc::ImageAccessor accessor; | |
230
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
316 accessor.AssignReadOnly(OrthancPlugins::Convert(image.GetPixelFormat()), image.GetWidth(), |
96 | 317 image.GetHeight(), image.GetPitch(), image.GetBuffer()); |
318 | |
227
e4def26f0fd3
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
319 std::unique_ptr<Orthanc::ImageBuffer> buffer; |
96 | 320 |
321 Orthanc::ImageAccessor converted; | |
322 | |
323 switch (accessor.GetFormat()) | |
324 { | |
325 case Orthanc::PixelFormat_RGB24: | |
207
3d3d00e3e715
fix for new ImageAccessor API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
191
diff
changeset
|
326 accessor.GetReadOnlyAccessor(converted); |
96 | 327 break; |
328 | |
173
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
329 case Orthanc::PixelFormat_RGB48: |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
330 buffer.reset(new Orthanc::ImageBuffer(Orthanc::PixelFormat_RGB24, |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
331 accessor.GetWidth(), |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
332 accessor.GetHeight(), false)); |
207
3d3d00e3e715
fix for new ImageAccessor API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
191
diff
changeset
|
333 buffer->GetWriteableAccessor(converted); |
173
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
334 ConvertRGB48ToRGB24(converted, accessor); |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
335 break; |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
336 |
96 | 337 case Orthanc::PixelFormat_Grayscale8: |
338 case Orthanc::PixelFormat_Grayscale16: | |
145 | 339 buffer.reset(new Orthanc::ImageBuffer(Orthanc::PixelFormat_Grayscale16, |
340 accessor.GetWidth(), | |
341 accessor.GetHeight(), | |
342 true /* force minimal pitch */)); | |
207
3d3d00e3e715
fix for new ImageAccessor API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
191
diff
changeset
|
343 buffer->GetWriteableAccessor(converted); |
96 | 344 Orthanc::ImageProcessing::Convert(converted, accessor); |
345 break; | |
346 | |
347 case Orthanc::PixelFormat_SignedGrayscale16: | |
207
3d3d00e3e715
fix for new ImageAccessor API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
191
diff
changeset
|
348 accessor.GetReadOnlyAccessor(converted); |
96 | 349 break; |
350 | |
351 default: | |
352 // Unsupported pixel format | |
353 return false; | |
354 } | |
355 | |
126
f99adade8b77
Fixed rendering of 16bpp images if values are < 0 or >= 32768
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
122
diff
changeset
|
356 result["Orthanc"]["IsSigned"] = (accessor.GetFormat() == Orthanc::PixelFormat_SignedGrayscale16); |
f99adade8b77
Fixed rendering of 16bpp images if values are < 0 or >= 32768
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
122
diff
changeset
|
357 |
96 | 358 // Sanity check: The pitch must be minimal |
359 assert(converted.GetSize() == converted.GetWidth() * converted.GetHeight() * | |
360 GetBytesPerPixel(converted.GetFormat())); | |
361 result["Orthanc"]["Compression"] = "Deflate"; | |
362 result["sizeInBytes"] = converted.GetSize(); | |
363 | |
364 std::string z; | |
230
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
365 CompressUsingDeflate(z, GetGlobalContext(), converted.GetConstBuffer(), converted.GetSize()); |
216 | 366 |
367 std::string s; | |
368 Orthanc::Toolbox::EncodeBase64(s, z); | |
369 result["Orthanc"]["PixelData"] = s; | |
96 | 370 |
371 return true; | |
372 } | |
373 | |
374 | |
375 | |
376 template <typename TargetType, typename SourceType> | |
377 static void ChangeDynamics(Orthanc::ImageAccessor& target, | |
378 const Orthanc::ImageAccessor& source, | |
379 SourceType source1, TargetType target1, | |
380 SourceType source2, TargetType target2) | |
381 { | |
382 if (source.GetWidth() != target.GetWidth() || | |
383 source.GetHeight() != target.GetHeight()) | |
384 { | |
385 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageSize); | |
386 } | |
387 | |
388 float scale = static_cast<float>(target2 - target1) / static_cast<float>(source2 - source1); | |
389 float offset = static_cast<float>(target1) - scale * static_cast<float>(source1); | |
390 | |
391 const float minValue = static_cast<float>(std::numeric_limits<TargetType>::min()); | |
392 const float maxValue = static_cast<float>(std::numeric_limits<TargetType>::max()); | |
393 | |
394 for (unsigned int y = 0; y < source.GetHeight(); y++) | |
395 { | |
396 const SourceType* p = reinterpret_cast<const SourceType*>(source.GetConstRow(y)); | |
397 TargetType* q = reinterpret_cast<TargetType*>(target.GetRow(y)); | |
398 | |
399 for (unsigned int x = 0; x < source.GetWidth(); x++, p++, q++) | |
400 { | |
401 float v = (scale * static_cast<float>(*p)) + offset; | |
402 | |
403 if (v > maxValue) | |
404 { | |
405 *q = std::numeric_limits<TargetType>::max(); | |
406 } | |
407 else if (v < minValue) | |
408 { | |
409 *q = std::numeric_limits<TargetType>::min(); | |
410 } | |
411 else | |
412 { | |
101 | 413 //*q = static_cast<TargetType>(boost::math::iround(v)); |
414 | |
415 // http://stackoverflow.com/a/485546/881731 | |
416 *q = static_cast<TargetType>(floor(v + 0.5f)); | |
96 | 417 } |
418 } | |
419 } | |
420 } | |
421 | |
422 | |
423 bool DecodedImageAdapter::EncodeUsingJpeg(Json::Value& result, | |
230
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
424 OrthancImage& image, |
96 | 425 uint8_t quality /* between 0 and 100 */) |
426 { | |
427 Orthanc::ImageAccessor accessor; | |
230
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
428 accessor.AssignReadOnly(OrthancPlugins::Convert(image.GetPixelFormat()), image.GetWidth(), |
96 | 429 image.GetHeight(), image.GetPitch(), image.GetBuffer()); |
430 | |
227
e4def26f0fd3
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
431 std::unique_ptr<Orthanc::ImageBuffer> buffer; |
96 | 432 |
433 Orthanc::ImageAccessor converted; | |
434 | |
435 if (accessor.GetFormat() == Orthanc::PixelFormat_Grayscale8 || | |
436 accessor.GetFormat() == Orthanc::PixelFormat_RGB24) | |
437 { | |
438 result["Orthanc"]["Stretched"] = false; | |
207
3d3d00e3e715
fix for new ImageAccessor API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
191
diff
changeset
|
439 accessor.GetReadOnlyAccessor(converted); |
96 | 440 } |
173
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
441 else if (accessor.GetFormat() == Orthanc::PixelFormat_RGB48) |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
442 { |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
443 result["Orthanc"]["Stretched"] = false; |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
444 |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
445 buffer.reset(new Orthanc::ImageBuffer(Orthanc::PixelFormat_RGB24, |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
446 accessor.GetWidth(), |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
447 accessor.GetHeight(), false)); |
207
3d3d00e3e715
fix for new ImageAccessor API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
191
diff
changeset
|
448 buffer->GetWriteableAccessor(converted); |
3d3d00e3e715
fix for new ImageAccessor API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
191
diff
changeset
|
449 |
173
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
450 ConvertRGB48ToRGB24(converted, accessor); |
4f0f4f64cff3
Support of rendering RGB48 lookup tables (palette)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
172
diff
changeset
|
451 } |
96 | 452 else if (accessor.GetFormat() == Orthanc::PixelFormat_Grayscale16 || |
453 accessor.GetFormat() == Orthanc::PixelFormat_SignedGrayscale16) | |
454 { | |
455 result["Orthanc"]["Stretched"] = true; | |
145 | 456 |
457 buffer.reset(new Orthanc::ImageBuffer(Orthanc::PixelFormat_Grayscale8, | |
458 accessor.GetWidth(), | |
459 accessor.GetHeight(), | |
460 true /* force minimal pitch */)); | |
207
3d3d00e3e715
fix for new ImageAccessor API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
191
diff
changeset
|
461 buffer->GetWriteableAccessor(converted); |
96 | 462 |
463 int64_t a, b; | |
172 | 464 Orthanc::ImageProcessing::GetMinMaxIntegerValue(a, b, accessor); |
96 | 465 result["Orthanc"]["StretchLow"] = static_cast<int32_t>(a); |
466 result["Orthanc"]["StretchHigh"] = static_cast<int32_t>(b); | |
467 | |
468 if (accessor.GetFormat() == Orthanc::PixelFormat_Grayscale16) | |
469 { | |
470 ChangeDynamics<uint8_t, uint16_t>(converted, accessor, a, 0, b, 255); | |
471 } | |
472 else | |
473 { | |
474 ChangeDynamics<uint8_t, int16_t>(converted, accessor, a, 0, b, 255); | |
475 } | |
476 } | |
477 else | |
478 { | |
479 return false; | |
480 } | |
481 | |
126
f99adade8b77
Fixed rendering of 16bpp images if values are < 0 or >= 32768
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
122
diff
changeset
|
482 result["Orthanc"]["IsSigned"] = (accessor.GetFormat() == Orthanc::PixelFormat_SignedGrayscale16); |
96 | 483 result["Orthanc"]["Compression"] = "Jpeg"; |
484 result["sizeInBytes"] = converted.GetSize(); | |
485 | |
486 std::string jpeg; | |
230
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
487 WriteJpegToMemory(jpeg, GetGlobalContext(), converted, quality); |
96 | 488 |
216 | 489 std::string s; |
490 Orthanc::Toolbox::EncodeBase64(s, jpeg); | |
491 result["Orthanc"]["PixelData"] = s; | |
492 | |
96 | 493 return true; |
494 } | |
0 | 495 } |