libpng/pngpread.c

1847 lines
50 KiB
C
Raw Normal View History

1995-12-19 09:22:19 +00:00
/* pngpread.c - read a png file in push mode
1998-01-01 13:13:13 +00:00
*
* Last changed in libpng 1.6.0 [(PENDING RELEASE)]
* Copyright (c) 1998-2012 Glenn Randers-Pehrson
2000-06-04 19:29:29 +00:00
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
* and license in png.h
1998-01-01 13:13:13 +00:00
*/
1995-12-19 09:22:19 +00:00
2008-07-10 14:13:13 +00:00
#include "pngpriv.h"
1996-01-16 07:51:56 +00:00
#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
2009-05-20 17:45:29 +00:00
/* Push model modes */
1999-12-10 15:43:02 +00:00
#define PNG_READ_SIG_MODE 0
#define PNG_READ_CHUNK_MODE 1
#define PNG_READ_IDAT_MODE 2
#define PNG_SKIP_MODE 3
#define PNG_READ_tEXt_MODE 4
#define PNG_READ_zTXt_MODE 5
#define PNG_READ_DONE_MODE 6
#define PNG_READ_iTXt_MODE 7
#define PNG_ERROR_MODE 8
2000-05-06 19:09:57 +00:00
void PNGAPI
png_process_data(png_structrp png_ptr, png_inforp info_ptr,
png_bytep buffer, png_size_t buffer_size)
1995-12-19 09:22:19 +00:00
{
if (png_ptr == NULL || info_ptr == NULL)
return;
1996-01-26 07:38:47 +00:00
png_push_restore_buffer(png_ptr, buffer, buffer_size);
1995-12-19 09:22:19 +00:00
1996-01-26 07:38:47 +00:00
while (png_ptr->buffer_size)
{
1997-01-17 07:34:35 +00:00
png_process_some_data(png_ptr, info_ptr);
1996-01-26 07:38:47 +00:00
}
1995-12-19 09:22:19 +00:00
}
png_size_t PNGAPI
png_process_data_pause(png_structrp png_ptr, int save)
{
if (png_ptr != NULL)
{
/* It's easiest for the caller if we do the save, then the caller doesn't
* have to supply the same data again:
*/
if (save)
png_push_save_buffer(png_ptr);
else
{
/* This includes any pending saved bytes: */
png_size_t remaining = png_ptr->buffer_size;
png_ptr->buffer_size = 0;
/* So subtract the saved buffer size, unless all the data
* is actually 'saved', in which case we just return 0
*/
if (png_ptr->save_buffer_size < remaining)
return remaining - png_ptr->save_buffer_size;
}
}
return 0;
}
png_uint_32 PNGAPI
png_process_data_skip(png_structrp png_ptr)
{
png_uint_32 remaining = 0;
if (png_ptr != NULL && png_ptr->process_mode == PNG_SKIP_MODE &&
png_ptr->skip_length > 0)
{
/* At the end of png_process_data the buffer size must be 0 (see the loop
* above) so we can detect a broken call here:
*/
if (png_ptr->buffer_size != 0)
png_error(png_ptr,
"png_process_data_skip called inside png_process_data");
/* If is impossible for there to be a saved buffer at this point -
* otherwise we could not be in SKIP mode. This will also happen if
* png_process_skip is called inside png_process_data (but only very
* rarely.)
*/
if (png_ptr->save_buffer_size != 0)
png_error(png_ptr, "png_process_data_skip called with saved data");
remaining = png_ptr->skip_length;
png_ptr->skip_length = 0;
png_ptr->process_mode = PNG_READ_CHUNK_MODE;
}
return remaining;
}
1997-01-17 07:34:35 +00:00
/* What we do with the incoming data depends on what we were previously
* doing before we ran out of data...
*/
2000-05-06 19:09:57 +00:00
void /* PRIVATE */
png_process_some_data(png_structrp png_ptr, png_inforp info_ptr)
1995-12-19 09:22:19 +00:00
{
if (png_ptr == NULL)
return;
1996-01-26 07:38:47 +00:00
switch (png_ptr->process_mode)
{
case PNG_READ_SIG_MODE:
{
1997-01-17 07:34:35 +00:00
png_push_read_sig(png_ptr, info_ptr);
1996-01-26 07:38:47 +00:00
break;
}
1996-01-26 07:38:47 +00:00
case PNG_READ_CHUNK_MODE:
{
1997-01-17 07:34:35 +00:00
png_push_read_chunk(png_ptr, info_ptr);
1996-01-26 07:38:47 +00:00
break;
}
1996-01-26 07:38:47 +00:00
case PNG_READ_IDAT_MODE:
{
1996-06-05 20:50:50 +00:00
png_push_read_IDAT(png_ptr);
1996-01-26 07:38:47 +00:00
break;
}
#ifdef PNG_READ_tEXt_SUPPORTED
case PNG_READ_tEXt_MODE:
{
png_push_read_tEXt(png_ptr, info_ptr);
break;
}
#endif
#ifdef PNG_READ_zTXt_SUPPORTED
case PNG_READ_zTXt_MODE:
{
png_push_read_zTXt(png_ptr, info_ptr);
break;
}
#endif
#ifdef PNG_READ_iTXt_SUPPORTED
case PNG_READ_iTXt_MODE:
{
png_push_read_iTXt(png_ptr, info_ptr);
break;
}
#endif
1996-01-26 07:38:47 +00:00
case PNG_SKIP_MODE:
{
1997-05-16 07:46:07 +00:00
png_push_crc_finish(png_ptr);
1996-01-26 07:38:47 +00:00
break;
}
1996-01-26 07:38:47 +00:00
default:
{
png_ptr->buffer_size = 0;
break;
}
}
1995-12-19 09:22:19 +00:00
}
1997-01-17 07:34:35 +00:00
/* Read any remaining signature bytes from the stream and compare them with
* the correct PNG signature. It is possible that this routine is called
1998-06-14 19:43:31 +00:00
* with bytes already read from the signature, either because they have been
* checked by the calling application, or because of multiple calls to this
* routine.
1997-01-17 07:34:35 +00:00
*/
2000-05-06 19:09:57 +00:00
void /* PRIVATE */
png_push_read_sig(png_structrp png_ptr, png_inforp info_ptr)
1995-12-19 09:22:19 +00:00
{
1997-05-16 07:46:07 +00:00
png_size_t num_checked = png_ptr->sig_bytes,
num_to_check = 8 - num_checked;
1996-01-26 07:38:47 +00:00
1997-01-17 07:34:35 +00:00
if (png_ptr->buffer_size < num_to_check)
1996-01-26 07:38:47 +00:00
{
1997-01-17 07:34:35 +00:00
num_to_check = png_ptr->buffer_size;
1996-01-26 07:38:47 +00:00
}
1998-12-29 17:47:59 +00:00
png_push_fill_buffer(png_ptr, &(info_ptr->signature[num_checked]),
num_to_check);
2008-07-10 14:13:13 +00:00
png_ptr->sig_bytes = (png_byte)(png_ptr->sig_bytes + num_to_check);
1996-01-26 07:38:47 +00:00
1997-01-17 07:34:35 +00:00
if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
1996-01-26 07:38:47 +00:00
{
1997-01-17 07:34:35 +00:00
if (num_checked < 4 &&
png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
png_error(png_ptr, "Not a PNG file");
1997-01-17 07:34:35 +00:00
else
png_error(png_ptr, "PNG file corrupted by ASCII conversion");
1996-01-26 07:38:47 +00:00
}
else
{
1997-01-17 07:34:35 +00:00
if (png_ptr->sig_bytes >= 8)
{
png_ptr->process_mode = PNG_READ_CHUNK_MODE;
}
1996-01-26 07:38:47 +00:00
}
1995-12-19 09:22:19 +00:00
}
2000-05-06 19:09:57 +00:00
void /* PRIVATE */
png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
1995-12-19 09:22:19 +00:00
{
png_uint_32 chunk_name;
1997-01-17 07:34:35 +00:00
/* First we make sure we have enough data for the 4 byte chunk name
1998-01-01 13:13:13 +00:00
* and the 4 byte chunk length before proceeding with decoding the
* chunk data. To fully decode each of these chunks, we also make
* sure we have enough data in the buffer for the 4 byte CRC at the
* end of every chunk (except IDAT, which is handled separately).
*/
1999-11-27 16:22:33 +00:00
if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
1996-01-26 07:38:47 +00:00
{
1997-01-17 07:34:35 +00:00
png_byte chunk_length[4];
png_byte chunk_tag[4];
1996-01-26 07:38:47 +00:00
if (png_ptr->buffer_size < 8)
{
png_push_save_buffer(png_ptr);
return;
}
1997-01-17 07:34:35 +00:00
png_push_fill_buffer(png_ptr, chunk_length, 4);
2008-07-10 14:13:13 +00:00
png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
1996-01-26 07:38:47 +00:00
png_reset_crc(png_ptr);
png_crc_read(png_ptr, chunk_tag, 4);
png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
2008-07-30 19:47:09 +00:00
png_check_chunk_name(png_ptr, png_ptr->chunk_name);
1999-11-27 16:22:33 +00:00
png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
1996-01-26 07:38:47 +00:00
}
chunk_name = png_ptr->chunk_name;
if (chunk_name == png_IDAT)
{
/* This is here above the if/else case statement below because if the
* unknown handling marks 'IDAT' as unknown then the IDAT handling case is
* completely skipped.
*
* TODO: there must be a better way of doing this.
*/
if (png_ptr->mode & PNG_AFTER_IDAT)
png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
}
2006-06-16 12:52:03 +00:00
if (chunk_name == png_IHDR)
1996-01-26 07:38:47 +00:00
{
2008-07-30 19:47:09 +00:00
if (png_ptr->push_length != 13)
png_error(png_ptr, "Invalid IHDR length");
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
1996-01-26 07:38:47 +00:00
return;
2008-08-04 18:31:41 +00:00
}
1997-01-17 07:34:35 +00:00
png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);
1996-01-26 07:38:47 +00:00
}
else if (chunk_name == png_IEND)
2004-08-10 02:50:32 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
2004-08-10 02:50:32 +00:00
return;
2008-08-04 18:31:41 +00:00
}
2004-08-10 02:50:32 +00:00
png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);
png_ptr->process_mode = PNG_READ_DONE_MODE;
png_push_have_end(png_ptr, info_ptr);
}
2004-08-10 02:50:32 +00:00
#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
else if (png_chunk_unknown_handling(png_ptr, chunk_name))
2004-08-10 02:50:32 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
2004-08-10 02:50:32 +00:00
return;
2008-08-04 18:31:41 +00:00
}
if (chunk_name == png_IDAT)
png_ptr->mode |= PNG_HAVE_IDAT;
png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
if (chunk_name == png_PLTE)
2004-08-10 02:50:32 +00:00
png_ptr->mode |= PNG_HAVE_PLTE;
else if (chunk_name == png_IDAT)
{
if (!(png_ptr->mode & PNG_HAVE_IHDR))
png_error(png_ptr, "Missing IHDR before IDAT");
else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
!(png_ptr->mode & PNG_HAVE_PLTE))
png_error(png_ptr, "Missing PLTE before IDAT");
}
2004-08-10 02:50:32 +00:00
}
2004-08-10 02:50:32 +00:00
#endif
else if (chunk_name == png_PLTE)
1996-01-26 07:38:47 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
1997-01-17 07:34:35 +00:00
return;
2008-08-04 18:31:41 +00:00
}
1997-01-17 07:34:35 +00:00
png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);
1996-01-26 07:38:47 +00:00
}
else if (chunk_name == png_IDAT)
1996-01-26 07:38:47 +00:00
{
/* If we reach an IDAT chunk, this means we have read all of the
* header chunks, and we can start reading the image (or if this
* is called after the image has been read - we have an error).
*/
if (!(png_ptr->mode & PNG_HAVE_IHDR))
png_error(png_ptr, "Missing IHDR before IDAT");
else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
!(png_ptr->mode & PNG_HAVE_PLTE))
png_error(png_ptr, "Missing PLTE before IDAT");
if (png_ptr->mode & PNG_HAVE_IDAT)
{
if (!(png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
if (png_ptr->push_length == 0)
return;
if (png_ptr->mode & PNG_AFTER_IDAT)
png_benign_error(png_ptr, "Too many IDATs found");
}
1996-01-26 07:38:47 +00:00
png_ptr->idat_size = png_ptr->push_length;
png_ptr->mode |= PNG_HAVE_IDAT;
1996-01-26 07:38:47 +00:00
png_ptr->process_mode = PNG_READ_IDAT_MODE;
1997-01-17 07:34:35 +00:00
png_push_have_info(png_ptr, info_ptr);
png_ptr->zstream.avail_out =
(uInt) PNG_ROWBYTES(png_ptr->pixel_depth,
png_ptr->iwidth) + 1;
1997-01-17 07:34:35 +00:00
png_ptr->zstream.next_out = png_ptr->row_buf;
1996-01-26 07:38:47 +00:00
return;
}
#ifdef PNG_READ_gAMA_SUPPORTED
else if (png_ptr->chunk_name == png_gAMA)
1996-01-26 07:38:47 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
1996-01-26 07:38:47 +00:00
return;
2008-08-04 18:31:41 +00:00
}
1997-01-17 07:34:35 +00:00
png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);
1996-01-26 07:38:47 +00:00
}
1995-12-19 09:22:19 +00:00
#endif
#ifdef PNG_READ_sBIT_SUPPORTED
else if (png_ptr->chunk_name == png_sBIT)
1996-01-26 07:38:47 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
1996-01-26 07:38:47 +00:00
return;
2008-08-04 18:31:41 +00:00
}
1997-01-17 07:34:35 +00:00
png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);
1996-01-26 07:38:47 +00:00
}
1995-12-19 09:22:19 +00:00
#endif
#ifdef PNG_READ_cHRM_SUPPORTED
else if (png_ptr->chunk_name == png_cHRM)
1996-01-26 07:38:47 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
1996-01-26 07:38:47 +00:00
return;
2008-08-04 18:31:41 +00:00
}
1997-01-17 07:34:35 +00:00
png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
1996-01-26 07:38:47 +00:00
}
1995-12-19 09:22:19 +00:00
#endif
#ifdef PNG_READ_sRGB_SUPPORTED
else if (chunk_name == png_sRGB)
1998-01-01 13:13:13 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
1998-01-01 13:13:13 +00:00
return;
2008-08-04 18:31:41 +00:00
}
1998-01-01 13:13:13 +00:00
png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
}
1998-01-01 13:13:13 +00:00
#endif
#ifdef PNG_READ_iCCP_SUPPORTED
else if (png_ptr->chunk_name == png_iCCP)
1999-12-10 15:43:02 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
1999-12-10 15:43:02 +00:00
return;
2008-08-04 18:31:41 +00:00
}
1999-12-10 15:43:02 +00:00
png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);
}
1999-12-10 15:43:02 +00:00
#endif
#ifdef PNG_READ_sPLT_SUPPORTED
else if (chunk_name == png_sPLT)
1999-12-10 15:43:02 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
1999-12-10 15:43:02 +00:00
return;
2008-08-04 18:31:41 +00:00
}
1999-12-10 15:43:02 +00:00
png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);
}
1999-12-10 15:43:02 +00:00
#endif
#ifdef PNG_READ_tRNS_SUPPORTED
else if (chunk_name == png_tRNS)
1996-01-26 07:38:47 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
1996-01-26 07:38:47 +00:00
return;
2008-08-04 18:31:41 +00:00
}
1997-01-17 07:34:35 +00:00
png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);
1996-01-26 07:38:47 +00:00
}
1995-12-19 09:22:19 +00:00
#endif
#ifdef PNG_READ_bKGD_SUPPORTED
else if (chunk_name == png_bKGD)
1996-01-26 07:38:47 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
1996-01-26 07:38:47 +00:00
return;
2008-08-04 18:31:41 +00:00
}
1997-01-17 07:34:35 +00:00
png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);
1996-01-26 07:38:47 +00:00
}
1995-12-19 09:22:19 +00:00
#endif
#ifdef PNG_READ_hIST_SUPPORTED
else if (chunk_name == png_hIST)
1996-01-26 07:38:47 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
1996-01-26 07:38:47 +00:00
return;
2008-08-04 18:31:41 +00:00
}
1997-01-17 07:34:35 +00:00
png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);
1996-01-26 07:38:47 +00:00
}
1995-12-19 09:22:19 +00:00
#endif
#ifdef PNG_READ_pHYs_SUPPORTED
else if (chunk_name == png_pHYs)
1996-01-26 07:38:47 +00:00
{
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
return;
}
1997-01-17 07:34:35 +00:00
png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);
1996-01-26 07:38:47 +00:00
}
1995-12-19 09:22:19 +00:00
#endif
#ifdef PNG_READ_oFFs_SUPPORTED
else if (chunk_name == png_oFFs)
1996-01-26 07:38:47 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
1996-01-26 07:38:47 +00:00
return;
2008-08-04 18:31:41 +00:00
}
1997-01-17 07:34:35 +00:00
png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);
1996-01-26 07:38:47 +00:00
}
1995-12-19 09:22:19 +00:00
#endif
#ifdef PNG_READ_pCAL_SUPPORTED
else if (chunk_name == png_pCAL)
1997-05-16 07:46:07 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
1997-05-16 07:46:07 +00:00
return;
2008-08-04 18:31:41 +00:00
}
1997-05-16 07:46:07 +00:00
png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
}
1997-05-16 07:46:07 +00:00
#endif
#ifdef PNG_READ_sCAL_SUPPORTED
else if (chunk_name == png_sCAL)
1999-12-10 15:43:02 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
1999-12-10 15:43:02 +00:00
return;
2008-08-04 18:31:41 +00:00
}
1999-12-10 15:43:02 +00:00
png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);
}
1999-12-10 15:43:02 +00:00
#endif
#ifdef PNG_READ_tIME_SUPPORTED
else if (chunk_name == png_tIME)
1996-01-26 07:38:47 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
1996-01-26 07:38:47 +00:00
return;
2008-08-04 18:31:41 +00:00
}
1997-01-17 07:34:35 +00:00
png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);
1996-01-26 07:38:47 +00:00
}
1995-12-19 09:22:19 +00:00
#endif
#ifdef PNG_READ_tEXt_SUPPORTED
else if (chunk_name == png_tEXt)
1996-01-26 07:38:47 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
2002-06-20 11:54:34 +00:00
return;
2008-08-04 18:31:41 +00:00
}
png_push_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
1996-01-26 07:38:47 +00:00
}
1995-12-19 09:22:19 +00:00
#endif
#ifdef PNG_READ_zTXt_SUPPORTED
else if (chunk_name == png_zTXt)
1996-01-26 07:38:47 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
2002-06-20 11:54:34 +00:00
return;
2008-08-04 18:31:41 +00:00
}
png_push_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
1996-01-26 07:38:47 +00:00
}
1999-12-10 15:43:02 +00:00
#endif
#ifdef PNG_READ_iTXt_SUPPORTED
else if (chunk_name == png_iTXt)
1999-12-10 15:43:02 +00:00
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
2002-06-20 11:54:34 +00:00
return;
2008-08-04 18:31:41 +00:00
}
png_push_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
1999-12-10 15:43:02 +00:00
}
1995-12-19 09:22:19 +00:00
#endif
1996-01-26 07:38:47 +00:00
else
{
2008-08-04 18:31:41 +00:00
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{
png_push_save_buffer(png_ptr);
2002-06-20 11:54:34 +00:00
return;
2008-08-04 18:31:41 +00:00
}
png_push_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
1996-01-26 07:38:47 +00:00
}
1995-12-19 09:22:19 +00:00
1999-11-27 16:22:33 +00:00
png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
1995-12-19 09:22:19 +00:00
}
2000-05-06 19:09:57 +00:00
void /* PRIVATE */
png_push_crc_skip(png_structrp png_ptr, png_uint_32 skip)
1995-12-19 09:22:19 +00:00
{
1996-01-26 07:38:47 +00:00
png_ptr->process_mode = PNG_SKIP_MODE;
1997-05-16 07:46:07 +00:00
png_ptr->skip_length = skip;
1995-12-19 09:22:19 +00:00
}
2000-05-06 19:09:57 +00:00
void /* PRIVATE */
png_push_crc_finish(png_structrp png_ptr)
1995-12-19 09:22:19 +00:00
{
1996-01-26 07:38:47 +00:00
if (png_ptr->skip_length && png_ptr->save_buffer_size)
{
png_size_t save_size = png_ptr->save_buffer_size;
png_uint_32 skip_length = png_ptr->skip_length;
1996-01-26 07:38:47 +00:00
/* We want the smaller of 'skip_length' and 'save_buffer_size', but
* they are of different types and we don't know which variable has the
* fewest bits. Carefully select the smaller and cast it to the type of
* the larger - this cannot overflow. Do not cast in the following test
* - it will break on either 16 or 64 bit platforms.
*/
if (skip_length < save_size)
save_size = (png_size_t)skip_length;
1996-01-26 07:38:47 +00:00
else
skip_length = (png_uint_32)save_size;
1996-01-26 07:38:47 +00:00
png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
png_ptr->skip_length -= skip_length;
1996-01-26 07:38:47 +00:00
png_ptr->buffer_size -= save_size;
png_ptr->save_buffer_size -= save_size;
1997-05-16 07:46:07 +00:00
png_ptr->save_buffer_ptr += save_size;
1996-01-26 07:38:47 +00:00
}
if (png_ptr->skip_length && png_ptr->current_buffer_size)
{
png_size_t save_size = png_ptr->current_buffer_size;
png_uint_32 skip_length = png_ptr->skip_length;
1996-01-26 07:38:47 +00:00
/* We want the smaller of 'skip_length' and 'current_buffer_size', here,
* the same problem exists as above and the same solution.
*/
if (skip_length < save_size)
save_size = (png_size_t)skip_length;
1996-01-26 07:38:47 +00:00
else
skip_length = (png_uint_32)save_size;
1996-01-26 07:38:47 +00:00
png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
png_ptr->skip_length -= skip_length;
1996-01-26 07:38:47 +00:00
png_ptr->buffer_size -= save_size;
png_ptr->current_buffer_size -= save_size;
1997-05-16 07:46:07 +00:00
png_ptr->current_buffer_ptr += save_size;
1996-01-26 07:38:47 +00:00
}
if (!png_ptr->skip_length)
{
if (png_ptr->buffer_size < 4)
{
png_push_save_buffer(png_ptr);
return;
}
1997-01-17 07:34:35 +00:00
png_crc_finish(png_ptr, 0);
1997-05-16 07:46:07 +00:00
png_ptr->process_mode = PNG_READ_CHUNK_MODE;
1996-01-26 07:38:47 +00:00
}
1995-12-19 09:22:19 +00:00
}
void PNGCBAPI
1997-05-16 07:46:07 +00:00
png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
1995-12-19 09:22:19 +00:00
{
1996-01-26 07:38:47 +00:00
png_bytep ptr;
if (png_ptr == NULL)
return;
1996-01-26 07:38:47 +00:00
ptr = buffer;
if (png_ptr->save_buffer_size)
{
1997-05-16 07:46:07 +00:00
png_size_t save_size;
1996-01-26 07:38:47 +00:00
if (length < png_ptr->save_buffer_size)
save_size = length;
1996-01-26 07:38:47 +00:00
else
save_size = png_ptr->save_buffer_size;
png_memcpy(ptr, png_ptr->save_buffer_ptr, save_size);
1996-01-26 07:38:47 +00:00
length -= save_size;
1997-05-16 07:46:07 +00:00
ptr += save_size;
1996-01-26 07:38:47 +00:00
png_ptr->buffer_size -= save_size;
png_ptr->save_buffer_size -= save_size;
1997-05-16 07:46:07 +00:00
png_ptr->save_buffer_ptr += save_size;
1996-01-26 07:38:47 +00:00
}
if (length && png_ptr->current_buffer_size)
{
1997-05-16 07:46:07 +00:00
png_size_t save_size;
1996-01-26 07:38:47 +00:00
if (length < png_ptr->current_buffer_size)
save_size = length;
1996-01-26 07:38:47 +00:00
else
save_size = png_ptr->current_buffer_size;
png_memcpy(ptr, png_ptr->current_buffer_ptr, save_size);
1996-01-26 07:38:47 +00:00
png_ptr->buffer_size -= save_size;
png_ptr->current_buffer_size -= save_size;
1997-05-16 07:46:07 +00:00
png_ptr->current_buffer_ptr += save_size;
1996-01-26 07:38:47 +00:00
}
1995-12-19 09:22:19 +00:00
}
2000-05-06 19:09:57 +00:00
void /* PRIVATE */
png_push_save_buffer(png_structrp png_ptr)
1995-12-19 09:22:19 +00:00
{
1996-01-26 07:38:47 +00:00
if (png_ptr->save_buffer_size)
{
if (png_ptr->save_buffer_ptr != png_ptr->save_buffer)
{
2008-07-10 14:13:13 +00:00
png_size_t i, istop;
1996-01-26 07:38:47 +00:00
png_bytep sp;
png_bytep dp;
1998-04-21 20:03:57 +00:00
istop = png_ptr->save_buffer_size;
1996-01-26 07:38:47 +00:00
for (i = 0, sp = png_ptr->save_buffer_ptr, dp = png_ptr->save_buffer;
i < istop; i++, sp++, dp++)
1996-01-26 07:38:47 +00:00
{
*dp = *sp;
}
}
}
if (png_ptr->save_buffer_size + png_ptr->current_buffer_size >
png_ptr->save_buffer_max)
1996-01-26 07:38:47 +00:00
{
1997-05-16 07:46:07 +00:00
png_size_t new_max;
1996-01-26 07:38:47 +00:00
png_bytep old_buffer;
2006-03-04 22:50:47 +00:00
if (png_ptr->save_buffer_size > PNG_SIZE_MAX -
(png_ptr->current_buffer_size + 256))
{
png_error(png_ptr, "Potential overflow of save_buffer");
}
new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;
1996-01-26 07:38:47 +00:00
old_buffer = png_ptr->save_buffer;
png_ptr->save_buffer = (png_bytep)png_malloc_warn(png_ptr,
(png_size_t)new_max);
if (png_ptr->save_buffer == NULL)
{
png_free(png_ptr, old_buffer);
png_error(png_ptr, "Insufficient memory for save_buffer");
}
png_memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
2001-04-20 15:32:10 +00:00
png_free(png_ptr, old_buffer);
png_ptr->save_buffer_max = new_max;
1996-01-26 07:38:47 +00:00
}
if (png_ptr->current_buffer_size)
{
png_memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
1997-05-16 07:46:07 +00:00
png_ptr->current_buffer_ptr, png_ptr->current_buffer_size);
1996-01-26 07:38:47 +00:00
png_ptr->save_buffer_size += png_ptr->current_buffer_size;
png_ptr->current_buffer_size = 0;
}
png_ptr->save_buffer_ptr = png_ptr->save_buffer;
png_ptr->buffer_size = 0;
1995-12-19 09:22:19 +00:00
}
2000-05-06 19:09:57 +00:00
void /* PRIVATE */
png_push_restore_buffer(png_structrp png_ptr, png_bytep buffer,
1997-05-16 07:46:07 +00:00
png_size_t buffer_length)
1995-12-19 09:22:19 +00:00
{
1996-01-26 07:38:47 +00:00
png_ptr->current_buffer = buffer;
png_ptr->current_buffer_size = buffer_length;
png_ptr->buffer_size = buffer_length + png_ptr->save_buffer_size;
png_ptr->current_buffer_ptr = png_ptr->current_buffer;
1995-12-19 09:22:19 +00:00
}
2000-05-06 19:09:57 +00:00
void /* PRIVATE */
png_push_read_IDAT(png_structrp png_ptr)
1995-12-19 09:22:19 +00:00
{
1999-11-27 16:22:33 +00:00
if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
1996-01-26 07:38:47 +00:00
{
1997-01-17 07:34:35 +00:00
png_byte chunk_length[4];
png_byte chunk_tag[4];
1996-01-26 07:38:47 +00:00
/* TODO: this code can be commoned up with the same code in push_read */
1996-01-26 07:38:47 +00:00
if (png_ptr->buffer_size < 8)
{
png_push_save_buffer(png_ptr);
return;
}
1997-01-17 07:34:35 +00:00
png_push_fill_buffer(png_ptr, chunk_length, 4);
2008-07-10 14:13:13 +00:00
png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
1996-01-26 07:38:47 +00:00
png_reset_crc(png_ptr);
png_crc_read(png_ptr, chunk_tag, 4);
png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
1999-11-27 16:22:33 +00:00
png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
1997-01-17 07:34:35 +00:00
if (png_ptr->chunk_name != png_IDAT)
1996-01-26 07:38:47 +00:00
{
1997-05-16 07:46:07 +00:00
png_ptr->process_mode = PNG_READ_CHUNK_MODE;
if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
1996-01-26 07:38:47 +00:00
png_error(png_ptr, "Not enough compressed data");
1996-01-26 07:38:47 +00:00
return;
}
png_ptr->idat_size = png_ptr->push_length;
}
1996-01-26 07:38:47 +00:00
if (png_ptr->idat_size && png_ptr->save_buffer_size)
{
png_size_t save_size = png_ptr->save_buffer_size;
png_uint_32 idat_size = png_ptr->idat_size;
/* We want the smaller of 'idat_size' and 'current_buffer_size', but they
* are of different types and we don't know which variable has the fewest
* bits. Carefully select the smaller and cast it to the type of the
* larger - this cannot overflow. Do not cast in the following test - it
* will break on either 16 or 64 bit platforms.
*/
if (idat_size < save_size)
save_size = (png_size_t)idat_size;
1996-01-26 07:38:47 +00:00
else
idat_size = (png_uint_32)save_size;
1996-01-26 07:38:47 +00:00
png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);
png_ptr->idat_size -= idat_size;
1996-01-26 07:38:47 +00:00
png_ptr->buffer_size -= save_size;
png_ptr->save_buffer_size -= save_size;
1997-05-16 07:46:07 +00:00
png_ptr->save_buffer_ptr += save_size;
1996-01-26 07:38:47 +00:00
}
1996-01-26 07:38:47 +00:00
if (png_ptr->idat_size && png_ptr->current_buffer_size)
{
png_size_t save_size = png_ptr->current_buffer_size;
png_uint_32 idat_size = png_ptr->idat_size;
1996-01-26 07:38:47 +00:00
/* We want the smaller of 'idat_size' and 'current_buffer_size', but they
* are of different types and we don't know which variable has the fewest
* bits. Carefully select the smaller and cast it to the type of the
* larger - this cannot overflow.
*/
if (idat_size < save_size)
save_size = (png_size_t)idat_size;
1996-01-26 07:38:47 +00:00
else
idat_size = (png_uint_32)save_size;
1996-01-26 07:38:47 +00:00
png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);
1996-01-26 07:38:47 +00:00
png_ptr->idat_size -= idat_size;
1996-01-26 07:38:47 +00:00
png_ptr->buffer_size -= save_size;
png_ptr->current_buffer_size -= save_size;
1997-05-16 07:46:07 +00:00
png_ptr->current_buffer_ptr += save_size;
1996-01-26 07:38:47 +00:00
}
if (!png_ptr->idat_size)
{
if (png_ptr->buffer_size < 4)
{
png_push_save_buffer(png_ptr);
return;
}
1997-01-17 07:34:35 +00:00
png_crc_finish(png_ptr, 0);
1999-11-27 16:22:33 +00:00
png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
2002-08-06 23:06:11 +00:00
png_ptr->mode |= PNG_AFTER_IDAT;
1996-01-26 07:38:47 +00:00
}
1995-12-19 09:22:19 +00:00
}
2000-05-06 19:09:57 +00:00
void /* PRIVATE */
png_process_IDAT_data(png_structrp png_ptr, png_bytep buffer,
1997-05-16 07:46:07 +00:00
png_size_t buffer_length)
1995-12-19 09:22:19 +00:00
{
/* The caller checks for a non-zero buffer length. */
if (!(buffer_length > 0) || buffer == NULL)
png_error(png_ptr, "No IDAT data (internal error)");
1996-01-26 07:38:47 +00:00
/* This routine must process all the data it has been given
* before returning, calling the row callback as required to
* handle the uncompressed results.
*/
1997-01-17 07:34:35 +00:00
png_ptr->zstream.next_in = buffer;
png_ptr->zstream.avail_in = (uInt)buffer_length;
/* Keep going until the decompressed data is all processed
* or the stream marked as finished.
*/
while (png_ptr->zstream.avail_in > 0 &&
!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
1996-01-26 07:38:47 +00:00
{
int ret;
/* We have data for zlib, but we must check that zlib
* has someplace to put the results. It doesn't matter
* if we don't expect any results -- it may be the input
* data is just the LZ end code.
*/
if (!(png_ptr->zstream.avail_out > 0))
1996-01-26 07:38:47 +00:00
{
png_ptr->zstream.avail_out =
(uInt) PNG_ROWBYTES(png_ptr->pixel_depth,
png_ptr->iwidth) + 1;
png_ptr->zstream.next_out = png_ptr->row_buf;
}
/* Using Z_SYNC_FLUSH here means that an unterminated
* LZ stream (a stream with a missing end code) can still
* be handled, otherwise (Z_NO_FLUSH) a future zlib
* implementation might defer output and therefore
* change the current behavior (see comments in inflate.c
* for why this doesn't happen at present with zlib 1.2.5).
*/
ret = inflate(&png_ptr->zstream, Z_SYNC_FLUSH);
/* Check for any failure before proceeding. */
if (ret != Z_OK && ret != Z_STREAM_END)
{
/* Terminate the decompression. */
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
2000-05-29 13:58:03 +00:00
/* This may be a truncated stream (missing or
* damaged end code). Treat that as a warning.
*/
if (png_ptr->row_number >= png_ptr->num_rows ||
png_ptr->pass > 6)
png_warning(png_ptr, "Truncated compressed data in IDAT");
else
png_error(png_ptr, "Decompression error in IDAT");
/* Skip the check on unprocessed input */
return;
1996-01-26 07:38:47 +00:00
}
/* Did inflate output any data? */
if (png_ptr->zstream.next_out != png_ptr->row_buf)
1996-01-26 07:38:47 +00:00
{
/* Is this unexpected data after the last row?
* If it is, artificially terminate the LZ output
* here.
*/
if (png_ptr->row_number >= png_ptr->num_rows ||
png_ptr->pass > 6)
2002-08-06 23:06:11 +00:00
{
/* Extra data. */
png_warning(png_ptr, "Extra compressed data in IDAT");
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
/* Do no more processing; skip the unprocessed
* input check below.
*/
return;
}
/* Do we have a complete row? */
if (png_ptr->zstream.avail_out == 0)
png_push_process_row(png_ptr);
1996-01-26 07:38:47 +00:00
}
/* And check for the end of the stream. */
if (ret == Z_STREAM_END)
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
1997-05-16 07:46:07 +00:00
}
/* All the data should have been processed, if anything
* is left at this point we have bytes of IDAT data
* after the zlib end code.
*/
if (png_ptr->zstream.avail_in > 0)
png_warning(png_ptr, "Extra compression data in IDAT");
1995-12-19 09:22:19 +00:00
}
2000-05-06 19:09:57 +00:00
void /* PRIVATE */
png_push_process_row(png_structrp png_ptr)
1995-12-19 09:22:19 +00:00
{
/* 1.5.6: row_info moved out of png_struct to a local here. */
png_row_info row_info;
1998-12-29 17:47:59 +00:00
row_info.width = png_ptr->iwidth; /* NOTE: width of current interlaced row */
row_info.color_type = png_ptr->color_type;
row_info.bit_depth = png_ptr->bit_depth;
row_info.channels = png_ptr->channels;
row_info.pixel_depth = png_ptr->pixel_depth;
row_info.rowbytes = PNG_ROWBYTES(row_info.pixel_depth, row_info.width);
1995-12-19 09:22:19 +00:00
if (png_ptr->row_buf[0] > PNG_FILTER_VALUE_NONE)
{
if (png_ptr->row_buf[0] < PNG_FILTER_VALUE_LAST)
png_read_filter_row(png_ptr, &row_info, png_ptr->row_buf + 1,
png_ptr->prev_row + 1, png_ptr->row_buf[0]);
else
png_error(png_ptr, "bad adaptive filter value");
}
1995-12-19 09:22:19 +00:00
/* libpng 1.5.6: the following line was copying png_ptr->rowbytes before
* 1.5.6, while the buffer really is this big in current versions of libpng
* it may not be in the future, so this was changed just to copy the
* interlaced row count:
*/
png_memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1);
1995-12-19 09:22:19 +00:00
#ifdef PNG_READ_TRANSFORMS_SUPPORTED
if (png_ptr->transformations)
png_do_read_transformations(png_ptr, &row_info);
#endif
1995-12-19 09:22:19 +00:00
/* The transformed pixel depth should match the depth now in row_info. */
if (png_ptr->transformed_pixel_depth == 0)
{
png_ptr->transformed_pixel_depth = row_info.pixel_depth;
if (row_info.pixel_depth > png_ptr->maximum_pixel_depth)
png_error(png_ptr, "progressive row overflow");
}
else if (png_ptr->transformed_pixel_depth != row_info.pixel_depth)
png_error(png_ptr, "internal progressive row size calculation error");
#ifdef PNG_READ_INTERLACING_SUPPORTED
2009-05-20 17:45:29 +00:00
/* Blow up interlaced rows to full size */
1997-05-16 07:46:07 +00:00
if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
1996-01-26 07:38:47 +00:00
{
if (png_ptr->pass < 6)
png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass,
png_ptr->transformations);
1996-01-26 07:38:47 +00:00
2001-01-15 18:22:32 +00:00
switch (png_ptr->pass)
{
1996-01-26 07:38:47 +00:00
case 0:
{
int i;
for (i = 0; i < 8 && png_ptr->pass == 0; i++)
{
png_push_have_row(png_ptr, png_ptr->row_buf + 1);
2009-05-20 17:45:29 +00:00
png_read_push_finish_row(png_ptr); /* Updates png_ptr->pass */
1996-01-26 07:38:47 +00:00
}
2009-05-20 17:45:29 +00:00
if (png_ptr->pass == 2) /* Pass 1 might be empty */
2001-01-15 18:22:32 +00:00
{
for (i = 0; i < 4 && png_ptr->pass == 2; i++)
{
2006-08-19 18:59:24 +00:00
png_push_have_row(png_ptr, NULL);
2001-01-15 18:22:32 +00:00
png_read_push_finish_row(png_ptr);
}
}
2002-06-20 11:54:34 +00:00
if (png_ptr->pass == 4 && png_ptr->height <= 4)
{
for (i = 0; i < 2 && png_ptr->pass == 4; i++)
{
2006-08-19 18:59:24 +00:00
png_push_have_row(png_ptr, NULL);
2002-06-20 11:54:34 +00:00
png_read_push_finish_row(png_ptr);
}
2001-05-07 19:52:45 +00:00
}
2001-05-07 19:52:45 +00:00
if (png_ptr->pass == 6 && png_ptr->height <= 4)
{
2006-08-19 18:59:24 +00:00
png_push_have_row(png_ptr, NULL);
2001-05-07 19:52:45 +00:00
png_read_push_finish_row(png_ptr);
}
1996-01-26 07:38:47 +00:00
break;
}
1996-01-26 07:38:47 +00:00
case 1:
{
int i;
for (i = 0; i < 8 && png_ptr->pass == 1; i++)
{
png_push_have_row(png_ptr, png_ptr->row_buf + 1);
png_read_push_finish_row(png_ptr);
}
2009-05-20 17:45:29 +00:00
if (png_ptr->pass == 2) /* Skip top 4 generated rows */
1996-01-26 07:38:47 +00:00
{
for (i = 0; i < 4 && png_ptr->pass == 2; i++)
{
2006-08-19 18:59:24 +00:00
png_push_have_row(png_ptr, NULL);
1996-01-26 07:38:47 +00:00
png_read_push_finish_row(png_ptr);
}
}
1996-01-26 07:38:47 +00:00
break;
}
1996-01-26 07:38:47 +00:00
case 2:
{
int i;
1996-01-26 07:38:47 +00:00
for (i = 0; i < 4 && png_ptr->pass == 2; i++)
{
png_push_have_row(png_ptr, png_ptr->row_buf + 1);
png_read_push_finish_row(png_ptr);
}
1996-01-26 07:38:47 +00:00
for (i = 0; i < 4 && png_ptr->pass == 2; i++)
{
2006-08-19 18:59:24 +00:00
png_push_have_row(png_ptr, NULL);
1996-01-26 07:38:47 +00:00
png_read_push_finish_row(png_ptr);
}
2009-05-20 17:45:29 +00:00
if (png_ptr->pass == 4) /* Pass 3 might be empty */
2001-01-15 18:22:32 +00:00
{
for (i = 0; i < 2 && png_ptr->pass == 4; i++)
{
2006-08-19 18:59:24 +00:00
png_push_have_row(png_ptr, NULL);
2001-01-15 18:22:32 +00:00
png_read_push_finish_row(png_ptr);
}
}
1996-01-26 07:38:47 +00:00
break;
}
1996-01-26 07:38:47 +00:00
case 3:
{
int i;
1996-01-26 07:38:47 +00:00
for (i = 0; i < 4 && png_ptr->pass == 3; i++)
{
png_push_have_row(png_ptr, png_ptr->row_buf + 1);
png_read_push_finish_row(png_ptr);
}
2009-05-20 17:45:29 +00:00
if (png_ptr->pass == 4) /* Skip top two generated rows */
1996-01-26 07:38:47 +00:00
{
for (i = 0; i < 2 && png_ptr->pass == 4; i++)
{
2006-08-19 18:59:24 +00:00
png_push_have_row(png_ptr, NULL);
1996-01-26 07:38:47 +00:00
png_read_push_finish_row(png_ptr);
}
}
1996-01-26 07:38:47 +00:00
break;
}
1996-01-26 07:38:47 +00:00
case 4:
{
int i;
1996-01-26 07:38:47 +00:00
for (i = 0; i < 2 && png_ptr->pass == 4; i++)
{
png_push_have_row(png_ptr, png_ptr->row_buf + 1);
png_read_push_finish_row(png_ptr);
}
1996-01-26 07:38:47 +00:00
for (i = 0; i < 2 && png_ptr->pass == 4; i++)
{
2006-08-19 18:59:24 +00:00
png_push_have_row(png_ptr, NULL);
1996-01-26 07:38:47 +00:00
png_read_push_finish_row(png_ptr);
}
2009-05-20 17:45:29 +00:00
if (png_ptr->pass == 6) /* Pass 5 might be empty */
2001-01-15 18:22:32 +00:00
{
2006-08-19 18:59:24 +00:00
png_push_have_row(png_ptr, NULL);
2001-01-15 18:22:32 +00:00
png_read_push_finish_row(png_ptr);
}
1996-01-26 07:38:47 +00:00
break;
}
1996-01-26 07:38:47 +00:00
case 5:
{
int i;
1996-01-26 07:38:47 +00:00
for (i = 0; i < 2 && png_ptr->pass == 5; i++)
{
png_push_have_row(png_ptr, png_ptr->row_buf + 1);
png_read_push_finish_row(png_ptr);
}
2009-05-20 17:45:29 +00:00
if (png_ptr->pass == 6) /* Skip top generated row */
1996-01-26 07:38:47 +00:00
{
2006-08-19 18:59:24 +00:00
png_push_have_row(png_ptr, NULL);
1996-01-26 07:38:47 +00:00
png_read_push_finish_row(png_ptr);
}
1996-01-26 07:38:47 +00:00
break;
}
default:
1996-01-26 07:38:47 +00:00
case 6:
{
png_push_have_row(png_ptr, png_ptr->row_buf + 1);
png_read_push_finish_row(png_ptr);
1996-01-26 07:38:47 +00:00
if (png_ptr->pass != 6)
break;
2006-08-19 18:59:24 +00:00
png_push_have_row(png_ptr, NULL);
1996-01-26 07:38:47 +00:00
png_read_push_finish_row(png_ptr);
}
}
}
else
1995-12-19 09:22:19 +00:00
#endif
1996-01-26 07:38:47 +00:00
{
png_push_have_row(png_ptr, png_ptr->row_buf + 1);
png_read_push_finish_row(png_ptr);
}
1995-12-19 09:22:19 +00:00
}
2000-05-06 19:09:57 +00:00
void /* PRIVATE */
png_read_push_finish_row(png_structrp png_ptr)
1995-12-19 09:22:19 +00:00
{
/* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
1999-12-10 15:43:02 +00:00
/* Start of interlace block */
static PNG_CONST png_byte png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
1999-12-10 15:43:02 +00:00
/* Offset to next interlace block */
static PNG_CONST png_byte png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
1999-12-10 15:43:02 +00:00
/* Start of interlace block in the y direction */
static PNG_CONST png_byte png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
1999-12-10 15:43:02 +00:00
/* Offset to next interlace block in the y direction */
static PNG_CONST png_byte png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
1999-12-10 15:43:02 +00:00
1999-11-27 16:22:33 +00:00
/* Height of interlace block. This is not currently used - if you need
* it, uncomment it here and in png.h
static PNG_CONST png_byte png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
1999-11-27 16:22:33 +00:00
*/
1999-12-10 15:43:02 +00:00
1995-12-19 09:22:19 +00:00
png_ptr->row_number++;
if (png_ptr->row_number < png_ptr->num_rows)
1996-01-26 07:38:47 +00:00
return;
1995-12-19 09:22:19 +00:00
#ifdef PNG_READ_INTERLACING_SUPPORTED
1995-12-19 09:22:19 +00:00
if (png_ptr->interlaced)
{
png_ptr->row_number = 0;
png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
1995-12-19 09:22:19 +00:00
do
{
png_ptr->pass++;
2001-01-15 18:22:32 +00:00
if ((png_ptr->pass == 1 && png_ptr->width < 5) ||
(png_ptr->pass == 3 && png_ptr->width < 3) ||
(png_ptr->pass == 5 && png_ptr->width < 2))
png_ptr->pass++;
2001-01-15 18:22:32 +00:00
2002-08-06 23:06:11 +00:00
if (png_ptr->pass > 7)
png_ptr->pass--;
1995-12-19 09:22:19 +00:00
if (png_ptr->pass >= 7)
break;
1998-12-29 17:47:59 +00:00
1995-12-19 09:22:19 +00:00
png_ptr->iwidth = (png_ptr->width +
png_pass_inc[png_ptr->pass] - 1 -
png_pass_start[png_ptr->pass]) /
png_pass_inc[png_ptr->pass];
1998-03-07 12:06:55 +00:00
1995-12-19 09:22:19 +00:00
if (png_ptr->transformations & PNG_INTERLACE)
break;
1998-12-29 17:47:59 +00:00
png_ptr->num_rows = (png_ptr->height +
png_pass_yinc[png_ptr->pass] - 1 -
png_pass_ystart[png_ptr->pass]) /
png_pass_yinc[png_ptr->pass];
1998-12-29 17:47:59 +00:00
} while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0);
1995-12-19 09:22:19 +00:00
}
#endif /* PNG_READ_INTERLACING_SUPPORTED */
1995-12-19 09:22:19 +00:00
}
#ifdef PNG_READ_tEXt_SUPPORTED
void /* PRIVATE */
png_push_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32
length)
{
if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
{
PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
png_error(png_ptr, "Out of place tEXt");
/* NOT REACHED */
}
#ifdef PNG_MAX_MALLOC_64K
png_ptr->skip_length = 0; /* This may not be necessary */
if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
{
png_warning(png_ptr, "tEXt chunk too large to fit in memory");
png_ptr->skip_length = length - (png_uint_32)65535L;
length = (png_uint_32)65535L;
}
#endif
png_ptr->current_text = (png_charp)png_malloc(png_ptr,
(png_size_t)(length + 1));
png_ptr->current_text[length] = '\0';
png_ptr->current_text_ptr = png_ptr->current_text;
png_ptr->current_text_size = (png_size_t)length;
png_ptr->current_text_left = (png_size_t)length;
png_ptr->process_mode = PNG_READ_tEXt_MODE;
}
void /* PRIVATE */
png_push_read_tEXt(png_structrp png_ptr, png_inforp info_ptr)
{
if (png_ptr->buffer_size && png_ptr->current_text_left)
{
png_size_t text_size;
if (png_ptr->buffer_size < png_ptr->current_text_left)
text_size = png_ptr->buffer_size;
else
text_size = png_ptr->current_text_left;
png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
png_ptr->current_text_left -= text_size;
png_ptr->current_text_ptr += text_size;
}
if (!(png_ptr->current_text_left))
{
png_textp text_ptr;
png_charp text;
png_charp key;
int ret;
if (png_ptr->buffer_size < 4)
{
png_push_save_buffer(png_ptr);
return;
}
png_push_crc_finish(png_ptr);
#ifdef PNG_MAX_MALLOC_64K
if (png_ptr->skip_length)
return;
#endif
key = png_ptr->current_text;
for (text = key; *text; text++)
/* Empty loop */ ;
if (text < key + png_ptr->current_text_size)
text++;
text_ptr = (png_textp)png_malloc(png_ptr, png_sizeof(png_text));
text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
text_ptr->key = key;
text_ptr->itxt_length = 0;
text_ptr->lang = NULL;
text_ptr->lang_key = NULL;
text_ptr->text = text;
ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
png_free(png_ptr, key);
png_free(png_ptr, text_ptr);
png_ptr->current_text = NULL;
if (ret)
png_warning(png_ptr, "Insufficient memory to store text chunk");
}
}
#endif
#ifdef PNG_READ_zTXt_SUPPORTED
void /* PRIVATE */
png_push_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32
length)
{
if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
{
PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
png_error(png_ptr, "Out of place zTXt");
/* NOT REACHED */
}
#ifdef PNG_MAX_MALLOC_64K
/* We can't handle zTXt chunks > 64K, since we don't have enough space
* to be able to store the uncompressed data. Actually, the threshold
* is probably around 32K, but it isn't as definite as 64K is.
*/
if (length > (png_uint_32)65535L)
{
png_warning(png_ptr, "zTXt chunk too large to fit in memory");
png_push_crc_skip(png_ptr, length);
return;
}
#endif
png_ptr->current_text = (png_charp)png_malloc(png_ptr,
(png_size_t)(length + 1));
png_ptr->current_text[length] = '\0';
png_ptr->current_text_ptr = png_ptr->current_text;
png_ptr->current_text_size = (png_size_t)length;
png_ptr->current_text_left = (png_size_t)length;
png_ptr->process_mode = PNG_READ_zTXt_MODE;
}
void /* PRIVATE */
png_push_read_zTXt(png_structrp png_ptr, png_inforp info_ptr)
{
if (png_ptr->buffer_size && png_ptr->current_text_left)
{
png_size_t text_size;
if (png_ptr->buffer_size < (png_uint_32)png_ptr->current_text_left)
text_size = png_ptr->buffer_size;
else
text_size = png_ptr->current_text_left;
png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
png_ptr->current_text_left -= text_size;
png_ptr->current_text_ptr += text_size;
}
if (!(png_ptr->current_text_left))
{
png_textp text_ptr;
png_charp text;
png_charp key;
int ret;
png_size_t text_size, key_size;
if (png_ptr->buffer_size < 4)
{
png_push_save_buffer(png_ptr);
return;
}
png_push_crc_finish(png_ptr);
key = png_ptr->current_text;
for (text = key; *text; text++)
/* Empty loop */ ;
/* zTXt can't have zero text */
if (text >= key + png_ptr->current_text_size)
{
png_ptr->current_text = NULL;
png_free(png_ptr, key);
return;
}
text++;
if (*text != PNG_TEXT_COMPRESSION_zTXt) /* Check compression byte */
{
png_ptr->current_text = NULL;
png_free(png_ptr, key);
return;
}
text++;
png_ptr->zstream.next_in = (png_bytep)text;
png_ptr->zstream.avail_in = (uInt)(png_ptr->current_text_size -
(text - key));
png_ptr->zstream.next_out = png_ptr->zbuf;
png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
key_size = text - key;
text_size = 0;
text = NULL;
ret = Z_STREAM_END;
while (png_ptr->zstream.avail_in)
{
ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
if (ret != Z_OK && ret != Z_STREAM_END)
{
inflateReset(&png_ptr->zstream);
png_ptr->zstream.avail_in = 0;
png_ptr->current_text = NULL;
png_free(png_ptr, key);
png_free(png_ptr, text);
return;
}
if (!(png_ptr->zstream.avail_out) || ret == Z_STREAM_END)
{
if (text == NULL)
{
text = (png_charp)png_malloc(png_ptr,
(png_ptr->zbuf_size
- png_ptr->zstream.avail_out + key_size + 1));
png_memcpy(text + key_size, png_ptr->zbuf,
png_ptr->zbuf_size - png_ptr->zstream.avail_out);
png_memcpy(text, key, key_size);
text_size = key_size + png_ptr->zbuf_size -
png_ptr->zstream.avail_out;
*(text + text_size) = '\0';
}
else
{
png_charp tmp;
tmp = text;
text = (png_charp)png_malloc(png_ptr, text_size +
(png_ptr->zbuf_size
- png_ptr->zstream.avail_out + 1));
png_memcpy(text, tmp, text_size);
png_free(png_ptr, tmp);
png_memcpy(text + text_size, png_ptr->zbuf,
png_ptr->zbuf_size - png_ptr->zstream.avail_out);
text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
*(text + text_size) = '\0';
}
if (ret != Z_STREAM_END)
{
png_ptr->zstream.next_out = png_ptr->zbuf;
png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
}
}
else
{
break;
}
if (ret == Z_STREAM_END)
break;
}
inflateReset(&png_ptr->zstream);
png_ptr->zstream.avail_in = 0;
if (ret != Z_STREAM_END)
{
png_ptr->current_text = NULL;
png_free(png_ptr, key);
png_free(png_ptr, text);
return;
}
png_ptr->current_text = NULL;
png_free(png_ptr, key);
key = text;
text += key_size;
text_ptr = (png_textp)png_malloc(png_ptr,
png_sizeof(png_text));
text_ptr->compression = PNG_TEXT_COMPRESSION_zTXt;
text_ptr->key = key;
text_ptr->itxt_length = 0;
text_ptr->lang = NULL;
text_ptr->lang_key = NULL;
text_ptr->text = text;
ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
png_free(png_ptr, key);
png_free(png_ptr, text_ptr);
if (ret)
png_warning(png_ptr, "Insufficient memory to store text chunk");
}
}
#endif
#ifdef PNG_READ_iTXt_SUPPORTED
void /* PRIVATE */
png_push_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32
length)
{
if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
{
PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
png_error(png_ptr, "Out of place iTXt");
/* NOT REACHED */
}
#ifdef PNG_MAX_MALLOC_64K
png_ptr->skip_length = 0; /* This may not be necessary */
if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
{
png_warning(png_ptr, "iTXt chunk too large to fit in memory");
png_ptr->skip_length = length - (png_uint_32)65535L;
length = (png_uint_32)65535L;
}
#endif
png_ptr->current_text = (png_charp)png_malloc(png_ptr,
(png_size_t)(length + 1));
png_ptr->current_text[length] = '\0';
png_ptr->current_text_ptr = png_ptr->current_text;
png_ptr->current_text_size = (png_size_t)length;
png_ptr->current_text_left = (png_size_t)length;
png_ptr->process_mode = PNG_READ_iTXt_MODE;
}
void /* PRIVATE */
png_push_read_iTXt(png_structrp png_ptr, png_inforp info_ptr)
{
if (png_ptr->buffer_size && png_ptr->current_text_left)
{
png_size_t text_size;
if (png_ptr->buffer_size < png_ptr->current_text_left)
text_size = png_ptr->buffer_size;
else
text_size = png_ptr->current_text_left;
png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
png_ptr->current_text_left -= text_size;
png_ptr->current_text_ptr += text_size;
}
if (!(png_ptr->current_text_left))
{
png_textp text_ptr;
png_charp key;
int comp_flag;
png_charp lang;
png_charp lang_key;
png_charp text;
int ret;
if (png_ptr->buffer_size < 4)
{
png_push_save_buffer(png_ptr);
return;
}
png_push_crc_finish(png_ptr);
#ifdef PNG_MAX_MALLOC_64K
if (png_ptr->skip_length)
return;
#endif
key = png_ptr->current_text;
for (lang = key; *lang; lang++)
/* Empty loop */ ;
if (lang < key + png_ptr->current_text_size - 3)
lang++;
comp_flag = *lang++;
lang++; /* Skip comp_type, always zero */
for (lang_key = lang; *lang_key; lang_key++)
/* Empty loop */ ;
lang_key++; /* Skip NUL separator */
text=lang_key;
if (lang_key < key + png_ptr->current_text_size - 1)
{
for (; *text; text++)
/* Empty loop */ ;
}
if (text < key + png_ptr->current_text_size)
text++;
text_ptr = (png_textp)png_malloc(png_ptr,
png_sizeof(png_text));
text_ptr->compression = comp_flag + 2;
text_ptr->key = key;
text_ptr->lang = lang;
text_ptr->lang_key = lang_key;
text_ptr->text = text;
text_ptr->text_length = 0;
text_ptr->itxt_length = png_strlen(text);
ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
png_ptr->current_text = NULL;
png_free(png_ptr, text_ptr);
if (ret)
png_warning(png_ptr, "Insufficient memory to store iTXt chunk");
}
}
#endif
/* This function is called when we haven't found a handler for this
* chunk. If there isn't a problem with the chunk itself (ie a bad chunk
* name or a critical chunk), the chunk is (currently) silently ignored.
*/
void /* PRIVATE */
png_push_handle_unknown(png_structrp png_ptr, png_inforp info_ptr, png_uint_32
length)
{
png_uint_32 skip = 0;
png_uint_32 chunk_name = png_ptr->chunk_name;
if (PNG_CHUNK_CRITICAL(chunk_name))
{
#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
if (png_chunk_unknown_handling(png_ptr, chunk_name) !=
PNG_HANDLE_CHUNK_ALWAYS
#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
&& png_ptr->read_user_chunk_fn == NULL
#endif
)
#endif
png_chunk_error(png_ptr, "unknown critical chunk");
PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
}
#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
/* TODO: the code below is apparently just using the
* png_struct::unknown_chunk member as a temporarily variable, it should be
* possible to eliminate both it and the temporary buffer.
*/
if (png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
{
#ifdef PNG_MAX_MALLOC_64K
if (length > 65535)
{
png_warning(png_ptr, "unknown chunk too large to fit in memory");
skip = length - 65535;
length = 65535;
}
#endif
/* This is just a record for the user; libpng doesn't use the character
* form of the name.
*/
PNG_CSTRING_FROM_CHUNK(png_ptr->unknown_chunk.name, png_ptr->chunk_name);
/* The following cast should be safe because of the check above. */
png_ptr->unknown_chunk.size = (png_size_t)length;
if (length == 0)
png_ptr->unknown_chunk.data = NULL;
else
{
png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr,
png_ptr->unknown_chunk.size);
png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data,
png_ptr->unknown_chunk.size);
}
#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
if (png_ptr->read_user_chunk_fn != NULL)
{
/* Callback to user unknown chunk handler */
int ret;
ret = (*(png_ptr->read_user_chunk_fn))
(png_ptr, &png_ptr->unknown_chunk);
if (ret < 0)
png_chunk_error(png_ptr, "error in user chunk");
if (ret == 0)
{
if (PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
if (png_chunk_unknown_handling(png_ptr, chunk_name) !=
PNG_HANDLE_CHUNK_ALWAYS)
png_chunk_error(png_ptr, "unknown critical chunk");
png_set_unknown_chunks(png_ptr, info_ptr,
&png_ptr->unknown_chunk, 1);
}
}
else
#endif
png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
png_free(png_ptr, png_ptr->unknown_chunk.data);
png_ptr->unknown_chunk.data = NULL;
}
else
#endif
skip=length;
png_push_crc_skip(png_ptr, skip);
}
2000-05-06 19:09:57 +00:00
void /* PRIVATE */
png_push_have_info(png_structrp png_ptr, png_inforp info_ptr)
1995-12-19 09:22:19 +00:00
{
1997-05-16 07:46:07 +00:00
if (png_ptr->info_fn != NULL)
1997-01-17 07:34:35 +00:00
(*(png_ptr->info_fn))(png_ptr, info_ptr);
1995-12-19 09:22:19 +00:00
}
2000-05-06 19:09:57 +00:00
void /* PRIVATE */
png_push_have_end(png_structrp png_ptr, png_inforp info_ptr)
1995-12-19 09:22:19 +00:00
{
1997-05-16 07:46:07 +00:00
if (png_ptr->end_fn != NULL)
1997-01-17 07:34:35 +00:00
(*(png_ptr->end_fn))(png_ptr, info_ptr);
1995-12-19 09:22:19 +00:00
}
2000-05-06 19:09:57 +00:00
void /* PRIVATE */
png_push_have_row(png_structrp png_ptr, png_bytep row)
1995-12-19 09:22:19 +00:00
{
if (png_ptr->row_fn != NULL)
1996-01-26 07:38:47 +00:00
(*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number,
(int)png_ptr->pass);
1995-12-19 09:22:19 +00:00
}
#ifdef PNG_READ_INTERLACING_SUPPORTED
2000-05-06 19:09:57 +00:00
void PNGAPI
png_progressive_combine_row(png_const_structrp png_ptr, png_bytep old_row,
png_const_bytep new_row)
1995-12-19 09:22:19 +00:00
{
if (png_ptr == NULL)
return;
/* new_row is a flag here - if it is NULL then the app callback was called
* from an empty row (see the calls to png_struct::row_fn below), otherwise
* it must be png_ptr->row_buf+1
*/
if (new_row != NULL)
png_combine_row(png_ptr, old_row, 1/*display*/);
1995-12-19 09:22:19 +00:00
}
#endif /* PNG_READ_INTERLACING_SUPPORTED */
1995-12-19 09:22:19 +00:00
2000-05-06 19:09:57 +00:00
void PNGAPI
png_set_progressive_read_fn(png_structrp png_ptr, png_voidp progressive_ptr,
png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
png_progressive_end_ptr end_fn)
1995-12-19 09:22:19 +00:00
{
if (png_ptr == NULL)
return;
1996-01-26 07:38:47 +00:00
png_ptr->info_fn = info_fn;
png_ptr->row_fn = row_fn;
1995-12-19 09:22:19 +00:00
png_ptr->end_fn = end_fn;
1996-06-05 20:50:50 +00:00
2002-05-01 16:51:26 +00:00
png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
1995-12-19 09:22:19 +00:00
}
2000-05-06 19:09:57 +00:00
png_voidp PNGAPI
png_get_progressive_ptr(png_const_structrp png_ptr)
1995-12-19 09:22:19 +00:00
{
if (png_ptr == NULL)
return (NULL);
1997-01-17 07:34:35 +00:00
return png_ptr->io_ptr;
1995-12-19 09:22:19 +00:00
}
1996-01-16 07:51:56 +00:00
#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */