annotate Core/Images/PngReader.cpp @ 2068:879f3be759ef

renames to make code clearer
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 13 Jul 2016 16:10:25 +0200
parents 08ce34cfacad
children aa4b8895cd23
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
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 *
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 * This program is free software: you can redistribute it and/or
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * modify it under the terms of the GNU General Public License as
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * published by the Free Software Foundation, either version 3 of the
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * License, or (at your option) any later version.
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 *
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 * In addition, as a special exception, the copyright holders of this
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * program give permission to link the code of its release with the
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * that use the same license as the "OpenSSL" library), and distribute
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * the linked executables. You must obey the GNU General Public License
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * 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
17 * modify file(s) with this exception, you may extend this exception to
238a0c99ced2 PNG reader
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
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 * 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
20 * version. If you delete this exception statement from all source files
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 * in the program, then also delete it here.
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 *
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 * 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
24 * WITHOUT ANY WARRANTY; without even the implied warranty of
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 * General Public License for more details.
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 *
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 * You should have received a copy of the GNU General Public License
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 **/
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
824
a811bdf8b8eb precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 800
diff changeset
33 #include "../PrecompiledHeaders.h"
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 #include "PngReader.h"
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 #include "../OrthancException.h"
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 #include "../Toolbox.h"
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 #include <png.h>
492
f3d4193c571a switch to jsoncpp-0.6.0-rc2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 455
diff changeset
40 #include <string.h> // For memcpy()
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 namespace Orthanc
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 namespace
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 struct FileRabi
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 FILE* fp_;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 FileRabi(const char* filename)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 {
2017
08ce34cfacad refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
52 fp_ = Toolbox::OpenFile(filename, FileMode_ReadBinary);
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 if (!fp_)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 throw OrthancException(ErrorCode_InexistentFile);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 ~FileRabi()
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 if (fp_)
2017
08ce34cfacad refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
62 {
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 fclose(fp_);
2017
08ce34cfacad refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
64 }
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 }
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 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 struct PngReader::PngRabi
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 png_structp png_;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 png_infop info_;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 png_infop endInfo_;
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 void Destruct()
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 if (png_)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 png_destroy_read_struct(&png_, &info_, &endInfo_);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 png_ = NULL;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 info_ = NULL;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 endInfo_ = NULL;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 }
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
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 PngRabi()
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 png_ = NULL;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 info_ = NULL;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 endInfo_ = NULL;
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 png_ = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 if (!png_)
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 throw OrthancException(ErrorCode_NotEnoughMemory);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 info_ = png_create_info_struct(png_);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 if (!info_)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 png_destroy_read_struct(&png_, NULL, NULL);
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 endInfo_ = 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_, &info_, 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
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 ~PngRabi()
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 Destruct();
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 }
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 static void MemoryCallback(png_structp png_ptr,
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 png_bytep data,
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 png_size_t size);
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
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 void PngReader::CheckHeader(const void* header)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 int is_png = !png_sig_cmp((png_bytep) header, 0, 8);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 if (!is_png)
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 throw OrthancException(ErrorCode_BadFileFormat);
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 }
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 PngReader::PngReader()
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 {
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
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139 void PngReader::Read(PngRabi& rabi)
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 png_set_sig_bytes(rabi.png_, 8);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 png_read_info(rabi.png_, rabi.info_);
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 png_uint_32 width, height;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 int bit_depth, color_type, interlace_type;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 int compression_type, filter_method;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 // get size and bit-depth of the PNG-image
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 png_get_IHDR(rabi.png_, rabi.info_,
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150 &width, &height,
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151 &bit_depth, &color_type, &interlace_type,
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 &compression_type, &filter_method);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
154 PixelFormat format;
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
155 unsigned int pitch;
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth == 8)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158 {
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
159 format = PixelFormat_Grayscale8;
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
160 pitch = width;
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 else if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth == 16)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 {
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
164 format = PixelFormat_Grayscale16;
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
165 pitch = 2 * width;
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167 if (Toolbox::DetectEndianness() == Endianness_Little)
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 png_set_swap(rabi.png_);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172 else if (color_type == PNG_COLOR_TYPE_RGB && bit_depth == 8)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173 {
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
174 format = PixelFormat_RGB24;
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
175 pitch = 3 * width;
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176 }
800
ecedd89055db generation of DICOM images from PNG files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 799
diff changeset
177 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
178 {
ecedd89055db generation of DICOM images from PNG files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 799
diff changeset
179 format = PixelFormat_RGBA32;
ecedd89055db generation of DICOM images from PNG files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 799
diff changeset
180 pitch = 4 * width;
ecedd89055db generation of DICOM images from PNG files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 799
diff changeset
181 }
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
182 else
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184 throw OrthancException(ErrorCode_NotImplemented);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
187 data_.resize(height * pitch);
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
189 if (height == 0 || width == 0)
455
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 // Empty image, we are done
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
192 AssignEmpty(format);
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 return;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194 }
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
195
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196 png_read_update_info(rabi.png_, rabi.info_);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
198 std::vector<png_bytep> rows(height);
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
199 for (size_t i = 0; i < height; i++)
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 {
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
201 rows[i] = &data_[0] + i * pitch;
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
204 png_read_image(rabi.png_, &rows[0]);
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
205
1610
2dff2bdffdb8 font support within Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
206 AssignWritable(format, width, height, pitch, &data_[0]);
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
207 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
208
1925
56276bad7e42 removal of two overloads making few sense
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
209 void PngReader::ReadFromFile(const std::string& filename)
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
210 {
1925
56276bad7e42 removal of two overloads making few sense
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
211 FileRabi f(filename.c_str());
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
212
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
213 char header[8];
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
214 if (fread(header, 1, 8, f.fp_) != 8)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
215 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
216 throw OrthancException(ErrorCode_BadFileFormat);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
217 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
218
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
219 CheckHeader(header);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
220
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
221 PngRabi rabi;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
222
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
223 if (setjmp(png_jmpbuf(rabi.png_)))
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 rabi.Destruct();
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
226 throw OrthancException(ErrorCode_BadFileFormat);
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
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
229 png_init_io(rabi.png_, f.fp_);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
230
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
231 Read(rabi);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
232 }
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
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
235 namespace
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 struct MemoryBuffer
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
238 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
239 const uint8_t* buffer_;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
240 size_t size_;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
241 size_t pos_;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
242 bool ok_;
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
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 void PngReader::PngRabi::MemoryCallback(png_structp png_ptr,
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
248 png_bytep outBytes,
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
249 png_size_t byteCountToRead)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
250 {
656
08eca5d86aad fixes to cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 492
diff changeset
251 MemoryBuffer* from = reinterpret_cast<MemoryBuffer*>(png_get_io_ptr(png_ptr));
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
252
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
253 if (!from->ok_)
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 return;
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
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
258 if (from->pos_ + byteCountToRead > from->size_)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
259 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
260 from->ok_ = false;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
261 return;
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
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
264 memcpy(outBytes, from->buffer_ + from->pos_, byteCountToRead);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
265
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
266 from->pos_ += byteCountToRead;
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
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 void PngReader::ReadFromMemory(const void* buffer,
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
271 size_t size)
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 if (size < 8)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
274 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
275 throw OrthancException(ErrorCode_BadFileFormat);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
276 }
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 CheckHeader(buffer);
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 PngRabi rabi;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
281
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
282 if (setjmp(png_jmpbuf(rabi.png_)))
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
283 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
284 rabi.Destruct();
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 MemoryBuffer tmp;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
289 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
290 tmp.size_ = size - 8;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
291 tmp.pos_ = 0;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
292 tmp.ok_ = true;
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 png_set_read_fn(rabi.png_, &tmp, PngRabi::MemoryCallback);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
295
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
296 Read(rabi);
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 if (!tmp.ok_)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
299 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
300 throw OrthancException(ErrorCode_BadFileFormat);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
301 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
302 }
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 void PngReader::ReadFromMemory(const std::string& buffer)
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 if (buffer.size() != 0)
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
307 {
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
308 ReadFromMemory(&buffer[0], buffer.size());
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
309 }
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
310 else
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
311 {
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
312 ReadFromMemory(NULL, 0);
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
313 }
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
314 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
315 }