Mercurial > hg > orthanc
annotate Core/ImageFormats/ImageBuffer.cpp @ 860:80c7e53a69b5 jpeg
bugfix
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Sat, 07 Jun 2014 10:32:15 +0200 |
parents | 839be3022203 |
children | 3c0d0836f704 |
rev | line source |
---|---|
801 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
3 * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege, | |
4 * Belgium | |
5 * | |
6 * This program is free software: you can redistribute it and/or | |
7 * modify it under the terms of the GNU General Public License as | |
8 * published by the Free Software Foundation, either version 3 of the | |
9 * License, or (at your option) any later version. | |
10 * | |
11 * In addition, as a special exception, the copyright holders of this | |
12 * program give permission to link the code of its release with the | |
13 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
14 * that use the same license as the "OpenSSL" library), and distribute | |
15 * the linked executables. You must obey the GNU General Public License | |
16 * in all respects for all of the code used other than "OpenSSL". If you | |
17 * modify file(s) with this exception, you may extend this exception to | |
18 * your version of the file(s), but you are not obligated to do so. If | |
19 * you do not wish to do so, delete this exception statement from your | |
20 * version. If you delete this exception statement from all source files | |
21 * in the program, then also delete it here. | |
22 * | |
23 * This program is distributed in the hope that it will be useful, but | |
24 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
26 * General Public License for more details. | |
27 * | |
28 * You should have received a copy of the GNU General Public License | |
29 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
30 **/ | |
31 | |
32 | |
824
a811bdf8b8eb
precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
801
diff
changeset
|
33 #include "../PrecompiledHeaders.h" |
801 | 34 #include "ImageBuffer.h" |
35 | |
860 | 36 #include <stdio.h> |
37 | |
801 | 38 namespace Orthanc |
39 { | |
40 void ImageBuffer::Allocate() | |
41 { | |
42 if (changed_) | |
43 { | |
844 | 44 /* |
45 if (forceMinimalPitch_) | |
46 { | |
47 TODO: Align pitch and memory buffer to optimal size for SIMD. | |
48 } | |
49 */ | |
50 | |
801 | 51 pitch_ = GetBytesPerPixel() * width_; |
52 | |
53 data_.resize(pitch_ * height_); | |
54 if (data_.size() > 0) | |
55 { | |
56 buffer_ = &data_[0]; | |
57 } | |
58 else | |
59 { | |
60 buffer_ = 0; | |
61 } | |
62 | |
63 changed_ = false; | |
64 } | |
65 } | |
66 | |
67 | |
853
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
844
diff
changeset
|
68 ImageBuffer::ImageBuffer(unsigned int width, |
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
844
diff
changeset
|
69 unsigned int height, |
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
844
diff
changeset
|
70 PixelFormat format) |
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
844
diff
changeset
|
71 { |
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
844
diff
changeset
|
72 Initialize(); |
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
844
diff
changeset
|
73 SetWidth(width); |
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
844
diff
changeset
|
74 SetHeight(height); |
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
844
diff
changeset
|
75 SetFormat(format); |
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
844
diff
changeset
|
76 } |
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
844
diff
changeset
|
77 |
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
844
diff
changeset
|
78 |
839be3022203
DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
844
diff
changeset
|
79 void ImageBuffer::Initialize() |
801 | 80 { |
81 changed_ = false; | |
844 | 82 forceMinimalPitch_ = true; |
801 | 83 format_ = PixelFormat_Grayscale8; |
84 width_ = 0; | |
85 height_ = 0; | |
86 pitch_ = 0; | |
87 buffer_ = NULL; | |
88 } | |
89 | |
90 | |
91 void ImageBuffer::SetFormat(PixelFormat format) | |
92 { | |
93 changed_ = true; | |
94 format_ = format; | |
95 } | |
96 | |
97 | |
98 void ImageBuffer::SetWidth(unsigned int width) | |
99 { | |
100 changed_ = true; | |
101 width_ = width; | |
102 } | |
103 | |
104 | |
105 void ImageBuffer::SetHeight(unsigned int height) | |
106 { | |
107 changed_ = true; | |
108 height_ = height; | |
109 } | |
110 | |
111 | |
112 ImageAccessor ImageBuffer::GetAccessor() | |
113 { | |
114 Allocate(); | |
115 | |
116 ImageAccessor accessor; | |
117 accessor.AssignWritable(format_, width_, height_, pitch_, buffer_); | |
118 return accessor; | |
119 } | |
120 | |
121 | |
122 ImageAccessor ImageBuffer::GetConstAccessor() | |
123 { | |
124 Allocate(); | |
125 | |
126 ImageAccessor accessor; | |
127 accessor.AssignReadOnly(format_, width_, height_, pitch_, buffer_); | |
128 return accessor; | |
129 } | |
844 | 130 |
131 | |
132 void ImageBuffer::SetMinimalPitchForced(bool force) | |
133 { | |
134 changed_ = true; | |
135 forceMinimalPitch_ = force; | |
136 } | |
801 | 137 } |