annotate OrthancFramework/Sources/Images/PngReader.cpp @ 5054:255b02c68908

Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
author Alain Mazy <am@osimis.io>
date Fri, 08 Jul 2022 15:26:52 +0200
parents 43e613a7756b
children 0ea402b4d901
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
4870
43e613a7756b upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4831
diff changeset
5 * Copyright (C) 2017-2022 Osimis S.A., Belgium
43e613a7756b upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4831
diff changeset
6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 *
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * This program is free software: you can redistribute it and/or
4119
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
9 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
10 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
11 * the License, or (at your option) any later version.
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 *
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * 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
14 * WITHOUT ANY WARRANTY; without even the implied warranty of
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
16 * Lesser General Public License for more details.
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 *
4119
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
18 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
19 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
20 * <http://www.gnu.org/licenses/>.
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 **/
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
824
a811bdf8b8eb precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 800
diff changeset
24 #include "../PrecompiledHeaders.h"
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 #include "PngReader.h"
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 #include "../OrthancException.h"
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 #include "../Toolbox.h"
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29
2171
35febe19e874 improved support for sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2170
diff changeset
30 #if ORTHANC_SANDBOXED == 0
35febe19e874 improved support for sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2170
diff changeset
31 # include "../SystemToolbox.h"
35febe19e874 improved support for sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2170
diff changeset
32 #endif
35febe19e874 improved support for sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2170
diff changeset
33
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 #include <png.h>
492
f3d4193c571a switch to jsoncpp-0.6.0-rc2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 455
diff changeset
35 #include <string.h> // For memcpy()
455
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 namespace Orthanc
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 {
2170
baf8dd89b4e0 improved support for sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2143
diff changeset
39 #if ORTHANC_SANDBOXED == 0
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 namespace
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 struct FileRabi
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 FILE* fp_;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45
4201
2d5209153b32 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
46 explicit FileRabi(const char* filename)
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 {
2140
aa4b8895cd23 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2017
diff changeset
48 fp_ = SystemToolbox::OpenFile(filename, FileMode_ReadBinary);
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 if (!fp_)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 throw OrthancException(ErrorCode_InexistentFile);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 }
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
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 ~FileRabi()
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 if (fp_)
2017
08ce34cfacad refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
58 {
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 fclose(fp_);
2017
08ce34cfacad refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
60 }
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 }
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 }
2170
baf8dd89b4e0 improved support for sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2143
diff changeset
64 #endif
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 struct PngReader::PngRabi
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 png_structp png_;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 png_infop info_;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 png_infop endInfo_;
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 void Destruct()
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 if (png_)
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 png_destroy_read_struct(&png_, &info_, &endInfo_);
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_ = NULL;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 info_ = NULL;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 endInfo_ = NULL;
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 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84
4201
2d5209153b32 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
85 PngRabi() :
2d5209153b32 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
86 png_(NULL),
2d5209153b32 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
87 info_(NULL),
2d5209153b32 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
88 endInfo_(NULL)
455
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_ = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 if (!png_)
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 throw OrthancException(ErrorCode_NotEnoughMemory);
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
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96 info_ = png_create_info_struct(png_);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 if (!info_)
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 png_destroy_read_struct(&png_, NULL, NULL);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 throw OrthancException(ErrorCode_NotEnoughMemory);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 }
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 endInfo_ = png_create_info_struct(png_);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 if (!info_)
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 png_destroy_read_struct(&png_, &info_, NULL);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 throw OrthancException(ErrorCode_NotEnoughMemory);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 }
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
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 ~PngRabi()
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 Destruct();
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
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 static void MemoryCallback(png_structp png_ptr,
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 png_bytep data,
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 png_size_t size);
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 void PngReader::CheckHeader(const void* header)
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 int is_png = !png_sig_cmp((png_bytep) header, 0, 8);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 if (!is_png)
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 throw OrthancException(ErrorCode_BadFileFormat);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 }
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 PngReader::PngReader()
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 void PngReader::Read(PngRabi& rabi)
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 png_set_sig_bytes(rabi.png_, 8);
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 png_read_info(rabi.png_, rabi.info_);
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_uint_32 width, height;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142 int bit_depth, color_type, interlace_type;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 int compression_type, filter_method;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 // get size and bit-depth of the PNG-image
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145 png_get_IHDR(rabi.png_, rabi.info_,
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 &width, &height,
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 &bit_depth, &color_type, &interlace_type,
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 &compression_type, &filter_method);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
150 PixelFormat format;
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
151 unsigned int pitch;
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth == 8)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 {
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
155 format = PixelFormat_Grayscale8;
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
156 pitch = width;
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158 else if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth == 16)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159 {
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
160 format = PixelFormat_Grayscale16;
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
161 pitch = 2 * width;
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 if (Toolbox::DetectEndianness() == Endianness_Little)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165 png_set_swap(rabi.png_);
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 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 else if (color_type == PNG_COLOR_TYPE_RGB && bit_depth == 8)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169 {
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
170 format = PixelFormat_RGB24;
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
171 pitch = 3 * width;
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172 }
800
ecedd89055db generation of DICOM images from PNG files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 799
diff changeset
173 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
174 {
ecedd89055db generation of DICOM images from PNG files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 799
diff changeset
175 format = PixelFormat_RGBA32;
ecedd89055db generation of DICOM images from PNG files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 799
diff changeset
176 pitch = 4 * width;
ecedd89055db generation of DICOM images from PNG files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 799
diff changeset
177 }
5054
255b02c68908 Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents: 4870
diff changeset
178 else if (color_type == PNG_COLOR_TYPE_RGBA && bit_depth == 16)
255b02c68908 Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents: 4870
diff changeset
179 {
255b02c68908 Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents: 4870
diff changeset
180 format = PixelFormat_RGBA64;
255b02c68908 Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents: 4870
diff changeset
181 pitch = 8 * width;
255b02c68908 Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents: 4870
diff changeset
182
255b02c68908 Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents: 4870
diff changeset
183 if (Toolbox::DetectEndianness() == Endianness_Little)
255b02c68908 Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents: 4870
diff changeset
184 {
255b02c68908 Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents: 4870
diff changeset
185 png_set_swap(rabi.png_);
255b02c68908 Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents: 4870
diff changeset
186 }
255b02c68908 Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents: 4870
diff changeset
187 }
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188 else
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190 throw OrthancException(ErrorCode_NotImplemented);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
193 data_.resize(height * pitch);
455
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 if (height == 0 || width == 0)
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197 // Empty image, we are done
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
198 AssignEmpty(format);
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 return;
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
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 png_read_update_info(rabi.png_, rabi.info_);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
204 std::vector<png_bytep> rows(height);
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
205 for (size_t i = 0; i < height; i++)
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
206 {
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
207 rows[i] = &data_[0] + i * pitch;
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
208 }
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 png_read_image(rabi.png_, &rows[0]);
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
211
1610
2dff2bdffdb8 font support within Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
212 AssignWritable(format, width, height, pitch, &data_[0]);
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
213 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
214
2170
baf8dd89b4e0 improved support for sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2143
diff changeset
215
baf8dd89b4e0 improved support for sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2143
diff changeset
216 #if ORTHANC_SANDBOXED == 0
1925
56276bad7e42 removal of two overloads making few sense
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
217 void PngReader::ReadFromFile(const std::string& filename)
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
218 {
1925
56276bad7e42 removal of two overloads making few sense
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
219 FileRabi f(filename.c_str());
455
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 char header[8];
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
222 if (fread(header, 1, 8, f.fp_) != 8)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
223 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
224 throw OrthancException(ErrorCode_BadFileFormat);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
225 }
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 CheckHeader(header);
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 PngRabi rabi;
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 if (setjmp(png_jmpbuf(rabi.png_)))
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 rabi.Destruct();
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
234 throw OrthancException(ErrorCode_BadFileFormat);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
235 }
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 png_init_io(rabi.png_, f.fp_);
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 Read(rabi);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
240 }
2170
baf8dd89b4e0 improved support for sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2143
diff changeset
241 #endif
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
242
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 namespace
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 struct MemoryBuffer
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
247 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
248 const uint8_t* buffer_;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
249 size_t size_;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
250 size_t pos_;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
251 bool ok_;
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 }
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 void PngReader::PngRabi::MemoryCallback(png_structp png_ptr,
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
257 png_bytep outBytes,
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
258 png_size_t byteCountToRead)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
259 {
656
08eca5d86aad fixes to cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 492
diff changeset
260 MemoryBuffer* from = reinterpret_cast<MemoryBuffer*>(png_get_io_ptr(png_ptr));
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
261
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
262 if (!from->ok_)
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 return;
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
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
267 if (from->pos_ + byteCountToRead > from->size_)
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 from->ok_ = false;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
270 return;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
271 }
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 memcpy(outBytes, from->buffer_ + from->pos_, byteCountToRead);
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 from->pos_ += byteCountToRead;
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
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
279 void PngReader::ReadFromMemory(const void* buffer,
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
280 size_t size)
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 (size < 8)
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 throw OrthancException(ErrorCode_BadFileFormat);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
285 }
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 CheckHeader(buffer);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
288
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
289 PngRabi rabi;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
290
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
291 if (setjmp(png_jmpbuf(rabi.png_)))
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
292 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
293 rabi.Destruct();
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
294 throw OrthancException(ErrorCode_BadFileFormat);
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
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
297 MemoryBuffer tmp;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
298 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
299 tmp.size_ = size - 8;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
300 tmp.pos_ = 0;
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
301 tmp.ok_ = true;
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 png_set_read_fn(rabi.png_, &tmp, PngRabi::MemoryCallback);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
304
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
305 Read(rabi);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
306
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
307 if (!tmp.ok_)
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
308 {
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
309 throw OrthancException(ErrorCode_BadFileFormat);
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
310 }
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 void PngReader::ReadFromMemory(const std::string& buffer)
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 if (buffer.size() != 0)
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
316 {
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
317 ReadFromMemory(&buffer[0], buffer.size());
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
318 }
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
319 else
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
320 {
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
321 ReadFromMemory(NULL, 0);
797
37adac56017a ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
322 }
455
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
323 }
238a0c99ced2 PNG reader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
324 }