Mercurial > hg > orthanc

annotate Core/DicomFormat/DicomIntegerPixelAccessor.cpp @ 3430:4c45e018bd3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved logging
author Alain Mazy <alain@mazy.be>
date Mon, 17 Jun 2019 23:35:46 +0200
parents 4e43e67f8ecf
children 94f4a18a79cc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
1900
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288
6e7e5ed91c2d upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
4 * Department, University Hospital of Liege, Belgium
3060
4e43e67f8ecf preparing for 2019
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * License, or (at your option) any later version.
136
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
11 *
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
12 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
13 * program give permission to link the code of its release with the
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
15 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
16 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
17 * in all respects for all of the code used other than "OpenSSL". If you
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
18 * modify file(s) with this exception, you may extend this exception to
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
19 * your version of the file(s), but you are not obligated to do so. If
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
20 * you do not wish to do so, delete this exception statement from your
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
21 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
22 * in the program, then also delete it here.
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 *
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 * This program is distributed in the hope that it will be useful, but
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 * General Public License for more details.
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 *
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 **/
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33
824
a811bdf8b8eb precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 800
diff changeset
34 #include "../PrecompiledHeaders.h"
a811bdf8b8eb precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 800
diff changeset
35
6
9d483cf71d17 fix warnings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2
diff changeset
36 #ifndef NOMINMAX
2
67a6978503b7 fixing Windows build
Jodogne@Laptop
parents: 0
diff changeset
37 #define NOMINMAX
6
9d483cf71d17 fix warnings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2
diff changeset
38 #endif
9d483cf71d17 fix warnings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2
diff changeset
39
627
b8f738685ad2 fix for visual studio
jodogne
parents: 537
diff changeset
40 #include "DicomIntegerPixelAccessor.h"
b8f738685ad2 fix for visual studio
jodogne
parents: 537
diff changeset
41
79
297bad4e1019 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
42 #include "../OrthancException.h"
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 #include <boost/lexical_cast.hpp>
2
67a6978503b7 fixing Windows build
Jodogne@Laptop
parents: 0
diff changeset
44 #include <limits>
107
3b45473c0a73 replace boost::locale with iconv for debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
45 #include <cassert>
368
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
46 #include <stdio.h>
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
48 namespace Orthanc
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 DicomIntegerPixelAccessor::DicomIntegerPixelAccessor(const DicomMap& values,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 const void* pixelData,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 size_t size) :
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
53 information_(values),
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 pixelData_(pixelData),
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 size_(size)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 {
2279
16e45af17a4d Ability to retrieve raw frames encoded as unsigned 32-bits integers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
57 if (information_.GetBitsAllocated() > 32 ||
16e45af17a4d Ability to retrieve raw frames encoded as unsigned 32-bits integers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
58 information_.GetBitsStored() >= 32)
16e45af17a4d Ability to retrieve raw frames encoded as unsigned 32-bits integers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
59 {
16e45af17a4d Ability to retrieve raw frames encoded as unsigned 32-bits integers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
60 // Not available, as the accessor internally uses int32_t values
16e45af17a4d Ability to retrieve raw frames encoded as unsigned 32-bits integers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
61 throw OrthancException(ErrorCode_NotImplemented);
16e45af17a4d Ability to retrieve raw frames encoded as unsigned 32-bits integers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
62 }
16e45af17a4d Ability to retrieve raw frames encoded as unsigned 32-bits integers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
63
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
64 frame_ = 0;
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
65 frameOffset_ = information_.GetFrameSize();
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
67 if (information_.GetNumberOfFrames() * frameOffset_ > size)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 {
319
760d0f32cb34 PMSCT_RLE1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
69 throw OrthancException(ErrorCode_BadFileFormat);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
72 if (information_.IsSigned())
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 {
537
2890721b0f57 comment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 465
diff changeset
74 // Pixels are signed
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
75 mask_ = (1 << (information_.GetBitsStored() - 1)) - 1;
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
76 signMask_ = (1 << (information_.GetBitsStored() - 1));
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 else
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 {
537
2890721b0f57 comment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 465
diff changeset
80 // Pixels are unsigned
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
81 mask_ = (1 << information_.GetBitsStored()) - 1;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 signMask_ = 0;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 }
53
293038baf8f1 access to multi-frame images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
84
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
85 if (information_.IsPlanar())
368
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
86 {
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
87 /**
857
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
88 * Each color plane shall be sent contiguously. For RGB images,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
89 * this means the order of the pixel values sent is R1, R2, R3,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
90 * ..., G1, G2, G3, ..., B1, B2, B3, etc.
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
91 **/
860
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 857
diff changeset
92 rowOffset_ = information_.GetWidth() * information_.GetBytesPerValue();
857
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
93 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
94 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
95 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
96 /**
368
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
97 * The sample values for the first pixel are followed by the
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
98 * sample values for the second pixel, etc. For RGB images, this
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
99 * means the order of the pixel values sent shall be R1, G1, B1,
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
100 * R2, G2, B2, ..., etc.
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
101 **/
860
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 857
diff changeset
102 rowOffset_ = information_.GetWidth() * information_.GetBytesPerValue() * information_.GetChannelCount();
368
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
103 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 void DicomIntegerPixelAccessor::GetExtremeValues(int32_t& min,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 int32_t& max) const
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 {
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
110 if (information_.GetHeight() == 0 || information_.GetWidth() == 0)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 min = max = 0;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 return;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 min = std::numeric_limits<int32_t>::max();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 max = std::numeric_limits<int32_t>::min();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
119 for (unsigned int y = 0; y < information_.GetHeight(); y++)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 {
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
121 for (unsigned int x = 0; x < information_.GetWidth(); x++)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 {
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
123 for (unsigned int c = 0; c < information_.GetChannelCount(); c++)
368
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
124 {
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
125 int32_t v = GetValue(x, y);
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
126 if (v < min)
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
127 min = v;
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
128 if (v > max)
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
129 max = v;
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
130 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135
368
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
136 int32_t DicomIntegerPixelAccessor::GetValue(unsigned int x,
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
137 unsigned int y,
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
138 unsigned int channel) const
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139 {
857
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
140 assert(x < information_.GetWidth() &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
141 y < information_.GetHeight() &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
142 channel < information_.GetChannelCount());
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143
53
293038baf8f1 access to multi-frame images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
144 const uint8_t* pixel = reinterpret_cast<const uint8_t*>(pixelData_) +
368
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
145 y * rowOffset_ + frame_ * frameOffset_;
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
146
1908
5096681efce6 direct hyperlinks to the DICOM standard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
147 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#sect_C.7.6.3.1.3
857
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
148 if (information_.IsPlanar())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
149 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
150 /**
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
151 * Each color plane shall be sent contiguously. For RGB images,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
152 * this means the order of the pixel values sent is R1, R2, R3,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
153 * ..., G1, G2, G3, ..., B1, B2, B3, etc.
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
154 **/
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
155 assert(frameOffset_ % information_.GetChannelCount() == 0);
860
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 857
diff changeset
156 pixel += channel * frameOffset_ / information_.GetChannelCount() + x * information_.GetBytesPerValue();
857
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
157 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 854
diff changeset
158 else
368
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
159 {
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
160 /**
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
161 * The sample values for the first pixel are followed by the
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
162 * sample values for the second pixel, etc. For RGB images, this
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
163 * means the order of the pixel values sent shall be R1, G1, B1,
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
164 * R2, G2, B2, ..., etc.
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
165 **/
860
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 857
diff changeset
166 pixel += channel * information_.GetBytesPerValue() + x * information_.GetChannelCount() * information_.GetBytesPerValue();
368
80011cd589e6 support of rgb images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 319
diff changeset
167 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168
464
5987dd8e0776 fix reading signed values in dicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
169 uint32_t v;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170 v = pixel[0];
860
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 857
diff changeset
171 if (information_.GetBytesPerValue() >= 2)
464
5987dd8e0776 fix reading signed values in dicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
172 v = v + (static_cast<uint32_t>(pixel[1]) << 8);
860
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 857
diff changeset
173 if (information_.GetBytesPerValue() >= 3)
464
5987dd8e0776 fix reading signed values in dicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
174 v = v + (static_cast<uint32_t>(pixel[2]) << 16);
860
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 857
diff changeset
175 if (information_.GetBytesPerValue() >= 4)
464
5987dd8e0776 fix reading signed values in dicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
176 v = v + (static_cast<uint32_t>(pixel[3]) << 24);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
178 v = v >> information_.GetShift();
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 if (v & signMask_)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181 {
464
5987dd8e0776 fix reading signed values in dicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
182 // Signed value
465
7a966b440f19 signed images to PNG
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 464
diff changeset
183 // http://en.wikipedia.org/wiki/Two%27s_complement#Subtraction_from_2N
7a966b440f19 signed images to PNG
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 464
diff changeset
184 return -static_cast<int32_t>(mask_) + static_cast<int32_t>(v & mask_) - 1;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 }
464
5987dd8e0776 fix reading signed values in dicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
186 else
5987dd8e0776 fix reading signed values in dicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
187 {
5987dd8e0776 fix reading signed values in dicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
188 // Unsigned value
5987dd8e0776 fix reading signed values in dicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
189 return static_cast<int32_t>(v & mask_);
5987dd8e0776 fix reading signed values in dicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
190 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 }
53
293038baf8f1 access to multi-frame images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
192
293038baf8f1 access to multi-frame images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
193
293038baf8f1 access to multi-frame images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
194 void DicomIntegerPixelAccessor::SetCurrentFrame(unsigned int frame)
293038baf8f1 access to multi-frame images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
195 {
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
196 if (frame >= information_.GetNumberOfFrames())
53
293038baf8f1 access to multi-frame images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
197 {
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
198 throw OrthancException(ErrorCode_ParameterOutOfRange);
53
293038baf8f1 access to multi-frame images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
199 }
293038baf8f1 access to multi-frame images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
200
293038baf8f1 access to multi-frame images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
201 frame_ = frame;
293038baf8f1 access to multi-frame images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
202 }
293038baf8f1 access to multi-frame images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
203
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
204 }