Mercurial > hg > orthanc
annotate OrthancFramework/Sources/DicomFormat/DicomImageInformation.cpp @ 4831:7053502fbf97
added copyright UCLouvain
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 25 Nov 2021 19:01:11 +0100 |
parents | 4cfd96732076 |
children | 43e613a7756b |
rev | line source |
---|---|
853 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1206
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
4437
d9473bd5ed43
upgrade to year 2021
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4312
diff
changeset
|
5 * Copyright (C) 2017-2021 Osimis S.A., Belgium |
4831
7053502fbf97
added copyright UCLouvain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4827
diff
changeset
|
6 * Copyright (C) 2021-2021 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
853 | 7 * |
8 * This program is free software: you can redistribute it and/or | |
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4076
diff
changeset
|
9 * modify it under the terms of the GNU Lesser General Public License |
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4076
diff
changeset
|
10 * as published by the Free Software Foundation, either version 3 of |
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4076
diff
changeset
|
11 * the License, or (at your option) any later version. |
3007 | 12 * |
853 | 13 * This program is distributed in the hope that it will be useful, but |
14 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4076
diff
changeset
|
16 * Lesser General Public License for more details. |
853 | 17 * |
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4076
diff
changeset
|
18 * You should have received a copy of the GNU Lesser General Public |
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4076
diff
changeset
|
19 * License along with this program. If not, see |
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4076
diff
changeset
|
20 * <http://www.gnu.org/licenses/>. |
853 | 21 **/ |
22 | |
23 | |
24 #include "../PrecompiledHeaders.h" | |
25 | |
26 #ifndef NOMINMAX | |
27 #define NOMINMAX | |
28 #endif | |
29 | |
30 #include "DicomImageInformation.h" | |
31 | |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
32 #include "../Compatibility.h" |
853 | 33 #include "../OrthancException.h" |
1206
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
34 #include "../Toolbox.h" |
853 | 35 #include <boost/lexical_cast.hpp> |
36 #include <limits> | |
37 #include <cassert> | |
38 #include <stdio.h> | |
2870 | 39 #include <memory> |
853 | 40 |
41 namespace Orthanc | |
42 { | |
43 DicomImageInformation::DicomImageInformation(const DicomMap& values) | |
44 { | |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
45 uint32_t pixelRepresentation = 0; |
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
46 uint32_t planarConfiguration = 0; |
853 | 47 |
48 try | |
49 { | |
1737
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
50 std::string p = values.GetValue(DICOM_TAG_PHOTOMETRIC_INTERPRETATION).GetContent(); |
1206
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
51 Toolbox::ToUpperCase(p); |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
52 |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
53 if (p == "RGB") |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
54 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
55 photometric_ = PhotometricInterpretation_RGB; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
56 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
57 else if (p == "MONOCHROME1") |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
58 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
59 photometric_ = PhotometricInterpretation_Monochrome1; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
60 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
61 else if (p == "MONOCHROME2") |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
62 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
63 photometric_ = PhotometricInterpretation_Monochrome2; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
64 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
65 else if (p == "PALETTE COLOR") |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
66 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
67 photometric_ = PhotometricInterpretation_Palette; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
68 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
69 else if (p == "HSV") |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
70 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
71 photometric_ = PhotometricInterpretation_HSV; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
72 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
73 else if (p == "ARGB") |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
74 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
75 photometric_ = PhotometricInterpretation_ARGB; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
76 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
77 else if (p == "CMYK") |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
78 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
79 photometric_ = PhotometricInterpretation_CMYK; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
80 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
81 else if (p == "YBR_FULL") |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
82 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
83 photometric_ = PhotometricInterpretation_YBRFull; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
84 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
85 else if (p == "YBR_FULL_422") |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
86 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
87 photometric_ = PhotometricInterpretation_YBRFull422; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
88 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
89 else if (p == "YBR_PARTIAL_420") |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
90 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
91 photometric_ = PhotometricInterpretation_YBRPartial420; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
92 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
93 else if (p == "YBR_PARTIAL_422") |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
94 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
95 photometric_ = PhotometricInterpretation_YBRPartial422; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
96 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
97 else if (p == "YBR_ICT") |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
98 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
99 photometric_ = PhotometricInterpretation_YBR_ICT; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
100 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
101 else if (p == "YBR_RCT") |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
102 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
103 photometric_ = PhotometricInterpretation_YBR_RCT; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
104 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
105 else |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
106 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
107 photometric_ = PhotometricInterpretation_Unknown; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
108 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
109 |
3519
fc26659493b6
added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images
amazy
parents:
3060
diff
changeset
|
110 values.GetValue(DICOM_TAG_COLUMNS).ParseFirstUnsignedInteger(width_); // in some US images, we've seen tag values of "800\0"; that's why we parse the 'first' value |
fc26659493b6
added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images
amazy
parents:
3060
diff
changeset
|
111 values.GetValue(DICOM_TAG_ROWS).ParseFirstUnsignedInteger(height_); |
fc26659493b6
added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images
amazy
parents:
3060
diff
changeset
|
112 |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
113 if (!values.ParseUnsignedInteger32(bitsAllocated_, DICOM_TAG_BITS_ALLOCATED)) |
853 | 114 { |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
115 throw OrthancException(ErrorCode_BadFileFormat); |
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
116 } |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
117 |
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
118 if (!values.ParseUnsignedInteger32(samplesPerPixel_, DICOM_TAG_SAMPLES_PER_PIXEL)) |
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
119 { |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
120 samplesPerPixel_ = 1; // Assume 1 color channel |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
121 } |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
122 |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
123 if (!values.ParseUnsignedInteger32(bitsStored_, DICOM_TAG_BITS_STORED)) |
853 | 124 { |
125 bitsStored_ = bitsAllocated_; | |
126 } | |
127 | |
4827
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
128 if (bitsStored_ > bitsAllocated_) |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
129 { |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
130 throw OrthancException(ErrorCode_BadFileFormat); |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
131 } |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
132 |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
133 if (!values.ParseUnsignedInteger32(highBit_, DICOM_TAG_HIGH_BIT)) |
853 | 134 { |
135 highBit_ = bitsStored_ - 1; | |
136 } | |
137 | |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
138 if (!values.ParseUnsignedInteger32(pixelRepresentation, DICOM_TAG_PIXEL_REPRESENTATION)) |
853 | 139 { |
140 pixelRepresentation = 0; // Assume unsigned pixels | |
141 } | |
142 | |
143 if (samplesPerPixel_ > 1) | |
144 { | |
145 // The "Planar Configuration" is only set when "Samples per Pixels" is greater than 1 | |
1908
5096681efce6
direct hyperlinks to the DICOM standard
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1905
diff
changeset
|
146 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#sect_C.7.6.3.1.3 |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
147 |
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
148 if (!values.ParseUnsignedInteger32(planarConfiguration, DICOM_TAG_PLANAR_CONFIGURATION)) |
853 | 149 { |
150 planarConfiguration = 0; // Assume interleaved color channels | |
151 } | |
152 } | |
153 } | |
154 catch (boost::bad_lexical_cast&) | |
155 { | |
156 throw OrthancException(ErrorCode_NotImplemented); | |
157 } | |
158 catch (OrthancException&) | |
159 { | |
160 throw OrthancException(ErrorCode_NotImplemented); | |
161 } | |
162 | |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
163 |
2416
feb0d2dcfa9b
try and fix compiler bugs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2279
diff
changeset
|
164 if (values.HasTag(DICOM_TAG_NUMBER_OF_FRAMES)) |
853 | 165 { |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
166 if (!values.ParseUnsignedInteger32(numberOfFrames_, DICOM_TAG_NUMBER_OF_FRAMES)) |
2416
feb0d2dcfa9b
try and fix compiler bugs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2279
diff
changeset
|
167 { |
feb0d2dcfa9b
try and fix compiler bugs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2279
diff
changeset
|
168 throw OrthancException(ErrorCode_NotImplemented); |
feb0d2dcfa9b
try and fix compiler bugs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2279
diff
changeset
|
169 } |
853 | 170 } |
2416
feb0d2dcfa9b
try and fix compiler bugs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2279
diff
changeset
|
171 else |
853 | 172 { |
2416
feb0d2dcfa9b
try and fix compiler bugs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2279
diff
changeset
|
173 numberOfFrames_ = 1; |
853 | 174 } |
175 | |
3007 | 176 if (bitsAllocated_ != 8 && bitsAllocated_ != 16 && |
4827
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
177 bitsAllocated_ != 24 && bitsAllocated_ != 32 && |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
178 bitsAllocated_ != 1 /* new in Orthanc 1.9.8 */) |
853 | 179 { |
3007 | 180 throw OrthancException(ErrorCode_IncompatibleImageFormat, "Image not supported: " + boost::lexical_cast<std::string>(bitsAllocated_) + " bits allocated"); |
181 } | |
182 else if (numberOfFrames_ == 0) | |
183 { | |
184 throw OrthancException(ErrorCode_IncompatibleImageFormat, "Image not supported (no frames)"); | |
185 } | |
186 else if (planarConfiguration != 0 && planarConfiguration != 1) | |
187 { | |
188 throw OrthancException(ErrorCode_IncompatibleImageFormat, "Image not supported: planar configuration is " + boost::lexical_cast<std::string>(planarConfiguration)); | |
853 | 189 } |
190 | |
191 if (samplesPerPixel_ == 0) | |
192 { | |
3007 | 193 throw OrthancException(ErrorCode_IncompatibleImageFormat, "Image not supported: samples per pixel is 0"); |
853 | 194 } |
195 | |
4827
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
196 if (bitsStored_ == 1) |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
197 { |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
198 // This is the case of DICOM SEG, new in Orthanc 1.9.8 |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
199 if (bitsAllocated_ != 1) |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
200 { |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
201 throw OrthancException(ErrorCode_BadFileFormat); |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
202 } |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
203 else if (width_ % 8 != 0) |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
204 { |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
205 throw OrthancException(ErrorCode_BadFileFormat, "Bad number of columns for a black-and-white image"); |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
206 } |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
207 else |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
208 { |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
209 bytesPerValue_ = 0; // Arbitrary initialization |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
210 } |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
211 } |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
212 else |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
213 { |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
214 bytesPerValue_ = bitsAllocated_ / 8; |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
215 } |
853 | 216 |
217 isPlanar_ = (planarConfiguration != 0 ? true : false); | |
218 isSigned_ = (pixelRepresentation != 0 ? true : false); | |
219 } | |
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
220 |
2870 | 221 DicomImageInformation* DicomImageInformation::Clone() const |
222 { | |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
223 std::unique_ptr<DicomImageInformation> target(new DicomImageInformation); |
2870 | 224 target->width_ = width_; |
225 target->height_ = height_; | |
226 target->samplesPerPixel_ = samplesPerPixel_; | |
227 target->numberOfFrames_ = numberOfFrames_; | |
228 target->isPlanar_ = isPlanar_; | |
229 target->isSigned_ = isSigned_; | |
230 target->bytesPerValue_ = bytesPerValue_; | |
231 target->bitsAllocated_ = bitsAllocated_; | |
232 target->bitsStored_ = bitsStored_; | |
233 target->highBit_ = highBit_; | |
234 target->photometric_ = photometric_; | |
235 | |
236 return target.release(); | |
237 } | |
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
238 |
4297 | 239 unsigned int DicomImageInformation::GetWidth() const |
4279
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
240 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
241 return width_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
242 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
243 |
4297 | 244 unsigned int DicomImageInformation::GetHeight() const |
4279
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
245 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
246 return height_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
247 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
248 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
249 unsigned int DicomImageInformation::GetNumberOfFrames() const |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
250 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
251 return numberOfFrames_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
252 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
253 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
254 unsigned int DicomImageInformation::GetChannelCount() const |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
255 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
256 return samplesPerPixel_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
257 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
258 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
259 unsigned int DicomImageInformation::GetBitsStored() const |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
260 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
261 return bitsStored_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
262 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
263 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
264 size_t DicomImageInformation::GetBytesPerValue() const |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
265 { |
4827
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
266 if (bitsStored_ == 1) |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
267 { |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
268 throw OrthancException(ErrorCode_BadSequenceOfCalls, |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
269 "This call is incompatible with black-and-white images"); |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
270 } |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
271 else |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
272 { |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
273 assert(bitsAllocated_ >= 8); |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
274 return bytesPerValue_; |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
275 } |
4279
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
276 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
277 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
278 bool DicomImageInformation::IsSigned() const |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
279 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
280 return isSigned_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
281 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
282 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
283 unsigned int DicomImageInformation::GetBitsAllocated() const |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
284 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
285 return bitsAllocated_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
286 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
287 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
288 unsigned int DicomImageInformation::GetHighBit() const |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
289 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
290 return highBit_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
291 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
292 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
293 bool DicomImageInformation::IsPlanar() const |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
294 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
295 return isPlanar_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
296 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
297 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
298 unsigned int DicomImageInformation::GetShift() const |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
299 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
300 return highBit_ + 1 - bitsStored_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
301 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
302 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
303 PhotometricInterpretation DicomImageInformation::GetPhotometricInterpretation() const |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
304 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
305 return photometric_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
306 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
307 |
1905
8b1baa2315b8
Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
308 bool DicomImageInformation::ExtractPixelFormat(PixelFormat& format, |
8b1baa2315b8
Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
309 bool ignorePhotometricInterpretation) const |
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
310 { |
1905
8b1baa2315b8
Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
311 if (photometric_ == PhotometricInterpretation_Palette) |
8b1baa2315b8
Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
312 { |
2423
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
313 if (GetBitsStored() == 8 && GetChannelCount() == 1 && !IsSigned()) |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
314 { |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
315 format = PixelFormat_RGB24; |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
316 return true; |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
317 } |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
318 |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
319 if (GetBitsStored() == 16 && GetChannelCount() == 1 && !IsSigned()) |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
320 { |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
321 format = PixelFormat_RGB48; |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
322 return true; |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
323 } |
1905
8b1baa2315b8
Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
324 } |
2423
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
325 |
1905
8b1baa2315b8
Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
326 if (ignorePhotometricInterpretation || |
8b1baa2315b8
Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
327 photometric_ == PhotometricInterpretation_Monochrome1 || |
1206
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
328 photometric_ == PhotometricInterpretation_Monochrome2) |
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
329 { |
1206
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
330 if (GetBitsStored() == 8 && GetChannelCount() == 1 && !IsSigned()) |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
331 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
332 format = PixelFormat_Grayscale8; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
333 return true; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
334 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
335 |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
336 if (GetBitsAllocated() == 16 && GetChannelCount() == 1 && !IsSigned()) |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
337 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
338 format = PixelFormat_Grayscale16; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
339 return true; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
340 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
341 |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
342 if (GetBitsAllocated() == 16 && GetChannelCount() == 1 && IsSigned()) |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
343 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
344 format = PixelFormat_SignedGrayscale16; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
345 return true; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
346 } |
2838
f3a2d109e361
new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
347 |
f3a2d109e361
new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
348 if (GetBitsAllocated() == 32 && GetChannelCount() == 1 && !IsSigned()) |
f3a2d109e361
new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
349 { |
f3a2d109e361
new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
350 format = PixelFormat_Grayscale32; |
f3a2d109e361
new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
351 return true; |
f3a2d109e361
new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
352 } |
4827
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
353 |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
354 if (GetBitsStored() == 1 && GetChannelCount() == 1 && !IsSigned()) |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
355 { |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
356 // This is the case of DICOM SEG, new in Orthanc 1.9.8 |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
357 format = PixelFormat_Grayscale8; |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
358 return true; |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
359 } |
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
360 } |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
361 |
3007 | 362 if (GetBitsStored() == 8 && |
363 GetChannelCount() == 3 && | |
1206
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
364 !IsSigned() && |
1905
8b1baa2315b8
Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
365 (ignorePhotometricInterpretation || photometric_ == PhotometricInterpretation_RGB)) |
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
366 { |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
367 format = PixelFormat_RGB24; |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
368 return true; |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
369 } |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
370 |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
371 return false; |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
372 } |
1924
6c73df12ca51
New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1908
diff
changeset
|
373 |
6c73df12ca51
New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1908
diff
changeset
|
374 |
6c73df12ca51
New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1908
diff
changeset
|
375 size_t DicomImageInformation::GetFrameSize() const |
6c73df12ca51
New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1908
diff
changeset
|
376 { |
4827
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
377 if (bitsStored_ == 1) |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
378 { |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
379 assert(GetWidth() % 8 == 0); |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
380 |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
381 if (GetChannelCount() == 1) |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
382 { |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
383 return GetHeight() * GetWidth() / 8; |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
384 } |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
385 else |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
386 { |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
387 throw OrthancException(ErrorCode_IncompatibleImageFormat, |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
388 "Image not supported (multi-channel black-and-image image)"); |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
389 } |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
390 } |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
391 else |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
392 { |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
393 return (GetHeight() * |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
394 GetWidth() * |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
395 GetBytesPerValue() * |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
396 GetChannelCount()); |
4cfd96732076
Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
397 } |
1924
6c73df12ca51
New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1908
diff
changeset
|
398 } |
4312
6d49e3b6ff77
fix abi of DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4297
diff
changeset
|
399 |
6d49e3b6ff77
fix abi of DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4297
diff
changeset
|
400 |
6d49e3b6ff77
fix abi of DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4297
diff
changeset
|
401 unsigned int DicomImageInformation::GetUsefulTagLength() |
6d49e3b6ff77
fix abi of DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4297
diff
changeset
|
402 { |
6d49e3b6ff77
fix abi of DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4297
diff
changeset
|
403 return 256; |
6d49e3b6ff77
fix abi of DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4297
diff
changeset
|
404 } |
853 | 405 } |