Mercurial > hg > orthanc
annotate OrthancServer/Internals/DicomImageDecoder.cpp @ 858:ebc41566f742 jpeg
removed unneeded check
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 06 Jun 2014 15:25:31 +0200 |
| parents | ff530685e46a |
| children | 610a9a1ed855 |
| 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" |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
81 #include "../../Core/ImageFormats/ImageProcessing.h" |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
82 #include "../../Core/DicomFormat/DicomIntegerPixelAccessor.h" |
| 845 | 83 #include "../ToDcmtkBridge.h" |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
84 #include "../FromDcmtkBridge.h" |
| 845 | 85 |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
86 #include <glog/logging.h> |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
87 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
88 #include <boost/lexical_cast.hpp> |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
89 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
90 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 |
| 845 | 91 #include <dcmtk/dcmjpls/djcodecd.h> |
| 92 #include <dcmtk/dcmjpls/djcparam.h> | |
| 93 #include <dcmtk/dcmjpeg/djrplol.h> | |
| 94 #endif | |
| 95 | |
| 96 | |
| 97 namespace Orthanc | |
| 98 { | |
| 852 | 99 class DicomImageDecoder::ImageSource |
| 100 { | |
| 101 private: | |
| 102 std::string psmct_; | |
|
853
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
103 std::auto_ptr<DicomIntegerPixelAccessor> slowAccessor_; |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
104 std::auto_ptr<ImageAccessor> fastAccessor_; |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
105 |
| 852 | 106 public: |
| 107 void Setup(DcmDataset& dataset, | |
| 108 unsigned int frame) | |
| 109 { | |
|
853
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
110 psmct_.clear(); |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
111 slowAccessor_.reset(NULL); |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
112 fastAccessor_.reset(NULL); |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
113 |
| 852 | 114 // See also: http://support.dcmtk.org/wiki/dcmtk/howto/accessing-compressed-data |
| 115 | |
| 116 DicomMap m; | |
| 117 FromDcmtkBridge::Convert(m, dataset); | |
| 118 | |
| 119 /** | |
| 120 * Create an accessor to the raw values of the DICOM image. | |
| 121 **/ | |
| 122 | |
| 123 DcmElement* e; | |
| 124 if (dataset.findAndGetElement(ToDcmtkBridge::Convert(DICOM_TAG_PIXEL_DATA), e).good() && | |
| 125 e != NULL) | |
| 126 { | |
| 127 Uint8* pixData = NULL; | |
| 128 if (e->getUint8Array(pixData) == EC_Normal) | |
| 129 { | |
|
853
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
130 slowAccessor_.reset(new DicomIntegerPixelAccessor(m, pixData, e->getLength())); |
| 852 | 131 } |
| 132 } | |
| 133 else if (DicomImageDecoder::DecodePsmctRle1(psmct_, dataset)) | |
| 134 { | |
| 135 LOG(INFO) << "The PMSCT_RLE1 decoding has succeeded"; | |
| 136 Uint8* pixData = NULL; | |
| 137 if (psmct_.size() > 0) | |
| 138 { | |
| 139 pixData = reinterpret_cast<Uint8*>(&psmct_[0]); | |
| 140 } | |
| 141 | |
|
853
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
142 slowAccessor_.reset(new DicomIntegerPixelAccessor(m, pixData, psmct_.size())); |
| 852 | 143 } |
| 144 | |
|
853
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
145 if (slowAccessor_.get() == NULL) |
| 852 | 146 { |
| 147 throw OrthancException(ErrorCode_BadFileFormat); | |
| 148 } | |
| 149 | |
|
853
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
150 slowAccessor_->SetCurrentFrame(frame); |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
151 |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
152 |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
153 /** |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
154 * If possible, create a fast ImageAccessor to the image buffer. |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
155 **/ |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
156 |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
157 |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
158 } |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
159 |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
160 unsigned int GetWidth() const |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
161 { |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
162 assert(slowAccessor_.get() != NULL); |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
163 return slowAccessor_->GetInformation().GetWidth(); |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
164 } |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
165 |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
166 unsigned int GetHeight() const |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
167 { |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
168 assert(slowAccessor_.get() != NULL); |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
169 return slowAccessor_->GetInformation().GetHeight(); |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
170 } |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
171 |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
172 unsigned int GetBytesPerPixel() const |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
173 { |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
174 assert(slowAccessor_.get() != NULL); |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
175 return slowAccessor_->GetInformation().GetBytesPerPixel(); |
| 852 | 176 } |
| 177 | |
| 178 unsigned int GetChannelCount() const | |
| 179 { | |
|
853
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
180 assert(slowAccessor_.get() != NULL); |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
181 return slowAccessor_->GetInformation().GetChannelCount(); |
| 852 | 182 } |
| 183 | |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
184 const DicomIntegerPixelAccessor& GetAccessor() const |
| 852 | 185 { |
|
853
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
186 assert(slowAccessor_.get() != NULL); |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
187 return *slowAccessor_; |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
188 } |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
189 |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
190 bool HasFastAccessor() const |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
191 { |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
192 return fastAccessor_.get() != NULL; |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
193 } |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
194 |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
195 const ImageAccessor& GetFastAccessor() const |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
196 { |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
197 assert(HasFastAccessor()); |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
198 return *fastAccessor_; |
| 852 | 199 } |
| 200 }; | |
| 201 | |
| 202 | |
| 846 | 203 static const DicomTag DICOM_TAG_CONTENT(0x07a1, 0x100a); |
| 204 static const DicomTag DICOM_TAG_COMPRESSION_TYPE(0x07a1, 0x1011); | |
| 205 | |
| 206 bool DicomImageDecoder::IsPsmctRle1(DcmDataset& dataset) | |
| 207 { | |
| 208 DcmElement* e; | |
| 209 char* c; | |
| 210 | |
| 211 // Check whether the DICOM instance contains an image encoded with | |
| 212 // the PMSCT_RLE1 scheme. | |
| 213 if (!dataset.findAndGetElement(ToDcmtkBridge::Convert(DICOM_TAG_COMPRESSION_TYPE), e).good() || | |
| 214 e == NULL || | |
| 215 !e->isaString() || | |
| 216 !e->getString(c).good() || | |
| 217 c == NULL || | |
| 218 strcmp("PMSCT_RLE1", c)) | |
| 219 { | |
| 220 return false; | |
| 221 } | |
| 222 else | |
| 223 { | |
| 224 return true; | |
| 225 } | |
| 226 } | |
| 227 | |
| 228 | |
| 229 bool DicomImageDecoder::DecodePsmctRle1(std::string& output, | |
| 230 DcmDataset& dataset) | |
| 231 { | |
| 232 // Check whether the DICOM instance contains an image encoded with | |
| 233 // the PMSCT_RLE1 scheme. | |
| 234 if (!IsPsmctRle1(dataset)) | |
| 235 { | |
| 236 return false; | |
| 237 } | |
| 238 | |
| 239 // OK, this is a custom RLE encoding from Philips. Get the pixel | |
| 240 // data from the appropriate private DICOM tag. | |
| 241 Uint8* pixData = NULL; | |
| 242 DcmElement* e; | |
| 243 if (!dataset.findAndGetElement(ToDcmtkBridge::Convert(DICOM_TAG_CONTENT), e).good() || | |
| 244 e == NULL || | |
| 245 e->getUint8Array(pixData) != EC_Normal) | |
| 246 { | |
| 247 return false; | |
| 248 } | |
| 249 | |
| 250 // The "unsigned" below IS VERY IMPORTANT | |
| 251 const uint8_t* inbuffer = reinterpret_cast<const uint8_t*>(pixData); | |
| 252 const size_t length = e->getLength(); | |
| 253 | |
| 254 /** | |
| 255 * The code below is an adaptation of a sample code for GDCM by | |
| 256 * Mathieu Malaterre (under a BSD license). | |
| 257 * http://gdcm.sourceforge.net/html/rle2img_8cxx-example.html | |
| 258 **/ | |
| 259 | |
| 260 // RLE pass | |
| 261 std::vector<uint8_t> temp; | |
| 262 temp.reserve(length); | |
| 263 for (size_t i = 0; i < length; i++) | |
| 264 { | |
| 265 if (inbuffer[i] == 0xa5) | |
| 266 { | |
| 267 temp.push_back(inbuffer[i+2]); | |
| 268 for (uint8_t repeat = inbuffer[i + 1]; repeat != 0; repeat--) | |
| 269 { | |
| 270 temp.push_back(inbuffer[i+2]); | |
| 271 } | |
| 272 i += 2; | |
| 273 } | |
| 274 else | |
| 275 { | |
| 276 temp.push_back(inbuffer[i]); | |
| 277 } | |
| 278 } | |
| 279 | |
| 280 // Delta encoding pass | |
| 281 uint16_t delta = 0; | |
| 282 output.clear(); | |
| 283 output.reserve(temp.size()); | |
| 284 for (size_t i = 0; i < temp.size(); i++) | |
| 285 { | |
| 286 uint16_t value; | |
| 287 | |
| 288 if (temp[i] == 0x5a) | |
| 289 { | |
| 290 uint16_t v1 = temp[i + 1]; | |
| 291 uint16_t v2 = temp[i + 2]; | |
| 292 value = (v2 << 8) + v1; | |
| 293 i += 2; | |
| 294 } | |
| 295 else | |
| 296 { | |
| 297 value = delta + (int8_t) temp[i]; | |
| 298 } | |
| 299 | |
| 300 output.push_back(value & 0xff); | |
| 301 output.push_back(value >> 8); | |
| 302 delta = value; | |
| 303 } | |
| 304 | |
| 305 if (output.size() % 2) | |
| 306 { | |
| 307 output.resize(output.size() - 1); | |
| 308 } | |
| 309 | |
| 310 return true; | |
| 311 } | |
| 312 | |
| 313 | |
| 845 | 314 void DicomImageDecoder::SetupImageBuffer(ImageBuffer& target, |
| 315 DcmDataset& dataset) | |
| 316 { | |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
317 DicomMap m; |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
318 FromDcmtkBridge::Convert(m, dataset); |
| 845 | 319 |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
320 DicomImageInformation info(m); |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
321 PixelFormat format; |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
322 |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
323 if (!info.ExtractPixelFormat(format)) |
| 845 | 324 { |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
325 LOG(WARNING) << "Unsupported DICOM image: " << info.GetBitsStored() |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
326 << "bpp, " << info.GetChannelCount() << " channels, " |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
327 << (info.IsSigned() ? "signed" : "unsigned"); |
| 845 | 328 throw OrthancException(ErrorCode_NotImplemented); |
| 329 } | |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
330 |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
331 target.SetHeight(info.GetHeight()); |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
332 target.SetWidth(info.GetWidth()); |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
333 target.SetFormat(format); |
| 845 | 334 } |
| 335 | |
| 336 | |
| 337 bool DicomImageDecoder::IsJpegLossless(const DcmDataset& dataset) | |
| 338 { | |
| 851 | 339 // http://support.dcmtk.org/docs/dcxfer_8h-source.html |
| 845 | 340 return (dataset.getOriginalXfer() == EXS_JPEGLSLossless || |
| 341 dataset.getOriginalXfer() == EXS_JPEGLSLossy); | |
| 342 } | |
| 343 | |
| 344 | |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
345 bool DicomImageDecoder::IsUncompressedImage(const DcmDataset& dataset) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
346 { |
| 851 | 347 // 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
|
348 return (dataset.getOriginalXfer() == EXS_Unknown || |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
349 dataset.getOriginalXfer() == EXS_LittleEndianImplicit || |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
350 dataset.getOriginalXfer() == EXS_BigEndianImplicit || |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
351 dataset.getOriginalXfer() == EXS_LittleEndianExplicit || |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
352 dataset.getOriginalXfer() == EXS_BigEndianExplicit); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
353 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
354 |
|
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 template <typename PixelType> |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
357 static void CopyPixels(ImageAccessor& target, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
358 const DicomIntegerPixelAccessor& source) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
359 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
360 const PixelType minValue = std::numeric_limits<PixelType>::min(); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
361 const PixelType maxValue = std::numeric_limits<PixelType>::max(); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
362 |
|
853
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
363 for (unsigned int y = 0; y < source.GetInformation().GetHeight(); y++) |
|
847
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 PixelType* pixel = reinterpret_cast<PixelType*>(target.GetRow(y)); |
|
853
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
366 for (unsigned int x = 0; x < source.GetInformation().GetWidth(); x++) |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
367 { |
|
853
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
368 for (unsigned int c = 0; c < source.GetInformation().GetChannelCount(); c++, pixel++) |
|
847
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 int32_t v = source.GetValue(x, y, c); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
371 if (v < static_cast<int32_t>(minValue)) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
372 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
373 *pixel = 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 else if (v > static_cast<int32_t>(maxValue)) |
|
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 *pixel = 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 else |
|
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 *pixel = static_cast<PixelType>(v); |
|
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 } |
|
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 void DicomImageDecoder::DecodeUncompressedImage(ImageBuffer& target, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
390 DcmDataset& dataset, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
391 unsigned int frame) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
392 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
393 if (!IsUncompressedImage(dataset)) |
|
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 throw OrthancException(ErrorCode_BadParameterType); |
|
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 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
398 DecodeUncompressedImageInternal(target, dataset, frame); |
|
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 |
|
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 void DicomImageDecoder::DecodeUncompressedImageInternal(ImageBuffer& target, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
403 DcmDataset& dataset, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
404 unsigned int frame) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
405 { |
| 852 | 406 ImageSource source; |
| 407 source.Setup(dataset, frame); | |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
408 |
|
858
ebc41566f742
removed unneeded check
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
854
diff
changeset
|
409 |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
410 /** |
|
858
ebc41566f742
removed unneeded check
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
854
diff
changeset
|
411 * Resize the target image. |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
412 **/ |
|
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 SetupImageBuffer(target, dataset); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
415 |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
416 if (source.GetWidth() != target.GetWidth() || |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
417 source.GetHeight() != target.GetHeight()) |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
418 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
419 throw OrthancException(ErrorCode_InternalError); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
420 } |
|
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 /** |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
424 * If the format of the DICOM buffer is natively supported, use a |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
425 * direct access to copy its values. |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
426 **/ |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
427 |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
428 ImageAccessor targetAccessor(target.GetAccessor()); |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
429 const DicomImageInformation& info = source.GetAccessor().GetInformation(); |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
430 |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
431 bool fastVersionSuccess = false; |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
432 PixelFormat sourceFormat; |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
433 if (info.ExtractPixelFormat(sourceFormat)) |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
434 { |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
435 try |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
436 { |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
437 ImageAccessor sourceImage; |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
438 sourceImage.AssignReadOnly(sourceFormat, |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
439 info.GetWidth(), |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
440 info.GetHeight(), |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
441 info.GetWidth() * info.GetBytesPerPixel(), |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
442 source.GetAccessor().GetPixelData()); |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
443 |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
444 ImageProcessing::Convert(targetAccessor, sourceImage); |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
445 ImageProcessing::ShiftRight(targetAccessor, info.GetShift()); |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
446 fastVersionSuccess = true; |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
447 } |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
448 catch (OrthancException&) |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
449 { |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
450 // Unsupported conversion |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
451 } |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
452 } |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
453 |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
454 |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
455 /** |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
456 * 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
|
457 * image. |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
458 **/ |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
459 |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
460 if (!fastVersionSuccess) |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
461 { |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
462 switch (target.GetFormat()) |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
463 { |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
464 case PixelFormat_RGB24: |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
465 case PixelFormat_RGBA32: |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
466 case PixelFormat_Grayscale8: |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
467 CopyPixels<uint8_t>(targetAccessor, 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 |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
470 case PixelFormat_Grayscale16: |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
471 CopyPixels<uint16_t>(targetAccessor, 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 |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
474 case PixelFormat_SignedGrayscale16: |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
475 CopyPixels<int16_t>(targetAccessor, source.GetAccessor()); |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
476 break; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
477 |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
478 default: |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
479 throw OrthancException(ErrorCode_InternalError); |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
480 } |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
481 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
482 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
483 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
484 |
| 845 | 485 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 |
| 486 void DicomImageDecoder::DecodeJpegLossless(ImageBuffer& target, | |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
487 DcmDataset& dataset, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
488 unsigned int frame) |
| 845 | 489 { |
| 490 if (!IsJpegLossless(dataset)) | |
| 491 { | |
| 492 throw OrthancException(ErrorCode_BadParameterType); | |
| 493 } | |
| 494 | |
| 495 DcmElement *element = NULL; | |
| 496 if (!dataset.findAndGetElement(ToDcmtkBridge::Convert(DICOM_TAG_PIXEL_DATA), element).good()) | |
| 497 { | |
| 498 throw OrthancException(ErrorCode_BadFileFormat); | |
| 499 } | |
| 500 | |
| 501 DcmPixelData& pixelData = dynamic_cast<DcmPixelData&>(*element); | |
| 502 DcmPixelSequence* pixelSequence = NULL; | |
| 503 if (!pixelData.getEncapsulatedRepresentation | |
| 504 (dataset.getOriginalXfer(), NULL, pixelSequence).good()) | |
| 505 { | |
| 506 throw OrthancException(ErrorCode_BadFileFormat); | |
| 507 } | |
| 508 | |
| 509 SetupImageBuffer(target, dataset); | |
| 510 | |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
511 ImageAccessor targetAccessor(target.GetAccessor()); |
| 845 | 512 |
| 513 /** | |
| 514 * The "DJLSLosslessDecoder" and "DJLSNearLosslessDecoder" in DCMTK | |
| 515 * are exactly the same, except for the "supportedTransferSyntax()" | |
| 516 * virtual function. | |
| 517 * http://support.dcmtk.org/docs/classDJLSDecoderBase.html | |
| 518 **/ | |
| 519 | |
| 520 DJLSLosslessDecoder decoder; DJLSCodecParameter parameters; | |
| 521 //DJLSNearLosslessDecoder decoder; DJLSCodecParameter parameters; | |
| 522 | |
| 523 Uint32 startFragment = 0; // Default | |
| 524 OFString decompressedColorModel; // Out | |
| 525 DJ_RPLossless representationParameter; | |
| 526 OFCondition c = decoder.decodeFrame(&representationParameter, pixelSequence, ¶meters, | |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
527 &dataset, frame, startFragment, targetAccessor.GetBuffer(), |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
528 targetAccessor.GetSize(), decompressedColorModel); |
| 845 | 529 |
| 530 if (!c.good()) | |
| 531 { | |
| 532 throw OrthancException(ErrorCode_InternalError); | |
| 533 } | |
| 534 } | |
| 535 #endif | |
| 846 | 536 |
| 537 | |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
538 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
539 bool DicomImageDecoder::Decode(ImageBuffer& target, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
540 DcmDataset& dataset, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
541 unsigned int frame) |
|
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 if (IsUncompressedImage(dataset)) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
544 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
545 DecodeUncompressedImage(target, dataset, frame); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
546 return true; |
|
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 |
| 852 | 549 |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
550 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
551 if (IsJpegLossless(dataset)) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
552 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
553 LOG(INFO) << "Decoding a JPEG-LS image"; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
554 DecodeJpegLossless(target, dataset, frame); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
555 return true; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
556 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
557 #endif |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
558 |
| 852 | 559 |
| 560 #if ORTHANC_JPEG_ENABLED == 1 | |
| 561 // TODO Implement this part to speed up JPEG decompression | |
| 562 #endif | |
| 563 | |
| 564 | |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
565 /** |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
566 * 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
|
567 * 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
|
568 * 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
|
569 * actually the second example of the following page: |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
570 * 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
|
571 **/ |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
572 |
|
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 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
|
575 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
576 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
|
577 converted->chooseRepresentation(EXS_LittleEndianExplicit, NULL); |
|
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 if (converted->canWriteXfer(EXS_LittleEndianExplicit)) |
|
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 DecodeUncompressedImageInternal(target, *converted, frame); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
582 return true; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
583 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
584 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
585 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
586 return false; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
587 } |
| 845 | 588 } |