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
|
|
|
*
|
2009-07-11 14:14:22 +00:00
|
|
|
* Last changed in libpng 1.2.37 [July 11, 2009]
|
2009-05-18 16:55:55 +00:00
|
|
|
* Copyright (c) 1998-2009 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.)
|
2009-06-29 01:26:26 +00:00
|
|
|
*
|
|
|
|
* 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
|
|
|
|
|
|
|
#define PNG_INTERNAL
|
|
|
|
#include "png.h"
|
1996-01-16 07:51:56 +00:00
|
|
|
#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
|
|
|
|
|
2009-05-20 17:43:52 +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
|
1997-01-17 07:34:35 +00:00
|
|
|
png_process_data(png_structp png_ptr, png_infop info_ptr,
|
1997-05-16 07:46:07 +00:00
|
|
|
png_bytep buffer, png_size_t buffer_size)
|
1995-12-19 09:22:19 +00:00
|
|
|
{
|
2009-05-20 17:43:52 +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
|
|
|
}
|
|
|
|
|
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 */
|
1997-01-17 07:34:35 +00:00
|
|
|
png_process_some_data(png_structp png_ptr, png_infop info_ptr)
|
1995-12-19 09:22:19 +00:00
|
|
|
{
|
2009-05-20 17:43:52 +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;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
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;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
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;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1995-12-19 09:22:19 +00:00
|
|
|
#if defined(PNG_READ_tEXt_SUPPORTED)
|
1996-01-26 07:38:47 +00:00
|
|
|
case PNG_READ_tEXt_MODE:
|
|
|
|
{
|
1997-01-17 07:34:35 +00:00
|
|
|
png_push_read_tEXt(png_ptr, info_ptr);
|
1996-01-26 07:38:47 +00:00
|
|
|
break;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1995-12-19 09:22:19 +00:00
|
|
|
#endif
|
1996-01-26 07:38:47 +00:00
|
|
|
#if defined(PNG_READ_zTXt_SUPPORTED)
|
|
|
|
case PNG_READ_zTXt_MODE:
|
|
|
|
{
|
1997-01-17 07:34:35 +00:00
|
|
|
png_push_read_zTXt(png_ptr, info_ptr);
|
1996-01-26 07:38:47 +00:00
|
|
|
break;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1999-12-10 15:43:02 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_iTXt_SUPPORTED)
|
|
|
|
case PNG_READ_iTXt_MODE:
|
|
|
|
{
|
|
|
|
png_push_read_iTXt(png_ptr, info_ptr);
|
|
|
|
break;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
#endif
|
|
|
|
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;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
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 */
|
1997-01-17 07:34:35 +00:00
|
|
|
png_push_read_sig(png_structp png_ptr, png_infop 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]),
|
1997-05-16 07:46:07 +00:00
|
|
|
num_to_check);
|
2008-07-10 14:10:58 +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");
|
|
|
|
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 */
|
1997-01-17 07:34:35 +00:00
|
|
|
png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
|
1995-12-19 09:22:19 +00:00
|
|
|
{
|
1999-11-29 05:32:18 +00:00
|
|
|
#ifdef PNG_USE_LOCAL_ARRAYS
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_IHDR;
|
|
|
|
PNG_CONST PNG_IDAT;
|
|
|
|
PNG_CONST PNG_IEND;
|
|
|
|
PNG_CONST PNG_PLTE;
|
1999-11-29 05:32:18 +00:00
|
|
|
#if defined(PNG_READ_bKGD_SUPPORTED)
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_bKGD;
|
1999-11-29 05:32:18 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_cHRM_SUPPORTED)
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_cHRM;
|
1999-11-29 05:32:18 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_gAMA_SUPPORTED)
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_gAMA;
|
1999-11-29 05:32:18 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_hIST_SUPPORTED)
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_hIST;
|
1999-11-29 05:32:18 +00:00
|
|
|
#endif
|
2000-02-05 05:40:16 +00:00
|
|
|
#if defined(PNG_READ_iCCP_SUPPORTED)
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_iCCP;
|
2000-02-05 05:40:16 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_iTXt_SUPPORTED)
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_iTXt;
|
2000-02-05 05:40:16 +00:00
|
|
|
#endif
|
1999-11-29 05:32:18 +00:00
|
|
|
#if defined(PNG_READ_oFFs_SUPPORTED)
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_oFFs;
|
1999-11-29 05:32:18 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_pCAL_SUPPORTED)
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_pCAL;
|
1999-11-29 05:32:18 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_pHYs_SUPPORTED)
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_pHYs;
|
1999-11-29 05:32:18 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_sBIT_SUPPORTED)
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_sBIT;
|
1999-11-29 05:32:18 +00:00
|
|
|
#endif
|
2000-02-05 05:40:16 +00:00
|
|
|
#if defined(PNG_READ_sCAL_SUPPORTED)
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_sCAL;
|
2000-02-05 05:40:16 +00:00
|
|
|
#endif
|
1999-11-29 05:32:18 +00:00
|
|
|
#if defined(PNG_READ_sRGB_SUPPORTED)
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_sRGB;
|
1999-11-29 05:32:18 +00:00
|
|
|
#endif
|
1999-12-10 15:43:02 +00:00
|
|
|
#if defined(PNG_READ_sPLT_SUPPORTED)
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_sPLT;
|
1999-12-10 15:43:02 +00:00
|
|
|
#endif
|
1999-11-29 05:32:18 +00:00
|
|
|
#if defined(PNG_READ_tEXt_SUPPORTED)
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_tEXt;
|
1999-11-29 05:32:18 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_tIME_SUPPORTED)
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_tIME;
|
1999-11-29 05:32:18 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_tRNS_SUPPORTED)
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_tRNS;
|
1999-11-29 05:32:18 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_zTXt_SUPPORTED)
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_zTXt;
|
1999-11-29 05:32:18 +00:00
|
|
|
#endif
|
|
|
|
#endif /* PNG_USE_LOCAL_ARRAYS */
|
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];
|
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-06 11:05:04 +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);
|
1997-05-16 07:46:07 +00:00
|
|
|
png_crc_read(png_ptr, png_ptr->chunk_name, 4);
|
2008-07-30 00:08:32 +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
|
|
|
}
|
|
|
|
|
2007-09-18 17:44:25 +00:00
|
|
|
if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
|
2008-07-10 14:10:58 +00:00
|
|
|
if (png_ptr->mode & PNG_AFTER_IDAT)
|
2006-06-07 02:48:26 +00:00
|
|
|
png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
|
|
|
|
|
1997-01-17 07:34:35 +00:00
|
|
|
if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
|
1996-01-26 07:38:47 +00:00
|
|
|
{
|
2008-07-30 00:08:32 +00:00
|
|
|
if (png_ptr->push_length != 13)
|
|
|
|
png_error(png_ptr, "Invalid IHDR length");
|
2009-05-20 17:43:52 +00:00
|
|
|
|
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;
|
|
|
|
}
|
2009-05-20 17:43:52 +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
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2004-08-10 02:50:32 +00:00
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
|
|
|
|
{
|
|
|
|
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
|
|
|
|
{
|
|
|
|
png_push_save_buffer(png_ptr);
|
|
|
|
return;
|
|
|
|
}
|
2009-05-20 17:43:52 +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);
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2004-08-10 02:50:32 +00:00
|
|
|
#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
|
|
|
|
else if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name))
|
|
|
|
{
|
|
|
|
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
|
|
|
|
{
|
|
|
|
png_push_save_buffer(png_ptr);
|
|
|
|
return;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2004-08-10 02:50:32 +00:00
|
|
|
if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
|
|
|
|
png_ptr->mode |= PNG_HAVE_IDAT;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2004-08-10 02:50:32 +00:00
|
|
|
png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2004-08-10 02:50:32 +00:00
|
|
|
if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
|
|
|
|
png_ptr->mode |= PNG_HAVE_PLTE;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2004-08-10 02:50:32 +00:00
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
|
|
|
|
{
|
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before IDAT");
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2004-08-10 02:50:32 +00:00
|
|
|
else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
|
|
|
|
!(png_ptr->mode & PNG_HAVE_PLTE))
|
|
|
|
png_error(png_ptr, "Missing PLTE before IDAT");
|
|
|
|
}
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2004-08-10 02:50:32 +00:00
|
|
|
#endif
|
1997-01-17 07:34:35 +00:00
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
|
1996-01-26 07:38:47 +00:00
|
|
|
{
|
1997-01-17 07:34:35 +00:00
|
|
|
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
|
1996-01-26 07:38:47 +00:00
|
|
|
{
|
1997-01-17 07:34:35 +00:00
|
|
|
png_push_save_buffer(png_ptr);
|
|
|
|
return;
|
1996-01-26 07:38:47 +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
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2007-09-18 17:44:25 +00:00
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
|
1996-01-26 07:38:47 +00:00
|
|
|
{
|
1997-01-17 07:34:35 +00:00
|
|
|
/* If we reach an IDAT chunk, this means we have read all of the
|
1998-01-01 13:13:13 +00:00
|
|
|
* header chunks, and we can start reading the image (or if this
|
|
|
|
* is called after the image has been read - we have an error).
|
|
|
|
*/
|
2009-05-20 17:43:52 +00:00
|
|
|
|
|
|
|
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");
|
2002-03-26 00:49:08 +00:00
|
|
|
|
1997-01-17 07:34:35 +00:00
|
|
|
if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
2006-06-07 02:48:26 +00:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
|
2009-05-20 17:43:52 +00:00
|
|
|
if (png_ptr->push_length == 0)
|
|
|
|
return;
|
1997-01-17 07:34:35 +00:00
|
|
|
|
|
|
|
if (png_ptr->mode & PNG_AFTER_IDAT)
|
|
|
|
png_error(png_ptr, "Too many IDAT's found");
|
|
|
|
}
|
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
png_ptr->idat_size = png_ptr->push_length;
|
1997-01-17 07:34:35 +00:00
|
|
|
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_ptr->irowbytes;
|
|
|
|
png_ptr->zstream.next_out = png_ptr->row_buf;
|
1996-01-26 07:38:47 +00:00
|
|
|
return;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1995-12-19 09:22:19 +00:00
|
|
|
#if defined(PNG_READ_gAMA_SUPPORTED)
|
1997-01-17 07:34:35 +00:00
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))
|
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;
|
|
|
|
}
|
2009-05-20 17:43:52 +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
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1995-12-19 09:22:19 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_sBIT_SUPPORTED)
|
1997-01-17 07:34:35 +00:00
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))
|
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;
|
|
|
|
}
|
2009-05-20 17:43:52 +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
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1995-12-19 09:22:19 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_cHRM_SUPPORTED)
|
1997-01-17 07:34:35 +00:00
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))
|
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;
|
|
|
|
}
|
2009-05-20 17:43:52 +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
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1995-12-19 09:22:19 +00:00
|
|
|
#endif
|
1998-01-01 13:13:13 +00:00
|
|
|
#if defined(PNG_READ_sRGB_SUPPORTED)
|
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))
|
|
|
|
{
|
|
|
|
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
|
|
|
|
{
|
|
|
|
png_push_save_buffer(png_ptr);
|
|
|
|
return;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1998-01-01 13:13:13 +00:00
|
|
|
png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1998-01-01 13:13:13 +00:00
|
|
|
#endif
|
1999-12-10 15:43:02 +00:00
|
|
|
#if defined(PNG_READ_iCCP_SUPPORTED)
|
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_iCCP, 4))
|
|
|
|
{
|
|
|
|
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
|
|
|
|
{
|
|
|
|
png_push_save_buffer(png_ptr);
|
|
|
|
return;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1999-12-10 15:43:02 +00:00
|
|
|
png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1999-12-10 15:43:02 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_sPLT_SUPPORTED)
|
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_sPLT, 4))
|
|
|
|
{
|
|
|
|
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
|
|
|
|
{
|
|
|
|
png_push_save_buffer(png_ptr);
|
|
|
|
return;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1999-12-10 15:43:02 +00:00
|
|
|
png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1999-12-10 15:43:02 +00:00
|
|
|
#endif
|
1995-12-19 09:22:19 +00:00
|
|
|
#if defined(PNG_READ_tRNS_SUPPORTED)
|
1997-01-17 07:34:35 +00:00
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))
|
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;
|
|
|
|
}
|
2009-05-20 17:43:52 +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
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1995-12-19 09:22:19 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_bKGD_SUPPORTED)
|
1997-01-17 07:34:35 +00:00
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))
|
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;
|
|
|
|
}
|
2009-05-20 17:43:52 +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
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1995-12-19 09:22:19 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_hIST_SUPPORTED)
|
1997-01-17 07:34:35 +00:00
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))
|
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;
|
|
|
|
}
|
2009-05-20 17:43:52 +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
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1995-12-19 09:22:19 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_pHYs_SUPPORTED)
|
1997-01-17 07:34:35 +00:00
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_pHYs, 4))
|
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;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
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
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1995-12-19 09:22:19 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_oFFs_SUPPORTED)
|
1997-01-17 07:34:35 +00:00
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))
|
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;
|
|
|
|
}
|
2009-05-20 17:43:52 +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
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
#if defined(PNG_READ_pCAL_SUPPORTED)
|
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))
|
|
|
|
{
|
|
|
|
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
|
|
|
|
{
|
|
|
|
png_push_save_buffer(png_ptr);
|
|
|
|
return;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
#endif
|
1999-12-10 15:43:02 +00:00
|
|
|
#if defined(PNG_READ_sCAL_SUPPORTED)
|
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_sCAL, 4))
|
|
|
|
{
|
|
|
|
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
|
|
|
|
{
|
|
|
|
png_push_save_buffer(png_ptr);
|
|
|
|
return;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1999-12-10 15:43:02 +00:00
|
|
|
png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1999-12-10 15:43:02 +00:00
|
|
|
#endif
|
1995-12-19 09:22:19 +00:00
|
|
|
#if defined(PNG_READ_tIME_SUPPORTED)
|
1997-01-17 07:34:35 +00:00
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
|
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;
|
|
|
|
}
|
2009-05-20 17:43:52 +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
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1995-12-19 09:22:19 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_tEXt_SUPPORTED)
|
1997-01-17 07:34:35 +00:00
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
|
1996-01-26 07:38:47 +00:00
|
|
|
{
|
2002-06-20 11:54:34 +00:00
|
|
|
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
|
|
|
|
{
|
|
|
|
png_push_save_buffer(png_ptr);
|
|
|
|
return;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1997-01-17 07:34:35 +00:00
|
|
|
png_push_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
|
1996-01-26 07:38:47 +00:00
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1995-12-19 09:22:19 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_zTXt_SUPPORTED)
|
1997-01-17 07:34:35 +00:00
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
|
1996-01-26 07:38:47 +00:00
|
|
|
{
|
2002-06-20 11:54:34 +00:00
|
|
|
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
|
|
|
|
{
|
|
|
|
png_push_save_buffer(png_ptr);
|
|
|
|
return;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1997-01-17 07:34:35 +00:00
|
|
|
png_push_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
|
1996-01-26 07:38:47 +00:00
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1999-12-10 15:43:02 +00:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_iTXt_SUPPORTED)
|
2000-02-05 05:40:16 +00:00
|
|
|
else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4))
|
1999-12-10 15:43:02 +00:00
|
|
|
{
|
2002-06-20 11:54:34 +00:00
|
|
|
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
|
|
|
|
{
|
|
|
|
png_push_save_buffer(png_ptr);
|
|
|
|
return;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1999-12-10 15:43:02 +00:00
|
|
|
png_push_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1995-12-19 09:22:19 +00:00
|
|
|
#endif
|
1996-01-26 07:38:47 +00:00
|
|
|
else
|
|
|
|
{
|
2002-06-20 11:54:34 +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_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 */
|
1997-05-16 07:46:07 +00:00
|
|
|
png_push_crc_skip(png_structp 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 */
|
1997-05-16 07:46:07 +00:00
|
|
|
png_push_crc_finish(png_structp 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)
|
|
|
|
{
|
1997-05-16 07:46:07 +00:00
|
|
|
png_size_t save_size;
|
1996-01-26 07:38:47 +00:00
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
if (png_ptr->skip_length < (png_uint_32)png_ptr->save_buffer_size)
|
|
|
|
save_size = (png_size_t)png_ptr->skip_length;
|
1996-01-26 07:38:47 +00:00
|
|
|
else
|
|
|
|
save_size = png_ptr->save_buffer_size;
|
|
|
|
|
|
|
|
png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
|
|
|
|
|
|
|
|
png_ptr->skip_length -= save_size;
|
|
|
|
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)
|
|
|
|
{
|
1997-05-16 07:46:07 +00:00
|
|
|
png_size_t save_size;
|
1996-01-26 07:38:47 +00:00
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
if (png_ptr->skip_length < (png_uint_32)png_ptr->current_buffer_size)
|
|
|
|
save_size = (png_size_t)png_ptr->skip_length;
|
1996-01-26 07:38:47 +00:00
|
|
|
else
|
|
|
|
save_size = png_ptr->current_buffer_size;
|
|
|
|
|
|
|
|
png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
|
|
|
|
|
|
|
|
png_ptr->skip_length -= save_size;
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2002-05-01 16:51:26 +00:00
|
|
|
void PNGAPI
|
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;
|
|
|
|
|
2009-05-20 17:43:52 +00:00
|
|
|
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;
|
|
|
|
else
|
|
|
|
save_size = png_ptr->save_buffer_size;
|
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
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;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
else
|
|
|
|
save_size = png_ptr->current_buffer_size;
|
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
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 */
|
1995-12-19 09:22:19 +00:00
|
|
|
png_push_save_buffer(png_structp png_ptr)
|
|
|
|
{
|
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-06 11:05:04 +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;
|
1998-04-21 20:03:57 +00:00
|
|
|
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)
|
|
|
|
{
|
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 -
|
2004-07-28 13:20:44 +00:00
|
|
|
(png_ptr->current_buffer_size + 256))
|
|
|
|
{
|
|
|
|
png_error(png_ptr, "Potential overflow of save_buffer");
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
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;
|
1998-12-29 17:47:59 +00:00
|
|
|
png_ptr->save_buffer = (png_bytep)png_malloc(png_ptr,
|
1998-02-07 16:20:57 +00:00
|
|
|
(png_uint_32)new_max);
|
2001-04-20 15:32:10 +00:00
|
|
|
png_memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
|
|
|
|
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)
|
|
|
|
{
|
1997-05-16 07:46:07 +00:00
|
|
|
png_memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
|
|
|
|
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 */
|
1995-12-19 09:22:19 +00:00
|
|
|
png_push_restore_buffer(png_structp 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 */
|
1996-06-05 20:50:50 +00:00
|
|
|
png_push_read_IDAT(png_structp png_ptr)
|
1995-12-19 09:22:19 +00:00
|
|
|
{
|
1999-11-29 05:32:18 +00:00
|
|
|
#ifdef PNG_USE_LOCAL_ARRAYS
|
2007-05-21 18:27:47 +00:00
|
|
|
PNG_CONST PNG_IDAT;
|
1999-11-29 05:32:18 +00:00
|
|
|
#endif
|
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];
|
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-06 11:05:04 +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);
|
1997-05-16 07:46:07 +00:00
|
|
|
png_crc_read(png_ptr, png_ptr->chunk_name, 4);
|
1999-11-27 16:22:33 +00:00
|
|
|
png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
|
1997-01-17 07:34:35 +00:00
|
|
|
|
2007-09-18 17:44:25 +00:00
|
|
|
if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
|
1996-01-26 07:38:47 +00:00
|
|
|
{
|
1997-05-16 07:46:07 +00:00
|
|
|
png_ptr->process_mode = PNG_READ_CHUNK_MODE;
|
1996-06-05 20:50:50 +00:00
|
|
|
if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
|
1996-01-26 07:38:47 +00:00
|
|
|
png_error(png_ptr, "Not enough compressed data");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
png_ptr->idat_size = png_ptr->push_length;
|
|
|
|
}
|
|
|
|
if (png_ptr->idat_size && 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
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
if (png_ptr->idat_size < (png_uint_32)png_ptr->save_buffer_size)
|
1998-02-07 16:20:57 +00:00
|
|
|
{
|
|
|
|
save_size = (png_size_t)png_ptr->idat_size;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
|
|
|
/* Check for overflow */
|
2008-07-10 14:10:58 +00:00
|
|
|
if ((png_uint_32)save_size != png_ptr->idat_size)
|
1998-02-07 16:20:57 +00:00
|
|
|
png_error(png_ptr, "save_size overflowed in pngpread");
|
|
|
|
}
|
1996-01-26 07:38:47 +00:00
|
|
|
else
|
|
|
|
save_size = png_ptr->save_buffer_size;
|
|
|
|
|
|
|
|
png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2002-08-06 23:06:11 +00:00
|
|
|
if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
|
|
|
|
png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
png_ptr->idat_size -= save_size;
|
|
|
|
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->idat_size && 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
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
if (png_ptr->idat_size < (png_uint_32)png_ptr->current_buffer_size)
|
1998-02-07 16:20:57 +00:00
|
|
|
{
|
|
|
|
save_size = (png_size_t)png_ptr->idat_size;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
|
|
|
/* Check for overflow */
|
2008-07-10 14:10:58 +00:00
|
|
|
if ((png_uint_32)save_size != png_ptr->idat_size)
|
1998-02-07 16:20:57 +00:00
|
|
|
png_error(png_ptr, "save_size overflowed in pngpread");
|
|
|
|
}
|
1996-01-26 07:38:47 +00:00
|
|
|
else
|
|
|
|
save_size = png_ptr->current_buffer_size;
|
|
|
|
|
|
|
|
png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
|
2002-08-06 23:06:11 +00:00
|
|
|
if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
|
|
|
|
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 -= save_size;
|
|
|
|
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 */
|
1995-12-19 09:22:19 +00:00
|
|
|
png_process_IDAT_data(png_structp 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
|
|
|
int ret;
|
|
|
|
|
1996-06-05 20:50:50 +00:00
|
|
|
if ((png_ptr->flags & PNG_FLAG_ZLIB_FINISHED) && buffer_length)
|
1996-01-26 07:38:47 +00:00
|
|
|
png_error(png_ptr, "Extra compression data");
|
|
|
|
|
1997-01-17 07:34:35 +00:00
|
|
|
png_ptr->zstream.next_in = buffer;
|
|
|
|
png_ptr->zstream.avail_in = (uInt)buffer_length;
|
2008-07-10 14:10:58 +00:00
|
|
|
for (;;)
|
1996-01-26 07:38:47 +00:00
|
|
|
{
|
1997-01-17 07:34:35 +00:00
|
|
|
ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
|
2000-05-29 13:58:03 +00:00
|
|
|
if (ret != Z_OK)
|
1996-01-26 07:38:47 +00:00
|
|
|
{
|
2000-05-29 13:58:03 +00:00
|
|
|
if (ret == Z_STREAM_END)
|
1996-01-26 07:38:47 +00:00
|
|
|
{
|
2000-05-29 13:58:03 +00:00
|
|
|
if (png_ptr->zstream.avail_in)
|
|
|
|
png_error(png_ptr, "Extra compressed data");
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2000-05-29 13:58:03 +00:00
|
|
|
if (!(png_ptr->zstream.avail_out))
|
|
|
|
{
|
|
|
|
png_push_process_row(png_ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
png_ptr->mode |= PNG_AFTER_IDAT;
|
|
|
|
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
|
|
|
|
break;
|
1996-01-26 07:38:47 +00:00
|
|
|
}
|
2000-05-29 13:58:03 +00:00
|
|
|
else if (ret == Z_BUF_ERROR)
|
|
|
|
break;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2000-05-29 13:58:03 +00:00
|
|
|
else
|
|
|
|
png_error(png_ptr, "Decompression Error");
|
1996-01-26 07:38:47 +00:00
|
|
|
}
|
1997-01-17 07:34:35 +00:00
|
|
|
if (!(png_ptr->zstream.avail_out))
|
1996-01-26 07:38:47 +00:00
|
|
|
{
|
2002-06-28 14:34:00 +00:00
|
|
|
if ((
|
|
|
|
#if defined(PNG_READ_INTERLACING_SUPPORTED)
|
|
|
|
png_ptr->interlaced && png_ptr->pass > 6) ||
|
|
|
|
(!png_ptr->interlaced &&
|
|
|
|
#endif
|
2004-08-08 02:42:49 +00:00
|
|
|
png_ptr->row_number == png_ptr->num_rows))
|
2002-08-06 23:06:11 +00:00
|
|
|
{
|
2002-08-16 03:02:57 +00:00
|
|
|
if (png_ptr->zstream.avail_in)
|
|
|
|
png_warning(png_ptr, "Too much data in IDAT chunks");
|
2002-08-06 23:06:11 +00:00
|
|
|
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
|
|
|
|
break;
|
|
|
|
}
|
1996-01-26 07:38:47 +00:00
|
|
|
png_push_process_row(png_ptr);
|
1997-01-17 07:34:35 +00:00
|
|
|
png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes;
|
|
|
|
png_ptr->zstream.next_out = png_ptr->row_buf;
|
1996-01-26 07:38:47 +00:00
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
1995-12-19 09:22:19 +00:00
|
|
|
}
|
|
|
|
|
2000-05-06 19:09:57 +00:00
|
|
|
void /* PRIVATE */
|
1995-12-19 09:22:19 +00:00
|
|
|
png_push_process_row(png_structp png_ptr)
|
|
|
|
{
|
1996-01-26 07:38:47 +00:00
|
|
|
png_ptr->row_info.color_type = png_ptr->color_type;
|
1995-12-19 09:22:19 +00:00
|
|
|
png_ptr->row_info.width = png_ptr->iwidth;
|
|
|
|
png_ptr->row_info.channels = png_ptr->channels;
|
|
|
|
png_ptr->row_info.bit_depth = png_ptr->bit_depth;
|
|
|
|
png_ptr->row_info.pixel_depth = png_ptr->pixel_depth;
|
1998-12-29 17:47:59 +00:00
|
|
|
|
2004-08-04 11:34:52 +00:00
|
|
|
png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
|
|
|
|
png_ptr->row_info.width);
|
1995-12-19 09:22:19 +00:00
|
|
|
|
1996-06-05 20:50:50 +00:00
|
|
|
png_read_filter_row(png_ptr, &(png_ptr->row_info),
|
|
|
|
png_ptr->row_buf + 1, png_ptr->prev_row + 1,
|
|
|
|
(int)(png_ptr->row_buf[0]));
|
1995-12-19 09:22:19 +00:00
|
|
|
|
1998-02-09 02:56:40 +00:00
|
|
|
png_memcpy_check(png_ptr, png_ptr->prev_row, png_ptr->row_buf,
|
1998-02-07 16:20:57 +00:00
|
|
|
png_ptr->rowbytes + 1);
|
1995-12-19 09:22:19 +00:00
|
|
|
|
2004-11-26 23:28:09 +00:00
|
|
|
if (png_ptr->transformations || (png_ptr->flags&PNG_FLAG_STRIP_ALPHA))
|
1995-12-19 09:22:19 +00:00
|
|
|
png_do_read_transformations(png_ptr);
|
|
|
|
|
|
|
|
#if defined(PNG_READ_INTERLACING_SUPPORTED)
|
2009-05-20 17:43:52 +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)
|
2001-01-12 21:13:06 +00:00
|
|
|
/* old interface (pre-1.0.9):
|
1996-01-26 07:38:47 +00:00
|
|
|
png_do_read_interlace(&(png_ptr->row_info),
|
1997-05-16 07:46:07 +00:00
|
|
|
png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
|
2001-01-12 21:13:06 +00:00
|
|
|
*/
|
|
|
|
png_do_read_interlace(png_ptr);
|
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:43:52 +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:43:52 +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++)
|
|
|
|
{
|
2001-10-27 12:35:13 +00:00
|
|
|
png_push_have_row(png_ptr, png_bytep_NULL);
|
2001-01-15 18:22:32 +00:00
|
|
|
png_read_push_finish_row(png_ptr);
|
|
|
|
}
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
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++)
|
|
|
|
{
|
|
|
|
png_push_have_row(png_ptr, png_bytep_NULL);
|
|
|
|
png_read_push_finish_row(png_ptr);
|
|
|
|
}
|
2001-05-07 19:52:45 +00:00
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2001-05-07 19:52:45 +00:00
|
|
|
if (png_ptr->pass == 6 && png_ptr->height <= 4)
|
|
|
|
{
|
2001-10-27 12:35:13 +00:00
|
|
|
png_push_have_row(png_ptr, png_bytep_NULL);
|
2001-05-07 19:52:45 +00:00
|
|
|
png_read_push_finish_row(png_ptr);
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
break;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
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:43:52 +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++)
|
|
|
|
{
|
2001-10-27 12:35:13 +00:00
|
|
|
png_push_have_row(png_ptr, png_bytep_NULL);
|
1996-01-26 07:38:47 +00:00
|
|
|
png_read_push_finish_row(png_ptr);
|
|
|
|
}
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
break;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
case 2:
|
|
|
|
{
|
|
|
|
int i;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
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);
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
for (i = 0; i < 4 && png_ptr->pass == 2; i++)
|
|
|
|
{
|
2001-10-27 12:35:13 +00:00
|
|
|
png_push_have_row(png_ptr, png_bytep_NULL);
|
1996-01-26 07:38:47 +00:00
|
|
|
png_read_push_finish_row(png_ptr);
|
|
|
|
}
|
2009-05-20 17:43:52 +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++)
|
|
|
|
{
|
2001-10-27 12:35:13 +00:00
|
|
|
png_push_have_row(png_ptr, png_bytep_NULL);
|
2001-01-15 18:22:32 +00:00
|
|
|
png_read_push_finish_row(png_ptr);
|
|
|
|
}
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
break;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
case 3:
|
|
|
|
{
|
|
|
|
int i;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
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:43:52 +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++)
|
|
|
|
{
|
2001-10-27 12:35:13 +00:00
|
|
|
png_push_have_row(png_ptr, png_bytep_NULL);
|
1996-01-26 07:38:47 +00:00
|
|
|
png_read_push_finish_row(png_ptr);
|
|
|
|
}
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
break;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
case 4:
|
|
|
|
{
|
|
|
|
int i;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
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);
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
for (i = 0; i < 2 && png_ptr->pass == 4; i++)
|
|
|
|
{
|
2001-10-27 12:35:13 +00:00
|
|
|
png_push_have_row(png_ptr, png_bytep_NULL);
|
1996-01-26 07:38:47 +00:00
|
|
|
png_read_push_finish_row(png_ptr);
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
|
|
|
if (png_ptr->pass == 6) /* Pass 5 might be empty */
|
2001-01-15 18:22:32 +00:00
|
|
|
{
|
2001-10-27 12:35:13 +00:00
|
|
|
png_push_have_row(png_ptr, png_bytep_NULL);
|
2001-01-15 18:22:32 +00:00
|
|
|
png_read_push_finish_row(png_ptr);
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
break;
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
case 5:
|
|
|
|
{
|
|
|
|
int i;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
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:43:52 +00:00
|
|
|
|
|
|
|
if (png_ptr->pass == 6) /* Skip top generated row */
|
1996-01-26 07:38:47 +00:00
|
|
|
{
|
2001-10-27 12:35:13 +00:00
|
|
|
png_push_have_row(png_ptr, png_bytep_NULL);
|
1996-01-26 07:38:47 +00:00
|
|
|
png_read_push_finish_row(png_ptr);
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case 6:
|
|
|
|
{
|
|
|
|
png_push_have_row(png_ptr, png_ptr->row_buf + 1);
|
|
|
|
png_read_push_finish_row(png_ptr);
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
if (png_ptr->pass != 6)
|
|
|
|
break;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2001-10-27 12:35:13 +00:00
|
|
|
png_push_have_row(png_ptr, png_bytep_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 */
|
1995-12-19 09:22:19 +00:00
|
|
|
png_read_push_finish_row(png_structp png_ptr)
|
|
|
|
{
|
1999-11-29 05:32:18 +00:00
|
|
|
#ifdef PNG_USE_LOCAL_ARRAYS
|
2009-05-20 17:43:52 +00:00
|
|
|
/* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
|
1999-12-10 15:43:02 +00:00
|
|
|
|
2009-05-20 17:43:52 +00:00
|
|
|
/* Start of interlace block */
|
2007-05-18 18:40:59 +00:00
|
|
|
PNG_CONST int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
|
1999-12-10 15:43:02 +00:00
|
|
|
|
2009-05-20 17:43:52 +00:00
|
|
|
/* Offset to next interlace block */
|
2007-05-18 18:40:59 +00:00
|
|
|
PNG_CONST int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
|
1999-12-10 15:43:02 +00:00
|
|
|
|
2009-05-20 17:43:52 +00:00
|
|
|
/* Start of interlace block in the y direction */
|
2007-05-18 18:40:59 +00:00
|
|
|
PNG_CONST int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
|
1999-12-10 15:43:02 +00:00
|
|
|
|
2009-05-20 17:43:52 +00:00
|
|
|
/* Offset to next interlace block in the y direction */
|
2007-05-18 18:40:59 +00:00
|
|
|
PNG_CONST int FARDATA 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
|
2007-05-18 18:40:59 +00:00
|
|
|
PNG_CONST int FARDATA png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
|
1999-11-27 16:22:33 +00:00
|
|
|
*/
|
1999-11-29 05:32:18 +00:00
|
|
|
#endif
|
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
|
|
|
|
2009-05-20 17:43:52 +00:00
|
|
|
#if defined(PNG_READ_INTERLACING_SUPPORTED)
|
1995-12-19 09:22:19 +00:00
|
|
|
if (png_ptr->interlaced)
|
|
|
|
{
|
|
|
|
png_ptr->row_number = 0;
|
2009-05-18 15:18:00 +00:00
|
|
|
png_memset_check(png_ptr, png_ptr->prev_row, 0,
|
|
|
|
png_ptr->rowbytes + 1);
|
1995-12-19 09:22:19 +00:00
|
|
|
do
|
|
|
|
{
|
2008-07-06 11:05:04 +00:00
|
|
|
png_ptr->pass++;
|
|
|
|
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++;
|
|
|
|
|
|
|
|
if (png_ptr->pass > 7)
|
|
|
|
png_ptr->pass--;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2008-07-06 11:05:04 +00:00
|
|
|
if (png_ptr->pass >= 7)
|
|
|
|
break;
|
|
|
|
|
|
|
|
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];
|
|
|
|
|
|
|
|
png_ptr->irowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,
|
|
|
|
png_ptr->iwidth) + 1;
|
|
|
|
|
|
|
|
if (png_ptr->transformations & PNG_INTERLACE)
|
|
|
|
break;
|
|
|
|
|
|
|
|
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
|
|
|
}
|
2009-05-18 16:55:55 +00:00
|
|
|
#endif /* PNG_READ_INTERLACING_SUPPORTED */
|
1995-12-19 09:22:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#if defined(PNG_READ_tEXt_SUPPORTED)
|
2000-05-06 19:09:57 +00:00
|
|
|
void /* PRIVATE */
|
2001-05-07 19:52:45 +00:00
|
|
|
png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
|
|
|
|
length)
|
1995-12-19 09:22:19 +00:00
|
|
|
{
|
2000-03-21 11:13:06 +00:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
|
1998-02-09 02:56:40 +00:00
|
|
|
{
|
|
|
|
png_error(png_ptr, "Out of place tEXt");
|
2009-05-20 17:43:52 +00:00
|
|
|
info_ptr = info_ptr; /* To quiet some compiler warnings */
|
1998-02-09 02:56:40 +00:00
|
|
|
}
|
1997-01-17 07:34:35 +00:00
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
#ifdef PNG_MAX_MALLOC_64K
|
|
|
|
png_ptr->skip_length = 0; /* This may not be necessary */
|
|
|
|
|
2001-05-07 19:52:45 +00:00
|
|
|
if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
|
1997-05-16 07:46:07 +00:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "tEXt chunk too large to fit in memory");
|
1998-01-01 13:13:13 +00:00
|
|
|
png_ptr->skip_length = length - (png_uint_32)65535L;
|
|
|
|
length = (png_uint_32)65535L;
|
1997-05-16 07:46:07 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1998-12-29 17:47:59 +00:00
|
|
|
png_ptr->current_text = (png_charp)png_malloc(png_ptr,
|
2008-07-06 11:05:04 +00:00
|
|
|
(png_uint_32)(length + 1));
|
1997-05-16 07:46:07 +00:00
|
|
|
png_ptr->current_text[length] = '\0';
|
1996-01-26 07:38:47 +00:00
|
|
|
png_ptr->current_text_ptr = png_ptr->current_text;
|
1998-02-07 16:20:57 +00:00
|
|
|
png_ptr->current_text_size = (png_size_t)length;
|
|
|
|
png_ptr->current_text_left = (png_size_t)length;
|
1996-01-26 07:38:47 +00:00
|
|
|
png_ptr->process_mode = PNG_READ_tEXt_MODE;
|
1995-12-19 09:22:19 +00:00
|
|
|
}
|
|
|
|
|
2000-05-06 19:09:57 +00:00
|
|
|
void /* PRIVATE */
|
1997-01-17 07:34:35 +00:00
|
|
|
png_push_read_tEXt(png_structp png_ptr, png_infop info_ptr)
|
1995-12-19 09:22:19 +00:00
|
|
|
{
|
1996-01-26 07:38:47 +00:00
|
|
|
if (png_ptr->buffer_size && png_ptr->current_text_left)
|
|
|
|
{
|
1997-05-16 07:46:07 +00:00
|
|
|
png_size_t text_size;
|
1996-01-26 07:38:47 +00:00
|
|
|
|
|
|
|
if (png_ptr->buffer_size < png_ptr->current_text_left)
|
|
|
|
text_size = png_ptr->buffer_size;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
else
|
|
|
|
text_size = png_ptr->current_text_left;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
|
1996-01-26 07:38:47 +00:00
|
|
|
png_ptr->current_text_left -= text_size;
|
1997-05-16 07:46:07 +00:00
|
|
|
png_ptr->current_text_ptr += text_size;
|
1996-01-26 07:38:47 +00:00
|
|
|
}
|
|
|
|
if (!(png_ptr->current_text_left))
|
|
|
|
{
|
1997-05-16 07:46:07 +00:00
|
|
|
png_textp text_ptr;
|
1996-01-26 07:38:47 +00:00
|
|
|
png_charp text;
|
|
|
|
png_charp key;
|
2002-05-25 16:12:10 +00:00
|
|
|
int ret;
|
1996-01-26 07:38:47 +00:00
|
|
|
|
|
|
|
if (png_ptr->buffer_size < 4)
|
|
|
|
{
|
|
|
|
png_push_save_buffer(png_ptr);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
png_push_crc_finish(png_ptr);
|
|
|
|
|
|
|
|
#if defined(PNG_MAX_MALLOC_64K)
|
|
|
|
if (png_ptr->skip_length)
|
|
|
|
return;
|
|
|
|
#endif
|
1996-01-26 07:38:47 +00:00
|
|
|
|
|
|
|
key = png_ptr->current_text;
|
|
|
|
|
|
|
|
for (text = key; *text; text++)
|
2009-05-20 17:43:52 +00:00
|
|
|
/* Empty loop */ ;
|
1996-01-26 07:38:47 +00:00
|
|
|
|
2007-09-27 00:34:29 +00:00
|
|
|
if (text < key + png_ptr->current_text_size)
|
1996-01-26 07:38:47 +00:00
|
|
|
text++;
|
|
|
|
|
2004-07-28 13:20:44 +00:00
|
|
|
text_ptr = (png_textp)png_malloc(png_ptr,
|
|
|
|
(png_uint_32)png_sizeof(png_text));
|
1997-05-16 07:46:07 +00:00
|
|
|
text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
|
|
|
|
text_ptr->key = key;
|
2000-05-06 19:09:57 +00:00
|
|
|
#ifdef PNG_iTXt_SUPPORTED
|
2001-10-27 12:35:13 +00:00
|
|
|
text_ptr->lang = NULL;
|
|
|
|
text_ptr->lang_key = NULL;
|
2000-05-06 19:09:57 +00:00
|
|
|
#endif
|
1997-05-16 07:46:07 +00:00
|
|
|
text_ptr->text = text;
|
1996-01-26 07:38:47 +00:00
|
|
|
|
2002-05-25 16:12:10 +00:00
|
|
|
ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
|
1997-05-16 07:46:07 +00:00
|
|
|
|
2000-07-08 18:19:41 +00:00
|
|
|
png_free(png_ptr, key);
|
1997-05-16 07:46:07 +00:00
|
|
|
png_free(png_ptr, text_ptr);
|
2002-06-20 11:54:34 +00:00
|
|
|
png_ptr->current_text = NULL;
|
2002-05-25 16:12:10 +00:00
|
|
|
|
|
|
|
if (ret)
|
|
|
|
png_warning(png_ptr, "Insufficient memory to store text chunk.");
|
1996-01-26 07:38:47 +00:00
|
|
|
}
|
1995-12-19 09:22:19 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(PNG_READ_zTXt_SUPPORTED)
|
2000-05-06 19:09:57 +00:00
|
|
|
void /* PRIVATE */
|
2001-05-07 19:52:45 +00:00
|
|
|
png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
|
|
|
|
length)
|
1995-12-19 09:22:19 +00:00
|
|
|
{
|
2000-03-21 11:13:06 +00:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
|
1998-02-09 02:56:40 +00:00
|
|
|
{
|
|
|
|
png_error(png_ptr, "Out of place zTXt");
|
2009-05-20 17:43:52 +00:00
|
|
|
info_ptr = info_ptr; /* To quiet some compiler warnings */
|
1998-02-09 02:56:40 +00:00
|
|
|
}
|
1997-01-17 07:34:35 +00:00
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
#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.
|
|
|
|
*/
|
1998-01-01 13:13:13 +00:00
|
|
|
if (length > (png_uint_32)65535L)
|
1997-05-16 07:46:07 +00:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "zTXt chunk too large to fit in memory");
|
|
|
|
png_push_crc_skip(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1998-02-07 16:20:57 +00:00
|
|
|
png_ptr->current_text = (png_charp)png_malloc(png_ptr,
|
2008-07-10 14:10:58 +00:00
|
|
|
(png_uint_32)(length + 1));
|
1997-05-16 07:46:07 +00:00
|
|
|
png_ptr->current_text[length] = '\0';
|
1996-01-26 07:38:47 +00:00
|
|
|
png_ptr->current_text_ptr = png_ptr->current_text;
|
1998-02-07 16:20:57 +00:00
|
|
|
png_ptr->current_text_size = (png_size_t)length;
|
|
|
|
png_ptr->current_text_left = (png_size_t)length;
|
1996-01-26 07:38:47 +00:00
|
|
|
png_ptr->process_mode = PNG_READ_zTXt_MODE;
|
1995-12-19 09:22:19 +00:00
|
|
|
}
|
|
|
|
|
2000-05-06 19:09:57 +00:00
|
|
|
void /* PRIVATE */
|
1997-01-17 07:34:35 +00:00
|
|
|
png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)
|
1995-12-19 09:22:19 +00:00
|
|
|
{
|
1996-01-26 07:38:47 +00:00
|
|
|
if (png_ptr->buffer_size && png_ptr->current_text_left)
|
|
|
|
{
|
1997-05-16 07:46:07 +00:00
|
|
|
png_size_t text_size;
|
1996-01-26 07:38:47 +00:00
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
if (png_ptr->buffer_size < (png_uint_32)png_ptr->current_text_left)
|
1996-01-26 07:38:47 +00:00
|
|
|
text_size = png_ptr->buffer_size;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1996-01-26 07:38:47 +00:00
|
|
|
else
|
|
|
|
text_size = png_ptr->current_text_left;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
|
1996-01-26 07:38:47 +00:00
|
|
|
png_ptr->current_text_left -= text_size;
|
1997-05-16 07:46:07 +00:00
|
|
|
png_ptr->current_text_ptr += text_size;
|
1996-01-26 07:38:47 +00:00
|
|
|
}
|
|
|
|
if (!(png_ptr->current_text_left))
|
|
|
|
{
|
1997-05-16 07:46:07 +00:00
|
|
|
png_textp text_ptr;
|
1996-01-26 07:38:47 +00:00
|
|
|
png_charp text;
|
|
|
|
png_charp key;
|
|
|
|
int ret;
|
1997-05-16 07:46:07 +00:00
|
|
|
png_size_t text_size, key_size;
|
1996-01-26 07:38:47 +00:00
|
|
|
|
|
|
|
if (png_ptr->buffer_size < 4)
|
|
|
|
{
|
|
|
|
png_push_save_buffer(png_ptr);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
png_push_crc_finish(png_ptr);
|
1996-01-26 07:38:47 +00:00
|
|
|
|
|
|
|
key = png_ptr->current_text;
|
|
|
|
|
|
|
|
for (text = key; *text; text++)
|
2009-05-20 17:43:52 +00:00
|
|
|
/* Empty loop */ ;
|
1996-01-26 07:38:47 +00:00
|
|
|
|
|
|
|
/* zTXt can't have zero text */
|
2007-09-27 00:34:29 +00:00
|
|
|
if (text >= key + png_ptr->current_text_size)
|
1996-01-26 07:38:47 +00:00
|
|
|
{
|
2002-06-20 11:54:34 +00:00
|
|
|
png_ptr->current_text = NULL;
|
1997-01-17 07:34:35 +00:00
|
|
|
png_free(png_ptr, key);
|
1996-01-26 07:38:47 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
text++;
|
|
|
|
|
2009-05-20 17:43:52 +00:00
|
|
|
if (*text != PNG_TEXT_COMPRESSION_zTXt) /* Check compression byte */
|
1996-01-26 07:38:47 +00:00
|
|
|
{
|
2002-06-20 11:54:34 +00:00
|
|
|
png_ptr->current_text = NULL;
|
1997-01-17 07:34:35 +00:00
|
|
|
png_free(png_ptr, key);
|
1996-01-26 07:38:47 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
text++;
|
|
|
|
|
1997-01-17 07:34:35 +00:00
|
|
|
png_ptr->zstream.next_in = (png_bytep )text;
|
|
|
|
png_ptr->zstream.avail_in = (uInt)(png_ptr->current_text_size -
|
1996-01-26 07:38:47 +00:00
|
|
|
(text - key));
|
1997-01-17 07:34:35 +00:00
|
|
|
png_ptr->zstream.next_out = png_ptr->zbuf;
|
1998-03-07 12:06:55 +00:00
|
|
|
png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
|
1996-01-26 07:38:47 +00:00
|
|
|
|
|
|
|
key_size = text - key;
|
|
|
|
text_size = 0;
|
|
|
|
text = NULL;
|
|
|
|
ret = Z_STREAM_END;
|
|
|
|
|
1997-01-17 07:34:35 +00:00
|
|
|
while (png_ptr->zstream.avail_in)
|
1996-01-26 07:38:47 +00:00
|
|
|
{
|
1997-01-17 07:34:35 +00:00
|
|
|
ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
|
1996-01-26 07:38:47 +00:00
|
|
|
if (ret != Z_OK && ret != Z_STREAM_END)
|
|
|
|
{
|
1997-01-17 07:34:35 +00:00
|
|
|
inflateReset(&png_ptr->zstream);
|
|
|
|
png_ptr->zstream.avail_in = 0;
|
2002-06-20 11:54:34 +00:00
|
|
|
png_ptr->current_text = NULL;
|
1997-01-17 07:34:35 +00:00
|
|
|
png_free(png_ptr, key);
|
|
|
|
png_free(png_ptr, text);
|
1996-01-26 07:38:47 +00:00
|
|
|
return;
|
|
|
|
}
|
1997-05-16 07:46:07 +00:00
|
|
|
if (!(png_ptr->zstream.avail_out) || ret == Z_STREAM_END)
|
1996-01-26 07:38:47 +00:00
|
|
|
{
|
1997-05-16 07:46:07 +00:00
|
|
|
if (text == NULL)
|
1996-01-26 07:38:47 +00:00
|
|
|
{
|
1997-01-17 07:34:35 +00:00
|
|
|
text = (png_charp)png_malloc(png_ptr,
|
2008-07-10 14:10:58 +00:00
|
|
|
(png_uint_32)(png_ptr->zbuf_size
|
|
|
|
- png_ptr->zstream.avail_out + key_size + 1));
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2001-04-20 15:32:10 +00:00
|
|
|
png_memcpy(text + key_size, png_ptr->zbuf,
|
|
|
|
png_ptr->zbuf_size - png_ptr->zstream.avail_out);
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2001-04-20 15:32:10 +00:00
|
|
|
png_memcpy(text, key, key_size);
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2001-04-20 15:32:10 +00:00
|
|
|
text_size = key_size + png_ptr->zbuf_size -
|
|
|
|
png_ptr->zstream.avail_out;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2001-04-20 15:32:10 +00:00
|
|
|
*(text + text_size) = '\0';
|
1996-01-26 07:38:47 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
png_charp tmp;
|
|
|
|
|
|
|
|
tmp = text;
|
1998-01-31 03:45:12 +00:00
|
|
|
text = (png_charp)png_malloc(png_ptr, text_size +
|
2009-06-29 01:26:26 +00:00
|
|
|
(png_uint_32)(png_ptr->zbuf_size
|
2008-09-06 12:03:59 +00:00
|
|
|
- png_ptr->zstream.avail_out + 1));
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2001-04-20 15:32:10 +00:00
|
|
|
png_memcpy(text, tmp, text_size);
|
|
|
|
png_free(png_ptr, tmp);
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2001-04-20 15:32:10 +00:00
|
|
|
png_memcpy(text + text_size, png_ptr->zbuf,
|
|
|
|
png_ptr->zbuf_size - png_ptr->zstream.avail_out);
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2001-04-20 15:32:10 +00:00
|
|
|
text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
|
|
|
|
*(text + text_size) = '\0';
|
1996-01-26 07:38:47 +00:00
|
|
|
}
|
|
|
|
if (ret != Z_STREAM_END)
|
|
|
|
{
|
1997-01-17 07:34:35 +00:00
|
|
|
png_ptr->zstream.next_out = png_ptr->zbuf;
|
|
|
|
png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
|
1996-01-26 07:38:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret == Z_STREAM_END)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1997-01-17 07:34:35 +00:00
|
|
|
inflateReset(&png_ptr->zstream);
|
|
|
|
png_ptr->zstream.avail_in = 0;
|
1996-01-26 07:38:47 +00:00
|
|
|
|
|
|
|
if (ret != Z_STREAM_END)
|
|
|
|
{
|
2002-06-20 11:54:34 +00:00
|
|
|
png_ptr->current_text = NULL;
|
1997-01-17 07:34:35 +00:00
|
|
|
png_free(png_ptr, key);
|
|
|
|
png_free(png_ptr, text);
|
1996-01-26 07:38:47 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2002-06-20 11:54:34 +00:00
|
|
|
png_ptr->current_text = NULL;
|
1997-01-17 07:34:35 +00:00
|
|
|
png_free(png_ptr, key);
|
1996-01-26 07:38:47 +00:00
|
|
|
key = text;
|
1997-05-16 07:46:07 +00:00
|
|
|
text += key_size;
|
1996-01-26 07:38:47 +00:00
|
|
|
|
2004-07-28 13:20:44 +00:00
|
|
|
text_ptr = (png_textp)png_malloc(png_ptr,
|
|
|
|
(png_uint_32)png_sizeof(png_text));
|
2001-04-20 15:32:10 +00:00
|
|
|
text_ptr->compression = PNG_TEXT_COMPRESSION_zTXt;
|
|
|
|
text_ptr->key = key;
|
2000-05-06 19:09:57 +00:00
|
|
|
#ifdef PNG_iTXt_SUPPORTED
|
2001-10-27 12:35:13 +00:00
|
|
|
text_ptr->lang = NULL;
|
|
|
|
text_ptr->lang_key = NULL;
|
2000-05-06 19:09:57 +00:00
|
|
|
#endif
|
2001-04-20 15:32:10 +00:00
|
|
|
text_ptr->text = text;
|
1999-12-10 15:43:02 +00:00
|
|
|
|
2002-05-25 16:12:10 +00:00
|
|
|
ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
|
1999-12-10 15:43:02 +00:00
|
|
|
|
2000-07-08 18:19:41 +00:00
|
|
|
png_free(png_ptr, key);
|
2001-04-20 15:32:10 +00:00
|
|
|
png_free(png_ptr, text_ptr);
|
2002-05-25 16:12:10 +00:00
|
|
|
|
|
|
|
if (ret)
|
|
|
|
png_warning(png_ptr, "Insufficient memory to store text chunk.");
|
1999-12-10 15:43:02 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(PNG_READ_iTXt_SUPPORTED)
|
2000-05-06 19:09:57 +00:00
|
|
|
void /* PRIVATE */
|
2001-05-07 19:52:45 +00:00
|
|
|
png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
|
|
|
|
length)
|
1999-12-10 15:43:02 +00:00
|
|
|
{
|
2000-03-21 11:13:06 +00:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
|
1999-12-10 15:43:02 +00:00
|
|
|
{
|
|
|
|
png_error(png_ptr, "Out of place iTXt");
|
2009-05-20 17:43:52 +00:00
|
|
|
info_ptr = info_ptr; /* To quiet some compiler warnings */
|
1999-12-10 15:43:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef PNG_MAX_MALLOC_64K
|
|
|
|
png_ptr->skip_length = 0; /* This may not be necessary */
|
|
|
|
|
2001-05-07 19:52:45 +00:00
|
|
|
if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
|
1999-12-10 15:43:02 +00:00
|
|
|
{
|
|
|
|
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,
|
2008-07-10 14:10:58 +00:00
|
|
|
(png_uint_32)(length + 1));
|
2001-04-20 15:32:10 +00:00
|
|
|
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;
|
1999-12-10 15:43:02 +00:00
|
|
|
}
|
|
|
|
|
2000-05-06 19:09:57 +00:00
|
|
|
void /* PRIVATE */
|
1999-12-10 15:43:02 +00:00
|
|
|
png_push_read_iTXt(png_structp png_ptr, png_infop info_ptr)
|
|
|
|
{
|
2000-02-05 05:40:16 +00:00
|
|
|
|
1999-12-10 15:43:02 +00:00
|
|
|
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;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1999-12-10 15:43:02 +00:00
|
|
|
else
|
|
|
|
text_size = png_ptr->current_text_left;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
1999-12-10 15:43:02 +00:00
|
|
|
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;
|
2000-03-21 11:13:06 +00:00
|
|
|
int comp_flag;
|
2000-02-05 05:40:16 +00:00
|
|
|
png_charp lang;
|
|
|
|
png_charp lang_key;
|
|
|
|
png_charp text;
|
2002-05-25 16:12:10 +00:00
|
|
|
int ret;
|
1999-12-10 15:43:02 +00:00
|
|
|
|
|
|
|
if (png_ptr->buffer_size < 4)
|
|
|
|
{
|
|
|
|
png_push_save_buffer(png_ptr);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
png_push_crc_finish(png_ptr);
|
|
|
|
|
|
|
|
#if defined(PNG_MAX_MALLOC_64K)
|
|
|
|
if (png_ptr->skip_length)
|
|
|
|
return;
|
|
|
|
#endif
|
|
|
|
|
2000-02-05 05:40:16 +00:00
|
|
|
key = png_ptr->current_text;
|
1999-12-10 15:43:02 +00:00
|
|
|
|
2000-02-05 05:40:16 +00:00
|
|
|
for (lang = key; *lang; lang++)
|
2009-05-20 17:43:52 +00:00
|
|
|
/* Empty loop */ ;
|
1999-12-10 15:43:02 +00:00
|
|
|
|
2007-09-27 00:34:29 +00:00
|
|
|
if (lang < key + png_ptr->current_text_size - 3)
|
2000-02-05 05:40:16 +00:00
|
|
|
lang++;
|
1999-12-10 15:43:02 +00:00
|
|
|
|
2000-02-05 05:40:16 +00:00
|
|
|
comp_flag = *lang++;
|
2009-05-20 17:43:52 +00:00
|
|
|
lang++; /* Skip comp_type, always zero */
|
2000-02-05 05:40:16 +00:00
|
|
|
|
|
|
|
for (lang_key = lang; *lang_key; lang_key++)
|
2009-05-20 17:43:52 +00:00
|
|
|
/* Empty loop */ ;
|
|
|
|
|
|
|
|
lang_key++; /* Skip NUL separator */
|
2000-02-05 05:40:16 +00:00
|
|
|
|
2007-09-27 00:34:29 +00:00
|
|
|
text=lang_key;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2007-09-27 00:34:29 +00:00
|
|
|
if (lang_key < key + png_ptr->current_text_size - 1)
|
|
|
|
{
|
|
|
|
for (; *text; text++)
|
2009-05-20 17:43:52 +00:00
|
|
|
/* Empty loop */ ;
|
2007-09-27 00:34:29 +00:00
|
|
|
}
|
1999-12-10 15:43:02 +00:00
|
|
|
|
2007-09-27 00:34:29 +00:00
|
|
|
if (text < key + png_ptr->current_text_size)
|
1999-12-10 15:43:02 +00:00
|
|
|
text++;
|
|
|
|
|
2004-07-28 13:20:44 +00:00
|
|
|
text_ptr = (png_textp)png_malloc(png_ptr,
|
|
|
|
(png_uint_32)png_sizeof(png_text));
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2000-02-05 05:40:16 +00:00
|
|
|
text_ptr->compression = comp_flag + 2;
|
1997-05-16 07:46:07 +00:00
|
|
|
text_ptr->key = key;
|
2000-02-05 05:40:16 +00:00
|
|
|
text_ptr->lang = lang;
|
|
|
|
text_ptr->lang_key = lang_key;
|
1997-05-16 07:46:07 +00:00
|
|
|
text_ptr->text = text;
|
2000-02-05 05:40:16 +00:00
|
|
|
text_ptr->text_length = 0;
|
|
|
|
text_ptr->itxt_length = png_strlen(text);
|
1997-05-16 07:46:07 +00:00
|
|
|
|
2002-05-25 16:12:10 +00:00
|
|
|
ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
|
1997-05-16 07:46:07 +00:00
|
|
|
|
2002-06-20 11:54:34 +00:00
|
|
|
png_ptr->current_text = NULL;
|
|
|
|
|
1997-05-16 07:46:07 +00:00
|
|
|
png_free(png_ptr, text_ptr);
|
2002-05-25 16:12:10 +00:00
|
|
|
if (ret)
|
|
|
|
png_warning(png_ptr, "Insufficient memory to store iTXt chunk.");
|
1996-01-26 07:38:47 +00:00
|
|
|
}
|
1995-12-19 09:22:19 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1997-01-17 07:34:35 +00:00
|
|
|
/* This function is called when we haven't found a handler for this
|
2000-02-05 05:40:16 +00:00
|
|
|
* 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.
|
1998-01-01 13:13:13 +00:00
|
|
|
*/
|
2000-05-06 19:09:57 +00:00
|
|
|
void /* PRIVATE */
|
2001-05-07 19:52:45 +00:00
|
|
|
png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
|
|
|
|
length)
|
1997-01-17 07:34:35 +00:00
|
|
|
{
|
2008-07-22 18:51:08 +00:00
|
|
|
png_uint_32 skip = 0;
|
1997-01-17 07:34:35 +00:00
|
|
|
|
|
|
|
if (!(png_ptr->chunk_name[0] & 0x20))
|
|
|
|
{
|
2000-05-01 14:31:54 +00:00
|
|
|
#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
|
2008-07-10 14:10:58 +00:00
|
|
|
if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
|
|
|
|
PNG_HANDLE_CHUNK_ALWAYS
|
2000-02-05 05:40:16 +00:00
|
|
|
#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
|
2008-07-10 14:10:58 +00:00
|
|
|
&& png_ptr->read_user_chunk_fn == NULL
|
2000-02-05 05:40:16 +00:00
|
|
|
#endif
|
2008-07-10 14:10:58 +00:00
|
|
|
)
|
2000-05-01 14:31:54 +00:00
|
|
|
#endif
|
2008-07-10 14:10:58 +00:00
|
|
|
png_chunk_error(png_ptr, "unknown critical chunk");
|
2000-02-05 05:40:16 +00:00
|
|
|
|
2009-05-20 17:43:52 +00:00
|
|
|
info_ptr = info_ptr; /* To quiet some compiler warnings */
|
1997-01-17 07:34:35 +00:00
|
|
|
}
|
|
|
|
|
2000-02-05 05:40:16 +00:00
|
|
|
#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
|
|
|
|
if (png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
|
|
|
|
{
|
|
|
|
#ifdef PNG_MAX_MALLOC_64K
|
2007-08-21 03:48:21 +00:00
|
|
|
if (length > (png_uint_32)65535L)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "unknown chunk too large to fit in memory");
|
|
|
|
skip = length - (png_uint_32)65535L;
|
|
|
|
length = (png_uint_32)65535L;
|
|
|
|
}
|
2000-02-05 05:40:16 +00:00
|
|
|
#endif
|
2007-10-16 19:27:46 +00:00
|
|
|
png_memcpy((png_charp)png_ptr->unknown_chunk.name,
|
2009-06-29 01:26:26 +00:00
|
|
|
(png_charp)png_ptr->chunk_name,
|
2007-10-16 19:27:46 +00:00
|
|
|
png_sizeof(png_ptr->unknown_chunk.name));
|
2008-07-22 18:51:08 +00:00
|
|
|
png_ptr->unknown_chunk.name[png_sizeof(png_ptr->unknown_chunk.name) - 1]
|
|
|
|
= '\0';
|
2007-10-16 19:27:46 +00:00
|
|
|
|
2007-08-21 03:48:21 +00:00
|
|
|
png_ptr->unknown_chunk.size = (png_size_t)length;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2008-04-12 11:59:47 +00:00
|
|
|
if (length == 0)
|
|
|
|
png_ptr->unknown_chunk.data = NULL;
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2008-04-12 11:59:47 +00:00
|
|
|
else
|
|
|
|
{
|
2008-07-06 11:05:04 +00:00
|
|
|
png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr,
|
|
|
|
(png_uint_32)length);
|
2008-04-12 11:59:47 +00:00
|
|
|
png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2001-04-15 01:15:41 +00:00
|
|
|
#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
|
2008-07-10 14:10:58 +00:00
|
|
|
if (png_ptr->read_user_chunk_fn != NULL)
|
2007-08-21 03:48:21 +00:00
|
|
|
{
|
2009-05-20 17:43:52 +00:00
|
|
|
/* Callback to user unknown chunk handler */
|
2007-08-21 03:48:21 +00:00
|
|
|
int ret;
|
|
|
|
ret = (*(png_ptr->read_user_chunk_fn))
|
|
|
|
(png_ptr, &png_ptr->unknown_chunk);
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2007-08-21 03:48:21 +00:00
|
|
|
if (ret < 0)
|
|
|
|
png_chunk_error(png_ptr, "error in user chunk");
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2007-08-21 03:48:21 +00:00
|
|
|
if (ret == 0)
|
|
|
|
{
|
|
|
|
if (!(png_ptr->chunk_name[0] & 0x20))
|
2008-07-10 14:10:58 +00:00
|
|
|
if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
|
2007-08-21 03:48:21 +00:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2008-01-09 16:58:36 +00:00
|
|
|
else
|
2007-05-12 04:12:12 +00:00
|
|
|
#endif
|
2008-01-09 16:58:36 +00:00
|
|
|
png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
|
2008-04-14 14:26:03 +00:00
|
|
|
png_free(png_ptr, png_ptr->unknown_chunk.data);
|
|
|
|
png_ptr->unknown_chunk.data = NULL;
|
2000-02-05 05:40:16 +00:00
|
|
|
}
|
2009-05-20 17:43:52 +00:00
|
|
|
|
2000-02-05 05:40:16 +00:00
|
|
|
else
|
|
|
|
#endif
|
|
|
|
skip=length;
|
|
|
|
png_push_crc_skip(png_ptr, skip);
|
1997-01-17 07:34:35 +00:00
|
|
|
}
|
|
|
|
|
2000-05-06 19:09:57 +00:00
|
|
|
void /* PRIVATE */
|
1997-01-17 07:34:35 +00:00
|
|
|
png_push_have_info(png_structp png_ptr, png_infop 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 */
|
1997-01-17 07:34:35 +00:00
|
|
|
png_push_have_end(png_structp png_ptr, png_infop 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 */
|
1995-12-19 09:22:19 +00:00
|
|
|
png_push_have_row(png_structp png_ptr, png_bytep row)
|
|
|
|
{
|
1997-05-16 07:46:07 +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
|
|
|
}
|
|
|
|
|
2000-05-06 19:09:57 +00:00
|
|
|
void PNGAPI
|
1997-01-17 07:34:35 +00:00
|
|
|
png_progressive_combine_row (png_structp png_ptr,
|
|
|
|
png_bytep old_row, png_bytep new_row)
|
1995-12-19 09:22:19 +00:00
|
|
|
{
|
1999-11-29 05:32:18 +00:00
|
|
|
#ifdef PNG_USE_LOCAL_ARRAYS
|
2007-05-18 18:40:59 +00:00
|
|
|
PNG_CONST int FARDATA png_pass_dsp_mask[7] =
|
2000-11-10 18:26:19 +00:00
|
|
|
{0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff};
|
1999-11-29 05:32:18 +00:00
|
|
|
#endif
|
2009-05-20 17:43:52 +00:00
|
|
|
if (png_ptr == NULL)
|
|
|
|
return;
|
|
|
|
|
1998-06-14 19:43:31 +00:00
|
|
|
if (new_row != NULL) /* new_row must == png_ptr->row_buf here. */
|
1997-01-17 07:34:35 +00:00
|
|
|
png_combine_row(png_ptr, old_row, png_pass_dsp_mask[png_ptr->pass]);
|
1995-12-19 09:22:19 +00:00
|
|
|
}
|
|
|
|
|
2000-05-06 19:09:57 +00:00
|
|
|
void PNGAPI
|
1995-12-19 09:22:19 +00:00
|
|
|
png_set_progressive_read_fn(png_structp png_ptr, png_voidp progressive_ptr,
|
1996-01-26 07:38:47 +00:00
|
|
|
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
|
|
|
{
|
2009-05-20 17:43:52 +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
|
1997-01-17 07:34:35 +00:00
|
|
|
png_get_progressive_ptr(png_structp png_ptr)
|
1995-12-19 09:22:19 +00:00
|
|
|
{
|
2009-05-20 17:43:52 +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 */
|