Mercurial > hg > orthanc
annotate OrthancServer/Internals/DicomImageDecoder.cpp @ 860:80c7e53a69b5 jpeg
bugfix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Sat, 07 Jun 2014 10:32:15 +0200 |
| parents | 610a9a1ed855 |
| children | a546b05a43da |
| 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 |
| 852 | 172 unsigned int GetChannelCount() const |
| 173 { | |
|
853
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().GetChannelCount(); |
| 852 | 176 } |
| 177 | |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
178 const DicomIntegerPixelAccessor& GetAccessor() const |
| 852 | 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_; |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
182 } |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
183 |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
184 bool HasFastAccessor() const |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
185 { |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
186 return fastAccessor_.get() != NULL; |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
187 } |
|
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 const ImageAccessor& GetFastAccessor() const |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
190 { |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
191 assert(HasFastAccessor()); |
|
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
192 return *fastAccessor_; |
| 852 | 193 } |
| 194 }; | |
| 195 | |
| 196 | |
| 846 | 197 static const DicomTag DICOM_TAG_CONTENT(0x07a1, 0x100a); |
| 198 static const DicomTag DICOM_TAG_COMPRESSION_TYPE(0x07a1, 0x1011); | |
| 199 | |
| 200 bool DicomImageDecoder::IsPsmctRle1(DcmDataset& dataset) | |
| 201 { | |
| 202 DcmElement* e; | |
| 203 char* c; | |
| 204 | |
| 205 // Check whether the DICOM instance contains an image encoded with | |
| 206 // the PMSCT_RLE1 scheme. | |
| 207 if (!dataset.findAndGetElement(ToDcmtkBridge::Convert(DICOM_TAG_COMPRESSION_TYPE), e).good() || | |
| 208 e == NULL || | |
| 209 !e->isaString() || | |
| 210 !e->getString(c).good() || | |
| 211 c == NULL || | |
| 212 strcmp("PMSCT_RLE1", c)) | |
| 213 { | |
| 214 return false; | |
| 215 } | |
| 216 else | |
| 217 { | |
| 218 return true; | |
| 219 } | |
| 220 } | |
| 221 | |
| 222 | |
| 223 bool DicomImageDecoder::DecodePsmctRle1(std::string& output, | |
| 224 DcmDataset& dataset) | |
| 225 { | |
| 226 // Check whether the DICOM instance contains an image encoded with | |
| 227 // the PMSCT_RLE1 scheme. | |
| 228 if (!IsPsmctRle1(dataset)) | |
| 229 { | |
| 230 return false; | |
| 231 } | |
| 232 | |
| 233 // OK, this is a custom RLE encoding from Philips. Get the pixel | |
| 234 // data from the appropriate private DICOM tag. | |
| 235 Uint8* pixData = NULL; | |
| 236 DcmElement* e; | |
| 237 if (!dataset.findAndGetElement(ToDcmtkBridge::Convert(DICOM_TAG_CONTENT), e).good() || | |
| 238 e == NULL || | |
| 239 e->getUint8Array(pixData) != EC_Normal) | |
| 240 { | |
| 241 return false; | |
| 242 } | |
| 243 | |
| 244 // The "unsigned" below IS VERY IMPORTANT | |
| 245 const uint8_t* inbuffer = reinterpret_cast<const uint8_t*>(pixData); | |
| 246 const size_t length = e->getLength(); | |
| 247 | |
| 248 /** | |
| 249 * The code below is an adaptation of a sample code for GDCM by | |
| 250 * Mathieu Malaterre (under a BSD license). | |
| 251 * http://gdcm.sourceforge.net/html/rle2img_8cxx-example.html | |
| 252 **/ | |
| 253 | |
| 254 // RLE pass | |
| 255 std::vector<uint8_t> temp; | |
| 256 temp.reserve(length); | |
| 257 for (size_t i = 0; i < length; i++) | |
| 258 { | |
| 259 if (inbuffer[i] == 0xa5) | |
| 260 { | |
| 261 temp.push_back(inbuffer[i+2]); | |
| 262 for (uint8_t repeat = inbuffer[i + 1]; repeat != 0; repeat--) | |
| 263 { | |
| 264 temp.push_back(inbuffer[i+2]); | |
| 265 } | |
| 266 i += 2; | |
| 267 } | |
| 268 else | |
| 269 { | |
| 270 temp.push_back(inbuffer[i]); | |
| 271 } | |
| 272 } | |
| 273 | |
| 274 // Delta encoding pass | |
| 275 uint16_t delta = 0; | |
| 276 output.clear(); | |
| 277 output.reserve(temp.size()); | |
| 278 for (size_t i = 0; i < temp.size(); i++) | |
| 279 { | |
| 280 uint16_t value; | |
| 281 | |
| 282 if (temp[i] == 0x5a) | |
| 283 { | |
| 284 uint16_t v1 = temp[i + 1]; | |
| 285 uint16_t v2 = temp[i + 2]; | |
| 286 value = (v2 << 8) + v1; | |
| 287 i += 2; | |
| 288 } | |
| 289 else | |
| 290 { | |
| 291 value = delta + (int8_t) temp[i]; | |
| 292 } | |
| 293 | |
| 294 output.push_back(value & 0xff); | |
| 295 output.push_back(value >> 8); | |
| 296 delta = value; | |
| 297 } | |
| 298 | |
| 299 if (output.size() % 2) | |
| 300 { | |
| 301 output.resize(output.size() - 1); | |
| 302 } | |
| 303 | |
| 304 return true; | |
| 305 } | |
| 306 | |
| 307 | |
| 845 | 308 void DicomImageDecoder::SetupImageBuffer(ImageBuffer& target, |
| 309 DcmDataset& dataset) | |
| 310 { | |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
311 DicomMap m; |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
312 FromDcmtkBridge::Convert(m, dataset); |
| 845 | 313 |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
314 DicomImageInformation info(m); |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
315 PixelFormat format; |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
316 |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
317 if (!info.ExtractPixelFormat(format)) |
| 845 | 318 { |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
319 LOG(WARNING) << "Unsupported DICOM image: " << info.GetBitsStored() |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
320 << "bpp, " << info.GetChannelCount() << " channels, " |
| 860 | 321 << (info.IsSigned() ? "signed" : "unsigned") |
| 322 << (info.IsPlanar() ? ", planar" : ", non-planar"); | |
| 845 | 323 throw OrthancException(ErrorCode_NotImplemented); |
| 324 } | |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
325 |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
326 target.SetHeight(info.GetHeight()); |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
327 target.SetWidth(info.GetWidth()); |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
328 target.SetFormat(format); |
| 845 | 329 } |
| 330 | |
| 331 | |
| 332 bool DicomImageDecoder::IsJpegLossless(const DcmDataset& dataset) | |
| 333 { | |
| 851 | 334 // http://support.dcmtk.org/docs/dcxfer_8h-source.html |
| 845 | 335 return (dataset.getOriginalXfer() == EXS_JPEGLSLossless || |
| 336 dataset.getOriginalXfer() == EXS_JPEGLSLossy); | |
| 337 } | |
| 338 | |
| 339 | |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
340 bool DicomImageDecoder::IsUncompressedImage(const DcmDataset& dataset) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
341 { |
| 851 | 342 // 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
|
343 return (dataset.getOriginalXfer() == EXS_Unknown || |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
344 dataset.getOriginalXfer() == EXS_LittleEndianImplicit || |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
345 dataset.getOriginalXfer() == EXS_BigEndianImplicit || |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
346 dataset.getOriginalXfer() == EXS_LittleEndianExplicit || |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
347 dataset.getOriginalXfer() == EXS_BigEndianExplicit); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
348 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
349 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
350 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
351 template <typename PixelType> |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
352 static void CopyPixels(ImageAccessor& target, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
353 const DicomIntegerPixelAccessor& source) |
|
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 const PixelType minValue = std::numeric_limits<PixelType>::min(); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
356 const PixelType maxValue = std::numeric_limits<PixelType>::max(); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
357 |
|
853
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
358 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
|
359 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
360 PixelType* pixel = reinterpret_cast<PixelType*>(target.GetRow(y)); |
|
853
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
361 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
|
362 { |
|
853
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
852
diff
changeset
|
363 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
|
364 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
365 int32_t v = source.GetValue(x, y, c); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
366 if (v < static_cast<int32_t>(minValue)) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
367 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
368 *pixel = minValue; |
|
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 else if (v > static_cast<int32_t>(maxValue)) |
|
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 *pixel = maxValue; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
373 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
374 else |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
375 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
376 *pixel = static_cast<PixelType>(v); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
377 } |
|
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 } |
|
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 } |
|
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 void DicomImageDecoder::DecodeUncompressedImage(ImageBuffer& target, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
385 DcmDataset& dataset, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
386 unsigned int frame) |
|
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 if (!IsUncompressedImage(dataset)) |
|
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 throw OrthancException(ErrorCode_BadParameterType); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
391 } |
|
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 DecodeUncompressedImageInternal(target, dataset, 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 |
|
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 void DicomImageDecoder::DecodeUncompressedImageInternal(ImageBuffer& target, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
398 DcmDataset& dataset, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
399 unsigned int frame) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
400 { |
| 852 | 401 ImageSource source; |
| 402 source.Setup(dataset, frame); | |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
403 |
|
858
ebc41566f742
removed unneeded check
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
854
diff
changeset
|
404 |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
405 /** |
|
858
ebc41566f742
removed unneeded check
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
854
diff
changeset
|
406 * Resize the target image. |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
407 **/ |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
408 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
409 SetupImageBuffer(target, dataset); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
410 |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
411 if (source.GetWidth() != target.GetWidth() || |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
412 source.GetHeight() != target.GetHeight()) |
|
847
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 throw OrthancException(ErrorCode_InternalError); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
415 } |
|
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 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
418 /** |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
419 * 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
|
420 * direct access to copy its values. |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
421 **/ |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
422 |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
423 ImageAccessor targetAccessor(target.GetAccessor()); |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
424 const DicomImageInformation& info = source.GetAccessor().GetInformation(); |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
425 |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
426 bool fastVersionSuccess = false; |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
427 PixelFormat sourceFormat; |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
428 if (info.ExtractPixelFormat(sourceFormat)) |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
429 { |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
430 try |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
431 { |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
432 ImageAccessor sourceImage; |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
433 sourceImage.AssignReadOnly(sourceFormat, |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
434 info.GetWidth(), |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
435 info.GetHeight(), |
| 860 | 436 info.GetWidth() * GetBytesPerPixel(sourceFormat), |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
437 source.GetAccessor().GetPixelData()); |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
438 |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
439 ImageProcessing::Convert(targetAccessor, sourceImage); |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
440 ImageProcessing::ShiftRight(targetAccessor, info.GetShift()); |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
441 fastVersionSuccess = true; |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
442 } |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
443 catch (OrthancException&) |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
444 { |
|
859
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
445 // Unsupported conversion, use the slow version |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
446 } |
|
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 |
|
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 /** |
|
859
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
451 * Slow version : loop over the DICOM buffer, storing its value |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
452 * into the target image. |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
453 **/ |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
454 |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
455 if (!fastVersionSuccess) |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
456 { |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
457 switch (target.GetFormat()) |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
458 { |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
459 case PixelFormat_RGB24: |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
460 case PixelFormat_RGBA32: |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
461 case PixelFormat_Grayscale8: |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
462 CopyPixels<uint8_t>(targetAccessor, source.GetAccessor()); |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
463 break; |
| 860 | 464 |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
465 case PixelFormat_Grayscale16: |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
466 CopyPixels<uint16_t>(targetAccessor, source.GetAccessor()); |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
467 break; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
468 |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
469 case PixelFormat_SignedGrayscale16: |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
470 CopyPixels<int16_t>(targetAccessor, source.GetAccessor()); |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
471 break; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
472 |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
473 default: |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
474 throw OrthancException(ErrorCode_InternalError); |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
475 } |
|
847
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 | |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
506 ImageAccessor targetAccessor(target.GetAccessor()); |
| 845 | 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, | |
|
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
522 &dataset, frame, startFragment, targetAccessor.GetBuffer(), |
|
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
523 targetAccessor.GetSize(), decompressedColorModel); |
| 845 | 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 |
|
859
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
534 |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
535 bool DicomImageDecoder::Decode(ImageBuffer& target, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
536 DcmDataset& dataset, |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
537 unsigned int frame) |
|
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 if (IsUncompressedImage(dataset)) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
540 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
541 DecodeUncompressedImage(target, dataset, frame); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
542 return true; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
543 } |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
544 |
| 852 | 545 |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
546 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
547 if (IsJpegLossless(dataset)) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
548 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
549 LOG(INFO) << "Decoding a JPEG-LS image"; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
550 DecodeJpegLossless(target, dataset, frame); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
551 return true; |
|
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 #endif |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
554 |
| 852 | 555 |
| 556 #if ORTHANC_JPEG_ENABLED == 1 | |
| 557 // TODO Implement this part to speed up JPEG decompression | |
| 558 #endif | |
| 559 | |
| 560 | |
|
847
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
561 /** |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
562 * 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
|
563 * 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
|
564 * 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
|
565 * actually the second example of the following page: |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
566 * 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
|
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 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
570 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
|
571 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
572 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
|
573 converted->chooseRepresentation(EXS_LittleEndianExplicit, NULL); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
574 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
575 if (converted->canWriteXfer(EXS_LittleEndianExplicit)) |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
576 { |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
577 DecodeUncompressedImageInternal(target, *converted, frame); |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
578 return true; |
|
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 |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
582 return false; |
|
03ea55da7429
fully functional JPEG-LS conversion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
846
diff
changeset
|
583 } |
|
859
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
584 |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
585 |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
586 bool DicomImageDecoder::Decode(ImageBuffer& target, |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
587 DcmDataset& dataset, |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
588 unsigned int frame, |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
589 PixelFormat format, |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
590 Mode mode) |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
591 { |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
592 // TODO OPTIMIZE THIS !!! |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
593 |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
594 ImageBuffer tmp; |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
595 if (!Decode(tmp, dataset, frame)) |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
596 { |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
597 return false; |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
598 } |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
599 |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
600 target.SetFormat(format); |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
601 target.SetWidth(tmp.GetWidth()); |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
602 target.SetHeight(tmp.GetHeight()); |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
603 |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
604 switch (mode) |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
605 { |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
606 case Mode_Truncate: |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
607 { |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
608 ImageAccessor a(target.GetAccessor()); |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
609 ImageAccessor b(tmp.GetAccessor()); |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
610 ImageProcessing::Convert(a, b); |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
611 return true; |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
612 } |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
613 |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
614 default: |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
615 throw OrthancException(ErrorCode_NotImplemented); |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
616 } |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
617 |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
618 return false; |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
619 } |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
620 |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
621 |
|
610a9a1ed855
ImageProcessing::Convert
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
858
diff
changeset
|
622 |
| 845 | 623 } |