Mercurial > hg > orthanc

annotate OrthancFramework/Sources/DicomFormat/DicomImageInformation.cpp @ 5803:e219e272650d find-refactoring tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix retrieval of grandchildren info + cleanup
author Alain Mazy <am@orthanc.team>
date Fri, 20 Sep 2024 18:18:52 +0200
parents f7adfb22e20e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
1900
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
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
5640
f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5485
diff changeset
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5485
diff changeset
6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium
5485
48b8dae6dc77 upgrade to year 2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5432
diff changeset
7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 *
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * 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
10 * 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
11 * 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
12 * the License, or (at your option) any later version.
3007
c9f93628215a more error details
am@osimis.io
parents: 2870
diff changeset
13 *
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * This program is distributed in the hope that it will be useful, but
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * WITHOUT ANY WARRANTY; without even the implied warranty of
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * 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
17 * Lesser General Public License for more details.
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 *
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
19 * 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
20 * 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
21 * <http://www.gnu.org/licenses/>.
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 **/
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 #include "../PrecompiledHeaders.h"
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 #ifndef NOMINMAX
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 #define NOMINMAX
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 #endif
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 #include "DicomImageInformation.h"
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
3712
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
33 #include "../Compatibility.h"
4882
6971ea27a2a9 fix build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4881
diff changeset
34 #include "../Logging.h"
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 #include "../OrthancException.h"
1206
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
36 #include "../Toolbox.h"
4882
6971ea27a2a9 fix build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4881
diff changeset
37
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 #include <boost/lexical_cast.hpp>
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 #include <limits>
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 #include <cassert>
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 #include <stdio.h>
2870
716dd24974ef DicomImageInformation::Clone()
am@osimis.io
parents: 2838
diff changeset
42 #include <memory>
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 namespace Orthanc
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 {
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 DicomImageInformation::DicomImageInformation(const DicomMap& values)
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 {
4881
e1ef13ae8fbd added warning message in DicomImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4870
diff changeset
48 std::string sopClassUid;
e1ef13ae8fbd added warning message in DicomImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4870
diff changeset
49 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
50 {
e1ef13ae8fbd added warning message in DicomImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4870
diff changeset
51 sopClassUid = Toolbox::StripSpaces(sopClassUid);
e1ef13ae8fbd added warning message in DicomImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4870
diff changeset
52 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
53 {
e1ef13ae8fbd added warning message in DicomImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4870
diff changeset
54 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
55 }
e1ef13ae8fbd added warning message in DicomImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4870
diff changeset
56 }
e1ef13ae8fbd added warning message in DicomImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4870
diff changeset
57
4076
eab8010c05fc avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
58 uint32_t pixelRepresentation = 0;
eab8010c05fc avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
59 uint32_t planarConfiguration = 0;
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 try
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 {
5415
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
63 std::string p;
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
64 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
65 Toolbox::ToUpperCase(p);
1206
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
66
5415
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
67 if (p == "RGB")
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
68 {
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
69 photometric_ = PhotometricInterpretation_RGB;
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
70 }
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
71 else if (p == "MONOCHROME1")
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
72 {
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
73 photometric_ = PhotometricInterpretation_Monochrome1;
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
74 }
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
75 else if (p == "MONOCHROME2")
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
76 {
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
77 photometric_ = PhotometricInterpretation_Monochrome2;
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
78 }
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
79 else if (p == "PALETTE COLOR")
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
80 {
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
81 photometric_ = PhotometricInterpretation_Palette;
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
82 }
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
83 else if (p == "HSV")
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
84 {
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
85 photometric_ = PhotometricInterpretation_HSV;
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
86 }
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
87 else if (p == "ARGB")
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
88 {
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
89 photometric_ = PhotometricInterpretation_ARGB;
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
90 }
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
91 else if (p == "CMYK")
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
92 {
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
93 photometric_ = PhotometricInterpretation_CMYK;
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
94 }
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
95 else if (p == "YBR_FULL")
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
96 {
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
97 photometric_ = PhotometricInterpretation_YBRFull;
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
98 }
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
99 else if (p == "YBR_FULL_422")
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
100 {
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
101 photometric_ = PhotometricInterpretation_YBRFull422;
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
102 }
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
103 else if (p == "YBR_PARTIAL_420")
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
104 {
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
105 photometric_ = PhotometricInterpretation_YBRPartial420;
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
106 }
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
107 else if (p == "YBR_PARTIAL_422")
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
108 {
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
109 photometric_ = PhotometricInterpretation_YBRPartial422;
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
110 }
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
111 else if (p == "YBR_ICT")
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
112 {
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
113 photometric_ = PhotometricInterpretation_YBR_ICT;
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
114 }
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
115 else if (p == "YBR_RCT")
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
116 {
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
117 photometric_ = PhotometricInterpretation_YBR_RCT;
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
118 }
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
119 else
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
120 {
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
121 photometric_ = PhotometricInterpretation_Unknown;
1c6708a0e0c6 tolerance if photometric interpretation is not set
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5323
diff changeset
122 }
1206
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
123 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
124 else
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
125 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
126 photometric_ = PhotometricInterpretation_Unknown;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
127 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
128
3519
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_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
130 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
131
4076
eab8010c05fc avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
132 if (!values.ParseUnsignedInteger32(bitsAllocated_, DICOM_TAG_BITS_ALLOCATED))
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 {
4076
eab8010c05fc avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
134 throw OrthancException(ErrorCode_BadFileFormat);
854
ff530685e46a fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
135 }
4076
eab8010c05fc avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
136
eab8010c05fc avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
137 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
138 {
ff530685e46a fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
139 samplesPerPixel_ = 1; // Assume 1 color channel
ff530685e46a fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
140 }
ff530685e46a fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
141
4076
eab8010c05fc avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
142 if (!values.ParseUnsignedInteger32(bitsStored_, DICOM_TAG_BITS_STORED))
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 {
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 bitsStored_ = bitsAllocated_;
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145 }
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146
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
147 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
148 {
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 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
150 }
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
151
4076
eab8010c05fc avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
152 if (!values.ParseUnsignedInteger32(highBit_, DICOM_TAG_HIGH_BIT))
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 {
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 highBit_ = bitsStored_ - 1;
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 }
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156
4076
eab8010c05fc avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
157 if (!values.ParseUnsignedInteger32(pixelRepresentation, DICOM_TAG_PIXEL_REPRESENTATION))
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158 {
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159 pixelRepresentation = 0; // Assume unsigned pixels
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 }
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 if (samplesPerPixel_ > 1)
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 {
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164 // 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
165 // 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
166
eab8010c05fc avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
167 if (!values.ParseUnsignedInteger32(planarConfiguration, DICOM_TAG_PLANAR_CONFIGURATION))
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 {
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169 planarConfiguration = 0; // Assume interleaved color channels
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170 }
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171 }
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172 }
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173 catch (boost::bad_lexical_cast&)
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174 {
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
175 throw OrthancException(ErrorCode_NotImplemented);
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176 }
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177 catch (OrthancException&)
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178 {
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179 throw OrthancException(ErrorCode_NotImplemented);
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 }
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181
4076
eab8010c05fc avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
182
2416
feb0d2dcfa9b try and fix compiler bugs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2279
diff changeset
183 if (values.HasTag(DICOM_TAG_NUMBER_OF_FRAMES))
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184 {
4076
eab8010c05fc avoid relying on boost::bad_lexical_cast in DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
185 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
186 {
feb0d2dcfa9b try and fix compiler bugs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2279
diff changeset
187 throw OrthancException(ErrorCode_NotImplemented);
feb0d2dcfa9b try and fix compiler bugs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2279
diff changeset
188 }
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 }
2416
feb0d2dcfa9b try and fix compiler bugs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2279
diff changeset
190 else
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 {
2416
feb0d2dcfa9b try and fix compiler bugs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2279
diff changeset
192 numberOfFrames_ = 1;
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 }
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194
3007
c9f93628215a more error details
am@osimis.io
parents: 2870
diff changeset
195 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
196 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
197 bitsAllocated_ != 1 /* new in Orthanc 1.10.0 */)
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 {
3007
c9f93628215a more error details
am@osimis.io
parents: 2870
diff changeset
199 throw OrthancException(ErrorCode_IncompatibleImageFormat, "Image not supported: " + boost::lexical_cast<std::string>(bitsAllocated_) + " bits allocated");
c9f93628215a more error details
am@osimis.io
parents: 2870
diff changeset
200 }
c9f93628215a more error details
am@osimis.io
parents: 2870
diff changeset
201 else if (numberOfFrames_ == 0)
c9f93628215a more error details
am@osimis.io
parents: 2870
diff changeset
202 {
c9f93628215a more error details
am@osimis.io
parents: 2870
diff changeset
203 throw OrthancException(ErrorCode_IncompatibleImageFormat, "Image not supported (no frames)");
c9f93628215a more error details
am@osimis.io
parents: 2870
diff changeset
204 }
c9f93628215a more error details
am@osimis.io
parents: 2870
diff changeset
205 else if (planarConfiguration != 0 && planarConfiguration != 1)
c9f93628215a more error details
am@osimis.io
parents: 2870
diff changeset
206 {
c9f93628215a more error details
am@osimis.io
parents: 2870
diff changeset
207 throw OrthancException(ErrorCode_IncompatibleImageFormat, "Image not supported: planar configuration is " + boost::lexical_cast<std::string>(planarConfiguration));
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
208 }
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
209
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
210 if (samplesPerPixel_ == 0)
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
211 {
3007
c9f93628215a more error details
am@osimis.io
parents: 2870
diff changeset
212 throw OrthancException(ErrorCode_IncompatibleImageFormat, "Image not supported: samples per pixel is 0");
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
213 }
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
214
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
215 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
216 {
4902
df86d2505df8 Orthanc 1.9.8 is now known as Orthanc 1.10.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4882
diff changeset
217 // 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
218 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
219 {
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 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
221 }
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 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
223 {
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 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
225 }
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 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
227 {
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 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
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 }
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 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
232 {
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 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
234 }
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
235
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
236 isPlanar_ = (planarConfiguration != 0 ? true : false);
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
237 isSigned_ = (pixelRepresentation != 0 ? true : false);
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
238 }
854
ff530685e46a fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
239
2870
716dd24974ef DicomImageInformation::Clone()
am@osimis.io
parents: 2838
diff changeset
240 DicomImageInformation* DicomImageInformation::Clone() const
716dd24974ef DicomImageInformation::Clone()
am@osimis.io
parents: 2838
diff changeset
241 {
3712
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
242 std::unique_ptr<DicomImageInformation> target(new DicomImageInformation);
2870
716dd24974ef DicomImageInformation::Clone()
am@osimis.io
parents: 2838
diff changeset
243 target->width_ = width_;
716dd24974ef DicomImageInformation::Clone()
am@osimis.io
parents: 2838
diff changeset
244 target->height_ = height_;
716dd24974ef DicomImageInformation::Clone()
am@osimis.io
parents: 2838
diff changeset
245 target->samplesPerPixel_ = samplesPerPixel_;
716dd24974ef DicomImageInformation::Clone()
am@osimis.io
parents: 2838
diff changeset
246 target->numberOfFrames_ = numberOfFrames_;
716dd24974ef DicomImageInformation::Clone()
am@osimis.io
parents: 2838
diff changeset
247 target->isPlanar_ = isPlanar_;
716dd24974ef DicomImageInformation::Clone()
am@osimis.io
parents: 2838
diff changeset
248 target->isSigned_ = isSigned_;
716dd24974ef DicomImageInformation::Clone()
am@osimis.io
parents: 2838
diff changeset
249 target->bytesPerValue_ = bytesPerValue_;
716dd24974ef DicomImageInformation::Clone()
am@osimis.io
parents: 2838
diff changeset
250 target->bitsAllocated_ = bitsAllocated_;
716dd24974ef DicomImageInformation::Clone()
am@osimis.io
parents: 2838
diff changeset
251 target->bitsStored_ = bitsStored_;
716dd24974ef DicomImageInformation::Clone()
am@osimis.io
parents: 2838
diff changeset
252 target->highBit_ = highBit_;
716dd24974ef DicomImageInformation::Clone()
am@osimis.io
parents: 2838
diff changeset
253 target->photometric_ = photometric_;
716dd24974ef DicomImageInformation::Clone()
am@osimis.io
parents: 2838
diff changeset
254
716dd24974ef DicomImageInformation::Clone()
am@osimis.io
parents: 2838
diff changeset
255 return target.release();
716dd24974ef DicomImageInformation::Clone()
am@osimis.io
parents: 2838
diff changeset
256 }
854
ff530685e46a fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
257
4297
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4279
diff changeset
258 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
259 {
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
260 return width_;
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
261 }
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
262
4297
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4279
diff changeset
263 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
264 {
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
265 return height_;
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
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
268 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
269 {
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
270 return numberOfFrames_;
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
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
273 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
274 {
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
275 return samplesPerPixel_;
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 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
279 {
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
280 return bitsStored_;
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 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
284 {
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
285 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
286 {
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 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
288 "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
289 }
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 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
291 {
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 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
293 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
294 }
4279
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
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
297 bool DicomImageInformation::IsSigned() const
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
298 {
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
299 return isSigned_;
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
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
302 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
303 {
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
304 return bitsAllocated_;
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
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
307 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
308 {
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
309 return highBit_;
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
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
312 bool DicomImageInformation::IsPlanar() const
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
313 {
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
314 return isPlanar_;
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
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
317 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
318 {
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
319 return highBit_ + 1 - bitsStored_;
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
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
322 PhotometricInterpretation DicomImageInformation::GetPhotometricInterpretation() const
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
323 {
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
324 return photometric_;
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
325 }
ab4d015af660 moving inline methods to source files for ABI compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
326
1905
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
327 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
328 bool ignorePhotometricInterpretation) const
854
ff530685e46a fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
329 {
1905
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
330 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
331 {
2423
5a7c5c541a1d Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2416
diff changeset
332 if (GetBitsStored() == 8 && GetChannelCount() == 1 && !IsSigned())
5a7c5c541a1d Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2416
diff changeset
333 {
5a7c5c541a1d Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2416
diff changeset
334 format = PixelFormat_RGB24;
5a7c5c541a1d Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2416
diff changeset
335 return true;
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
5a7c5c541a1d Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2416
diff changeset
338 if (GetBitsStored() == 16 && GetChannelCount() == 1 && !IsSigned())
5a7c5c541a1d Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2416
diff changeset
339 {
5a7c5c541a1d Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2416
diff changeset
340 format = PixelFormat_RGB48;
5a7c5c541a1d Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2416
diff changeset
341 return true;
5a7c5c541a1d Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2416
diff changeset
342 }
1905
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
343 }
2423
5a7c5c541a1d Built-in decoding of palette images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2416
diff changeset
344
1905
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
345 if (ignorePhotometricInterpretation ||
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
346 photometric_ == PhotometricInterpretation_Monochrome1 ||
1206
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
347 photometric_ == PhotometricInterpretation_Monochrome2)
854
ff530685e46a fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
348 {
1206
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
349 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
350 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
351 format = PixelFormat_Grayscale8;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
352 return true;
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
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
355 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
356 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
357 format = PixelFormat_Grayscale16;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
358 return true;
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
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
361 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
362 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
363 format = PixelFormat_SignedGrayscale16;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
364 return true;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
365 }
2838
f3a2d109e361 new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
366
f3a2d109e361 new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
367 if (GetBitsAllocated() == 32 && GetChannelCount() == 1 && !IsSigned())
f3a2d109e361 new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
368 {
f3a2d109e361 new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
369 format = PixelFormat_Grayscale32;
f3a2d109e361 new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
370 return true;
f3a2d109e361 new orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
371 }
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
372
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 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
374 {
4902
df86d2505df8 Orthanc 1.9.8 is now known as Orthanc 1.10.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4882
diff changeset
375 // 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
376 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
377 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
378 }
854
ff530685e46a fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
379 }
ff530685e46a fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
380
3007
c9f93628215a more error details
am@osimis.io
parents: 2870
diff changeset
381 if (GetBitsStored() == 8 &&
c9f93628215a more error details
am@osimis.io
parents: 2870
diff changeset
382 GetChannelCount() == 3 &&
1206
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
383 !IsSigned() &&
1905
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
384 (ignorePhotometricInterpretation || photometric_ == PhotometricInterpretation_RGB))
854
ff530685e46a fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
385 {
ff530685e46a fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
386 format = PixelFormat_RGB24;
ff530685e46a fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
387 return true;
ff530685e46a fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
388 }
ff530685e46a fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
389
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
390 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
391 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
392 !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
393 (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
394 {
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 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
396 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
397 }
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
398
854
ff530685e46a fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
399 return false;
ff530685e46a fast version of image copy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
400 }
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
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
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 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
404 {
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
405 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
406 {
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 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
408
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 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
410 {
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 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
412 }
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 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
414 {
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 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
416 "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
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 }
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 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
420 {
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 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
422 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
423 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
424 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
425 }
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
426 }
4312
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
6d49e3b6ff77 fix abi of DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4297
diff changeset
429 unsigned int DicomImageInformation::GetUsefulTagLength()
6d49e3b6ff77 fix abi of DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4297
diff changeset
430 {
6d49e3b6ff77 fix abi of DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4297
diff changeset
431 return 256;
6d49e3b6ff77 fix abi of DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4297
diff changeset
432 }
5323
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
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
435 ValueRepresentation DicomImageInformation::GuessPixelDataValueRepresentation(const DicomTransferSyntax& transferSyntax,
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
436 unsigned int bitsAllocated)
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 /**
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
439 * This approach is validated in "Tests/GuessPixelDataVR.py":
5432
59e3b6f8c5be migration to UCLouvain servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5415
diff changeset
440 * 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
441 **/
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
442
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
443 if (transferSyntax == DicomTransferSyntax_LittleEndianExplicit ||
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
444 transferSyntax == DicomTransferSyntax_BigEndianExplicit)
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 /**
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
447 * Same rules apply to Little Endian Explicit and Big Endian
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
448 * Explicit (now retired). The VR of the pixel data directly
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
449 * depends upon the "Bits Allocated (0028,0100)" tag:
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
450 * 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
451 * 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
452 **/
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
453 if (bitsAllocated > 8)
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
454 {
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
455 return ValueRepresentation_OtherWord;
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
456 }
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
457 else
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
458 {
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
459 return ValueRepresentation_OtherByte;
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 }
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
462 else if (transferSyntax == DicomTransferSyntax_LittleEndianImplicit)
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
463 {
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
464 // Assume "OW" for DICOM Implicit VR Little Endian Transfer Syntax
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
465 // 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
466 return ValueRepresentation_OtherWord;
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
467 }
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
468 else
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
469 {
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
470 // Assume "OB" for all the compressed transfer syntaxes
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
471 // 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
472 return ValueRepresentation_OtherByte;
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
473 }
138e9d0c08c1 added DicomMap::GuessPixelDataValueRepresentation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
474 }
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
475 }