Mercurial > hg > orthanc
annotate OrthancServer/Internals/DicomImageDecoder.cpp @ 852:5944b8b80842 jpeg
refactoring
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 06 Jun 2014 10:28:02 +0200 |
| parents | e30d22020e35 |
| children | 839be3022203 |
| rev | line source |
|---|---|
| 845 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege, | |
| 4 * Belgium | |
| 5 * | |
| 6 * This program is free software: you can redistribute it and/or | |
| 7 * modify it under the terms of the GNU General Public License as | |
| 8 * published by the Free Software Foundation, either version 3 of the | |
| 9 * License, or (at your option) any later version. | |
| 10 * | |
| 11 * In addition, as a special exception, the copyright holders of this | |
| 12 * program give permission to link the code of its release with the | |
| 13 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 14 * that use the same license as the "OpenSSL" library), and distribute | |
| 15 * the linked executables. You must obey the GNU General Public License | |
| 16 * in all respects for all of the code used other than "OpenSSL". If you | |
| 17 * modify file(s) with this exception, you may extend this exception to | |
| 18 * your version of the file(s), but you are not obligated to do so. If | |
| 19 * you do not wish to do so, delete this exception statement from your | |
| 20 * version. If you delete this exception statement from all source files | |
| 21 * in the program, then also delete it here. | |
| 22 * | |
| 23 * This program is distributed in the hope that it will be useful, but | |
| 24 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 26 * General Public License for more details. | |
| 27 * | |
| 28 * You should have received a copy of the GNU General Public License | |
| 29 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 30 **/ | |
| 31 | |
| 32 | |
| 33 #include "../PrecompiledHeadersServer.h" | |
| 34 #include "DicomImageDecoder.h" | |
| 35 | |
| 846 | 36 |
| 37 /*========================================================================= | |
| 38 | |
| 39 This file is based on portions of the following project | |
| 40 (cf. function "DecodePsmctRle1()"): | |
| 41 | |
| 42 Program: GDCM (Grassroots DICOM). A DICOM library | |
| 43 Module: http://gdcm.sourceforge.net/Copyright.html | |
| 44 | |
| 45 Copyright (c) 2006-2011 Mathieu Malaterre | |
| 46 Copyright (c) 1993-2005 CREATIS | |
| 47 (CREATIS = Centre de Recherche et d'Applications en Traitement de l'Image) | |
| 48 All rights reserved. | |
| 49 | |
| 50 Redistribution and use in source and binary forms, with or without | |
| 51 modification, are permitted provided that the following conditions are met: | |
| 52 | |
| 53 * Redistributions of source code must retain the above copyright notice, | |
| 54 this list of conditions and the following disclaimer. | |
| 55 | |
| 56 * Redistributions in binary form must reproduce the above copyright notice, | |
| 57 this list of conditions and the following disclaimer in the documentation | |
| 58 and/or other materials provided with the distribution. | |
| 59 | |
| 60 * Neither name of Mathieu Malaterre, or CREATIS, nor the names of any | |
| 61 contributors (CNRS, INSERM, UCB, Universite Lyon I), may be used to | |
| 62 endorse or promote products derived from this software without specific | |
| 63 prior written permission. | |
| 64 | |
| 65 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' | |
| 66 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
| 67 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |
| 68 ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR | |
| 69 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | |
| 70 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | |
| 71 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |
| 72 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | |
| 73 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | |
| 74 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
| 75 | |
| 76 =========================================================================*/ | |
| 77 | |
| 78 | |
| 79 | |
| 845 | 80 #include "../../Core/OrthancException.h" |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
81 #include "../../Core/DicomFormat/DicomIntegerPixelAccessor.h" |
| 845 | 82 #include "../ToDcmtkBridge.h" |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
83 #include "../FromDcmtkBridge.h" |
| 845 | 84 |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
85 #include <glog/logging.h> |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
86 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
87 #include <boost/lexical_cast.hpp> |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
88 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
89 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 |
| 845 | 90 #include <dcmtk/dcmjpls/djcodecd.h> |
| 91 #include <dcmtk/dcmjpls/djcparam.h> | |
| 92 #include <dcmtk/dcmjpeg/djrplol.h> | |
| 93 #endif | |
| 94 | |
| 95 | |
| 96 namespace Orthanc | |
| 97 { | |
| 852 | 98 class DicomImageDecoder::ImageSource |
| 99 { | |
| 100 private: | |
| 101 std::string psmct_; | |
| 102 std::auto_ptr<DicomIntegerPixelAccessor> accessor_; | |
| 103 | |
| 104 public: | |
| 105 void Setup(DcmDataset& dataset, | |
| 106 unsigned int frame) | |
| 107 { | |
| 108 // See also: http://support.dcmtk.org/wiki/dcmtk/howto/accessing-compressed-data | |
| 109 | |
| 110 DicomMap m; | |
| 111 FromDcmtkBridge::Convert(m, dataset); | |
| 112 | |
| 113 /** | |
| 114 * Create an accessor to the raw values of the DICOM image. | |
| 115 **/ | |
| 116 | |
| 117 DcmElement* e; | |
| 118 if (dataset.findAndGetElement(ToDcmtkBridge::Convert(DICOM_TAG_PIXEL_DATA), e).good() && | |
| 119 e != NULL) | |
| 120 { | |
| 121 Uint8* pixData = NULL; | |
| 122 if (e->getUint8Array(pixData) == EC_Normal) | |
| 123 { | |
| 124 accessor_.reset(new DicomIntegerPixelAccessor(m, pixData, e->getLength())); | |
| 125 } | |
| 126 } | |
| 127 else if (DicomImageDecoder::DecodePsmctRle1(psmct_, dataset)) | |
| 128 { | |
| 129 LOG(INFO) << "The PMSCT_RLE1 decoding has succeeded"; | |
| 130 Uint8* pixData = NULL; | |
| 131 if (psmct_.size() > 0) | |
| 132 { | |
| 133 pixData = reinterpret_cast<Uint8*>(&psmct_[0]); | |
| 134 } | |
| 135 | |
| 136 accessor_.reset(new DicomIntegerPixelAccessor(m, pixData, psmct_.size())); | |
| 137 } | |
| 138 | |
| 139 if (accessor_.get() == NULL) | |
| 140 { | |
| 141 throw OrthancException(ErrorCode_BadFileFormat); | |
| 142 } | |
| 143 | |
| 144 accessor_->SetCurrentFrame(frame); | |
| 145 } | |
| 146 | |
| 147 unsigned int GetChannelCount() const | |
| 148 { | |
| 149 assert(accessor_.get() != NULL); | |
| 150 return accessor_->GetChannelCount(); | |
| 151 } | |
| 152 | |
| 153 const DicomIntegerPixelAccessor GetAccessor() const | |
| 154 { | |
| 155 assert(accessor_.get() != NULL); | |
| 156 return *accessor_; | |
| 157 } | |
| 158 }; | |
| 159 | |
| 160 | |
| 846 | 161 static const DicomTag DICOM_TAG_CONTENT(0x07a1, 0x100a); |
| 162 static const DicomTag DICOM_TAG_COMPRESSION_TYPE(0x07a1, 0x1011); | |
| 163 | |
| 164 bool DicomImageDecoder::IsPsmctRle1(DcmDataset& dataset) | |
| 165 { | |
| 166 DcmElement* e; | |
| 167 char* c; | |
| 168 | |
| 169 // Check whether the DICOM instance contains an image encoded with | |
| 170 // the PMSCT_RLE1 scheme. | |
| 171 if (!dataset.findAndGetElement(ToDcmtkBridge::Convert(DICOM_TAG_COMPRESSION_TYPE), e).good() || | |
| 172 e == NULL || | |
| 173 !e->isaString() || | |
| 174 !e->getString(c).good() || | |
| 175 c == NULL || | |
| 176 strcmp("PMSCT_RLE1", c)) | |
| 177 { | |
| 178 return false; | |
| 179 } | |
| 180 else | |
| 181 { | |
| 182 return true; | |
| 183 } | |
| 184 } | |
| 185 | |
| 186 | |
| 187 bool DicomImageDecoder::DecodePsmctRle1(std::string& output, | |
| 188 DcmDataset& dataset) | |
| 189 { | |
| 190 // Check whether the DICOM instance contains an image encoded with | |
| 191 // the PMSCT_RLE1 scheme. | |
| 192 if (!IsPsmctRle1(dataset)) | |
| 193 { | |
| 194 return false; | |
| 195 } | |
| 196 | |
| 197 // OK, this is a custom RLE encoding from Philips. Get the pixel | |
| 198 // data from the appropriate private DICOM tag. | |
| 199 Uint8* pixData = NULL; | |
| 200 DcmElement* e; | |
| 201 if (!dataset.findAndGetElement(ToDcmtkBridge::Convert(DICOM_TAG_CONTENT), e).good() || | |
| 202 e == NULL || | |
| 203 e->getUint8Array(pixData) != EC_Normal) | |
| 204 { | |
| 205 return false; | |
| 206 } | |
| 207 | |
| 208 // The "unsigned" below IS VERY IMPORTANT | |
| 209 const uint8_t* inbuffer = reinterpret_cast<const uint8_t*>(pixData); | |
| 210 const size_t length = e->getLength(); | |
| 211 | |
| 212 /** | |
| 213 * The code below is an adaptation of a sample code for GDCM by | |
| 214 * Mathieu Malaterre (under a BSD license). | |
| 215 * http://gdcm.sourceforge.net/html/rle2img_8cxx-example.html | |
| 216 **/ | |
| 217 | |
| 218 // RLE pass | |
| 219 std::vector<uint8_t> temp; | |
| 220 temp.reserve(length); | |
| 221 for (size_t i = 0; i < length; i++) | |
| 222 { | |
| 223 if (inbuffer[i] == 0xa5) | |
| 224 { | |
| 225 temp.push_back(inbuffer[i+2]); | |
| 226 for (uint8_t repeat = inbuffer[i + 1]; repeat != 0; repeat--) | |
| 227 { | |
| 228 temp.push_back(inbuffer[i+2]); | |
| 229 } | |
| 230 i += 2; | |
| 231 } | |
| 232 else | |
| 233 { | |
| 234 temp.push_back(inbuffer[i]); | |
| 235 } | |
| 236 } | |
| 237 | |
| 238 // Delta encoding pass | |
| 239 uint16_t delta = 0; | |
| 240 output.clear(); | |
| 241 output.reserve(temp.size()); | |
| 242 for (size_t i = 0; i < temp.size(); i++) | |
| 243 { | |
| 244 uint16_t value; | |
| 245 | |
| 246 if (temp[i] == 0x5a) | |
| 247 { | |
| 248 uint16_t v1 = temp[i + 1]; | |
| 249 uint16_t v2 = temp[i + 2]; | |
| 250 value = (v2 << 8) + v1; | |
| 251 i += 2; | |
| 252 } | |
| 253 else | |
| 254 { | |
| 255 value = delta + (int8_t) temp[i]; | |
| 256 } | |
| 257 | |
| 258 output.push_back(value & 0xff); | |
| 259 output.push_back(value >> 8); | |
| 260 delta = value; | |
| 261 } | |
| 262 | |
| 263 if (output.size() % 2) | |
| 264 { | |
| 265 output.resize(output.size() - 1); | |
| 266 } | |
| 267 | |
| 268 return true; | |
| 269 } | |
| 270 | |
| 271 | |
| 845 | 272 void DicomImageDecoder::SetupImageBuffer(ImageBuffer& target, |
| 273 DcmDataset& dataset) | |
| 274 { | |
| 275 OFString value; | |
| 276 | |
| 277 if (!dataset.findAndGetOFString(ToDcmtkBridge::Convert(DICOM_TAG_COLUMNS), value).good()) | |
| 278 { | |
| 279 throw OrthancException(ErrorCode_BadFileFormat); | |
| 280 } | |
| 281 | |
| 282 unsigned int width = boost::lexical_cast<unsigned int>(value.c_str()); | |
| 283 | |
| 284 if (!dataset.findAndGetOFString(ToDcmtkBridge::Convert(DICOM_TAG_ROWS), value).good()) | |
| 285 { | |
| 286 throw OrthancException(ErrorCode_BadFileFormat); | |
| 287 } | |
| 288 | |
| 289 unsigned int height = boost::lexical_cast<unsigned int>(value.c_str()); | |
| 290 | |
| 291 if (!dataset.findAndGetOFString(ToDcmtkBridge::Convert(DICOM_TAG_BITS_STORED), value).good()) | |
| 292 { | |
| 293 throw OrthancException(ErrorCode_BadFileFormat); | |
| 294 } | |
| 295 | |
| 296 unsigned int bitsStored = boost::lexical_cast<unsigned int>(value.c_str()); | |
| 297 | |
| 298 if (!dataset.findAndGetOFString(ToDcmtkBridge::Convert(DICOM_TAG_PIXEL_REPRESENTATION), value).good()) | |
| 299 { | |
| 300 throw OrthancException(ErrorCode_BadFileFormat); | |
| 301 } | |
| 302 | |
| 303 bool isSigned = (boost::lexical_cast<unsigned int>(value.c_str()) != 0); | |
| 304 | |
| 305 unsigned int samplesPerPixel = 1; // By default | |
| 306 if (dataset.findAndGetOFString(ToDcmtkBridge::Convert(DICOM_TAG_SAMPLES_PER_PIXEL), value).good()) | |
| 307 { | |
| 308 samplesPerPixel = boost::lexical_cast<unsigned int>(value.c_str()); | |
| 309 } | |
| 310 | |
| 311 target.SetHeight(height); | |
| 312 target.SetWidth(width); | |
| 313 | |
| 314 if (bitsStored == 8 && samplesPerPixel == 1 && !isSigned) | |
| 315 { | |
| 316 target.SetFormat(PixelFormat_Grayscale8); | |
| 317 } | |
| 318 else if (bitsStored == 8 && samplesPerPixel == 3 && !isSigned) | |
| 319 { | |
| 320 target.SetFormat(PixelFormat_RGB24); | |
| 321 } | |
|
850
9ee2e7a5efaf
support of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
847
diff
changeset
|
322 else if (bitsStored >= 9 && bitsStored <= 16 && samplesPerPixel == 1 && !isSigned) |
| 845 | 323 { |
| 324 target.SetFormat(PixelFormat_Grayscale16); | |
| 325 } | |
|
850
9ee2e7a5efaf
support of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
847
diff
changeset
|
326 else if (bitsStored >= 9 && bitsStored <= 16 && samplesPerPixel == 1 && isSigned) |
| 845 | 327 { |
| 328 target.SetFormat(PixelFormat_SignedGrayscale16); | |
| 329 } | |
| 330 else | |
| 331 { | |
|
850
9ee2e7a5efaf
support of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
847
diff
changeset
|
332 LOG(WARNING) << "Unsupported DICOM image: " << bitsStored << "bpp, " |
|
9ee2e7a5efaf
support of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
847
diff
changeset
|
333 << samplesPerPixel << " channels, " << (isSigned ? "signed" : "unsigned"); |
| 845 | 334 throw OrthancException(ErrorCode_NotImplemented); |
| 335 } | |
| 336 } | |
| 337 | |
| 338 | |
| 339 bool DicomImageDecoder::IsJpegLossless(const DcmDataset& dataset) | |
| 340 { | |
| 851 | 341 // http://support.dcmtk.org/docs/dcxfer_8h-source.html |
| 845 | 342 return (dataset.getOriginalXfer() == EXS_JPEGLSLossless || |
| 343 dataset.getOriginalXfer() == EXS_JPEGLSLossy); | |
| 344 } | |
| 345 | |
| 346 | |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
347 bool DicomImageDecoder::IsUncompressedImage(const DcmDataset& dataset) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
348 { |
| 851 | 349 // http://support.dcmtk.org/docs/dcxfer_8h-source.html |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
350 return (dataset.getOriginalXfer() == EXS_Unknown || |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
351 dataset.getOriginalXfer() == EXS_LittleEndianImplicit || |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
352 dataset.getOriginalXfer() == EXS_BigEndianImplicit || |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
353 dataset.getOriginalXfer() == EXS_LittleEndianExplicit || |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
354 dataset.getOriginalXfer() == EXS_BigEndianExplicit); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
355 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
356 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
357 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
358 template <typename PixelType> |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
359 static void CopyPixels(ImageAccessor& target, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
360 const DicomIntegerPixelAccessor& source) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
361 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
362 const PixelType minValue = std::numeric_limits<PixelType>::min(); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
363 const PixelType maxValue = std::numeric_limits<PixelType>::max(); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
364 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
365 for (unsigned int y = 0; y < source.GetHeight(); y++) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
366 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
367 PixelType* pixel = reinterpret_cast<PixelType*>(target.GetRow(y)); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
368 for (unsigned int x = 0; x < source.GetWidth(); x++) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
369 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
370 for (unsigned int c = 0; c < source.GetChannelCount(); c++, pixel++) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
371 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
372 int32_t v = source.GetValue(x, y, c); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
373 if (v < static_cast<int32_t>(minValue)) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
374 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
375 *pixel = minValue; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
376 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
377 else if (v > static_cast<int32_t>(maxValue)) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
378 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
379 *pixel = maxValue; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
380 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
381 else |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
382 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
383 *pixel = static_cast<PixelType>(v); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
384 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
385 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
386 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
387 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
388 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
389 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
390 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
391 void DicomImageDecoder::DecodeUncompressedImage(ImageBuffer& target, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
392 DcmDataset& dataset, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
393 unsigned int frame) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
394 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
395 if (!IsUncompressedImage(dataset)) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
396 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
397 throw OrthancException(ErrorCode_BadParameterType); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
398 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
399 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
400 DecodeUncompressedImageInternal(target, dataset, frame); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
401 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
402 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
403 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
404 void DicomImageDecoder::DecodeUncompressedImageInternal(ImageBuffer& target, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
405 DcmDataset& dataset, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
406 unsigned int frame) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
407 { |
| 852 | 408 ImageSource source; |
| 409 source.Setup(dataset, frame); | |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
410 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
411 /** |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
412 * Resize the target image, with some sanity checks. |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
413 **/ |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
414 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
415 SetupImageBuffer(target, dataset); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
416 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
417 if (target.GetWidth() != target.GetWidth() || |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
418 target.GetHeight() != target.GetHeight()) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
419 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
420 throw OrthancException(ErrorCode_InternalError); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
421 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
422 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
423 bool ok; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
424 switch (target.GetFormat()) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
425 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
426 case PixelFormat_RGB24: |
| 852 | 427 ok = source.GetChannelCount() == 3; |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
428 break; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
429 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
430 case PixelFormat_RGBA32: |
| 852 | 431 ok = source.GetChannelCount() == 4; |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
432 break; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
433 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
434 case PixelFormat_Grayscale8: |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
435 case PixelFormat_Grayscale16: |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
436 case PixelFormat_SignedGrayscale16: |
| 852 | 437 ok = source.GetChannelCount() == 1; |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
438 break; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
439 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
440 default: |
| 852 | 441 ok = false; |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
442 break; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
443 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
444 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
445 if (!ok) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
446 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
447 throw OrthancException(ErrorCode_InternalError); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
448 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
449 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
450 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
451 /** |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
452 * Loop over the DICOM buffer, storing its value into the target |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
453 * image. |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
454 **/ |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
455 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
456 ImageAccessor accessor(target.GetAccessor()); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
457 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
458 switch (target.GetFormat()) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
459 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
460 case PixelFormat_RGB24: |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
461 case PixelFormat_RGBA32: |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
462 case PixelFormat_Grayscale8: |
| 852 | 463 CopyPixels<uint8_t>(accessor, source.GetAccessor()); |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
464 break; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
465 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
466 case PixelFormat_Grayscale16: |
| 852 | 467 CopyPixels<uint16_t>(accessor, source.GetAccessor()); |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
468 break; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
469 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
470 case PixelFormat_SignedGrayscale16: |
| 852 | 471 CopyPixels<int16_t>(accessor, source.GetAccessor()); |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
472 break; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
473 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
474 default: |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
475 throw OrthancException(ErrorCode_InternalError); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
476 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
477 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
478 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
479 |
| 845 | 480 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 |
| 481 void DicomImageDecoder::DecodeJpegLossless(ImageBuffer& target, | |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
482 DcmDataset& dataset, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
483 unsigned int frame) |
| 845 | 484 { |
| 485 if (!IsJpegLossless(dataset)) | |
| 486 { | |
| 487 throw OrthancException(ErrorCode_BadParameterType); | |
| 488 } | |
| 489 | |
| 490 DcmElement *element = NULL; | |
| 491 if (!dataset.findAndGetElement(ToDcmtkBridge::Convert(DICOM_TAG_PIXEL_DATA), element).good()) | |
| 492 { | |
| 493 throw OrthancException(ErrorCode_BadFileFormat); | |
| 494 } | |
| 495 | |
| 496 DcmPixelData& pixelData = dynamic_cast<DcmPixelData&>(*element); | |
| 497 DcmPixelSequence* pixelSequence = NULL; | |
| 498 if (!pixelData.getEncapsulatedRepresentation | |
| 499 (dataset.getOriginalXfer(), NULL, pixelSequence).good()) | |
| 500 { | |
| 501 throw OrthancException(ErrorCode_BadFileFormat); | |
| 502 } | |
| 503 | |
| 504 SetupImageBuffer(target, dataset); | |
| 505 | |
| 506 ImageAccessor accessor(target.GetAccessor()); | |
| 507 | |
| 508 /** | |
| 509 * The "DJLSLosslessDecoder" and "DJLSNearLosslessDecoder" in DCMTK | |
| 510 * are exactly the same, except for the "supportedTransferSyntax()" | |
| 511 * virtual function. | |
| 512 * http://support.dcmtk.org/docs/classDJLSDecoderBase.html | |
| 513 **/ | |
| 514 | |
| 515 DJLSLosslessDecoder decoder; DJLSCodecParameter parameters; | |
| 516 //DJLSNearLosslessDecoder decoder; DJLSCodecParameter parameters; | |
| 517 | |
| 518 Uint32 startFragment = 0; // Default | |
| 519 OFString decompressedColorModel; // Out | |
| 520 DJ_RPLossless representationParameter; | |
| 521 OFCondition c = decoder.decodeFrame(&representationParameter, pixelSequence, ¶meters, | |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
522 &dataset, frame, startFragment, accessor.GetBuffer(), |
| 845 | 523 accessor.GetSize(), decompressedColorModel); |
| 524 | |
| 525 if (!c.good()) | |
| 526 { | |
| 527 throw OrthancException(ErrorCode_InternalError); | |
| 528 } | |
| 529 } | |
| 530 #endif | |
| 846 | 531 |
| 532 | |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
533 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
534 bool DicomImageDecoder::Decode(ImageBuffer& target, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
535 DcmDataset& dataset, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
536 unsigned int frame) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
537 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
538 if (IsUncompressedImage(dataset)) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
539 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
540 DecodeUncompressedImage(target, dataset, frame); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
541 return true; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
542 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
543 |
| 852 | 544 |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
545 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
546 if (IsJpegLossless(dataset)) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
547 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
548 LOG(INFO) << "Decoding a JPEG-LS image"; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
549 DecodeJpegLossless(target, dataset, frame); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
550 return true; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
551 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
552 #endif |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
553 |
| 852 | 554 |
| 555 #if ORTHANC_JPEG_ENABLED == 1 | |
| 556 // TODO Implement this part to speed up JPEG decompression | |
| 557 #endif | |
| 558 | |
| 559 | |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
560 /** |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
561 * This DICOM image format is not natively supported by |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
562 * Orthanc. As a last resort, try and decode it through |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
563 * DCMTK. This will result in higher memory consumption. This is |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
564 * actually the second example of the following page: |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
565 * http://support.dcmtk.org/docs/mod_dcmjpeg.html#Examples |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
566 **/ |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
567 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
568 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
569 LOG(INFO) << "Using DCMTK to decode a compressed image"; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
570 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
571 std::auto_ptr<DcmDataset> converted(dynamic_cast<DcmDataset*>(dataset.clone())); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
572 converted->chooseRepresentation(EXS_LittleEndianExplicit, NULL); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
573 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
574 if (converted->canWriteXfer(EXS_LittleEndianExplicit)) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
575 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
576 DecodeUncompressedImageInternal(target, *converted, frame); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
577 return true; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
578 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
579 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
580 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
581 return false; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
582 } |
| 845 | 583 } |