annotate Orthanc/Core/ImageFormats/PngReader.cpp @ 52:0d0cc354553f

attempt to unexpose libpng symbols in the dll
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 30 Jul 2015 17:34:11 +0200
parents 111689a2c177
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
31
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 *
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 * This program is free software: you can redistribute it and/or
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * modify it under the terms of the GNU General Public License as
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * published by the Free Software Foundation, either version 3 of the
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * License, or (at your option) any later version.
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 *
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 * In addition, as a special exception, the copyright holders of this
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * program give permission to link the code of its release with the
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * that use the same license as the "OpenSSL" library), and distribute
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * the linked executables. You must obey the GNU General Public License
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * in all respects for all of the code used other than "OpenSSL". If you
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * modify file(s) with this exception, you may extend this exception to
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * your version of the file(s), but you are not obligated to do so. If
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 * you do not wish to do so, delete this exception statement from your
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 * version. If you delete this exception statement from all source files
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 * in the program, then also delete it here.
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 *
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 * This program is distributed in the hope that it will be useful, but
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 * WITHOUT ANY WARRANTY; without even the implied warranty of
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 * General Public License for more details.
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 *
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 * You should have received a copy of the GNU General Public License
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 **/
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 #include "../PrecompiledHeaders.h"
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 #include "PngReader.h"
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 #include "../OrthancException.h"
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 #include "../Toolbox.h"
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 #include <png.h>
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 #include <string.h> // For memcpy()
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 namespace Orthanc
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 namespace
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 struct FileRabi
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 FILE* fp_;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 FileRabi(const char* filename)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 fp_ = fopen(filename, "rb");
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 if (!fp_)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 throw OrthancException(ErrorCode_InexistentFile);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 ~FileRabi()
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 if (fp_)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 fclose(fp_);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 };
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 struct PngReader::PngRabi
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 png_structp png_;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 png_infop info_;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 png_infop endInfo_;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 void Destruct()
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 if (png_)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 png_destroy_read_struct(&png_, &info_, &endInfo_);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 png_ = NULL;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 info_ = NULL;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 endInfo_ = NULL;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 PngRabi()
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 png_ = NULL;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 info_ = NULL;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 endInfo_ = NULL;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 png_ = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 if (!png_)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 throw OrthancException(ErrorCode_NotEnoughMemory);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 info_ = png_create_info_struct(png_);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 if (!info_)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 png_destroy_read_struct(&png_, NULL, NULL);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102 throw OrthancException(ErrorCode_NotEnoughMemory);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 endInfo_ = png_create_info_struct(png_);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 if (!info_)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 png_destroy_read_struct(&png_, &info_, NULL);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 throw OrthancException(ErrorCode_NotEnoughMemory);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 ~PngRabi()
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 Destruct();
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 static void MemoryCallback(png_structp png_ptr,
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 png_bytep data,
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 png_size_t size);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 };
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124 void PngReader::CheckHeader(const void* header)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 int is_png = !png_sig_cmp((png_bytep) header, 0, 8);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127 if (!is_png)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 throw OrthancException(ErrorCode_BadFileFormat);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 PngReader::PngReader()
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 void PngReader::Read(PngRabi& rabi)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139 png_set_sig_bytes(rabi.png_, 8);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 png_read_info(rabi.png_, rabi.info_);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 png_uint_32 width, height;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 int bit_depth, color_type, interlace_type;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145 int compression_type, filter_method;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 // get size and bit-depth of the PNG-image
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 png_get_IHDR(rabi.png_, rabi.info_,
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 &width, &height,
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 &bit_depth, &color_type, &interlace_type,
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150 &compression_type, &filter_method);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 PixelFormat format;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 unsigned int pitch;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth == 8)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 format = PixelFormat_Grayscale8;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158 pitch = width;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 else if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth == 16)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 format = PixelFormat_Grayscale16;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 pitch = 2 * width;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165 if (Toolbox::DetectEndianness() == Endianness_Little)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167 png_set_swap(rabi.png_);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170 else if (color_type == PNG_COLOR_TYPE_RGB && bit_depth == 8)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172 format = PixelFormat_RGB24;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173 pitch = 3 * width;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
175 else if (color_type == PNG_COLOR_TYPE_RGBA && bit_depth == 8)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177 format = PixelFormat_RGBA32;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178 pitch = 4 * width;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 else
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
182 throw OrthancException(ErrorCode_NotImplemented);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 data_.resize(height * pitch);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187 if (height == 0 || width == 0)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 // Empty image, we are done
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190 AssignEmpty(format);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 return;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194 png_read_update_info(rabi.png_, rabi.info_);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
195
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196 std::vector<png_bytep> rows(height);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197 for (size_t i = 0; i < height; i++)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 rows[i] = &data_[0] + i * pitch;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 png_read_image(rabi.png_, &rows[0]);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
204 AssignReadOnly(format, width, height, pitch, &data_[0]);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
205 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
206
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
207 void PngReader::ReadFromFile(const char* filename)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
208 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
209 FileRabi f(filename);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
210
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
211 char header[8];
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
212 if (fread(header, 1, 8, f.fp_) != 8)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
213 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
214 throw OrthancException(ErrorCode_BadFileFormat);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
215 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
216
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
217 CheckHeader(header);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
218
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
219 PngRabi rabi;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
220
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
221 if (setjmp(png_jmpbuf(rabi.png_)))
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
222 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
223 rabi.Destruct();
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
224 throw OrthancException(ErrorCode_BadFileFormat);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
225 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
226
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
227 png_init_io(rabi.png_, f.fp_);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
228
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
229 Read(rabi);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
230 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
231
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
232
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
233 namespace
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
234 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
235 struct MemoryBuffer
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
236 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
237 const uint8_t* buffer_;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
238 size_t size_;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
239 size_t pos_;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
240 bool ok_;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
241 };
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
242 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
243
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
244
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
245 void PngReader::PngRabi::MemoryCallback(png_structp png_ptr,
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
246 png_bytep outBytes,
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
247 png_size_t byteCountToRead)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
248 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
249 MemoryBuffer* from = reinterpret_cast<MemoryBuffer*>(png_get_io_ptr(png_ptr));
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
250
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
251 if (!from->ok_)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
252 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
253 return;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
254 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
255
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
256 if (from->pos_ + byteCountToRead > from->size_)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
257 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
258 from->ok_ = false;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
259 return;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
260 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
261
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
262 memcpy(outBytes, from->buffer_ + from->pos_, byteCountToRead);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
263
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
264 from->pos_ += byteCountToRead;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
265 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
266
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
267
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
268 void PngReader::ReadFromMemory(const void* buffer,
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
269 size_t size)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
270 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
271 if (size < 8)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
272 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
273 throw OrthancException(ErrorCode_BadFileFormat);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
274 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
275
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
276 CheckHeader(buffer);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
277
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
278 PngRabi rabi;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
279
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
280 if (setjmp(png_jmpbuf(rabi.png_)))
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
281 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
282 rabi.Destruct();
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
283 throw OrthancException(ErrorCode_BadFileFormat);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
284 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
285
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
286 MemoryBuffer tmp;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
287 tmp.buffer_ = reinterpret_cast<const uint8_t*>(buffer) + 8; // We skip the header
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
288 tmp.size_ = size - 8;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
289 tmp.pos_ = 0;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
290 tmp.ok_ = true;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
291
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
292 png_set_read_fn(rabi.png_, &tmp, PngRabi::MemoryCallback);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
293
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
294 Read(rabi);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
295
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
296 if (!tmp.ok_)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
297 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
298 throw OrthancException(ErrorCode_BadFileFormat);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
299 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
300 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
301
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
302 void PngReader::ReadFromMemory(const std::string& buffer)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
303 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
304 if (buffer.size() != 0)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
305 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
306 ReadFromMemory(&buffer[0], buffer.size());
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
307 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
308 else
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
309 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
310 ReadFromMemory(NULL, 0);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
311 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
312 }
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
313 }