Mercurial > hg > orthanc
annotate OrthancFramework/Sources/DicomFormat/DicomImageInformation.cpp @ 5485:48b8dae6dc77
upgrade to year 2024
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 04 Jan 2024 15:10:42 +0100 |
parents | 59e3b6f8c5be |
children | f7adfb22e20e |
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 |
5485
48b8dae6dc77
upgrade to year 2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5432
diff
changeset
|
5 * Copyright (C) 2017-2024 Osimis S.A., Belgium |
48b8dae6dc77
upgrade to year 2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5432
diff
changeset
|
6 * Copyright (C) 2021-2024 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" |
4882 | 33 #include "../Logging.h" |
853 | 34 #include "../OrthancException.h" |
1206
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
35 #include "../Toolbox.h" |
4882 | 36 |
853 | 37 #include <boost/lexical_cast.hpp> |
38 #include <limits> | |
39 #include <cassert> | |
40 #include <stdio.h> | |
2870 | 41 #include <memory> |
853 | 42 |
43 namespace Orthanc | |
44 { | |
45 DicomImageInformation::DicomImageInformation(const DicomMap& values) | |
46 { | |
4881
e1ef13ae8fbd
added warning message in DicomImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4870
diff
changeset
|
47 std::string sopClassUid; |
e1ef13ae8fbd
added warning message in DicomImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4870
diff
changeset
|
48 if (values.LookupStringValue(sopClassUid, DICOM_TAG_SOP_CLASS_UID, false)) |
e1ef13ae8fbd
added warning message in DicomImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4870
diff
changeset
|
49 { |
e1ef13ae8fbd
added warning message in DicomImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4870
diff
changeset
|
50 sopClassUid = Toolbox::StripSpaces(sopClassUid); |
e1ef13ae8fbd
added warning message in DicomImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4870
diff
changeset
|
51 if (sopClassUid == "1.2.840.10008.5.1.4.1.1.481.3" /* RT-STRUCT */) |
e1ef13ae8fbd
added warning message in DicomImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4870
diff
changeset
|
52 { |
e1ef13ae8fbd
added warning message in DicomImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4870
diff
changeset
|
53 LOG(WARNING) << "Orthanc::DicomImageInformation() should not be applied to SOP Class UID: " << sopClassUid; |
e1ef13ae8fbd
added warning message in DicomImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4870
diff
changeset
|
54 } |
e1ef13ae8fbd
added warning message in DicomImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4870
diff
changeset
|
55 } |
e1ef13ae8fbd
added warning message in DicomImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4870
diff
changeset
|
56 |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
57 uint32_t pixelRepresentation = 0; |
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
58 uint32_t planarConfiguration = 0; |
853 | 59 |
60 try | |
61 { | |
5415
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
62 std::string p; |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
63 if (values.LookupStringValue(p, DICOM_TAG_PHOTOMETRIC_INTERPRETATION, false)) { |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
64 Toolbox::ToUpperCase(p); |
1206
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
65 |
5415
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
66 if (p == "RGB") |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
67 { |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
68 photometric_ = PhotometricInterpretation_RGB; |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
69 } |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
70 else if (p == "MONOCHROME1") |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
71 { |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
72 photometric_ = PhotometricInterpretation_Monochrome1; |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
73 } |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
74 else if (p == "MONOCHROME2") |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
75 { |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
76 photometric_ = PhotometricInterpretation_Monochrome2; |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
77 } |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
78 else if (p == "PALETTE COLOR") |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
79 { |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
80 photometric_ = PhotometricInterpretation_Palette; |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
81 } |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
82 else if (p == "HSV") |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
83 { |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
84 photometric_ = PhotometricInterpretation_HSV; |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
85 } |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
86 else if (p == "ARGB") |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
87 { |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
88 photometric_ = PhotometricInterpretation_ARGB; |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
89 } |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
90 else if (p == "CMYK") |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
91 { |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
92 photometric_ = PhotometricInterpretation_CMYK; |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
93 } |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
94 else if (p == "YBR_FULL") |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
95 { |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
96 photometric_ = PhotometricInterpretation_YBRFull; |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
97 } |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
98 else if (p == "YBR_FULL_422") |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
99 { |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
100 photometric_ = PhotometricInterpretation_YBRFull422; |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
101 } |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
102 else if (p == "YBR_PARTIAL_420") |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
103 { |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
104 photometric_ = PhotometricInterpretation_YBRPartial420; |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
105 } |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
106 else if (p == "YBR_PARTIAL_422") |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
107 { |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
108 photometric_ = PhotometricInterpretation_YBRPartial422; |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
109 } |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
110 else if (p == "YBR_ICT") |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
111 { |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
112 photometric_ = PhotometricInterpretation_YBR_ICT; |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
113 } |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
114 else if (p == "YBR_RCT") |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
115 { |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
116 photometric_ = PhotometricInterpretation_YBR_RCT; |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
117 } |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
118 else |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
119 { |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
120 photometric_ = PhotometricInterpretation_Unknown; |
1c6708a0e0c6
tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5323
diff
changeset
|
121 } |
1206
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
122 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
123 else |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
124 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
125 photometric_ = PhotometricInterpretation_Unknown; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
126 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
127 |
3519
fc26659493b6
added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images
amazy
parents:
3060
diff
changeset
|
128 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
|
129 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
|
130 |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
131 if (!values.ParseUnsignedInteger32(bitsAllocated_, DICOM_TAG_BITS_ALLOCATED)) |
853 | 132 { |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
133 throw OrthancException(ErrorCode_BadFileFormat); |
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
134 } |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
135 |
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
136 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
|
137 { |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
138 samplesPerPixel_ = 1; // Assume 1 color channel |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
139 } |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
140 |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
141 if (!values.ParseUnsignedInteger32(bitsStored_, DICOM_TAG_BITS_STORED)) |
853 | 142 { |
143 bitsStored_ = bitsAllocated_; | |
144 } | |
145 | |
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
|
146 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
|
147 { |
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
|
148 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
|
149 } |
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
|
150 |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
151 if (!values.ParseUnsignedInteger32(highBit_, DICOM_TAG_HIGH_BIT)) |
853 | 152 { |
153 highBit_ = bitsStored_ - 1; | |
154 } | |
155 | |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
156 if (!values.ParseUnsignedInteger32(pixelRepresentation, DICOM_TAG_PIXEL_REPRESENTATION)) |
853 | 157 { |
158 pixelRepresentation = 0; // Assume unsigned pixels | |
159 } | |
160 | |
161 if (samplesPerPixel_ > 1) | |
162 { | |
163 // 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
|
164 // 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
|
165 |
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
166 if (!values.ParseUnsignedInteger32(planarConfiguration, DICOM_TAG_PLANAR_CONFIGURATION)) |
853 | 167 { |
168 planarConfiguration = 0; // Assume interleaved color channels | |
169 } | |
170 } | |
171 } | |
172 catch (boost::bad_lexical_cast&) | |
173 { | |
174 throw OrthancException(ErrorCode_NotImplemented); | |
175 } | |
176 catch (OrthancException&) | |
177 { | |
178 throw OrthancException(ErrorCode_NotImplemented); | |
179 } | |
180 | |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
181 |
2416
feb0d2dcfa9b
try and fix compiler bugs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2279
diff
changeset
|
182 if (values.HasTag(DICOM_TAG_NUMBER_OF_FRAMES)) |
853 | 183 { |
4076
eab8010c05fc
avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
184 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
|
185 { |
feb0d2dcfa9b
try and fix compiler bugs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2279
diff
changeset
|
186 throw OrthancException(ErrorCode_NotImplemented); |
feb0d2dcfa9b
try and fix compiler bugs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2279
diff
changeset
|
187 } |
853 | 188 } |
2416
feb0d2dcfa9b
try and fix compiler bugs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2279
diff
changeset
|
189 else |
853 | 190 { |
2416
feb0d2dcfa9b
try and fix compiler bugs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2279
diff
changeset
|
191 numberOfFrames_ = 1; |
853 | 192 } |
193 | |
3007 | 194 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
|
195 bitsAllocated_ != 24 && bitsAllocated_ != 32 && |
4902
df86d2505df8
Orthanc 1.9.8 is now known as Orthanc 1.10.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4882
diff
changeset
|
196 bitsAllocated_ != 1 /* new in Orthanc 1.10.0 */) |
853 | 197 { |
3007 | 198 throw OrthancException(ErrorCode_IncompatibleImageFormat, "Image not supported: " + boost::lexical_cast<std::string>(bitsAllocated_) + " bits allocated"); |
199 } | |
200 else if (numberOfFrames_ == 0) | |
201 { | |
202 throw OrthancException(ErrorCode_IncompatibleImageFormat, "Image not supported (no frames)"); | |
203 } | |
204 else if (planarConfiguration != 0 && planarConfiguration != 1) | |
205 { | |
206 throw OrthancException(ErrorCode_IncompatibleImageFormat, "Image not supported: planar configuration is " + boost::lexical_cast<std::string>(planarConfiguration)); | |
853 | 207 } |
208 | |
209 if (samplesPerPixel_ == 0) | |
210 { | |
3007 | 211 throw OrthancException(ErrorCode_IncompatibleImageFormat, "Image not supported: samples per pixel is 0"); |
853 | 212 } |
213 | |
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
|
214 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
|
215 { |
4902
df86d2505df8
Orthanc 1.9.8 is now known as Orthanc 1.10.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4882
diff
changeset
|
216 // This is the case of DICOM SEG, new in Orthanc 1.10.0 |
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
|
217 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
|
218 { |
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
|
219 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
|
220 } |
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
|
221 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
|
222 { |
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
|
223 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
|
224 } |
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
|
225 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
|
226 { |
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
|
227 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
|
228 } |
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
|
229 } |
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
|
230 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
|
231 { |
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
|
232 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
|
233 } |
853 | 234 |
235 isPlanar_ = (planarConfiguration != 0 ? true : false); | |
236 isSigned_ = (pixelRepresentation != 0 ? true : false); | |
237 } | |
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
238 |
2870 | 239 DicomImageInformation* DicomImageInformation::Clone() const |
240 { | |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
241 std::unique_ptr<DicomImageInformation> target(new DicomImageInformation); |
2870 | 242 target->width_ = width_; |
243 target->height_ = height_; | |
244 target->samplesPerPixel_ = samplesPerPixel_; | |
245 target->numberOfFrames_ = numberOfFrames_; | |
246 target->isPlanar_ = isPlanar_; | |
247 target->isSigned_ = isSigned_; | |
248 target->bytesPerValue_ = bytesPerValue_; | |
249 target->bitsAllocated_ = bitsAllocated_; | |
250 target->bitsStored_ = bitsStored_; | |
251 target->highBit_ = highBit_; | |
252 target->photometric_ = photometric_; | |
253 | |
254 return target.release(); | |
255 } | |
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
256 |
4297 | 257 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
|
258 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
259 return width_; |
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 |
4297 | 262 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
|
263 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
264 return height_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
265 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
266 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
267 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
|
268 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
269 return numberOfFrames_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
270 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
271 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
272 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
|
273 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
274 return samplesPerPixel_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
275 } |
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 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
|
278 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
279 return bitsStored_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
280 } |
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 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
|
283 { |
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
|
284 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
|
285 { |
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
|
286 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
|
287 "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
|
288 } |
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
|
289 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
|
290 { |
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
|
291 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
|
292 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
|
293 } |
4279
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 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
296 bool DicomImageInformation::IsSigned() const |
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 return isSigned_; |
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 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
301 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
|
302 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
303 return bitsAllocated_; |
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 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
306 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
|
307 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
308 return highBit_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
309 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
310 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
311 bool DicomImageInformation::IsPlanar() const |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
312 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
313 return isPlanar_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
314 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
315 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
316 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
|
317 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
318 return highBit_ + 1 - bitsStored_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
319 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
320 |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
321 PhotometricInterpretation DicomImageInformation::GetPhotometricInterpretation() const |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
322 { |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
323 return photometric_; |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
324 } |
ab4d015af660
moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
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 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
|
327 bool ignorePhotometricInterpretation) const |
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
328 { |
1905
8b1baa2315b8
Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
329 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
|
330 { |
2423
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
331 if (GetBitsStored() == 8 && GetChannelCount() == 1 && !IsSigned()) |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
332 { |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
333 format = PixelFormat_RGB24; |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
334 return true; |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
335 } |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
336 |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
337 if (GetBitsStored() == 16 && GetChannelCount() == 1 && !IsSigned()) |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
338 { |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
339 format = PixelFormat_RGB48; |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
340 return true; |
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
341 } |
1905
8b1baa2315b8
Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
342 } |
2423
5a7c5c541a1d
Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2416
diff
changeset
|
343 |
1905
8b1baa2315b8
Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
344 if (ignorePhotometricInterpretation || |
8b1baa2315b8
Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
345 photometric_ == PhotometricInterpretation_Monochrome1 || |
1206
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
346 photometric_ == PhotometricInterpretation_Monochrome2) |
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
347 { |
1206
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
348 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
|
349 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
350 format = PixelFormat_Grayscale8; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
351 return true; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
352 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
353 |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
354 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
|
355 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
356 format = PixelFormat_Grayscale16; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
357 return true; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
358 } |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
359 |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
360 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
|
361 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
362 format = PixelFormat_SignedGrayscale16; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
363 return true; |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
364 } |
2838
f3a2d109e361
new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
365 |
f3a2d109e361
new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
366 if (GetBitsAllocated() == 32 && GetChannelCount() == 1 && !IsSigned()) |
f3a2d109e361
new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
367 { |
f3a2d109e361
new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
368 format = PixelFormat_Grayscale32; |
f3a2d109e361
new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
369 return true; |
f3a2d109e361
new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
370 } |
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
|
371 |
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
|
372 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
|
373 { |
4902
df86d2505df8
Orthanc 1.9.8 is now known as Orthanc 1.10.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4882
diff
changeset
|
374 // This is the case of DICOM SEG, new in Orthanc 1.10.0 |
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
|
375 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
|
376 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
|
377 } |
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
378 } |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
379 |
3007 | 380 if (GetBitsStored() == 8 && |
381 GetChannelCount() == 3 && | |
1206
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
863
diff
changeset
|
382 !IsSigned() && |
1905
8b1baa2315b8
Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
383 (ignorePhotometricInterpretation || photometric_ == PhotometricInterpretation_RGB)) |
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
384 { |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
385 format = PixelFormat_RGB24; |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
386 return true; |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
387 } |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
388 |
5054
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4902
diff
changeset
|
389 if (GetBitsStored() == 16 && |
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4902
diff
changeset
|
390 GetChannelCount() == 3 && |
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4902
diff
changeset
|
391 !IsSigned() && |
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4902
diff
changeset
|
392 (ignorePhotometricInterpretation || photometric_ == PhotometricInterpretation_RGB)) |
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4902
diff
changeset
|
393 { |
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4902
diff
changeset
|
394 format = PixelFormat_RGB48; |
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4902
diff
changeset
|
395 return true; |
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4902
diff
changeset
|
396 } |
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4902
diff
changeset
|
397 |
854
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
398 return false; |
ff530685e46a
fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
853
diff
changeset
|
399 } |
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
|
400 |
6c73df12ca51
New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1908
diff
changeset
|
401 |
6c73df12ca51
New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1908
diff
changeset
|
402 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
|
403 { |
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
|
404 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
|
405 { |
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
|
406 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
|
407 |
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
|
408 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
|
409 { |
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
|
410 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
|
411 } |
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
|
412 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
|
413 { |
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
|
414 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
|
415 "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
|
416 } |
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
|
417 } |
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
|
418 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
|
419 { |
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
|
420 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
|
421 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
|
422 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
|
423 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
|
424 } |
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
|
425 } |
4312
6d49e3b6ff77
fix abi of DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4297
diff
changeset
|
426 |
6d49e3b6ff77
fix abi of DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4297
diff
changeset
|
427 |
6d49e3b6ff77
fix abi of DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4297
diff
changeset
|
428 unsigned int DicomImageInformation::GetUsefulTagLength() |
6d49e3b6ff77
fix abi of DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4297
diff
changeset
|
429 { |
6d49e3b6ff77
fix abi of DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4297
diff
changeset
|
430 return 256; |
6d49e3b6ff77
fix abi of DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4297
diff
changeset
|
431 } |
5323
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
432 |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
433 |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
434 ValueRepresentation DicomImageInformation::GuessPixelDataValueRepresentation(const DicomTransferSyntax& transferSyntax, |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
435 unsigned int bitsAllocated) |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
436 { |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
437 /** |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
438 * This approach is validated in "Tests/GuessPixelDataVR.py": |
5432
59e3b6f8c5be
migration to UCLouvain servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5415
diff
changeset
|
439 * https://orthanc.uclouvain.be/hg/orthanc-tests/file/default/Tests/GuessPixelDataVR.py |
5323
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
440 **/ |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
441 |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
442 if (transferSyntax == DicomTransferSyntax_LittleEndianExplicit || |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
443 transferSyntax == DicomTransferSyntax_BigEndianExplicit) |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
444 { |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
445 /** |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
446 * Same rules apply to Little Endian Explicit and Big Endian |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
447 * Explicit (now retired). The VR of the pixel data directly |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
448 * depends upon the "Bits Allocated (0028,0100)" tag: |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
449 * https://dicom.nema.org/medical/dicom/current/output/chtml/part05/sect_A.2.html |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
450 * https://dicom.nema.org/medical/dicom/2016b/output/chtml/part05/sect_A.3.html |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
451 **/ |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
452 if (bitsAllocated > 8) |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
453 { |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
454 return ValueRepresentation_OtherWord; |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
455 } |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
456 else |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
457 { |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
458 return ValueRepresentation_OtherByte; |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
459 } |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
460 } |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
461 else if (transferSyntax == DicomTransferSyntax_LittleEndianImplicit) |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
462 { |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
463 // Assume "OW" for DICOM Implicit VR Little Endian Transfer Syntax |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
464 // https://dicom.nema.org/medical/dicom/current/output/chtml/part05/chapter_A.html#sect_A.1 |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
465 return ValueRepresentation_OtherWord; |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
466 } |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
467 else |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
468 { |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
469 // Assume "OB" for all the compressed transfer syntaxes |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
470 // https://dicom.nema.org/medical/dicom/current/output/chtml/part05/sect_A.4.html |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
471 return ValueRepresentation_OtherByte; |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
472 } |
138e9d0c08c1
added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
473 } |
853 | 474 } |