blob: 0568b88af2c6a37c6de9bdea6d035e210899c277 [file] [log] [blame]
Guy Schalnat6d764711995-12-19 03:22:19 -06001
2/* pngpread.c - read a png file in push mode
Glenn Randers-Pehrsonb6ce43d1998-01-01 07:13:13 -06003 *
Glenn Randers-Pehrson5feb87c2010-06-21 12:28:05 -05004 * Last changed in libpng 1.5.0 [June 21, 2010]
Glenn Randers-Pehrsone69b55d2010-01-01 10:29:06 -06005 * Copyright (c) 1998-2010 Glenn Randers-Pehrson
Glenn Randers-Pehrsond4366722000-06-04 14:29:29 -05006 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
7 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
Glenn Randers-Pehrson3e61d792009-06-24 09:31:28 -05008 *
Glenn Randers-Pehrsonbfbf8652009-06-26 21:46:52 -05009 * This code is released under the libpng license.
Glenn Randers-Pehrsonc332bbc2009-06-25 13:43:50 -050010 * For conditions of distribution and use, see the disclaimer
Glenn Randers-Pehrson037023b2009-06-24 10:27:36 -050011 * and license in png.h
Glenn Randers-Pehrsonb6ce43d1998-01-01 07:13:13 -060012 */
Guy Schalnat6d764711995-12-19 03:22:19 -060013
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -050014#include "pngpriv.h"
Guy Schalnat4ee97b01996-01-16 01:51:56 -060015
Glenn Randers-Pehrsonc3cd22b2010-03-08 21:10:25 -060016#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
17
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -050018/* Push model modes */
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -060019#define PNG_READ_SIG_MODE 0
20#define PNG_READ_CHUNK_MODE 1
21#define PNG_READ_IDAT_MODE 2
22#define PNG_SKIP_MODE 3
23#define PNG_READ_tEXt_MODE 4
24#define PNG_READ_zTXt_MODE 5
25#define PNG_READ_DONE_MODE 6
26#define PNG_READ_iTXt_MODE 7
27#define PNG_ERROR_MODE 8
28
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -050029void PNGAPI
Andreas Dilger02ad0ef1997-01-17 01:34:35 -060030png_process_data(png_structp png_ptr, png_infop info_ptr,
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -060031 png_bytep buffer, png_size_t buffer_size)
Guy Schalnat6d764711995-12-19 03:22:19 -060032{
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -050033 if (png_ptr == NULL || info_ptr == NULL)
34 return;
35
Guy Schalnatb2e01bd1996-01-26 01:38:47 -060036 png_push_restore_buffer(png_ptr, buffer, buffer_size);
Guy Schalnat6d764711995-12-19 03:22:19 -060037
Guy Schalnatb2e01bd1996-01-26 01:38:47 -060038 while (png_ptr->buffer_size)
39 {
Andreas Dilger02ad0ef1997-01-17 01:34:35 -060040 png_process_some_data(png_ptr, info_ptr);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -060041 }
Guy Schalnat6d764711995-12-19 03:22:19 -060042}
43
Andreas Dilger02ad0ef1997-01-17 01:34:35 -060044/* What we do with the incoming data depends on what we were previously
45 * doing before we ran out of data...
46 */
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -050047void /* PRIVATE */
Andreas Dilger02ad0ef1997-01-17 01:34:35 -060048png_process_some_data(png_structp png_ptr, png_infop info_ptr)
Guy Schalnat6d764711995-12-19 03:22:19 -060049{
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -050050 if (png_ptr == NULL)
51 return;
52
Guy Schalnatb2e01bd1996-01-26 01:38:47 -060053 switch (png_ptr->process_mode)
54 {
55 case PNG_READ_SIG_MODE:
56 {
Andreas Dilger02ad0ef1997-01-17 01:34:35 -060057 png_push_read_sig(png_ptr, info_ptr);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -060058 break;
59 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -050060
Guy Schalnatb2e01bd1996-01-26 01:38:47 -060061 case PNG_READ_CHUNK_MODE:
62 {
Andreas Dilger02ad0ef1997-01-17 01:34:35 -060063 png_push_read_chunk(png_ptr, info_ptr);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -060064 break;
65 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -050066
Guy Schalnatb2e01bd1996-01-26 01:38:47 -060067 case PNG_READ_IDAT_MODE:
68 {
Guy Schalnate5a37791996-06-05 15:50:50 -050069 png_push_read_IDAT(png_ptr);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -060070 break;
71 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -050072
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -050073#ifdef PNG_READ_tEXt_SUPPORTED
Guy Schalnatb2e01bd1996-01-26 01:38:47 -060074 case PNG_READ_tEXt_MODE:
75 {
Andreas Dilger02ad0ef1997-01-17 01:34:35 -060076 png_push_read_tEXt(png_ptr, info_ptr);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -060077 break;
78 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -050079
Guy Schalnat6d764711995-12-19 03:22:19 -060080#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -050081#ifdef PNG_READ_zTXt_SUPPORTED
Guy Schalnatb2e01bd1996-01-26 01:38:47 -060082 case PNG_READ_zTXt_MODE:
83 {
Andreas Dilger02ad0ef1997-01-17 01:34:35 -060084 png_push_read_zTXt(png_ptr, info_ptr);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -060085 break;
86 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -050087
Guy Schalnatb2e01bd1996-01-26 01:38:47 -060088#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -050089#ifdef PNG_READ_iTXt_SUPPORTED
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -060090 case PNG_READ_iTXt_MODE:
91 {
92 png_push_read_iTXt(png_ptr, info_ptr);
93 break;
94 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -050095
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -060096#endif
Guy Schalnatb2e01bd1996-01-26 01:38:47 -060097 case PNG_SKIP_MODE:
98 {
Andreas Dilger47a0c421997-05-16 02:46:07 -050099 png_push_crc_finish(png_ptr);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600100 break;
101 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500102
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600103 default:
104 {
105 png_ptr->buffer_size = 0;
106 break;
107 }
108 }
Guy Schalnat6d764711995-12-19 03:22:19 -0600109}
110
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600111/* Read any remaining signature bytes from the stream and compare them with
112 * the correct PNG signature. It is possible that this routine is called
Glenn Randers-Pehrson345bc271998-06-14 14:43:31 -0500113 * with bytes already read from the signature, either because they have been
114 * checked by the calling application, or because of multiple calls to this
115 * routine.
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600116 */
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -0500117void /* PRIVATE */
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600118png_push_read_sig(png_structp png_ptr, png_infop info_ptr)
Guy Schalnat6d764711995-12-19 03:22:19 -0600119{
Andreas Dilger47a0c421997-05-16 02:46:07 -0500120 png_size_t num_checked = png_ptr->sig_bytes,
121 num_to_check = 8 - num_checked;
Guy Schalnat6d764711995-12-19 03:22:19 -0600122
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600123 if (png_ptr->buffer_size < num_to_check)
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600124 {
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600125 num_to_check = png_ptr->buffer_size;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600126 }
Guy Schalnat6d764711995-12-19 03:22:19 -0600127
Glenn Randers-Pehrson5c6aeb21998-12-29 11:47:59 -0600128 png_push_fill_buffer(png_ptr, &(info_ptr->signature[num_checked]),
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -0600129 num_to_check);
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -0500130 png_ptr->sig_bytes = (png_byte)(png_ptr->sig_bytes + num_to_check);
Guy Schalnat6d764711995-12-19 03:22:19 -0600131
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600132 if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600133 {
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600134 if (num_checked < 4 &&
135 png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
136 png_error(png_ptr, "Not a PNG file");
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -0500137
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600138 else
139 png_error(png_ptr, "PNG file corrupted by ASCII conversion");
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600140 }
141 else
142 {
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600143 if (png_ptr->sig_bytes >= 8)
144 {
145 png_ptr->process_mode = PNG_READ_CHUNK_MODE;
146 }
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600147 }
Guy Schalnat6d764711995-12-19 03:22:19 -0600148}
149
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -0500150void /* PRIVATE */
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600151png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
Guy Schalnat6d764711995-12-19 03:22:19 -0600152{
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500153 PNG_IHDR;
154 PNG_IDAT;
155 PNG_IEND;
156 PNG_PLTE;
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500157#ifdef PNG_READ_bKGD_SUPPORTED
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500158 PNG_bKGD;
Glenn Randers-Pehrson074af5e1999-11-28 23:32:18 -0600159#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500160#ifdef PNG_READ_cHRM_SUPPORTED
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500161 PNG_cHRM;
Glenn Randers-Pehrson074af5e1999-11-28 23:32:18 -0600162#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500163#ifdef PNG_READ_gAMA_SUPPORTED
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500164 PNG_gAMA;
Glenn Randers-Pehrson074af5e1999-11-28 23:32:18 -0600165#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500166#ifdef PNG_READ_hIST_SUPPORTED
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500167 PNG_hIST;
Glenn Randers-Pehrson074af5e1999-11-28 23:32:18 -0600168#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500169#ifdef PNG_READ_iCCP_SUPPORTED
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500170 PNG_iCCP;
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -0600171#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500172#ifdef PNG_READ_iTXt_SUPPORTED
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500173 PNG_iTXt;
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -0600174#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500175#ifdef PNG_READ_oFFs_SUPPORTED
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500176 PNG_oFFs;
Glenn Randers-Pehrson074af5e1999-11-28 23:32:18 -0600177#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500178#ifdef PNG_READ_pCAL_SUPPORTED
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500179 PNG_pCAL;
Glenn Randers-Pehrson074af5e1999-11-28 23:32:18 -0600180#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500181#ifdef PNG_READ_pHYs_SUPPORTED
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500182 PNG_pHYs;
Glenn Randers-Pehrson074af5e1999-11-28 23:32:18 -0600183#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500184#ifdef PNG_READ_sBIT_SUPPORTED
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500185 PNG_sBIT;
Glenn Randers-Pehrson074af5e1999-11-28 23:32:18 -0600186#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500187#ifdef PNG_READ_sCAL_SUPPORTED
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500188 PNG_sCAL;
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -0600189#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500190#ifdef PNG_READ_sRGB_SUPPORTED
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500191 PNG_sRGB;
Glenn Randers-Pehrson074af5e1999-11-28 23:32:18 -0600192#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500193#ifdef PNG_READ_sPLT_SUPPORTED
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500194 PNG_sPLT;
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -0600195#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500196#ifdef PNG_READ_tEXt_SUPPORTED
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500197 PNG_tEXt;
Glenn Randers-Pehrson074af5e1999-11-28 23:32:18 -0600198#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500199#ifdef PNG_READ_tIME_SUPPORTED
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500200 PNG_tIME;
Glenn Randers-Pehrson074af5e1999-11-28 23:32:18 -0600201#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500202#ifdef PNG_READ_tRNS_SUPPORTED
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500203 PNG_tRNS;
Glenn Randers-Pehrson074af5e1999-11-28 23:32:18 -0600204#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500205#ifdef PNG_READ_zTXt_SUPPORTED
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500206 PNG_zTXt;
Glenn Randers-Pehrson074af5e1999-11-28 23:32:18 -0600207#endif
Glenn Randers-Pehrsona2567be2009-10-19 20:31:31 -0500208
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600209 /* First we make sure we have enough data for the 4 byte chunk name
Glenn Randers-Pehrsonb6ce43d1998-01-01 07:13:13 -0600210 * and the 4 byte chunk length before proceeding with decoding the
211 * chunk data. To fully decode each of these chunks, we also make
212 * sure we have enough data in the buffer for the 4 byte CRC at the
213 * end of every chunk (except IDAT, which is handled separately).
214 */
Glenn Randers-Pehrson5379b241999-11-27 10:22:33 -0600215 if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600216 {
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600217 png_byte chunk_length[4];
Guy Schalnat6d764711995-12-19 03:22:19 -0600218
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600219 if (png_ptr->buffer_size < 8)
220 {
221 png_push_save_buffer(png_ptr);
222 return;
223 }
Guy Schalnat6d764711995-12-19 03:22:19 -0600224
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600225 png_push_fill_buffer(png_ptr, chunk_length, 4);
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -0500226 png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600227 png_reset_crc(png_ptr);
Andreas Dilger47a0c421997-05-16 02:46:07 -0500228 png_crc_read(png_ptr, png_ptr->chunk_name, 4);
Glenn Randers-Pehrsoneb580912008-07-30 14:47:09 -0500229 png_check_chunk_name(png_ptr, png_ptr->chunk_name);
Glenn Randers-Pehrson5379b241999-11-27 10:22:33 -0600230 png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600231 }
Guy Schalnat6d764711995-12-19 03:22:19 -0600232
Glenn Randers-Pehrsonbeb572e2006-08-19 13:59:24 -0500233 if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -0600234 if (png_ptr->mode & PNG_AFTER_IDAT)
235 png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
Glenn Randers-Pehrson6bc53be2006-06-16 07:52:03 -0500236
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600237 if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600238 {
Glenn Randers-Pehrsoneb580912008-07-30 14:47:09 -0500239 if (png_ptr->push_length != 13)
240 png_error(png_ptr, "Invalid IHDR length");
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500241
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500242 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
243 {
244 png_push_save_buffer(png_ptr);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600245 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500246 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500247
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600248 png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600249 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500250
Glenn Randers-Pehrsond029a752004-08-09 21:50:32 -0500251 else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
252 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500253 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
254 {
255 png_push_save_buffer(png_ptr);
Glenn Randers-Pehrsond029a752004-08-09 21:50:32 -0500256 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500257 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500258
Glenn Randers-Pehrsond029a752004-08-09 21:50:32 -0500259 png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);
260
261 png_ptr->process_mode = PNG_READ_DONE_MODE;
262 png_push_have_end(png_ptr, info_ptr);
263 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500264
Glenn Randers-Pehrsond029a752004-08-09 21:50:32 -0500265#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
266 else if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name))
267 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500268 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
269 {
270 png_push_save_buffer(png_ptr);
Glenn Randers-Pehrsond029a752004-08-09 21:50:32 -0500271 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500272 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500273
Glenn Randers-Pehrsond029a752004-08-09 21:50:32 -0500274 if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
275 png_ptr->mode |= PNG_HAVE_IDAT;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500276
Glenn Randers-Pehrsond029a752004-08-09 21:50:32 -0500277 png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500278
Glenn Randers-Pehrsond029a752004-08-09 21:50:32 -0500279 if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
280 png_ptr->mode |= PNG_HAVE_PLTE;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500281
Glenn Randers-Pehrsond029a752004-08-09 21:50:32 -0500282 else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
283 {
284 if (!(png_ptr->mode & PNG_HAVE_IHDR))
285 png_error(png_ptr, "Missing IHDR before IDAT");
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500286
Glenn Randers-Pehrsond029a752004-08-09 21:50:32 -0500287 else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -0600288 !(png_ptr->mode & PNG_HAVE_PLTE))
Glenn Randers-Pehrsond029a752004-08-09 21:50:32 -0500289 png_error(png_ptr, "Missing PLTE before IDAT");
290 }
291 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500292
Glenn Randers-Pehrsond029a752004-08-09 21:50:32 -0500293#endif
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600294 else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600295 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500296 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
297 {
298 png_push_save_buffer(png_ptr);
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600299 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500300 }
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600301 png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600302 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500303
Glenn Randers-Pehrsonbeb572e2006-08-19 13:59:24 -0500304 else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600305 {
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600306 /* If we reach an IDAT chunk, this means we have read all of the
Glenn Randers-Pehrsonb6ce43d1998-01-01 07:13:13 -0600307 * header chunks, and we can start reading the image (or if this
308 * is called after the image has been read - we have an error).
309 */
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500310
311 if (!(png_ptr->mode & PNG_HAVE_IHDR))
312 png_error(png_ptr, "Missing IHDR before IDAT");
313
314 else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
315 !(png_ptr->mode & PNG_HAVE_PLTE))
316 png_error(png_ptr, "Missing PLTE before IDAT");
Glenn Randers-Pehrson73d57cb2002-03-25 18:49:08 -0600317
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600318 if (png_ptr->mode & PNG_HAVE_IDAT)
319 {
Glenn Randers-Pehrson6bc53be2006-06-16 07:52:03 -0500320 if (!(png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500321 if (png_ptr->push_length == 0)
322 return;
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600323
324 if (png_ptr->mode & PNG_AFTER_IDAT)
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -0500325 png_benign_error(png_ptr, "Too many IDATs found");
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600326 }
327
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600328 png_ptr->idat_size = png_ptr->push_length;
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600329 png_ptr->mode |= PNG_HAVE_IDAT;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600330 png_ptr->process_mode = PNG_READ_IDAT_MODE;
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600331 png_push_have_info(png_ptr, info_ptr);
Glenn Randers-Pehrsone3f3c4e2010-02-07 18:08:50 -0600332 png_ptr->zstream.avail_out =
333 (uInt) PNG_ROWBYTES(png_ptr->pixel_depth,
334 png_ptr->iwidth) + 1;
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600335 png_ptr->zstream.next_out = png_ptr->row_buf;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600336 return;
337 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500338
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500339#ifdef PNG_READ_gAMA_SUPPORTED
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600340 else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))
341 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500342 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
343 {
344 png_push_save_buffer(png_ptr);
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600345 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500346 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500347
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600348 png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600349 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500350
Guy Schalnat6d764711995-12-19 03:22:19 -0600351#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500352#ifdef PNG_READ_sBIT_SUPPORTED
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600353 else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600354 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500355 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
356 {
357 png_push_save_buffer(png_ptr);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600358 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500359 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500360
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600361 png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600362 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500363
Guy Schalnat6d764711995-12-19 03:22:19 -0600364#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500365#ifdef PNG_READ_cHRM_SUPPORTED
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600366 else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600367 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500368 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
369 {
370 png_push_save_buffer(png_ptr);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600371 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500372 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500373
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600374 png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600375 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500376
Guy Schalnat6d764711995-12-19 03:22:19 -0600377#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500378#ifdef PNG_READ_sRGB_SUPPORTED
Glenn Randers-Pehrsonb6ce43d1998-01-01 07:13:13 -0600379 else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))
380 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500381 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
382 {
383 png_push_save_buffer(png_ptr);
Glenn Randers-Pehrsonb6ce43d1998-01-01 07:13:13 -0600384 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500385 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500386
Glenn Randers-Pehrsonb6ce43d1998-01-01 07:13:13 -0600387 png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
388 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500389
Glenn Randers-Pehrsonb6ce43d1998-01-01 07:13:13 -0600390#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500391#ifdef PNG_READ_iCCP_SUPPORTED
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -0600392 else if (!png_memcmp(png_ptr->chunk_name, png_iCCP, 4))
393 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500394 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
395 {
396 png_push_save_buffer(png_ptr);
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -0600397 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500398 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500399
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -0600400 png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);
401 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500402
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -0600403#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500404#ifdef PNG_READ_sPLT_SUPPORTED
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -0600405 else if (!png_memcmp(png_ptr->chunk_name, png_sPLT, 4))
406 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500407 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
408 {
409 png_push_save_buffer(png_ptr);
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -0600410 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500411 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500412
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -0600413 png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);
414 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500415
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -0600416#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500417#ifdef PNG_READ_tRNS_SUPPORTED
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600418 else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600419 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500420 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
421 {
422 png_push_save_buffer(png_ptr);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600423 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500424 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500425
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600426 png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600427 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500428
Guy Schalnat6d764711995-12-19 03:22:19 -0600429#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500430#ifdef PNG_READ_bKGD_SUPPORTED
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600431 else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600432 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500433 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
434 {
435 png_push_save_buffer(png_ptr);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600436 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500437 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500438
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600439 png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600440 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500441
Guy Schalnat6d764711995-12-19 03:22:19 -0600442#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500443#ifdef PNG_READ_hIST_SUPPORTED
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600444 else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600445 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500446 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
447 {
448 png_push_save_buffer(png_ptr);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600449 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500450 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500451
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600452 png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600453 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500454
Guy Schalnat6d764711995-12-19 03:22:19 -0600455#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500456#ifdef PNG_READ_pHYs_SUPPORTED
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600457 else if (!png_memcmp(png_ptr->chunk_name, png_pHYs, 4))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600458 {
459 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
460 {
461 png_push_save_buffer(png_ptr);
462 return;
463 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500464
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600465 png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600466 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500467
Guy Schalnat6d764711995-12-19 03:22:19 -0600468#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500469#ifdef PNG_READ_oFFs_SUPPORTED
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600470 else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600471 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500472 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
473 {
474 png_push_save_buffer(png_ptr);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600475 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500476 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500477
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600478 png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600479 }
Guy Schalnat6d764711995-12-19 03:22:19 -0600480#endif
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500481
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500482#ifdef PNG_READ_pCAL_SUPPORTED
Andreas Dilger47a0c421997-05-16 02:46:07 -0500483 else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))
484 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500485 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
486 {
487 png_push_save_buffer(png_ptr);
Andreas Dilger47a0c421997-05-16 02:46:07 -0500488 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500489 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500490
Andreas Dilger47a0c421997-05-16 02:46:07 -0500491 png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
492 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500493
Andreas Dilger47a0c421997-05-16 02:46:07 -0500494#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500495#ifdef PNG_READ_sCAL_SUPPORTED
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -0600496 else if (!png_memcmp(png_ptr->chunk_name, png_sCAL, 4))
497 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500498 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
499 {
500 png_push_save_buffer(png_ptr);
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -0600501 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500502 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500503
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -0600504 png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);
505 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500506
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -0600507#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500508#ifdef PNG_READ_tIME_SUPPORTED
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600509 else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600510 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500511 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
512 {
513 png_push_save_buffer(png_ptr);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600514 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500515 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500516
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600517 png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600518 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500519
Guy Schalnat6d764711995-12-19 03:22:19 -0600520#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500521#ifdef PNG_READ_tEXt_SUPPORTED
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600522 else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600523 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500524 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
525 {
526 png_push_save_buffer(png_ptr);
Glenn Randers-Pehrsond1e8c862002-06-20 06:54:34 -0500527 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500528 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500529
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600530 png_push_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600531 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500532
Guy Schalnat6d764711995-12-19 03:22:19 -0600533#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500534#ifdef PNG_READ_zTXt_SUPPORTED
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600535 else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600536 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500537 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
538 {
539 png_push_save_buffer(png_ptr);
Glenn Randers-Pehrsond1e8c862002-06-20 06:54:34 -0500540 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500541 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500542
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600543 png_push_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600544 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500545
Guy Schalnat6d764711995-12-19 03:22:19 -0600546#endif
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500547#ifdef PNG_READ_iTXt_SUPPORTED
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -0600548 else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4))
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -0600549 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500550 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
551 {
552 png_push_save_buffer(png_ptr);
Glenn Randers-Pehrsond1e8c862002-06-20 06:54:34 -0500553 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500554 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500555
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -0600556 png_push_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
557 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500558
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -0600559#endif
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600560 else
561 {
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500562 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
563 {
564 png_push_save_buffer(png_ptr);
Glenn Randers-Pehrsond1e8c862002-06-20 06:54:34 -0500565 return;
Glenn Randers-Pehrson79084212008-08-04 13:31:41 -0500566 }
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600567 png_push_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600568 }
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600569
Glenn Randers-Pehrson5379b241999-11-27 10:22:33 -0600570 png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
Guy Schalnat6d764711995-12-19 03:22:19 -0600571}
572
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -0500573void /* PRIVATE */
Andreas Dilger47a0c421997-05-16 02:46:07 -0500574png_push_crc_skip(png_structp png_ptr, png_uint_32 skip)
Guy Schalnat6d764711995-12-19 03:22:19 -0600575{
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600576 png_ptr->process_mode = PNG_SKIP_MODE;
Andreas Dilger47a0c421997-05-16 02:46:07 -0500577 png_ptr->skip_length = skip;
Guy Schalnat6d764711995-12-19 03:22:19 -0600578}
579
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -0500580void /* PRIVATE */
Andreas Dilger47a0c421997-05-16 02:46:07 -0500581png_push_crc_finish(png_structp png_ptr)
Guy Schalnat6d764711995-12-19 03:22:19 -0600582{
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600583 if (png_ptr->skip_length && png_ptr->save_buffer_size)
584 {
Andreas Dilger47a0c421997-05-16 02:46:07 -0500585 png_size_t save_size;
Guy Schalnat6d764711995-12-19 03:22:19 -0600586
Andreas Dilger47a0c421997-05-16 02:46:07 -0500587 if (png_ptr->skip_length < (png_uint_32)png_ptr->save_buffer_size)
588 save_size = (png_size_t)png_ptr->skip_length;
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -0500589
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600590 else
591 save_size = png_ptr->save_buffer_size;
Guy Schalnat6d764711995-12-19 03:22:19 -0600592
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600593 png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
Guy Schalnat6d764711995-12-19 03:22:19 -0600594
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600595 png_ptr->skip_length -= save_size;
596 png_ptr->buffer_size -= save_size;
597 png_ptr->save_buffer_size -= save_size;
Andreas Dilger47a0c421997-05-16 02:46:07 -0500598 png_ptr->save_buffer_ptr += save_size;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600599 }
600 if (png_ptr->skip_length && png_ptr->current_buffer_size)
601 {
Andreas Dilger47a0c421997-05-16 02:46:07 -0500602 png_size_t save_size;
Guy Schalnat6d764711995-12-19 03:22:19 -0600603
Andreas Dilger47a0c421997-05-16 02:46:07 -0500604 if (png_ptr->skip_length < (png_uint_32)png_ptr->current_buffer_size)
605 save_size = (png_size_t)png_ptr->skip_length;
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -0500606
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600607 else
608 save_size = png_ptr->current_buffer_size;
Guy Schalnat6d764711995-12-19 03:22:19 -0600609
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600610 png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
Guy Schalnat6d764711995-12-19 03:22:19 -0600611
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600612 png_ptr->skip_length -= save_size;
613 png_ptr->buffer_size -= save_size;
614 png_ptr->current_buffer_size -= save_size;
Andreas Dilger47a0c421997-05-16 02:46:07 -0500615 png_ptr->current_buffer_ptr += save_size;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600616 }
617 if (!png_ptr->skip_length)
618 {
619 if (png_ptr->buffer_size < 4)
620 {
621 png_push_save_buffer(png_ptr);
622 return;
623 }
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600624
625 png_crc_finish(png_ptr, 0);
Andreas Dilger47a0c421997-05-16 02:46:07 -0500626 png_ptr->process_mode = PNG_READ_CHUNK_MODE;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600627 }
Guy Schalnat6d764711995-12-19 03:22:19 -0600628}
629
Glenn Randers-Pehrsoneae8e362010-03-12 17:36:53 -0600630void PNGCBAPI
Andreas Dilger47a0c421997-05-16 02:46:07 -0500631png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
Guy Schalnat6d764711995-12-19 03:22:19 -0600632{
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600633 png_bytep ptr;
Guy Schalnat6d764711995-12-19 03:22:19 -0600634
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500635 if (png_ptr == NULL)
636 return;
637
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600638 ptr = buffer;
639 if (png_ptr->save_buffer_size)
640 {
Andreas Dilger47a0c421997-05-16 02:46:07 -0500641 png_size_t save_size;
Guy Schalnat6d764711995-12-19 03:22:19 -0600642
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600643 if (length < png_ptr->save_buffer_size)
644 save_size = length;
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -0500645
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600646 else
647 save_size = png_ptr->save_buffer_size;
Guy Schalnat6d764711995-12-19 03:22:19 -0600648
Andreas Dilger47a0c421997-05-16 02:46:07 -0500649 png_memcpy(ptr, png_ptr->save_buffer_ptr, save_size);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600650 length -= save_size;
Andreas Dilger47a0c421997-05-16 02:46:07 -0500651 ptr += save_size;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600652 png_ptr->buffer_size -= save_size;
653 png_ptr->save_buffer_size -= save_size;
Andreas Dilger47a0c421997-05-16 02:46:07 -0500654 png_ptr->save_buffer_ptr += save_size;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600655 }
656 if (length && png_ptr->current_buffer_size)
657 {
Andreas Dilger47a0c421997-05-16 02:46:07 -0500658 png_size_t save_size;
Guy Schalnat6d764711995-12-19 03:22:19 -0600659
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600660 if (length < png_ptr->current_buffer_size)
661 save_size = length;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500662
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600663 else
664 save_size = png_ptr->current_buffer_size;
Guy Schalnat6d764711995-12-19 03:22:19 -0600665
Andreas Dilger47a0c421997-05-16 02:46:07 -0500666 png_memcpy(ptr, png_ptr->current_buffer_ptr, save_size);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600667 png_ptr->buffer_size -= save_size;
668 png_ptr->current_buffer_size -= save_size;
Andreas Dilger47a0c421997-05-16 02:46:07 -0500669 png_ptr->current_buffer_ptr += save_size;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600670 }
Guy Schalnat6d764711995-12-19 03:22:19 -0600671}
672
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -0500673void /* PRIVATE */
Guy Schalnat6d764711995-12-19 03:22:19 -0600674png_push_save_buffer(png_structp png_ptr)
675{
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600676 if (png_ptr->save_buffer_size)
677 {
678 if (png_ptr->save_buffer_ptr != png_ptr->save_buffer)
679 {
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -0500680 png_size_t i, istop;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600681 png_bytep sp;
682 png_bytep dp;
Guy Schalnat6d764711995-12-19 03:22:19 -0600683
Glenn Randers-Pehrson896239b1998-04-21 15:03:57 -0500684 istop = png_ptr->save_buffer_size;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600685 for (i = 0, sp = png_ptr->save_buffer_ptr, dp = png_ptr->save_buffer;
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -0600686 i < istop; i++, sp++, dp++)
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600687 {
688 *dp = *sp;
689 }
690 }
691 }
Glenn Randers-Pehrsone00ed362010-02-07 22:42:58 -0600692 if (png_ptr->save_buffer_size + png_ptr->current_buffer_size >
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -0600693 png_ptr->save_buffer_max)
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600694 {
Andreas Dilger47a0c421997-05-16 02:46:07 -0500695 png_size_t new_max;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600696 png_bytep old_buffer;
Guy Schalnat6d764711995-12-19 03:22:19 -0600697
Glenn Randers-Pehrsone3f3c4e2010-02-07 18:08:50 -0600698 if (png_ptr->save_buffer_size > PNG_SIZE_MAX -
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -0600699 (png_ptr->current_buffer_size + 256))
Glenn Randers-Pehrsone00ed362010-02-07 22:42:58 -0600700 {
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -0600701 png_error(png_ptr, "Potential overflow of save_buffer");
Glenn Randers-Pehrsone00ed362010-02-07 22:42:58 -0600702 }
Glenn Randers-Pehrsone3f3c4e2010-02-07 18:08:50 -0600703
Glenn Randers-Pehrsone00ed362010-02-07 22:42:58 -0600704 new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600705 old_buffer = png_ptr->save_buffer;
Glenn Randers-Pehrsonf1eb9182010-02-08 15:36:41 -0600706 png_ptr->save_buffer = (png_bytep)png_malloc_warn(png_ptr,
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -0600707 (png_size_t)new_max);
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -0500708
Glenn Randers-Pehrsonf1eb9182010-02-08 15:36:41 -0600709 if (png_ptr->save_buffer == NULL)
710 {
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -0600711 png_free(png_ptr, old_buffer);
712 png_error(png_ptr, "Insufficient memory for save_buffer");
Glenn Randers-Pehrsonf1eb9182010-02-08 15:36:41 -0600713 }
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -0500714
Glenn Randers-Pehrson82ae3832001-04-20 10:32:10 -0500715 png_memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
716 png_free(png_ptr, old_buffer);
717 png_ptr->save_buffer_max = new_max;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600718 }
719 if (png_ptr->current_buffer_size)
720 {
Andreas Dilger47a0c421997-05-16 02:46:07 -0500721 png_memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
722 png_ptr->current_buffer_ptr, png_ptr->current_buffer_size);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600723 png_ptr->save_buffer_size += png_ptr->current_buffer_size;
724 png_ptr->current_buffer_size = 0;
725 }
726 png_ptr->save_buffer_ptr = png_ptr->save_buffer;
727 png_ptr->buffer_size = 0;
Guy Schalnat6d764711995-12-19 03:22:19 -0600728}
729
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -0500730void /* PRIVATE */
Guy Schalnat6d764711995-12-19 03:22:19 -0600731png_push_restore_buffer(png_structp png_ptr, png_bytep buffer,
Andreas Dilger47a0c421997-05-16 02:46:07 -0500732 png_size_t buffer_length)
Guy Schalnat6d764711995-12-19 03:22:19 -0600733{
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600734 png_ptr->current_buffer = buffer;
735 png_ptr->current_buffer_size = buffer_length;
736 png_ptr->buffer_size = buffer_length + png_ptr->save_buffer_size;
737 png_ptr->current_buffer_ptr = png_ptr->current_buffer;
Guy Schalnat6d764711995-12-19 03:22:19 -0600738}
739
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -0500740void /* PRIVATE */
Guy Schalnate5a37791996-06-05 15:50:50 -0500741png_push_read_IDAT(png_structp png_ptr)
Guy Schalnat6d764711995-12-19 03:22:19 -0600742{
Glenn Randers-Pehrson9bf60832009-09-20 13:37:50 -0500743 PNG_IDAT;
Glenn Randers-Pehrson5379b241999-11-27 10:22:33 -0600744 if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600745 {
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600746 png_byte chunk_length[4];
Guy Schalnat6d764711995-12-19 03:22:19 -0600747
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600748 if (png_ptr->buffer_size < 8)
749 {
750 png_push_save_buffer(png_ptr);
751 return;
752 }
Guy Schalnat6d764711995-12-19 03:22:19 -0600753
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600754 png_push_fill_buffer(png_ptr, chunk_length, 4);
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -0500755 png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600756 png_reset_crc(png_ptr);
Andreas Dilger47a0c421997-05-16 02:46:07 -0500757 png_crc_read(png_ptr, png_ptr->chunk_name, 4);
Glenn Randers-Pehrson5379b241999-11-27 10:22:33 -0600758 png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600759
Glenn Randers-Pehrsonbeb572e2006-08-19 13:59:24 -0500760 if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600761 {
Andreas Dilger47a0c421997-05-16 02:46:07 -0500762 png_ptr->process_mode = PNG_READ_CHUNK_MODE;
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -0500763
Guy Schalnate5a37791996-06-05 15:50:50 -0500764 if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600765 png_error(png_ptr, "Not enough compressed data");
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -0500766
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600767 return;
768 }
Guy Schalnat6d764711995-12-19 03:22:19 -0600769
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600770 png_ptr->idat_size = png_ptr->push_length;
771 }
772 if (png_ptr->idat_size && png_ptr->save_buffer_size)
773 {
Andreas Dilger47a0c421997-05-16 02:46:07 -0500774 png_size_t save_size;
Guy Schalnat6d764711995-12-19 03:22:19 -0600775
Andreas Dilger47a0c421997-05-16 02:46:07 -0500776 if (png_ptr->idat_size < (png_uint_32)png_ptr->save_buffer_size)
Glenn Randers-Pehrson0f881d61998-02-07 10:20:57 -0600777 {
778 save_size = (png_size_t)png_ptr->idat_size;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500779
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -0500780 /* Check for overflow */
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -0500781 if ((png_uint_32)save_size != png_ptr->idat_size)
Glenn Randers-Pehrson0f881d61998-02-07 10:20:57 -0600782 png_error(png_ptr, "save_size overflowed in pngpread");
783 }
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -0500784
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600785 else
786 save_size = png_ptr->save_buffer_size;
Guy Schalnat6d764711995-12-19 03:22:19 -0600787
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600788 png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500789
Glenn Randers-Pehrson57d96172010-06-19 19:25:17 -0500790 png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500791
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600792 png_ptr->idat_size -= save_size;
793 png_ptr->buffer_size -= save_size;
794 png_ptr->save_buffer_size -= save_size;
Andreas Dilger47a0c421997-05-16 02:46:07 -0500795 png_ptr->save_buffer_ptr += save_size;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600796 }
797 if (png_ptr->idat_size && png_ptr->current_buffer_size)
798 {
Andreas Dilger47a0c421997-05-16 02:46:07 -0500799 png_size_t save_size;
Guy Schalnat6d764711995-12-19 03:22:19 -0600800
Andreas Dilger47a0c421997-05-16 02:46:07 -0500801 if (png_ptr->idat_size < (png_uint_32)png_ptr->current_buffer_size)
Glenn Randers-Pehrson0f881d61998-02-07 10:20:57 -0600802 {
803 save_size = (png_size_t)png_ptr->idat_size;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500804
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -0500805 /* Check for overflow */
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -0500806 if ((png_uint_32)save_size != png_ptr->idat_size)
Glenn Randers-Pehrson0f881d61998-02-07 10:20:57 -0600807 png_error(png_ptr, "save_size overflowed in pngpread");
808 }
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600809 else
810 save_size = png_ptr->current_buffer_size;
Guy Schalnat6d764711995-12-19 03:22:19 -0600811
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600812 png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -0500813
Glenn Randers-Pehrson57d96172010-06-19 19:25:17 -0500814 png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);
Guy Schalnat6d764711995-12-19 03:22:19 -0600815
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600816 png_ptr->idat_size -= save_size;
817 png_ptr->buffer_size -= save_size;
818 png_ptr->current_buffer_size -= save_size;
Andreas Dilger47a0c421997-05-16 02:46:07 -0500819 png_ptr->current_buffer_ptr += save_size;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600820 }
821 if (!png_ptr->idat_size)
822 {
823 if (png_ptr->buffer_size < 4)
824 {
825 png_push_save_buffer(png_ptr);
826 return;
827 }
828
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600829 png_crc_finish(png_ptr, 0);
Glenn Randers-Pehrson5379b241999-11-27 10:22:33 -0600830 png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
Glenn Randers-Pehrson859665d2002-08-06 18:06:11 -0500831 png_ptr->mode |= PNG_AFTER_IDAT;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600832 }
Guy Schalnat6d764711995-12-19 03:22:19 -0600833}
834
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -0500835void /* PRIVATE */
Guy Schalnat6d764711995-12-19 03:22:19 -0600836png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
Andreas Dilger47a0c421997-05-16 02:46:07 -0500837 png_size_t buffer_length)
Guy Schalnat6d764711995-12-19 03:22:19 -0600838{
Glenn Randers-Pehrson57d96172010-06-19 19:25:17 -0500839 /* The caller checks for a non-zero buffer length. */
840 if (!(buffer_length > 0) || buffer == 0)
841 png_error(png_ptr, "No IDAT data (internal error)");
Guy Schalnat6d764711995-12-19 03:22:19 -0600842
Glenn Randers-Pehrson57d96172010-06-19 19:25:17 -0500843 /* This routine must process all the data it has been given
844 * before returning, calling the row callback as required to
Glenn Randers-Pehrson5feb87c2010-06-21 12:28:05 -0500845 * handle the uncompressed results.
Glenn Randers-Pehrson57d96172010-06-19 19:25:17 -0500846 */
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600847 png_ptr->zstream.next_in = buffer;
848 png_ptr->zstream.avail_in = (uInt)buffer_length;
Glenn Randers-Pehrson57d96172010-06-19 19:25:17 -0500849
850 /* Keep going until the decompressed data is all processed
851 * or the stream marked as finished.
852 */
853 while (png_ptr->zstream.avail_in > 0 &&
854 !(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600855 {
Glenn Randers-Pehrson57d96172010-06-19 19:25:17 -0500856 int ret;
857
858 /* We have data for zlib, but we must check that zlib
859 * has somewhere to put the results. It doesn't matter
Glenn Randers-Pehrson5feb87c2010-06-21 12:28:05 -0500860 * if we don't expect any results -- it may be the input
Glenn Randers-Pehrson57d96172010-06-19 19:25:17 -0500861 * data is just the LZ end code.
862 */
863 if (!(png_ptr->zstream.avail_out > 0))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600864 {
Glenn Randers-Pehrsone3f3c4e2010-02-07 18:08:50 -0600865 png_ptr->zstream.avail_out =
866 (uInt) PNG_ROWBYTES(png_ptr->pixel_depth,
867 png_ptr->iwidth) + 1;
Glenn Randers-Pehrson5feb87c2010-06-21 12:28:05 -0500868
Andreas Dilger02ad0ef1997-01-17 01:34:35 -0600869 png_ptr->zstream.next_out = png_ptr->row_buf;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600870 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500871
Glenn Randers-Pehrson57d96172010-06-19 19:25:17 -0500872 /* Using Z_SYNC_FLUSH here means that an unterminated
873 * LZ stream can still be handled (a stream with a missing
874 * end code), otherwise (Z_NO_FLUSH) a future zlib
875 * implementation might defer output and, therefore,
876 * change the current behavior. (See comments in inflate.c
877 * for why this doesn't happen at present with zlib 1.2.5.)
878 */
879 ret = inflate(&png_ptr->zstream, Z_SYNC_FLUSH);
880
881 /* Check for any failure before proceeding. */
882 if (ret != Z_OK && ret != Z_STREAM_END)
883 {
884 /* Terminate the decompression. */
885 png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
886
887 /* This may be a truncated stream (missing or
888 * damaged end code). Treat that as a warning.
889 */
890 if (png_ptr->row_number >= png_ptr->num_rows ||
891 png_ptr->pass > 6)
Glenn Randers-Pehrson5feb87c2010-06-21 12:28:05 -0500892 png_warning(png_ptr, "Truncated compressed data in IDAT");
893
Glenn Randers-Pehrson57d96172010-06-19 19:25:17 -0500894 else
Glenn Randers-Pehrson5feb87c2010-06-21 12:28:05 -0500895 png_error(png_ptr, "Decompression error in IDAT");
Glenn Randers-Pehrson57d96172010-06-19 19:25:17 -0500896
897 /* Skip the check on unprocessed input */
898 return;
899 }
900
901 /* Did inflate output any data? */
902 if (png_ptr->zstream.next_out != png_ptr->row_buf)
903 {
904 /* Is this unexpected data after the last row?
905 * If it is, artificially terminate the LZ output
906 * here.
907 */
908 if (png_ptr->row_number >= png_ptr->num_rows ||
909 png_ptr->pass > 6)
910 {
911 /* Extra data. */
Glenn Randers-Pehrson5feb87c2010-06-21 12:28:05 -0500912 png_warning(png_ptr, "Extra compressed data in IDAT");
Glenn Randers-Pehrson57d96172010-06-19 19:25:17 -0500913 png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
Glenn Randers-Pehrson5feb87c2010-06-21 12:28:05 -0500914
915 /* Do no more processing; skip the unprocessed
Glenn Randers-Pehrson57d96172010-06-19 19:25:17 -0500916 * input check below.
917 */
918 return;
919 }
920
921 /* Do we have a complete row? */
922 if (png_ptr->zstream.avail_out == 0)
923 png_push_process_row(png_ptr);
924
925 /* And check for the end of the stream. */
926 if (ret == Z_STREAM_END)
927 png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
928 }
Andreas Dilger47a0c421997-05-16 02:46:07 -0500929 }
Glenn Randers-Pehrson57d96172010-06-19 19:25:17 -0500930
931 /* All the data should have been processed, if anything
932 * is left at this point we have bytes of IDAT data
933 * after the zlib end code.
934 */
935 if (png_ptr->zstream.avail_in > 0)
Glenn Randers-Pehrson5feb87c2010-06-21 12:28:05 -0500936 png_warning(png_ptr, "Extra compression data in IDAT");
Guy Schalnat6d764711995-12-19 03:22:19 -0600937}
938
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -0500939void /* PRIVATE */
Guy Schalnat6d764711995-12-19 03:22:19 -0600940png_push_process_row(png_structp png_ptr)
941{
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600942 png_ptr->row_info.color_type = png_ptr->color_type;
Guy Schalnat6d764711995-12-19 03:22:19 -0600943 png_ptr->row_info.width = png_ptr->iwidth;
944 png_ptr->row_info.channels = png_ptr->channels;
945 png_ptr->row_info.bit_depth = png_ptr->bit_depth;
946 png_ptr->row_info.pixel_depth = png_ptr->pixel_depth;
Glenn Randers-Pehrson5c6aeb21998-12-29 11:47:59 -0600947
Glenn Randers-Pehrson272489d2004-08-04 06:34:52 -0500948 png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
949 png_ptr->row_info.width);
Guy Schalnat6d764711995-12-19 03:22:19 -0600950
Guy Schalnate5a37791996-06-05 15:50:50 -0500951 png_read_filter_row(png_ptr, &(png_ptr->row_info),
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -0500952 png_ptr->row_buf + 1, png_ptr->prev_row + 1,
953 (int)(png_ptr->row_buf[0]));
Guy Schalnat6d764711995-12-19 03:22:19 -0600954
Glenn Randers-Pehrsonbeb572e2006-08-19 13:59:24 -0500955 png_memcpy(png_ptr->prev_row, png_ptr->row_buf, png_ptr->rowbytes + 1);
Guy Schalnat6d764711995-12-19 03:22:19 -0600956
Glenn Randers-Pehrson73b029f2004-11-26 17:28:09 -0600957 if (png_ptr->transformations || (png_ptr->flags&PNG_FLAG_STRIP_ALPHA))
Guy Schalnat6d764711995-12-19 03:22:19 -0600958 png_do_read_transformations(png_ptr);
959
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -0500960#ifdef PNG_READ_INTERLACING_SUPPORTED
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -0500961 /* Blow up interlaced rows to full size */
Andreas Dilger47a0c421997-05-16 02:46:07 -0500962 if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600963 {
964 if (png_ptr->pass < 6)
Glenn Randers-Pehrson231e6872001-01-12 15:13:06 -0600965/* old interface (pre-1.0.9):
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600966 png_do_read_interlace(&(png_ptr->row_info),
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -0600967 png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
Glenn Randers-Pehrson231e6872001-01-12 15:13:06 -0600968 */
969 png_do_read_interlace(png_ptr);
Guy Schalnat6d764711995-12-19 03:22:19 -0600970
Glenn Randers-Pehrsoncdf140b2001-01-15 12:22:32 -0600971 switch (png_ptr->pass)
972 {
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600973 case 0:
974 {
975 int i;
976 for (i = 0; i < 8 && png_ptr->pass == 0; i++)
977 {
978 png_push_have_row(png_ptr, png_ptr->row_buf + 1);
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -0500979 png_read_push_finish_row(png_ptr); /* Updates png_ptr->pass */
Guy Schalnatb2e01bd1996-01-26 01:38:47 -0600980 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500981
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -0500982 if (png_ptr->pass == 2) /* Pass 1 might be empty */
Glenn Randers-Pehrsoncdf140b2001-01-15 12:22:32 -0600983 {
984 for (i = 0; i < 4 && png_ptr->pass == 2; i++)
985 {
Glenn Randers-Pehrsonbeb572e2006-08-19 13:59:24 -0500986 png_push_have_row(png_ptr, NULL);
Glenn Randers-Pehrsoncdf140b2001-01-15 12:22:32 -0600987 png_read_push_finish_row(png_ptr);
988 }
989 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500990
Glenn Randers-Pehrsond1e8c862002-06-20 06:54:34 -0500991 if (png_ptr->pass == 4 && png_ptr->height <= 4)
992 {
993 for (i = 0; i < 2 && png_ptr->pass == 4; i++)
994 {
Glenn Randers-Pehrsonbeb572e2006-08-19 13:59:24 -0500995 png_push_have_row(png_ptr, NULL);
Glenn Randers-Pehrsond1e8c862002-06-20 06:54:34 -0500996 png_read_push_finish_row(png_ptr);
997 }
Glenn Randers-Pehrson3097f612001-05-07 14:52:45 -0500998 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -0500999
Glenn Randers-Pehrson3097f612001-05-07 14:52:45 -05001000 if (png_ptr->pass == 6 && png_ptr->height <= 4)
1001 {
Glenn Randers-Pehrsonbeb572e2006-08-19 13:59:24 -05001002 png_push_have_row(png_ptr, NULL);
Glenn Randers-Pehrson3097f612001-05-07 14:52:45 -05001003 png_read_push_finish_row(png_ptr);
1004 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001005
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001006 break;
1007 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001008
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001009 case 1:
1010 {
1011 int i;
1012 for (i = 0; i < 8 && png_ptr->pass == 1; i++)
1013 {
1014 png_push_have_row(png_ptr, png_ptr->row_buf + 1);
1015 png_read_push_finish_row(png_ptr);
1016 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001017
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -05001018 if (png_ptr->pass == 2) /* Skip top 4 generated rows */
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001019 {
1020 for (i = 0; i < 4 && png_ptr->pass == 2; i++)
1021 {
Glenn Randers-Pehrsonbeb572e2006-08-19 13:59:24 -05001022 png_push_have_row(png_ptr, NULL);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001023 png_read_push_finish_row(png_ptr);
1024 }
1025 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001026
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001027 break;
1028 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001029
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001030 case 2:
1031 {
1032 int i;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001033
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001034 for (i = 0; i < 4 && png_ptr->pass == 2; i++)
1035 {
1036 png_push_have_row(png_ptr, png_ptr->row_buf + 1);
1037 png_read_push_finish_row(png_ptr);
1038 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001039
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001040 for (i = 0; i < 4 && png_ptr->pass == 2; i++)
1041 {
Glenn Randers-Pehrsonbeb572e2006-08-19 13:59:24 -05001042 png_push_have_row(png_ptr, NULL);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001043 png_read_push_finish_row(png_ptr);
1044 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001045
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -05001046 if (png_ptr->pass == 4) /* Pass 3 might be empty */
Glenn Randers-Pehrsoncdf140b2001-01-15 12:22:32 -06001047 {
1048 for (i = 0; i < 2 && png_ptr->pass == 4; i++)
1049 {
Glenn Randers-Pehrsonbeb572e2006-08-19 13:59:24 -05001050 png_push_have_row(png_ptr, NULL);
Glenn Randers-Pehrsoncdf140b2001-01-15 12:22:32 -06001051 png_read_push_finish_row(png_ptr);
1052 }
1053 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001054
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001055 break;
1056 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001057
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001058 case 3:
1059 {
1060 int i;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001061
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001062 for (i = 0; i < 4 && png_ptr->pass == 3; i++)
1063 {
1064 png_push_have_row(png_ptr, png_ptr->row_buf + 1);
1065 png_read_push_finish_row(png_ptr);
1066 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001067
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -05001068 if (png_ptr->pass == 4) /* Skip top two generated rows */
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001069 {
1070 for (i = 0; i < 2 && png_ptr->pass == 4; i++)
1071 {
Glenn Randers-Pehrsonbeb572e2006-08-19 13:59:24 -05001072 png_push_have_row(png_ptr, NULL);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001073 png_read_push_finish_row(png_ptr);
1074 }
1075 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001076
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001077 break;
1078 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001079
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001080 case 4:
1081 {
1082 int i;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001083
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001084 for (i = 0; i < 2 && png_ptr->pass == 4; i++)
1085 {
1086 png_push_have_row(png_ptr, png_ptr->row_buf + 1);
1087 png_read_push_finish_row(png_ptr);
1088 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001089
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001090 for (i = 0; i < 2 && png_ptr->pass == 4; i++)
1091 {
Glenn Randers-Pehrsonbeb572e2006-08-19 13:59:24 -05001092 png_push_have_row(png_ptr, NULL);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001093 png_read_push_finish_row(png_ptr);
1094 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001095
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -05001096 if (png_ptr->pass == 6) /* Pass 5 might be empty */
Glenn Randers-Pehrsoncdf140b2001-01-15 12:22:32 -06001097 {
Glenn Randers-Pehrsonbeb572e2006-08-19 13:59:24 -05001098 png_push_have_row(png_ptr, NULL);
Glenn Randers-Pehrsoncdf140b2001-01-15 12:22:32 -06001099 png_read_push_finish_row(png_ptr);
1100 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001101
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001102 break;
1103 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001104
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001105 case 5:
1106 {
1107 int i;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001108
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001109 for (i = 0; i < 2 && png_ptr->pass == 5; i++)
1110 {
1111 png_push_have_row(png_ptr, png_ptr->row_buf + 1);
1112 png_read_push_finish_row(png_ptr);
1113 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001114
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -05001115 if (png_ptr->pass == 6) /* Skip top generated row */
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001116 {
Glenn Randers-Pehrsonbeb572e2006-08-19 13:59:24 -05001117 png_push_have_row(png_ptr, NULL);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001118 png_read_push_finish_row(png_ptr);
1119 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001120
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001121 break;
1122 }
1123 case 6:
1124 {
1125 png_push_have_row(png_ptr, png_ptr->row_buf + 1);
1126 png_read_push_finish_row(png_ptr);
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001127
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001128 if (png_ptr->pass != 6)
1129 break;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001130
Glenn Randers-Pehrsonbeb572e2006-08-19 13:59:24 -05001131 png_push_have_row(png_ptr, NULL);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001132 png_read_push_finish_row(png_ptr);
1133 }
1134 }
1135 }
1136 else
Guy Schalnat6d764711995-12-19 03:22:19 -06001137#endif
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001138 {
1139 png_push_have_row(png_ptr, png_ptr->row_buf + 1);
1140 png_read_push_finish_row(png_ptr);
1141 }
Guy Schalnat6d764711995-12-19 03:22:19 -06001142}
1143
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -05001144void /* PRIVATE */
Guy Schalnat6d764711995-12-19 03:22:19 -06001145png_read_push_finish_row(png_structp png_ptr)
1146{
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001147 /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001148
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001149 /* Start of interlace block */
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001150 PNG_CONST int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001151
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001152 /* Offset to next interlace block */
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001153 PNG_CONST int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001154
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001155 /* Start of interlace block in the y direction */
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001156 PNG_CONST int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001157
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001158 /* Offset to next interlace block in the y direction */
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001159 PNG_CONST int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001160
Glenn Randers-Pehrson5379b241999-11-27 10:22:33 -06001161 /* Height of interlace block. This is not currently used - if you need
1162 * it, uncomment it here and in png.h
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001163 PNG_CONST int FARDATA png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
Glenn Randers-Pehrson5379b241999-11-27 10:22:33 -06001164 */
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001165
Guy Schalnat6d764711995-12-19 03:22:19 -06001166 png_ptr->row_number++;
1167 if (png_ptr->row_number < png_ptr->num_rows)
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001168 return;
Guy Schalnat6d764711995-12-19 03:22:19 -06001169
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -05001170#ifdef PNG_READ_INTERLACING_SUPPORTED
Guy Schalnat6d764711995-12-19 03:22:19 -06001171 if (png_ptr->interlaced)
1172 {
1173 png_ptr->row_number = 0;
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -05001174 png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
1175
Guy Schalnat6d764711995-12-19 03:22:19 -06001176 do
1177 {
1178 png_ptr->pass++;
Glenn Randers-Pehrsoncdf140b2001-01-15 12:22:32 -06001179 if ((png_ptr->pass == 1 && png_ptr->width < 5) ||
1180 (png_ptr->pass == 3 && png_ptr->width < 3) ||
1181 (png_ptr->pass == 5 && png_ptr->width < 2))
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001182 png_ptr->pass++;
Glenn Randers-Pehrsoncdf140b2001-01-15 12:22:32 -06001183
Glenn Randers-Pehrson859665d2002-08-06 18:06:11 -05001184 if (png_ptr->pass > 7)
1185 png_ptr->pass--;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001186
Guy Schalnat6d764711995-12-19 03:22:19 -06001187 if (png_ptr->pass >= 7)
1188 break;
Glenn Randers-Pehrson5c6aeb21998-12-29 11:47:59 -06001189
Guy Schalnat6d764711995-12-19 03:22:19 -06001190 png_ptr->iwidth = (png_ptr->width +
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -05001191 png_pass_inc[png_ptr->pass] - 1 -
1192 png_pass_start[png_ptr->pass]) /
1193 png_pass_inc[png_ptr->pass];
Glenn Randers-Pehrson08a33431998-03-07 06:06:55 -06001194
Guy Schalnat6d764711995-12-19 03:22:19 -06001195 if (png_ptr->transformations & PNG_INTERLACE)
1196 break;
Glenn Randers-Pehrson5c6aeb21998-12-29 11:47:59 -06001197
1198 png_ptr->num_rows = (png_ptr->height +
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -05001199 png_pass_yinc[png_ptr->pass] - 1 -
1200 png_pass_ystart[png_ptr->pass]) /
1201 png_pass_yinc[png_ptr->pass];
Glenn Randers-Pehrson5c6aeb21998-12-29 11:47:59 -06001202
1203 } while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0);
Guy Schalnat6d764711995-12-19 03:22:19 -06001204 }
Glenn Randers-Pehrsona31c74f2009-05-18 15:52:01 -05001205#endif /* PNG_READ_INTERLACING_SUPPORTED */
Guy Schalnat6d764711995-12-19 03:22:19 -06001206}
1207
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -05001208#ifdef PNG_READ_tEXt_SUPPORTED
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -05001209void /* PRIVATE */
Glenn Randers-Pehrson3097f612001-05-07 14:52:45 -05001210png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001211 length)
Guy Schalnat6d764711995-12-19 03:22:19 -06001212{
Glenn Randers-Pehrson520a7642000-03-21 05:13:06 -06001213 if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
Glenn Randers-Pehrsona357b991998-02-08 20:56:40 -06001214 {
1215 png_error(png_ptr, "Out of place tEXt");
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -05001216 info_ptr = info_ptr; /* To quiet some compiler warnings */
Glenn Randers-Pehrsona357b991998-02-08 20:56:40 -06001217 }
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001218
Andreas Dilger47a0c421997-05-16 02:46:07 -05001219#ifdef PNG_MAX_MALLOC_64K
1220 png_ptr->skip_length = 0; /* This may not be necessary */
1221
Glenn Randers-Pehrson3097f612001-05-07 14:52:45 -05001222 if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
Andreas Dilger47a0c421997-05-16 02:46:07 -05001223 {
1224 png_warning(png_ptr, "tEXt chunk too large to fit in memory");
Glenn Randers-Pehrsonb6ce43d1998-01-01 07:13:13 -06001225 png_ptr->skip_length = length - (png_uint_32)65535L;
1226 length = (png_uint_32)65535L;
Andreas Dilger47a0c421997-05-16 02:46:07 -05001227 }
1228#endif
1229
Glenn Randers-Pehrson5c6aeb21998-12-29 11:47:59 -06001230 png_ptr->current_text = (png_charp)png_malloc(png_ptr,
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001231 (png_size_t)(length + 1));
Andreas Dilger47a0c421997-05-16 02:46:07 -05001232 png_ptr->current_text[length] = '\0';
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001233 png_ptr->current_text_ptr = png_ptr->current_text;
Glenn Randers-Pehrson0f881d61998-02-07 10:20:57 -06001234 png_ptr->current_text_size = (png_size_t)length;
1235 png_ptr->current_text_left = (png_size_t)length;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001236 png_ptr->process_mode = PNG_READ_tEXt_MODE;
Guy Schalnat6d764711995-12-19 03:22:19 -06001237}
1238
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -05001239void /* PRIVATE */
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001240png_push_read_tEXt(png_structp png_ptr, png_infop info_ptr)
Guy Schalnat6d764711995-12-19 03:22:19 -06001241{
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001242 if (png_ptr->buffer_size && png_ptr->current_text_left)
1243 {
Andreas Dilger47a0c421997-05-16 02:46:07 -05001244 png_size_t text_size;
Guy Schalnat6d764711995-12-19 03:22:19 -06001245
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001246 if (png_ptr->buffer_size < png_ptr->current_text_left)
1247 text_size = png_ptr->buffer_size;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001248
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001249 else
1250 text_size = png_ptr->current_text_left;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001251
Andreas Dilger47a0c421997-05-16 02:46:07 -05001252 png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001253 png_ptr->current_text_left -= text_size;
Andreas Dilger47a0c421997-05-16 02:46:07 -05001254 png_ptr->current_text_ptr += text_size;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001255 }
1256 if (!(png_ptr->current_text_left))
1257 {
Andreas Dilger47a0c421997-05-16 02:46:07 -05001258 png_textp text_ptr;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001259 png_charp text;
1260 png_charp key;
Glenn Randers-Pehrson07748d12002-05-25 11:12:10 -05001261 int ret;
Guy Schalnat6d764711995-12-19 03:22:19 -06001262
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001263 if (png_ptr->buffer_size < 4)
1264 {
1265 png_push_save_buffer(png_ptr);
1266 return;
1267 }
Guy Schalnat6d764711995-12-19 03:22:19 -06001268
Andreas Dilger47a0c421997-05-16 02:46:07 -05001269 png_push_crc_finish(png_ptr);
1270
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -05001271#ifdef PNG_MAX_MALLOC_64K
Andreas Dilger47a0c421997-05-16 02:46:07 -05001272 if (png_ptr->skip_length)
1273 return;
1274#endif
Guy Schalnat6d764711995-12-19 03:22:19 -06001275
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001276 key = png_ptr->current_text;
Guy Schalnat6d764711995-12-19 03:22:19 -06001277
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001278 for (text = key; *text; text++)
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -05001279 /* Empty loop */ ;
Guy Schalnat6d764711995-12-19 03:22:19 -06001280
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001281 if (text < key + png_ptr->current_text_size)
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001282 text++;
1283
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -05001284 text_ptr = (png_textp)png_malloc(png_ptr, png_sizeof(png_text));
Andreas Dilger47a0c421997-05-16 02:46:07 -05001285 text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
1286 text_ptr->key = key;
Glenn Randers-Pehrsondd78d522010-03-30 08:34:02 -05001287 text_ptr->itxt_length = 0;
Glenn Randers-Pehrson3f549252001-10-27 07:35:13 -05001288 text_ptr->lang = NULL;
1289 text_ptr->lang_key = NULL;
Andreas Dilger47a0c421997-05-16 02:46:07 -05001290 text_ptr->text = text;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001291
Glenn Randers-Pehrson07748d12002-05-25 11:12:10 -05001292 ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
Andreas Dilger47a0c421997-05-16 02:46:07 -05001293
Glenn Randers-Pehrson316f97a2000-07-08 13:19:41 -05001294 png_free(png_ptr, key);
Andreas Dilger47a0c421997-05-16 02:46:07 -05001295 png_free(png_ptr, text_ptr);
Glenn Randers-Pehrsond1e8c862002-06-20 06:54:34 -05001296 png_ptr->current_text = NULL;
Glenn Randers-Pehrson07748d12002-05-25 11:12:10 -05001297
1298 if (ret)
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001299 png_warning(png_ptr, "Insufficient memory to store text chunk");
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001300 }
Guy Schalnat6d764711995-12-19 03:22:19 -06001301}
1302#endif
1303
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -05001304#ifdef PNG_READ_zTXt_SUPPORTED
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -05001305void /* PRIVATE */
Glenn Randers-Pehrson3097f612001-05-07 14:52:45 -05001306png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
1307 length)
Guy Schalnat6d764711995-12-19 03:22:19 -06001308{
Glenn Randers-Pehrson520a7642000-03-21 05:13:06 -06001309 if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -05001310 {
1311 png_error(png_ptr, "Out of place zTXt");
1312 info_ptr = info_ptr; /* To quiet some compiler warnings */
1313 }
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001314
Andreas Dilger47a0c421997-05-16 02:46:07 -05001315#ifdef PNG_MAX_MALLOC_64K
1316 /* We can't handle zTXt chunks > 64K, since we don't have enough space
1317 * to be able to store the uncompressed data. Actually, the threshold
1318 * is probably around 32K, but it isn't as definite as 64K is.
1319 */
Glenn Randers-Pehrsonb6ce43d1998-01-01 07:13:13 -06001320 if (length > (png_uint_32)65535L)
Andreas Dilger47a0c421997-05-16 02:46:07 -05001321 {
1322 png_warning(png_ptr, "zTXt chunk too large to fit in memory");
1323 png_push_crc_skip(png_ptr, length);
1324 return;
1325 }
1326#endif
1327
Glenn Randers-Pehrson0f881d61998-02-07 10:20:57 -06001328 png_ptr->current_text = (png_charp)png_malloc(png_ptr,
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001329 (png_size_t)(length + 1));
Andreas Dilger47a0c421997-05-16 02:46:07 -05001330 png_ptr->current_text[length] = '\0';
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001331 png_ptr->current_text_ptr = png_ptr->current_text;
Glenn Randers-Pehrson0f881d61998-02-07 10:20:57 -06001332 png_ptr->current_text_size = (png_size_t)length;
1333 png_ptr->current_text_left = (png_size_t)length;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001334 png_ptr->process_mode = PNG_READ_zTXt_MODE;
Guy Schalnat6d764711995-12-19 03:22:19 -06001335}
1336
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -05001337void /* PRIVATE */
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001338png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)
Guy Schalnat6d764711995-12-19 03:22:19 -06001339{
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001340 if (png_ptr->buffer_size && png_ptr->current_text_left)
1341 {
Andreas Dilger47a0c421997-05-16 02:46:07 -05001342 png_size_t text_size;
Guy Schalnat6d764711995-12-19 03:22:19 -06001343
Andreas Dilger47a0c421997-05-16 02:46:07 -05001344 if (png_ptr->buffer_size < (png_uint_32)png_ptr->current_text_left)
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001345 text_size = png_ptr->buffer_size;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001346
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001347 else
1348 text_size = png_ptr->current_text_left;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001349
Andreas Dilger47a0c421997-05-16 02:46:07 -05001350 png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001351 png_ptr->current_text_left -= text_size;
Andreas Dilger47a0c421997-05-16 02:46:07 -05001352 png_ptr->current_text_ptr += text_size;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001353 }
1354 if (!(png_ptr->current_text_left))
1355 {
Andreas Dilger47a0c421997-05-16 02:46:07 -05001356 png_textp text_ptr;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001357 png_charp text;
1358 png_charp key;
1359 int ret;
Andreas Dilger47a0c421997-05-16 02:46:07 -05001360 png_size_t text_size, key_size;
Guy Schalnat6d764711995-12-19 03:22:19 -06001361
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001362 if (png_ptr->buffer_size < 4)
1363 {
1364 png_push_save_buffer(png_ptr);
1365 return;
1366 }
Guy Schalnat6d764711995-12-19 03:22:19 -06001367
Andreas Dilger47a0c421997-05-16 02:46:07 -05001368 png_push_crc_finish(png_ptr);
Guy Schalnat6d764711995-12-19 03:22:19 -06001369
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001370 key = png_ptr->current_text;
Guy Schalnat6d764711995-12-19 03:22:19 -06001371
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001372 for (text = key; *text; text++)
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -05001373 /* Empty loop */ ;
Guy Schalnat6d764711995-12-19 03:22:19 -06001374
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001375 /* zTXt can't have zero text */
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001376 if (text >= key + png_ptr->current_text_size)
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001377 {
Glenn Randers-Pehrsond1e8c862002-06-20 06:54:34 -05001378 png_ptr->current_text = NULL;
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001379 png_free(png_ptr, key);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001380 return;
1381 }
Guy Schalnat6d764711995-12-19 03:22:19 -06001382
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001383 text++;
Guy Schalnat6d764711995-12-19 03:22:19 -06001384
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -05001385 if (*text != PNG_TEXT_COMPRESSION_zTXt) /* Check compression byte */
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001386 {
Glenn Randers-Pehrsond1e8c862002-06-20 06:54:34 -05001387 png_ptr->current_text = NULL;
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001388 png_free(png_ptr, key);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001389 return;
1390 }
Guy Schalnat6d764711995-12-19 03:22:19 -06001391
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001392 text++;
Guy Schalnat6d764711995-12-19 03:22:19 -06001393
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001394 png_ptr->zstream.next_in = (png_bytep )text;
1395 png_ptr->zstream.avail_in = (uInt)(png_ptr->current_text_size -
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001396 (text - key));
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001397 png_ptr->zstream.next_out = png_ptr->zbuf;
Glenn Randers-Pehrson08a33431998-03-07 06:06:55 -06001398 png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
Guy Schalnat6d764711995-12-19 03:22:19 -06001399
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001400 key_size = text - key;
1401 text_size = 0;
1402 text = NULL;
1403 ret = Z_STREAM_END;
Guy Schalnat6d764711995-12-19 03:22:19 -06001404
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001405 while (png_ptr->zstream.avail_in)
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001406 {
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001407 ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001408 if (ret != Z_OK && ret != Z_STREAM_END)
1409 {
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001410 inflateReset(&png_ptr->zstream);
1411 png_ptr->zstream.avail_in = 0;
Glenn Randers-Pehrsond1e8c862002-06-20 06:54:34 -05001412 png_ptr->current_text = NULL;
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001413 png_free(png_ptr, key);
1414 png_free(png_ptr, text);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001415 return;
1416 }
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -05001417
Andreas Dilger47a0c421997-05-16 02:46:07 -05001418 if (!(png_ptr->zstream.avail_out) || ret == Z_STREAM_END)
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001419 {
Andreas Dilger47a0c421997-05-16 02:46:07 -05001420 if (text == NULL)
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001421 {
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001422 text = (png_charp)png_malloc(png_ptr,
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001423 (png_ptr->zbuf_size
1424 - png_ptr->zstream.avail_out + key_size + 1));
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001425
Glenn Randers-Pehrson82ae3832001-04-20 10:32:10 -05001426 png_memcpy(text + key_size, png_ptr->zbuf,
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001427 png_ptr->zbuf_size - png_ptr->zstream.avail_out);
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001428
Glenn Randers-Pehrson82ae3832001-04-20 10:32:10 -05001429 png_memcpy(text, key, key_size);
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001430
Glenn Randers-Pehrson82ae3832001-04-20 10:32:10 -05001431 text_size = key_size + png_ptr->zbuf_size -
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001432 png_ptr->zstream.avail_out;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001433
Glenn Randers-Pehrson82ae3832001-04-20 10:32:10 -05001434 *(text + text_size) = '\0';
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001435 }
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -05001436
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001437 else
1438 {
1439 png_charp tmp;
Guy Schalnat6d764711995-12-19 03:22:19 -06001440
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001441 tmp = text;
Glenn Randers-Pehrson46f61e21998-01-30 21:45:12 -06001442 text = (png_charp)png_malloc(png_ptr, text_size +
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001443 (png_ptr->zbuf_size
1444 - png_ptr->zstream.avail_out + 1));
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001445
Glenn Randers-Pehrson82ae3832001-04-20 10:32:10 -05001446 png_memcpy(text, tmp, text_size);
1447 png_free(png_ptr, tmp);
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001448
Glenn Randers-Pehrson82ae3832001-04-20 10:32:10 -05001449 png_memcpy(text + text_size, png_ptr->zbuf,
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001450 png_ptr->zbuf_size - png_ptr->zstream.avail_out);
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001451
Glenn Randers-Pehrson82ae3832001-04-20 10:32:10 -05001452 text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
1453 *(text + text_size) = '\0';
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001454 }
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -05001455
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001456 if (ret != Z_STREAM_END)
1457 {
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001458 png_ptr->zstream.next_out = png_ptr->zbuf;
1459 png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001460 }
1461 }
1462 else
1463 {
1464 break;
1465 }
Guy Schalnat6d764711995-12-19 03:22:19 -06001466
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001467 if (ret == Z_STREAM_END)
1468 break;
1469 }
Guy Schalnat6d764711995-12-19 03:22:19 -06001470
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001471 inflateReset(&png_ptr->zstream);
1472 png_ptr->zstream.avail_in = 0;
Guy Schalnat6d764711995-12-19 03:22:19 -06001473
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001474 if (ret != Z_STREAM_END)
1475 {
Glenn Randers-Pehrsond1e8c862002-06-20 06:54:34 -05001476 png_ptr->current_text = NULL;
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001477 png_free(png_ptr, key);
1478 png_free(png_ptr, text);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001479 return;
1480 }
Guy Schalnat6d764711995-12-19 03:22:19 -06001481
Glenn Randers-Pehrsond1e8c862002-06-20 06:54:34 -05001482 png_ptr->current_text = NULL;
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001483 png_free(png_ptr, key);
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001484 key = text;
Andreas Dilger47a0c421997-05-16 02:46:07 -05001485 text += key_size;
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001486
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001487 text_ptr = (png_textp)png_malloc(png_ptr,
1488 png_sizeof(png_text));
Glenn Randers-Pehrson82ae3832001-04-20 10:32:10 -05001489 text_ptr->compression = PNG_TEXT_COMPRESSION_zTXt;
1490 text_ptr->key = key;
Glenn Randers-Pehrsondd78d522010-03-30 08:34:02 -05001491 text_ptr->itxt_length = 0;
Glenn Randers-Pehrson3f549252001-10-27 07:35:13 -05001492 text_ptr->lang = NULL;
1493 text_ptr->lang_key = NULL;
Glenn Randers-Pehrson82ae3832001-04-20 10:32:10 -05001494 text_ptr->text = text;
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001495
Glenn Randers-Pehrson07748d12002-05-25 11:12:10 -05001496 ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001497
Glenn Randers-Pehrson316f97a2000-07-08 13:19:41 -05001498 png_free(png_ptr, key);
Glenn Randers-Pehrson82ae3832001-04-20 10:32:10 -05001499 png_free(png_ptr, text_ptr);
Glenn Randers-Pehrson07748d12002-05-25 11:12:10 -05001500
1501 if (ret)
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001502 png_warning(png_ptr, "Insufficient memory to store text chunk");
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001503 }
1504}
1505#endif
1506
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -05001507#ifdef PNG_READ_iTXt_SUPPORTED
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -05001508void /* PRIVATE */
Glenn Randers-Pehrson3097f612001-05-07 14:52:45 -05001509png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001510 length)
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001511{
Glenn Randers-Pehrson520a7642000-03-21 05:13:06 -06001512 if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -05001513 {
1514 png_error(png_ptr, "Out of place iTXt");
1515 info_ptr = info_ptr; /* To quiet some compiler warnings */
1516 }
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001517
1518#ifdef PNG_MAX_MALLOC_64K
1519 png_ptr->skip_length = 0; /* This may not be necessary */
1520
Glenn Randers-Pehrson3097f612001-05-07 14:52:45 -05001521 if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001522 {
1523 png_warning(png_ptr, "iTXt chunk too large to fit in memory");
1524 png_ptr->skip_length = length - (png_uint_32)65535L;
1525 length = (png_uint_32)65535L;
1526 }
1527#endif
1528
1529 png_ptr->current_text = (png_charp)png_malloc(png_ptr,
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001530 (png_size_t)(length + 1));
Glenn Randers-Pehrson82ae3832001-04-20 10:32:10 -05001531 png_ptr->current_text[length] = '\0';
1532 png_ptr->current_text_ptr = png_ptr->current_text;
1533 png_ptr->current_text_size = (png_size_t)length;
1534 png_ptr->current_text_left = (png_size_t)length;
1535 png_ptr->process_mode = PNG_READ_iTXt_MODE;
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001536}
1537
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -05001538void /* PRIVATE */
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001539png_push_read_iTXt(png_structp png_ptr, png_infop info_ptr)
1540{
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001541
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001542 if (png_ptr->buffer_size && png_ptr->current_text_left)
1543 {
1544 png_size_t text_size;
1545
1546 if (png_ptr->buffer_size < png_ptr->current_text_left)
1547 text_size = png_ptr->buffer_size;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001548
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001549 else
1550 text_size = png_ptr->current_text_left;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001551
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001552 png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
1553 png_ptr->current_text_left -= text_size;
1554 png_ptr->current_text_ptr += text_size;
1555 }
Glenn Randers-Pehrsonf24daf22010-05-06 09:44:04 -05001556
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001557 if (!(png_ptr->current_text_left))
1558 {
1559 png_textp text_ptr;
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001560 png_charp key;
Glenn Randers-Pehrson520a7642000-03-21 05:13:06 -06001561 int comp_flag;
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001562 png_charp lang;
1563 png_charp lang_key;
1564 png_charp text;
Glenn Randers-Pehrson07748d12002-05-25 11:12:10 -05001565 int ret;
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001566
1567 if (png_ptr->buffer_size < 4)
1568 {
1569 png_push_save_buffer(png_ptr);
1570 return;
1571 }
1572
1573 png_push_crc_finish(png_ptr);
1574
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -05001575#ifdef PNG_MAX_MALLOC_64K
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001576 if (png_ptr->skip_length)
1577 return;
1578#endif
1579
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001580 key = png_ptr->current_text;
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001581
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001582 for (lang = key; *lang; lang++)
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -05001583 /* Empty loop */ ;
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001584
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001585 if (lang < key + png_ptr->current_text_size - 3)
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001586 lang++;
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001587
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001588 comp_flag = *lang++;
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -05001589 lang++; /* Skip comp_type, always zero */
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001590
1591 for (lang_key = lang; *lang_key; lang_key++)
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -05001592 /* Empty loop */ ;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001593
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -05001594 lang_key++; /* Skip NUL separator */
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001595
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001596 text=lang_key;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001597
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001598 if (lang_key < key + png_ptr->current_text_size - 1)
1599 {
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001600 for (; *text; text++)
1601 /* Empty loop */ ;
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001602 }
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001603
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001604 if (text < key + png_ptr->current_text_size)
Glenn Randers-Pehrson166c5a31999-12-10 09:43:02 -06001605 text++;
1606
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001607 text_ptr = (png_textp)png_malloc(png_ptr,
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001608 png_sizeof(png_text));
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001609
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001610 text_ptr->compression = comp_flag + 2;
Andreas Dilger47a0c421997-05-16 02:46:07 -05001611 text_ptr->key = key;
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001612 text_ptr->lang = lang;
1613 text_ptr->lang_key = lang_key;
Andreas Dilger47a0c421997-05-16 02:46:07 -05001614 text_ptr->text = text;
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001615 text_ptr->text_length = 0;
1616 text_ptr->itxt_length = png_strlen(text);
Andreas Dilger47a0c421997-05-16 02:46:07 -05001617
Glenn Randers-Pehrson07748d12002-05-25 11:12:10 -05001618 ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
Andreas Dilger47a0c421997-05-16 02:46:07 -05001619
Glenn Randers-Pehrsond1e8c862002-06-20 06:54:34 -05001620 png_ptr->current_text = NULL;
1621
Andreas Dilger47a0c421997-05-16 02:46:07 -05001622 png_free(png_ptr, text_ptr);
Glenn Randers-Pehrson07748d12002-05-25 11:12:10 -05001623 if (ret)
Glenn Randers-Pehrsonf81b50b2009-12-29 16:50:15 -06001624 png_warning(png_ptr, "Insufficient memory to store iTXt chunk");
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001625 }
Guy Schalnat6d764711995-12-19 03:22:19 -06001626}
1627#endif
1628
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001629/* This function is called when we haven't found a handler for this
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001630 * chunk. If there isn't a problem with the chunk itself (ie a bad chunk
1631 * name or a critical chunk), the chunk is (currently) silently ignored.
Glenn Randers-Pehrsonb6ce43d1998-01-01 07:13:13 -06001632 */
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -05001633void /* PRIVATE */
Glenn Randers-Pehrson3097f612001-05-07 14:52:45 -05001634png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001635 length)
Guy Schalnat6d764711995-12-19 03:22:19 -06001636{
Glenn Randers-Pehrson895a9c92008-07-25 08:51:18 -05001637 png_uint_32 skip = 0;
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001638
1639 if (!(png_ptr->chunk_name[0] & 0x20))
1640 {
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -05001641#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001642 if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001643 PNG_HANDLE_CHUNK_ALWAYS
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -05001644#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001645 && png_ptr->read_user_chunk_fn == NULL
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001646#endif
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001647 )
Glenn Randers-Pehrson6942d532000-05-01 09:31:54 -05001648#endif
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001649 png_chunk_error(png_ptr, "unknown critical chunk");
1650
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -05001651 info_ptr = info_ptr; /* To quiet some compiler warnings */
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001652 }
1653
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -05001654#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001655 if (png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
1656 {
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001657#ifdef PNG_MAX_MALLOC_64K
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001658 if (length > (png_uint_32)65535L)
1659 {
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001660 png_warning(png_ptr, "unknown chunk too large to fit in memory");
1661 skip = length - (png_uint_32)65535L;
1662 length = (png_uint_32)65535L;
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001663 }
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001664#endif
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001665 png_memcpy((png_charp)png_ptr->unknown_chunk.name,
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001666 (png_charp)png_ptr->chunk_name,
1667 png_sizeof(png_ptr->unknown_chunk.name));
Glenn Randers-Pehrson895a9c92008-07-25 08:51:18 -05001668 png_ptr->unknown_chunk.name[png_sizeof(png_ptr->unknown_chunk.name) - 1]
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001669 = '\0';
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001670
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001671 png_ptr->unknown_chunk.size = (png_size_t)length;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001672
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001673 if (length == 0)
1674 png_ptr->unknown_chunk.data = NULL;
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001675
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001676 else
1677 {
1678 png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr,
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001679 (png_size_t)length);
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001680 png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
1681 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001682
Glenn Randers-Pehrsone26c0952009-09-23 11:22:08 -05001683#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001684 if (png_ptr->read_user_chunk_fn != NULL)
1685 {
Glenn Randers-Pehrson4bb4d012009-05-20 12:45:29 -05001686 /* Callback to user unknown chunk handler */
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001687 int ret;
1688 ret = (*(png_ptr->read_user_chunk_fn))
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001689 (png_ptr, &png_ptr->unknown_chunk);
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001690
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001691 if (ret < 0)
1692 png_chunk_error(png_ptr, "error in user chunk");
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001693
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001694 if (ret == 0)
1695 {
1696 if (!(png_ptr->chunk_name[0] & 0x20))
1697 if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001698 PNG_HANDLE_CHUNK_ALWAYS)
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001699 png_chunk_error(png_ptr, "unknown critical chunk");
1700 png_set_unknown_chunks(png_ptr, info_ptr,
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001701 &png_ptr->unknown_chunk, 1);
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001702 }
1703 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001704
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001705 else
Glenn Randers-Pehrson82ae3832001-04-20 10:32:10 -05001706#endif
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001707 png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001708 png_free(png_ptr, png_ptr->unknown_chunk.data);
1709 png_ptr->unknown_chunk.data = NULL;
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001710 }
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001711
Glenn Randers-Pehrson61c32d92000-02-04 23:40:16 -06001712 else
1713#endif
1714 skip=length;
1715 png_push_crc_skip(png_ptr, skip);
Guy Schalnat6d764711995-12-19 03:22:19 -06001716}
1717
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -05001718void /* PRIVATE */
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001719png_push_have_info(png_structp png_ptr, png_infop info_ptr)
1720{
Andreas Dilger47a0c421997-05-16 02:46:07 -05001721 if (png_ptr->info_fn != NULL)
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001722 (*(png_ptr->info_fn))(png_ptr, info_ptr);
1723}
1724
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -05001725void /* PRIVATE */
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001726png_push_have_end(png_structp png_ptr, png_infop info_ptr)
Guy Schalnat6d764711995-12-19 03:22:19 -06001727{
Andreas Dilger47a0c421997-05-16 02:46:07 -05001728 if (png_ptr->end_fn != NULL)
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001729 (*(png_ptr->end_fn))(png_ptr, info_ptr);
Guy Schalnat6d764711995-12-19 03:22:19 -06001730}
1731
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -05001732void /* PRIVATE */
Guy Schalnat6d764711995-12-19 03:22:19 -06001733png_push_have_row(png_structp png_ptr, png_bytep row)
1734{
Glenn Randers-Pehrson78d55452010-06-19 07:03:50 -05001735 if (png_ptr->row_fn != NULL)
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001736 (*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number,
1737 (int)png_ptr->pass);
Guy Schalnat6d764711995-12-19 03:22:19 -06001738}
1739
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -05001740void PNGAPI
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001741png_progressive_combine_row (png_structp png_ptr,
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001742 png_bytep old_row, png_bytep new_row)
Guy Schalnat6d764711995-12-19 03:22:19 -06001743{
Glenn Randers-Pehrson145f5c82008-07-10 09:13:13 -05001744 PNG_CONST int FARDATA png_pass_dsp_mask[7] =
Glenn Randers-Pehrson5e5c1e12000-11-10 12:26:19 -06001745 {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff};
Glenn Randers-Pehrson86312502009-08-31 14:17:23 -05001746
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001747 if (png_ptr == NULL)
1748 return;
1749
Glenn Randers-Pehrson345bc271998-06-14 14:43:31 -05001750 if (new_row != NULL) /* new_row must == png_ptr->row_buf here. */
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001751 png_combine_row(png_ptr, old_row, png_pass_dsp_mask[png_ptr->pass]);
Guy Schalnat6d764711995-12-19 03:22:19 -06001752}
1753
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -05001754void PNGAPI
Guy Schalnat6d764711995-12-19 03:22:19 -06001755png_set_progressive_read_fn(png_structp png_ptr, png_voidp progressive_ptr,
Glenn Randers-Pehrson262d0ff2010-03-03 07:06:54 -06001756 png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
1757 png_progressive_end_ptr end_fn)
Guy Schalnat6d764711995-12-19 03:22:19 -06001758{
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001759 if (png_ptr == NULL)
1760 return;
1761
Guy Schalnatb2e01bd1996-01-26 01:38:47 -06001762 png_ptr->info_fn = info_fn;
1763 png_ptr->row_fn = row_fn;
Guy Schalnat6d764711995-12-19 03:22:19 -06001764 png_ptr->end_fn = end_fn;
Guy Schalnate5a37791996-06-05 15:50:50 -05001765
Glenn Randers-Pehrson25d82242002-05-01 11:51:26 -05001766 png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
Guy Schalnat6d764711995-12-19 03:22:19 -06001767}
1768
Glenn Randers-Pehrson75294572000-05-06 14:09:57 -05001769png_voidp PNGAPI
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001770png_get_progressive_ptr(png_structp png_ptr)
Guy Schalnat6d764711995-12-19 03:22:19 -06001771{
Glenn Randers-Pehrson glennrp@comcast.netb1c0d332009-05-15 20:39:34 -05001772 if (png_ptr == NULL)
1773 return (NULL);
1774
Andreas Dilger02ad0ef1997-01-17 01:34:35 -06001775 return png_ptr->io_ptr;
Guy Schalnat6d764711995-12-19 03:22:19 -06001776}
Guy Schalnat4ee97b01996-01-16 01:51:56 -06001777#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */