Mercurial > hg > orthanc
annotate Core/DicomParsing/DcmtkTranscoder.cpp @ 3906:f0dd5ded8927 transcoding
refactoring using IDicomTranscoder::TranscodedDicom
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 08 May 2020 11:16:16 +0200 |
| parents | c62f84c7eda9 |
| children | 1555feda39e2 |
| rev | line source |
|---|---|
| 3893 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
| 5 * Copyright (C) 2017-2020 Osimis S.A., Belgium | |
| 6 * | |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU General Public License as | |
| 9 * published by the Free Software Foundation, either version 3 of the | |
| 10 * License, or (at your option) any later version. | |
| 11 * | |
| 12 * In addition, as a special exception, the copyright holders of this | |
| 13 * program give permission to link the code of its release with the | |
| 14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 15 * that use the same license as the "OpenSSL" library), and distribute | |
| 16 * the linked executables. You must obey the GNU General Public License | |
| 17 * in all respects for all of the code used other than "OpenSSL". If you | |
| 18 * modify file(s) with this exception, you may extend this exception to | |
| 19 * your version of the file(s), but you are not obligated to do so. If | |
| 20 * you do not wish to do so, delete this exception statement from your | |
| 21 * version. If you delete this exception statement from all source files | |
| 22 * in the program, then also delete it here. | |
| 23 * | |
| 24 * This program is distributed in the hope that it will be useful, but | |
| 25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 27 * General Public License for more details. | |
| 28 * | |
| 29 * You should have received a copy of the GNU General Public License | |
| 30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 31 **/ | |
| 32 | |
| 33 | |
| 34 #include "../PrecompiledHeaders.h" | |
| 35 #include "DcmtkTranscoder.h" | |
| 36 | |
| 37 | |
| 38 #if !defined(ORTHANC_ENABLE_DCMTK_JPEG) | |
| 39 # error Macro ORTHANC_ENABLE_DCMTK_JPEG must be defined | |
| 40 #endif | |
| 41 | |
| 42 #if !defined(ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS) | |
| 43 # error Macro ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS must be defined | |
| 44 #endif | |
| 45 | |
| 46 | |
| 47 #include "FromDcmtkBridge.h" | |
| 48 #include "../OrthancException.h" | |
| 49 | |
| 50 #include <dcmtk/dcmdata/dcdeftag.h> | |
| 51 #include <dcmtk/dcmjpeg/djrploss.h> // for DJ_RPLossy | |
| 52 #include <dcmtk/dcmjpeg/djrplol.h> // for DJ_RPLossless | |
| 53 #include <dcmtk/dcmjpls/djrparam.h> // for DJLSRepresentationParameter | |
| 54 | |
| 55 | |
| 56 namespace Orthanc | |
| 57 { | |
| 58 static uint16_t GetBitsStored(DcmDataset& dataset) | |
| 59 { | |
| 60 uint16_t bitsStored; | |
| 61 if (dataset.findAndGetUint16(DCM_BitsStored, bitsStored).good()) | |
| 62 { | |
| 63 return bitsStored; | |
| 64 } | |
| 65 else | |
| 66 { | |
| 67 throw OrthancException(ErrorCode_BadFileFormat, | |
| 68 "Missing \"Bits Stored\" tag in DICOM instance"); | |
| 69 } | |
| 70 } | |
| 71 | |
| 72 | |
| 73 static std::string GetSopInstanceUid(DcmDataset& dataset) | |
| 74 { | |
| 75 const char* v = NULL; | |
| 76 | |
| 77 if (dataset.findAndGetString(DCM_SOPInstanceUID, v).good() && | |
| 78 v != NULL) | |
| 79 { | |
| 80 return std::string(v); | |
| 81 } | |
| 82 else | |
| 83 { | |
| 84 throw OrthancException(ErrorCode_BadFileFormat, "File without SOP instance UID"); | |
| 85 } | |
| 86 } | |
| 87 | |
| 88 | |
| 89 static void CheckSopInstanceUid(DcmFileFormat& dicom, | |
| 90 const std::string& sopInstanceUid, | |
| 91 bool mustEqual) | |
| 92 { | |
| 93 if (dicom.getDataset() == NULL) | |
| 94 { | |
| 95 throw OrthancException(ErrorCode_InternalError); | |
| 96 } | |
| 97 | |
| 98 bool ok; | |
| 99 | |
| 100 if (mustEqual) | |
| 101 { | |
| 102 ok = (GetSopInstanceUid(*dicom.getDataset()) == sopInstanceUid); | |
| 103 } | |
| 104 else | |
| 105 { | |
| 106 ok = (GetSopInstanceUid(*dicom.getDataset()) != sopInstanceUid); | |
| 107 } | |
| 108 | |
| 109 if (!ok) | |
| 110 { | |
| 111 throw OrthancException(ErrorCode_InternalError, | |
| 112 mustEqual ? "The SOP instance UID has changed unexpectedly during transcoding" : | |
| 113 "The SOP instance UID has not changed as expected during transcoding"); | |
| 114 } | |
| 115 } | |
| 116 | |
| 117 | |
| 118 void DcmtkTranscoder::SetLossyQuality(unsigned int quality) | |
| 119 { | |
| 120 if (quality <= 0 || | |
| 121 quality > 100) | |
| 122 { | |
| 123 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 124 } | |
| 125 else | |
| 126 { | |
| 127 lossyQuality_ = quality; | |
| 128 } | |
| 129 } | |
| 130 | |
| 131 | |
|
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
132 DcmFileFormat* DcmtkTranscoder::TranscodeToParsed(bool& hasSopInstanceUidChanged /* out */, |
|
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
133 const void* buffer, |
| 3893 | 134 size_t size, |
| 135 const std::set<DicomTransferSyntax>& allowedSyntaxes, | |
| 136 bool allowNewSopInstanceUid) | |
| 137 { | |
| 138 std::unique_ptr<DcmFileFormat> dicom(FromDcmtkBridge::LoadFromMemoryBuffer(buffer, size)); | |
| 139 | |
| 140 if (dicom.get() == NULL) | |
| 141 { | |
| 142 throw OrthancException(ErrorCode_InternalError); | |
| 143 } | |
| 144 | |
|
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
145 if (InplaceTranscode(hasSopInstanceUidChanged, *dicom, allowedSyntaxes, allowNewSopInstanceUid)) |
| 3893 | 146 { |
| 147 return dicom.release(); | |
| 148 } | |
| 149 else | |
| 150 { | |
| 151 return NULL; | |
| 152 } | |
| 153 } | |
| 154 | |
| 155 | |
|
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
156 bool DcmtkTranscoder::InplaceTranscode(bool& hasSopInstanceUidChanged /* out */, |
|
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
157 DcmFileFormat& dicom, |
| 3893 | 158 const std::set<DicomTransferSyntax>& allowedSyntaxes, |
| 159 bool allowNewSopInstanceUid) | |
| 160 { | |
| 161 if (dicom.getDataset() == NULL) | |
| 162 { | |
| 163 throw OrthancException(ErrorCode_InternalError); | |
| 164 } | |
| 165 | |
|
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
166 hasSopInstanceUidChanged = false; |
|
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
167 |
| 3893 | 168 DicomTransferSyntax syntax; |
| 169 if (!FromDcmtkBridge::LookupOrthancTransferSyntax(syntax, dicom)) | |
| 170 { | |
| 171 throw OrthancException(ErrorCode_BadFileFormat, | |
| 172 "Cannot determine the transfer syntax"); | |
| 173 } | |
| 174 | |
| 175 const uint16_t bitsStored = GetBitsStored(*dicom.getDataset()); | |
| 176 std::string sourceSopInstanceUid = GetSopInstanceUid(*dicom.getDataset()); | |
|
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
177 |
| 3893 | 178 if (allowedSyntaxes.find(syntax) != allowedSyntaxes.end()) |
| 179 { | |
| 180 // No transcoding is needed | |
| 181 return true; | |
| 182 } | |
| 183 | |
| 184 if (allowedSyntaxes.find(DicomTransferSyntax_LittleEndianImplicit) != allowedSyntaxes.end() && | |
| 185 FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_LittleEndianImplicit, NULL)) | |
| 186 { | |
| 187 CheckSopInstanceUid(dicom, sourceSopInstanceUid, true); | |
| 188 return true; | |
| 189 } | |
| 190 | |
| 191 if (allowedSyntaxes.find(DicomTransferSyntax_LittleEndianExplicit) != allowedSyntaxes.end() && | |
| 192 FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_LittleEndianExplicit, NULL)) | |
| 193 { | |
| 194 CheckSopInstanceUid(dicom, sourceSopInstanceUid, true); | |
| 195 return true; | |
| 196 } | |
| 197 | |
| 198 if (allowedSyntaxes.find(DicomTransferSyntax_BigEndianExplicit) != allowedSyntaxes.end() && | |
| 199 FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_BigEndianExplicit, NULL)) | |
| 200 { | |
| 201 CheckSopInstanceUid(dicom, sourceSopInstanceUid, true); | |
| 202 return true; | |
| 203 } | |
| 204 | |
| 205 if (allowedSyntaxes.find(DicomTransferSyntax_DeflatedLittleEndianExplicit) != allowedSyntaxes.end() && | |
| 206 FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_DeflatedLittleEndianExplicit, NULL)) | |
| 207 { | |
| 208 CheckSopInstanceUid(dicom, sourceSopInstanceUid, true); | |
| 209 return true; | |
| 210 } | |
| 211 | |
| 212 #if ORTHANC_ENABLE_DCMTK_JPEG == 1 | |
| 213 if (allowedSyntaxes.find(DicomTransferSyntax_JPEGProcess1) != allowedSyntaxes.end() && | |
| 214 allowNewSopInstanceUid && | |
| 215 bitsStored == 8) | |
| 216 { | |
| 217 // Check out "dcmjpeg/apps/dcmcjpeg.cc" | |
| 218 DJ_RPLossy parameters(lossyQuality_); | |
| 219 | |
| 220 if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGProcess1, ¶meters)) | |
| 221 { | |
| 222 CheckSopInstanceUid(dicom, sourceSopInstanceUid, false); | |
|
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
223 hasSopInstanceUidChanged = true; |
| 3893 | 224 return true; |
| 225 } | |
| 226 } | |
| 227 #endif | |
| 228 | |
| 229 #if ORTHANC_ENABLE_DCMTK_JPEG == 1 | |
| 230 if (allowedSyntaxes.find(DicomTransferSyntax_JPEGProcess2_4) != allowedSyntaxes.end() && | |
| 231 allowNewSopInstanceUid && | |
| 232 bitsStored <= 12) | |
| 233 { | |
| 234 // Check out "dcmjpeg/apps/dcmcjpeg.cc" | |
| 235 DJ_RPLossy parameters(lossyQuality_); | |
| 236 if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGProcess2_4, ¶meters)) | |
| 237 { | |
| 238 CheckSopInstanceUid(dicom, sourceSopInstanceUid, false); | |
|
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
239 hasSopInstanceUidChanged = true; |
| 3893 | 240 return true; |
| 241 } | |
| 242 } | |
| 243 #endif | |
| 244 | |
| 245 #if ORTHANC_ENABLE_DCMTK_JPEG == 1 | |
|
3902
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
246 if (allowedSyntaxes.find(DicomTransferSyntax_JPEGProcess14) != allowedSyntaxes.end()) |
|
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
247 { |
|
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
248 // Check out "dcmjpeg/apps/dcmcjpeg.cc" |
|
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
249 DJ_RPLossless parameters(6 /* opt_selection_value */, |
|
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
250 0 /* opt_point_transform */); |
|
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
251 if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGProcess14, ¶meters)) |
|
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
252 { |
|
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
253 CheckSopInstanceUid(dicom, sourceSopInstanceUid, true); |
|
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
254 return true; |
|
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
255 } |
|
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
256 } |
|
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
257 #endif |
|
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
258 |
|
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
259 #if ORTHANC_ENABLE_DCMTK_JPEG == 1 |
| 3893 | 260 if (allowedSyntaxes.find(DicomTransferSyntax_JPEGProcess14SV1) != allowedSyntaxes.end()) |
| 261 { | |
| 262 // Check out "dcmjpeg/apps/dcmcjpeg.cc" | |
| 263 DJ_RPLossless parameters(6 /* opt_selection_value */, | |
| 264 0 /* opt_point_transform */); | |
| 265 if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGProcess14SV1, ¶meters)) | |
| 266 { | |
| 267 CheckSopInstanceUid(dicom, sourceSopInstanceUid, true); | |
| 268 return true; | |
| 269 } | |
| 270 } | |
| 271 #endif | |
| 272 | |
| 273 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1 | |
| 274 if (allowedSyntaxes.find(DicomTransferSyntax_JPEGLSLossless) != allowedSyntaxes.end()) | |
| 275 { | |
| 276 // Check out "dcmjpls/apps/dcmcjpls.cc" | |
| 277 DJLSRepresentationParameter parameters(2 /* opt_nearlossless_deviation */, | |
| 278 OFTrue /* opt_useLosslessProcess */); | |
| 279 | |
| 280 /** | |
| 281 * WARNING: This call results in a segmentation fault if using | |
| 282 * the DCMTK package 3.6.2 from Ubuntu 18.04. | |
| 283 **/ | |
| 284 if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGLSLossless, ¶meters)) | |
| 285 { | |
| 286 CheckSopInstanceUid(dicom, sourceSopInstanceUid, true); | |
| 287 return true; | |
| 288 } | |
| 289 } | |
| 290 #endif | |
| 291 | |
| 292 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1 | |
| 293 if (allowNewSopInstanceUid && | |
| 294 allowedSyntaxes.find(DicomTransferSyntax_JPEGLSLossy) != allowedSyntaxes.end()) | |
| 295 { | |
| 296 // Check out "dcmjpls/apps/dcmcjpls.cc" | |
| 297 DJLSRepresentationParameter parameters(2 /* opt_nearlossless_deviation */, | |
| 298 OFFalse /* opt_useLosslessProcess */); | |
| 299 | |
| 300 /** | |
| 301 * WARNING: This call results in a segmentation fault if using | |
| 302 * the DCMTK package 3.6.2 from Ubuntu 18.04. | |
| 303 **/ | |
| 304 if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGLSLossy, ¶meters)) | |
| 305 { | |
| 306 CheckSopInstanceUid(dicom, sourceSopInstanceUid, false); | |
|
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
307 hasSopInstanceUidChanged = true; |
| 3893 | 308 return true; |
| 309 } | |
| 310 } | |
| 311 #endif | |
| 312 | |
| 313 return false; | |
| 314 } | |
| 315 | |
| 316 | |
| 317 bool DcmtkTranscoder::TranscodeToBuffer(std::string& target, | |
|
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
318 bool& hasSopInstanceUidChanged /* out */, |
| 3893 | 319 const void* buffer, |
| 320 size_t size, | |
| 321 const std::set<DicomTransferSyntax>& allowedSyntaxes, | |
| 322 bool allowNewSopInstanceUid) | |
| 323 { | |
| 324 std::unique_ptr<DcmFileFormat> transcoded( | |
|
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
325 TranscodeToParsed(hasSopInstanceUidChanged, buffer, size, allowedSyntaxes, allowNewSopInstanceUid)); |
| 3893 | 326 |
| 327 if (transcoded.get() == NULL) | |
| 328 { | |
| 329 return false; | |
| 330 } | |
| 331 else | |
| 332 { | |
| 333 if (transcoded->getDataset() == NULL) | |
| 334 { | |
| 335 throw OrthancException(ErrorCode_InternalError); | |
| 336 } | |
| 337 | |
| 338 FromDcmtkBridge::SaveToMemoryBuffer(target, *transcoded->getDataset()); | |
| 339 return true; | |
| 340 } | |
| 341 } | |
|
3904
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
342 |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
343 |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
344 bool DcmtkTranscoder::IsSupported(DicomTransferSyntax syntax) |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
345 { |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
346 if (syntax == DicomTransferSyntax_LittleEndianImplicit || |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
347 syntax == DicomTransferSyntax_LittleEndianExplicit || |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
348 syntax == DicomTransferSyntax_BigEndianExplicit || |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
349 syntax == DicomTransferSyntax_DeflatedLittleEndianExplicit) |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
350 { |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
351 return true; |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
352 } |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
353 |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
354 #if ORTHANC_ENABLE_DCMTK_JPEG == 1 |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
355 if (syntax == DicomTransferSyntax_JPEGProcess1 || |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
356 syntax == DicomTransferSyntax_JPEGProcess2_4 || |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
357 syntax == DicomTransferSyntax_JPEGProcess14 || |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
358 syntax == DicomTransferSyntax_JPEGProcess14SV1) |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
359 { |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
360 return true; |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
361 } |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
362 #endif |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
363 |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
364 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1 |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
365 if (syntax == DicomTransferSyntax_JPEGLSLossless || |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
366 syntax == DicomTransferSyntax_JPEGLSLossy) |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
367 { |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
368 return true; |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
369 } |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
370 #endif |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
371 |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
372 return false; |
|
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
373 } |
|
3906
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
374 |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
375 |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
376 |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
377 bool DcmtkTranscoder::TranscodeParsedToBuffer( |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
378 std::string& target /* out */, |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
379 DicomTransferSyntax& sourceSyntax /* out */, |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
380 DicomTransferSyntax& targetSyntax /* out */, |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
381 bool& hasSopInstanceUidChanged /* out */, |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
382 DcmFileFormat& dicom /* in, possibly modified */, |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
383 const std::set<DicomTransferSyntax>& allowedSyntaxes, |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
384 bool allowNewSopInstanceUid) |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
385 { |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
386 if (dicom.getDataset() == NULL) |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
387 { |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
388 throw OrthancException(ErrorCode_InternalError); |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
389 } |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
390 |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
391 if (!FromDcmtkBridge::LookupOrthancTransferSyntax(sourceSyntax, dicom)) |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
392 { |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
393 LOG(ERROR) << "Unsupport transfer syntax for transcoding"; |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
394 return false; |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
395 } |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
396 |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
397 if (InplaceTranscode(hasSopInstanceUidChanged, dicom, allowedSyntaxes, allowNewSopInstanceUid)) |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
398 { |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
399 if (FromDcmtkBridge::LookupOrthancTransferSyntax(targetSyntax, dicom) && |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
400 allowedSyntaxes.find(targetSyntax) != allowedSyntaxes.end() && |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
401 dicom.getDataset() != NULL) |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
402 { |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
403 FromDcmtkBridge::SaveToMemoryBuffer(target, *dicom.getDataset()); |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
404 return true; |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
405 } |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
406 else |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
407 { |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
408 throw OrthancException(ErrorCode_InternalError); |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
409 } |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
410 } |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
411 else |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
412 { |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
413 return false; |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
414 } |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
415 } |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
416 |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
417 |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
418 IDicomTranscoder::TranscodedDicom* DcmtkTranscoder::TranscodeToParsed2( |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
419 DcmFileFormat& dicom /* in, possibly modified */, |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
420 const void* buffer /* in, same DICOM file as "dicom" */, |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
421 size_t size, |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
422 const std::set<DicomTransferSyntax>& allowedSyntaxes, |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
423 bool allowNewSopInstanceUid) |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
424 { |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
425 DicomTransferSyntax sourceSyntax; |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
426 if (!FromDcmtkBridge::LookupOrthancTransferSyntax(sourceSyntax, dicom)) |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
427 { |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
428 LOG(ERROR) << "Unsupport transfer syntax for transcoding"; |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
429 return NULL; |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
430 } |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
431 |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
432 bool hasSopInstanceUidChanged; |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
433 |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
434 if (allowedSyntaxes.find(sourceSyntax) != allowedSyntaxes.end()) |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
435 { |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
436 // No transcoding is needed |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
437 return TranscodedDicom::CreateFromExternal(dicom, false /* no change in UID */); |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
438 } |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
439 else if (InplaceTranscode(hasSopInstanceUidChanged, dicom, |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
440 allowedSyntaxes, allowNewSopInstanceUid)) |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
441 { |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
442 return TranscodedDicom::CreateFromExternal(dicom, hasSopInstanceUidChanged); |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
443 } |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
444 else |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
445 { |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
446 // Cannot transcode |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
447 return NULL; |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
448 } |
|
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
449 } |
| 3893 | 450 } |