annotate Core/Images/PngReader.cpp @ 3508:70524b4acc72

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