2006-03-04 17:50:47 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
/* pngrutil.c - utilities to read a PNG file
|
1998-01-01 08:13:13 -05:00
|
|
|
*
|
2011-09-22 13:41:58 -04:00
|
|
|
* Last changed in libpng 1.5.6 [(PENDING RELEASE)]
|
2011-01-07 19:28:47 -05:00
|
|
|
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
2000-06-04 15:29:29 -04:00
|
|
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
|
|
|
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
1998-01-01 08:13:13 -05:00
|
|
|
*
|
2009-06-26 22:46:52 -04:00
|
|
|
* This code is released under the libpng license.
|
2009-06-25 14:43:50 -04:00
|
|
|
* For conditions of distribution and use, see the disclaimer
|
2009-06-24 11:27:36 -04:00
|
|
|
* and license in png.h
|
2009-06-24 10:31:28 -04:00
|
|
|
*
|
1998-05-21 10:27:50 -04:00
|
|
|
* This file contains routines that are only called from within
|
1998-01-01 08:13:13 -05:00
|
|
|
* libpng itself during the course of reading an image.
|
|
|
|
*/
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2011-01-06 10:01:04 -05:00
|
|
|
#include "pngpriv.h"
|
2010-03-08 22:10:25 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
#ifdef PNG_READ_SUPPORTED
|
|
|
|
|
|
|
|
#define png_strtod(p,a,b) strtod(a,b)
|
|
|
|
|
2006-02-20 23:09:05 -05:00
|
|
|
png_uint_32 PNGAPI
|
2011-01-07 19:28:47 -05:00
|
|
|
png_get_uint_31(png_structp png_ptr, png_const_bytep buf)
|
|
|
|
{
|
|
|
|
png_uint_32 uval = png_get_uint_32(buf);
|
|
|
|
|
|
|
|
if (uval > PNG_UINT_31_MAX)
|
|
|
|
png_error(png_ptr, "PNG unsigned integer out of range");
|
|
|
|
|
|
|
|
return (uval);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if defined(PNG_READ_gAMA_SUPPORTED) || defined(PNG_READ_cHRM_SUPPORTED)
|
|
|
|
/* The following is a variation on the above for use with the fixed
|
|
|
|
* point values used for gAMA and cHRM. Instead of png_error it
|
|
|
|
* issues a warning and returns (-1) - an invalid value because both
|
|
|
|
* gAMA and cHRM use *unsigned* integers for fixed point values.
|
|
|
|
*/
|
|
|
|
#define PNG_FIXED_ERROR (-1)
|
|
|
|
|
|
|
|
static png_fixed_point /* PRIVATE */
|
|
|
|
png_get_fixed_point(png_structp png_ptr, png_const_bytep buf)
|
2010-07-29 18:39:14 -04:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_uint_32 uval = png_get_uint_32(buf);
|
|
|
|
|
|
|
|
if (uval <= PNG_UINT_31_MAX)
|
|
|
|
return (png_fixed_point)uval; /* known to be in range */
|
|
|
|
|
|
|
|
/* The caller can turn off the warning by passing NULL. */
|
|
|
|
if (png_ptr != NULL)
|
|
|
|
png_warning(png_ptr, "PNG fixed point integer out of range");
|
|
|
|
|
|
|
|
return PNG_FIXED_ERROR;
|
2010-07-29 18:39:14 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
|
|
|
|
/* NOTE: the read macros will obscure these definitions, so that if
|
|
|
|
* PNG_USE_READ_MACROS is set the library will not use them internally,
|
|
|
|
* but the APIs will still be available externally.
|
|
|
|
*
|
|
|
|
* The parentheses around "PNGAPI function_name" in the following three
|
|
|
|
* functions are necessary because they allow the macros to co-exist with
|
|
|
|
* these (unused but exported) functions.
|
|
|
|
*/
|
|
|
|
|
1998-05-21 10:27:50 -04:00
|
|
|
/* Grab an unsigned 32-bit integer from a buffer in big-endian format. */
|
2011-01-07 19:28:47 -05:00
|
|
|
png_uint_32 (PNGAPI
|
|
|
|
png_get_uint_32)(png_const_bytep buf)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_uint_32 uval =
|
|
|
|
((png_uint_32)(*(buf )) << 24) +
|
|
|
|
((png_uint_32)(*(buf + 1)) << 16) +
|
|
|
|
((png_uint_32)(*(buf + 2)) << 8) +
|
|
|
|
((png_uint_32)(*(buf + 3)) ) ;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
return uval;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
1998-05-21 10:27:50 -04:00
|
|
|
/* Grab a signed 32-bit integer from a buffer in big-endian format. The
|
2011-01-07 19:28:47 -05:00
|
|
|
* data is stored in the PNG file in two's complement format and there
|
|
|
|
* is no guarantee that a 'png_int_32' is exactly 32 bits, therefore
|
|
|
|
* the following code does a two's complement to native conversion.
|
2009-05-15 21:39:34 -04:00
|
|
|
*/
|
2011-01-07 19:28:47 -05:00
|
|
|
png_int_32 (PNGAPI
|
|
|
|
png_get_int_32)(png_const_bytep buf)
|
1997-05-16 03:46:07 -04:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_uint_32 uval = png_get_uint_32(buf);
|
2011-09-09 08:32:37 -04:00
|
|
|
if ((uval & 0x80000000) == 0) /* non-negative */
|
2011-01-07 19:28:47 -05:00
|
|
|
return uval;
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2011-09-09 08:32:37 -04:00
|
|
|
uval = (uval ^ 0xffffffff) + 1; /* 2's complement: -x = ~x+1 */
|
2011-01-07 19:28:47 -05:00
|
|
|
return -(png_int_32)uval;
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
|
|
|
|
1998-05-21 10:27:50 -04:00
|
|
|
/* Grab an unsigned 16-bit integer from a buffer in big-endian format. */
|
2011-01-07 19:28:47 -05:00
|
|
|
png_uint_16 (PNGAPI
|
|
|
|
png_get_uint_16)(png_const_bytep buf)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
/* ANSI-C requires an int value to accomodate at least 16 bits so this
|
|
|
|
* works and allows the compiler not to worry about possible narrowing
|
|
|
|
* on 32 bit systems. (Pre-ANSI systems did not make integers smaller
|
|
|
|
* than 16 bits either.)
|
|
|
|
*/
|
|
|
|
unsigned int val =
|
|
|
|
((unsigned int)(*buf) << 8) +
|
|
|
|
((unsigned int)(*(buf + 1)));
|
|
|
|
|
|
|
|
return (png_uint_16)val;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* PNG_READ_INT_FUNCTIONS_SUPPORTED */
|
|
|
|
|
|
|
|
/* Read and check the PNG file signature */
|
|
|
|
void /* PRIVATE */
|
|
|
|
png_read_sig(png_structp png_ptr, png_infop info_ptr)
|
|
|
|
{
|
|
|
|
png_size_t num_checked, num_to_check;
|
|
|
|
|
|
|
|
/* Exit if the user application does not expect a signature. */
|
|
|
|
if (png_ptr->sig_bytes >= 8)
|
|
|
|
return;
|
|
|
|
|
|
|
|
num_checked = png_ptr->sig_bytes;
|
|
|
|
num_to_check = 8 - num_checked;
|
2010-11-20 22:48:29 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
#ifdef PNG_IO_STATE_SUPPORTED
|
|
|
|
png_ptr->io_state = PNG_IO_READING | PNG_IO_SIGNATURE;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* The signature must be serialized in a single I/O call. */
|
|
|
|
png_read_data(png_ptr, &(info_ptr->signature[num_checked]), num_to_check);
|
|
|
|
png_ptr->sig_bytes = 8;
|
|
|
|
|
|
|
|
if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
|
|
|
|
{
|
|
|
|
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");
|
|
|
|
}
|
|
|
|
if (num_checked < 3)
|
|
|
|
png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
|
2010-11-20 22:48:29 -05:00
|
|
|
}
|
|
|
|
|
2006-08-19 14:59:24 -04:00
|
|
|
/* Read the chunk header (length + type name).
|
|
|
|
* Put the type name into png_ptr->chunk_name, and return the length.
|
|
|
|
*/
|
|
|
|
png_uint_32 /* PRIVATE */
|
|
|
|
png_read_chunk_header(png_structp png_ptr)
|
|
|
|
{
|
|
|
|
png_byte buf[8];
|
|
|
|
png_uint_32 length;
|
|
|
|
|
|
|
|
#ifdef PNG_IO_STATE_SUPPORTED
|
|
|
|
png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_HDR;
|
|
|
|
#endif
|
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* Read the length and the chunk name.
|
|
|
|
* This must be performed in a single I/O call.
|
|
|
|
*/
|
2006-08-19 14:59:24 -04:00
|
|
|
png_read_data(png_ptr, buf, 8);
|
|
|
|
length = png_get_uint_31(png_ptr, buf);
|
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* Put the chunk name into png_ptr->chunk_name. */
|
2011-09-22 13:41:58 -04:00
|
|
|
png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(buf+4);
|
2006-08-19 14:59:24 -04:00
|
|
|
|
2011-09-22 13:41:58 -04:00
|
|
|
png_debug2(0, "Reading %lx chunk, length = %lu",
|
|
|
|
(unsigned long)png_ptr->chunk_name, (unsigned long)length);
|
2006-08-19 14:59:24 -04:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* Reset the crc and run it over the chunk name. */
|
2006-08-19 14:59:24 -04:00
|
|
|
png_reset_crc(png_ptr);
|
2011-09-22 13:41:58 -04:00
|
|
|
png_calculate_crc(png_ptr, buf + 4, 4);
|
2006-08-19 14:59:24 -04:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* Check to see if chunk name is valid. */
|
2008-07-25 09:51:18 -04:00
|
|
|
png_check_chunk_name(png_ptr, png_ptr->chunk_name);
|
|
|
|
|
2006-08-19 14:59:24 -04:00
|
|
|
#ifdef PNG_IO_STATE_SUPPORTED
|
|
|
|
png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_DATA;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return length;
|
|
|
|
}
|
|
|
|
|
2008-07-10 10:13:13 -04:00
|
|
|
/* Read data, and (optionally) run it through the CRC. */
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1997-05-16 03:46:07 -04:00
|
|
|
png_crc_read(png_structp png_ptr, png_bytep buf, png_size_t length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2009-05-15 21:39:34 -04:00
|
|
|
if (png_ptr == NULL)
|
|
|
|
return;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-12-19 04:22:19 -05:00
|
|
|
png_read_data(png_ptr, buf, length);
|
1997-05-16 03:46:07 -04:00
|
|
|
png_calculate_crc(png_ptr, buf, length);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
/* Optionally skip data and then check the CRC. Depending on whether we
|
2009-05-15 21:39:34 -04:00
|
|
|
* are reading a ancillary or critical chunk, and how the program has set
|
|
|
|
* things up, we may calculate the CRC on the data and print a message.
|
|
|
|
* Returns '1' if there was a CRC error, '0' otherwise.
|
|
|
|
*/
|
2000-05-06 15:09:57 -04:00
|
|
|
int /* PRIVATE */
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_structp png_ptr, png_uint_32 skip)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_size_t i;
|
|
|
|
png_size_t istop = png_ptr->zbuf_size;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1998-05-09 11:02:29 -04:00
|
|
|
for (i = (png_size_t)skip; i > istop; i -= istop)
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2008-07-10 10:13:13 -04:00
|
|
|
if (i)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_crc_read(png_ptr, png_ptr->zbuf, i);
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
if (png_crc_error(png_ptr))
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
2011-09-22 13:41:58 -04:00
|
|
|
if (PNG_CHUNK_ANCILLIARY(png_ptr->chunk_name) ?
|
|
|
|
!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) :
|
|
|
|
(png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE))
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
1998-01-03 23:40:55 -05:00
|
|
|
png_chunk_warning(png_ptr, "CRC error");
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
else
|
|
|
|
{
|
2006-06-16 08:52:03 -04:00
|
|
|
png_chunk_benign_error(png_ptr, "CRC error");
|
|
|
|
return (0);
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1998-01-31 21:07:59 -05:00
|
|
|
return (1);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1997-01-17 02:34:35 -05:00
|
|
|
|
1998-01-31 21:07:59 -05:00
|
|
|
return (0);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
1998-01-16 23:06:18 -05:00
|
|
|
/* Compare the CRC stored in the PNG file with that calculated by libpng from
|
2009-05-15 21:39:34 -04:00
|
|
|
* the data it has read thus far.
|
|
|
|
*/
|
2000-05-06 15:09:57 -04:00
|
|
|
int /* PRIVATE */
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_error(png_structp png_ptr)
|
|
|
|
{
|
|
|
|
png_byte crc_bytes[4];
|
|
|
|
png_uint_32 crc;
|
1997-05-16 03:46:07 -04:00
|
|
|
int need_crc = 1;
|
1997-01-17 02:34:35 -05:00
|
|
|
|
2011-09-22 13:41:58 -04:00
|
|
|
if (PNG_CHUNK_ANCILLIARY(png_ptr->chunk_name))
|
1997-05-16 03:46:07 -04:00
|
|
|
{
|
|
|
|
if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
|
|
|
|
(PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
|
|
|
|
need_crc = 0;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-09-22 13:41:58 -04:00
|
|
|
else /* critical */
|
1997-05-16 03:46:07 -04:00
|
|
|
{
|
|
|
|
if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
|
|
|
|
need_crc = 0;
|
|
|
|
}
|
1997-01-17 02:34:35 -05:00
|
|
|
|
2006-08-19 14:59:24 -04:00
|
|
|
#ifdef PNG_IO_STATE_SUPPORTED
|
|
|
|
png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_CRC;
|
|
|
|
#endif
|
2008-07-10 10:13:13 -04:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* The chunk CRC must be serialized in a single I/O call. */
|
1997-05-16 03:46:07 -04:00
|
|
|
png_read_data(png_ptr, crc_bytes, 4);
|
1997-01-17 02:34:35 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
if (need_crc)
|
|
|
|
{
|
|
|
|
crc = png_get_uint_32(crc_bytes);
|
1998-01-31 21:07:59 -05:00
|
|
|
return ((int)(crc != png_ptr->crc));
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
else
|
1998-01-31 21:07:59 -05:00
|
|
|
return (0);
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
|
|
|
|
2011-04-01 14:15:36 -04:00
|
|
|
#ifdef PNG_READ_COMPRESSED_TEXT_SUPPORTED
|
2011-01-07 19:28:47 -05:00
|
|
|
static png_size_t
|
|
|
|
png_inflate(png_structp png_ptr, png_bytep data, png_size_t size,
|
|
|
|
png_bytep output, png_size_t output_size)
|
2010-02-07 19:08:50 -05:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_size_t count = 0;
|
|
|
|
|
|
|
|
/* zlib can't necessarily handle more than 65535 bytes at once (i.e. it can't
|
|
|
|
* even necessarily handle 65536 bytes) because the type uInt is "16 bits or
|
|
|
|
* more". Consequently it is necessary to chunk the input to zlib. This
|
|
|
|
* code uses ZLIB_IO_MAX, from pngpriv.h, as the maximum (the maximum value
|
|
|
|
* that can be stored in a uInt.) It is possible to set ZLIB_IO_MAX to a
|
|
|
|
* lower value in pngpriv.h and this may sometimes have a performance
|
|
|
|
* advantage, because it forces access of the input data to be separated from
|
|
|
|
* at least some of the use by some period of time.
|
|
|
|
*/
|
|
|
|
png_ptr->zstream.next_in = data;
|
|
|
|
/* avail_in is set below from 'size' */
|
|
|
|
png_ptr->zstream.avail_in = 0;
|
2010-02-12 21:12:56 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
while (1)
|
2010-02-07 19:08:50 -05:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
int ret, avail;
|
|
|
|
|
|
|
|
/* The setting of 'avail_in' used to be outside the loop, by setting it
|
|
|
|
* inside it is possible to chunk the input to zlib and simply rely on
|
|
|
|
* zlib to advance the 'next_in' pointer. This allows arbitrary amounts o
|
|
|
|
* data to be passed through zlib at the unavoidable cost of requiring a
|
|
|
|
* window save (memcpy of up to 32768 output bytes) every ZLIB_IO_MAX
|
|
|
|
* input bytes.
|
|
|
|
*/
|
|
|
|
if (png_ptr->zstream.avail_in == 0 && size > 0)
|
|
|
|
{
|
|
|
|
if (size <= ZLIB_IO_MAX)
|
|
|
|
{
|
|
|
|
/* The value is less than ZLIB_IO_MAX so the cast is safe: */
|
|
|
|
png_ptr->zstream.avail_in = (uInt)size;
|
|
|
|
size = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
{
|
|
|
|
png_ptr->zstream.avail_in = ZLIB_IO_MAX;
|
|
|
|
size -= ZLIB_IO_MAX;
|
|
|
|
}
|
|
|
|
}
|
2010-09-10 23:05:27 -04:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* Reset the output buffer each time round - we empty it
|
|
|
|
* after every inflate call.
|
|
|
|
*/
|
2010-02-07 19:08:50 -05:00
|
|
|
png_ptr->zstream.next_out = png_ptr->zbuf;
|
2011-01-07 19:28:47 -05:00
|
|
|
png_ptr->zstream.avail_out = png_ptr->zbuf_size;
|
2010-02-07 19:08:50 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
ret = inflate(&png_ptr->zstream, Z_NO_FLUSH);
|
|
|
|
avail = png_ptr->zbuf_size - png_ptr->zstream.avail_out;
|
2010-02-07 19:08:50 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* First copy/count any new output - but only if we didn't
|
|
|
|
* get an error code.
|
|
|
|
*/
|
|
|
|
if ((ret == Z_OK || ret == Z_STREAM_END) && avail > 0)
|
2010-02-07 19:08:50 -05:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_size_t space = avail; /* > 0, see above */
|
|
|
|
|
|
|
|
if (output != 0 && output_size > count)
|
2010-03-06 09:18:03 -05:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_size_t copy = output_size - count;
|
|
|
|
|
|
|
|
if (space < copy)
|
|
|
|
copy = space;
|
|
|
|
|
|
|
|
png_memcpy(output + count, png_ptr->zbuf, copy);
|
2010-03-06 09:18:03 -05:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
count += space;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret == Z_OK)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Termination conditions - always reset the zstream, it
|
|
|
|
* must be left in inflateInit state.
|
|
|
|
*/
|
|
|
|
png_ptr->zstream.avail_in = 0;
|
|
|
|
inflateReset(&png_ptr->zstream);
|
|
|
|
|
|
|
|
if (ret == Z_STREAM_END)
|
|
|
|
return count; /* NOTE: may be zero. */
|
|
|
|
|
|
|
|
/* Now handle the error codes - the API always returns 0
|
|
|
|
* and the error message is dumped into the uncompressed
|
|
|
|
* buffer if available.
|
|
|
|
*/
|
2011-05-05 07:49:55 -04:00
|
|
|
# ifdef PNG_WARNINGS_SUPPORTED
|
2011-01-07 19:28:47 -05:00
|
|
|
{
|
2011-05-05 07:49:55 -04:00
|
|
|
png_const_charp msg;
|
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
if (png_ptr->zstream.msg != 0)
|
|
|
|
msg = png_ptr->zstream.msg;
|
|
|
|
|
2011-05-05 07:49:55 -04:00
|
|
|
else switch (ret)
|
2010-03-06 09:18:03 -05:00
|
|
|
{
|
2011-05-05 07:49:55 -04:00
|
|
|
case Z_BUF_ERROR:
|
|
|
|
msg = "Buffer error in compressed datastream";
|
|
|
|
break;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-05-05 07:49:55 -04:00
|
|
|
case Z_DATA_ERROR:
|
|
|
|
msg = "Data error in compressed datastream";
|
|
|
|
break;
|
2010-05-06 10:44:04 -04:00
|
|
|
|
2011-05-05 07:49:55 -04:00
|
|
|
default:
|
|
|
|
msg = "Incomplete compressed datastream";
|
|
|
|
break;
|
2010-03-06 09:18:03 -05:00
|
|
|
}
|
2010-02-12 21:12:56 -05:00
|
|
|
|
2011-05-05 07:49:55 -04:00
|
|
|
png_chunk_warning(png_ptr, msg);
|
2010-02-07 19:08:50 -05:00
|
|
|
}
|
2011-05-05 07:49:55 -04:00
|
|
|
# endif
|
2010-02-07 19:08:50 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* 0 means an error - notice that this code simply ignores
|
|
|
|
* zero length compressed chunks as a result.
|
|
|
|
*/
|
|
|
|
return 0;
|
2010-02-07 19:08:50 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
/*
|
|
|
|
* Decompress trailing data in a chunk. The assumption is that chunkdata
|
|
|
|
* points at an allocated area holding the contents of a chunk with a
|
|
|
|
* trailing compressed part. What we get back is an allocated area
|
|
|
|
* holding the original prefix part and an uncompressed version of the
|
|
|
|
* trailing part (the malloc area passed in is freed).
|
|
|
|
*/
|
2008-07-25 09:51:18 -04:00
|
|
|
void /* PRIVATE */
|
2000-05-06 15:09:57 -04:00
|
|
|
png_decompress_chunk(png_structp png_ptr, int comp_type,
|
2010-02-07 19:08:50 -05:00
|
|
|
png_size_t chunklength,
|
|
|
|
png_size_t prefix_size, png_size_t *newlength)
|
1999-12-10 10:43:02 -05:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
/* The caller should guarantee this */
|
|
|
|
if (prefix_size > chunklength)
|
2010-02-07 19:08:50 -05:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
/* The recovery is to delete the chunk. */
|
|
|
|
png_warning(png_ptr, "invalid chunklength");
|
|
|
|
prefix_size = 0; /* To delete everything */
|
2010-02-07 19:08:50 -05:00
|
|
|
}
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
else if (comp_type == PNG_COMPRESSION_TYPE_BASE)
|
2010-02-12 12:17:22 -05:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_size_t expanded_size = png_inflate(png_ptr,
|
|
|
|
(png_bytep)(png_ptr->chunkdata + prefix_size),
|
|
|
|
chunklength - prefix_size,
|
2011-04-16 20:35:05 -04:00
|
|
|
0, /* output */
|
|
|
|
0); /* output size */
|
2010-02-12 21:12:56 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* Now check the limits on this chunk - if the limit fails the
|
|
|
|
* compressed data will be removed, the prefix will remain.
|
|
|
|
*/
|
|
|
|
#ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
|
|
|
|
if (png_ptr->user_chunk_malloc_max &&
|
|
|
|
(prefix_size + expanded_size >= png_ptr->user_chunk_malloc_max - 1))
|
|
|
|
#else
|
|
|
|
# ifdef PNG_USER_CHUNK_MALLOC_MAX
|
|
|
|
if ((PNG_USER_CHUNK_MALLOC_MAX > 0) &&
|
|
|
|
prefix_size + expanded_size >= PNG_USER_CHUNK_MALLOC_MAX - 1)
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
png_warning(png_ptr, "Exceeded size limit while expanding chunk");
|
2010-02-12 21:12:56 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* If the size is zero either there was an error and a message
|
|
|
|
* has already been output (warning) or the size really is zero
|
|
|
|
* and we have nothing to do - the code will exit through the
|
|
|
|
* error case below.
|
|
|
|
*/
|
|
|
|
#if defined(PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED) || \
|
|
|
|
defined(PNG_USER_CHUNK_MALLOC_MAX)
|
|
|
|
else if (expanded_size > 0)
|
|
|
|
#else
|
|
|
|
if (expanded_size > 0)
|
|
|
|
#endif
|
2011-01-06 10:01:04 -05:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
/* Success (maybe) - really uncompress the chunk. */
|
|
|
|
png_size_t new_size = 0;
|
2011-07-15 00:02:11 -04:00
|
|
|
png_charp text = (png_charp)png_malloc_warn(png_ptr,
|
2011-01-07 19:28:47 -05:00
|
|
|
prefix_size + expanded_size + 1);
|
2011-01-06 10:01:04 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
if (text != NULL)
|
2011-01-06 10:01:04 -05:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_memcpy(text, png_ptr->chunkdata, prefix_size);
|
|
|
|
new_size = png_inflate(png_ptr,
|
|
|
|
(png_bytep)(png_ptr->chunkdata + prefix_size),
|
|
|
|
chunklength - prefix_size,
|
|
|
|
(png_bytep)(text + prefix_size), expanded_size);
|
|
|
|
text[prefix_size + expanded_size] = 0; /* just in case */
|
2011-01-06 10:01:04 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
if (new_size == expanded_size)
|
|
|
|
{
|
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = text;
|
|
|
|
*newlength = prefix_size + expanded_size;
|
|
|
|
return; /* The success return! */
|
2011-01-06 10:01:04 -05:00
|
|
|
}
|
2010-10-23 14:20:18 -04:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
png_warning(png_ptr, "png_inflate logic error");
|
|
|
|
png_free(png_ptr, text);
|
2011-01-06 10:01:04 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
else
|
2011-01-07 19:28:47 -05:00
|
|
|
png_warning(png_ptr, "Not enough memory to decompress chunk");
|
2011-01-06 10:01:04 -05:00
|
|
|
}
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2010-02-12 12:17:22 -05:00
|
|
|
else /* if (comp_type != PNG_COMPRESSION_TYPE_BASE) */
|
|
|
|
{
|
2011-05-05 07:49:55 -04:00
|
|
|
PNG_WARNING_PARAMETERS(p)
|
|
|
|
png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_d, comp_type);
|
|
|
|
png_formatted_warning(png_ptr, p, "Unknown zTXt compression type @1");
|
2010-02-12 12:17:22 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* The recovery is to simply drop the data. */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Generic error return - leave the prefix, delete the compressed
|
|
|
|
* data, reallocate the chunkdata to remove the potentially large
|
|
|
|
* amount of compressed data.
|
|
|
|
*/
|
|
|
|
{
|
2011-07-15 00:02:11 -04:00
|
|
|
png_charp text = (png_charp)png_malloc_warn(png_ptr, prefix_size + 1);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
|
|
|
if (text != NULL)
|
|
|
|
{
|
|
|
|
if (prefix_size > 0)
|
|
|
|
png_memcpy(text, png_ptr->chunkdata, prefix_size);
|
|
|
|
|
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = text;
|
|
|
|
|
|
|
|
/* This is an extra zero in the 'uncompressed' part. */
|
|
|
|
*(png_ptr->chunkdata + prefix_size) = 0x00;
|
|
|
|
}
|
|
|
|
/* Ignore a malloc error here - it is safe. */
|
1999-12-10 10:43:02 -05:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
|
|
|
*newlength = prefix_size;
|
1999-12-10 10:43:02 -05:00
|
|
|
}
|
2011-04-01 14:15:36 -04:00
|
|
|
#endif /* PNG_READ_COMPRESSED_TEXT_SUPPORTED */
|
1997-01-17 02:34:35 -05:00
|
|
|
|
2009-05-15 21:39:34 -04:00
|
|
|
/* Read and check the IDHR chunk */
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
png_byte buf[13];
|
|
|
|
png_uint_32 width, height;
|
|
|
|
int bit_depth, color_type, compression_type, filter_type;
|
|
|
|
int interlace_type;
|
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_IHDR");
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2000-03-21 06:13:06 -05:00
|
|
|
if (png_ptr->mode & PNG_HAVE_IHDR)
|
1996-06-05 16:50:50 -04:00
|
|
|
png_error(png_ptr, "Out of place IHDR");
|
|
|
|
|
2009-05-15 21:39:34 -04:00
|
|
|
/* Check the length */
|
1995-07-20 03:43:20 -04:00
|
|
|
if (length != 13)
|
1995-12-19 04:22:19 -05:00
|
|
|
png_error(png_ptr, "Invalid IHDR chunk");
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->mode |= PNG_HAVE_IHDR;
|
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
png_crc_read(png_ptr, buf, 13);
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, 0);
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2004-07-28 09:20:44 -04:00
|
|
|
width = png_get_uint_31(png_ptr, buf);
|
|
|
|
height = png_get_uint_31(png_ptr, buf + 4);
|
1995-07-20 03:43:20 -04:00
|
|
|
bit_depth = buf[8];
|
|
|
|
color_type = buf[9];
|
|
|
|
compression_type = buf[10];
|
|
|
|
filter_type = buf[11];
|
|
|
|
interlace_type = buf[12];
|
|
|
|
|
2009-05-15 21:39:34 -04:00
|
|
|
/* Set internal variables */
|
1995-07-20 03:43:20 -04:00
|
|
|
png_ptr->width = width;
|
|
|
|
png_ptr->height = height;
|
1996-01-26 02:38:47 -05:00
|
|
|
png_ptr->bit_depth = (png_byte)bit_depth;
|
|
|
|
png_ptr->interlaced = (png_byte)interlace_type;
|
|
|
|
png_ptr->color_type = (png_byte)color_type;
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_MNG_FEATURES_SUPPORTED
|
2000-12-15 09:54:42 -05:00
|
|
|
png_ptr->filter_type = (png_byte)filter_type;
|
2001-05-18 05:54:50 -04:00
|
|
|
#endif
|
2004-07-17 23:45:44 -04:00
|
|
|
png_ptr->compression_type = (png_byte)compression_type;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-05-15 21:39:34 -04:00
|
|
|
/* Find number of channels */
|
1995-07-20 03:43:20 -04:00
|
|
|
switch (png_ptr->color_type)
|
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
default: /* invalid, png_set_IHDR calls png_error */
|
1997-05-16 03:46:07 -04:00
|
|
|
case PNG_COLOR_TYPE_GRAY:
|
|
|
|
case PNG_COLOR_TYPE_PALETTE:
|
1995-07-20 03:43:20 -04:00
|
|
|
png_ptr->channels = 1;
|
|
|
|
break;
|
2009-05-15 21:39:34 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
case PNG_COLOR_TYPE_RGB:
|
1995-07-20 03:43:20 -04:00
|
|
|
png_ptr->channels = 3;
|
|
|
|
break;
|
2009-05-15 21:39:34 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
case PNG_COLOR_TYPE_GRAY_ALPHA:
|
1995-07-20 03:43:20 -04:00
|
|
|
png_ptr->channels = 2;
|
|
|
|
break;
|
2009-05-15 21:39:34 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
case PNG_COLOR_TYPE_RGB_ALPHA:
|
1995-07-20 03:43:20 -04:00
|
|
|
png_ptr->channels = 4;
|
|
|
|
break;
|
|
|
|
}
|
1997-01-17 02:34:35 -05:00
|
|
|
|
2009-05-15 21:39:34 -04:00
|
|
|
/* Set up other useful info */
|
1996-01-26 02:38:47 -05:00
|
|
|
png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth *
|
1998-02-07 11:20:57 -05:00
|
|
|
png_ptr->channels);
|
2008-07-10 10:13:13 -04:00
|
|
|
png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->width);
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug1(3, "bit_depth = %d", png_ptr->bit_depth);
|
|
|
|
png_debug1(3, "channels = %d", png_ptr->channels);
|
2011-01-14 22:18:37 -05:00
|
|
|
png_debug1(3, "rowbytes = %lu", (unsigned long)png_ptr->rowbytes);
|
1997-05-16 03:46:07 -04:00
|
|
|
png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
|
2011-01-07 19:28:47 -05:00
|
|
|
color_type, interlace_type, compression_type, filter_type);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
2009-05-15 21:39:34 -04:00
|
|
|
/* Read and check the palette */
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2000-12-28 08:50:05 -05:00
|
|
|
png_color palette[PNG_MAX_PALETTE_LENGTH];
|
1997-01-17 02:34:35 -05:00
|
|
|
int num, i;
|
2009-08-31 09:42:02 -04:00
|
|
|
#ifdef PNG_POINTER_INDEXING_SUPPORTED
|
2000-06-04 15:29:29 -04:00
|
|
|
png_colorp pal_ptr;
|
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_PLTE");
|
1997-05-16 03:46:07 -04:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before PLTE");
|
2009-05-15 21:39:34 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid PLTE after IDAT");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2009-05-15 21:39:34 -04:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_PLTE)
|
1997-01-17 02:34:35 -05:00
|
|
|
png_error(png_ptr, "Duplicate PLTE chunk");
|
|
|
|
|
|
|
|
png_ptr->mode |= PNG_HAVE_PLTE;
|
1996-06-05 16:50:50 -04:00
|
|
|
|
2001-05-07 15:52:45 -04:00
|
|
|
if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
|
|
|
|
{
|
|
|
|
png_warning(png_ptr,
|
2011-01-07 19:28:47 -05:00
|
|
|
"Ignoring PLTE chunk in grayscale PNG");
|
2001-05-07 15:52:45 -04:00
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2009-09-23 12:32:37 -04:00
|
|
|
#ifndef PNG_READ_OPT_PLTE_SUPPORTED
|
1996-06-05 16:50:50 -04:00
|
|
|
if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
|
|
|
|
{
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
1996-06-05 16:50:50 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2000-12-28 08:50:05 -05:00
|
|
|
if (length > 3*PNG_MAX_PALETTE_LENGTH || length % 3)
|
1996-06-05 16:50:50 -04:00
|
|
|
{
|
|
|
|
if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid palette chunk");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
1996-06-05 16:50:50 -04:00
|
|
|
return;
|
|
|
|
}
|
2009-05-15 21:39:34 -04:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
else
|
|
|
|
{
|
|
|
|
png_error(png_ptr, "Invalid palette chunk");
|
|
|
|
}
|
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
num = (int)length / 3;
|
2000-04-09 20:06:13 -04:00
|
|
|
|
2009-08-31 09:42:02 -04:00
|
|
|
#ifdef PNG_POINTER_INDEXING_SUPPORTED
|
2000-06-04 15:29:29 -04:00
|
|
|
for (i = 0, pal_ptr = palette; i < num; i++, pal_ptr++)
|
|
|
|
{
|
|
|
|
png_byte buf[3];
|
|
|
|
|
|
|
|
png_crc_read(png_ptr, buf, 3);
|
|
|
|
pal_ptr->red = buf[0];
|
|
|
|
pal_ptr->green = buf[1];
|
|
|
|
pal_ptr->blue = buf[2];
|
|
|
|
}
|
|
|
|
#else
|
1996-01-26 02:38:47 -05:00
|
|
|
for (i = 0; i < num; i++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
png_byte buf[3];
|
|
|
|
|
|
|
|
png_crc_read(png_ptr, buf, 3);
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Don't depend upon png_color being any order */
|
1995-07-20 03:43:20 -04:00
|
|
|
palette[i].red = buf[0];
|
|
|
|
palette[i].green = buf[1];
|
|
|
|
palette[i].blue = buf[2];
|
|
|
|
}
|
2000-06-04 15:29:29 -04:00
|
|
|
#endif
|
1997-01-17 02:34:35 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* If we actually need the PLTE chunk (ie for a paletted image), we do
|
2009-05-15 21:39:34 -04:00
|
|
|
* whatever the normal CRC configuration tells us. However, if we
|
|
|
|
* have an RGB image, the PLTE can be considered ancillary, so
|
|
|
|
* we will act as though it is.
|
|
|
|
*/
|
2009-09-23 12:32:37 -04:00
|
|
|
#ifndef PNG_READ_OPT_PLTE_SUPPORTED
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
|
1998-01-30 22:45:12 -05:00
|
|
|
#endif
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_crc_finish(png_ptr, 0);
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2009-09-23 12:32:37 -04:00
|
|
|
#ifndef PNG_READ_OPT_PLTE_SUPPORTED
|
1997-01-17 02:34:35 -05:00
|
|
|
else if (png_crc_error(png_ptr)) /* Only if we have a CRC error */
|
|
|
|
{
|
|
|
|
/* If we don't want to use the data from an ancillary chunk,
|
2011-01-07 19:28:47 -05:00
|
|
|
* we have two options: an error abort, or a warning and we
|
|
|
|
* ignore the data in this chunk (which should be OK, since
|
|
|
|
* it's considered ancillary for a RGB or RGBA image).
|
|
|
|
*/
|
1997-01-17 02:34:35 -05:00
|
|
|
if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE))
|
|
|
|
{
|
|
|
|
if (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)
|
|
|
|
{
|
2008-07-25 09:51:18 -04:00
|
|
|
png_chunk_benign_error(png_ptr, "CRC error");
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
else
|
|
|
|
{
|
1998-01-03 23:40:55 -05:00
|
|
|
png_chunk_warning(png_ptr, "CRC error");
|
1997-01-17 02:34:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
/* Otherwise, we (optionally) emit a warning and use the chunk. */
|
1997-01-17 02:34:35 -05:00
|
|
|
else if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN))
|
|
|
|
{
|
1998-01-03 23:40:55 -05:00
|
|
|
png_chunk_warning(png_ptr, "CRC error");
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
|
|
|
}
|
1998-01-30 22:45:12 -05:00
|
|
|
#endif
|
2000-04-09 20:06:13 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_set_PLTE(png_ptr, info_ptr, palette, num);
|
1998-04-21 16:03:57 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_tRNS_SUPPORTED
|
1998-04-21 16:03:57 -04:00
|
|
|
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
|
|
|
|
{
|
2000-02-05 00:40:16 -05:00
|
|
|
if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
2000-04-09 20:06:13 -04:00
|
|
|
if (png_ptr->num_trans > (png_uint_16)num)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Truncating incorrect tRNS chunk length");
|
2000-04-09 20:06:13 -04:00
|
|
|
png_ptr->num_trans = (png_uint_16)num;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2000-04-09 20:06:13 -04:00
|
|
|
if (info_ptr->num_trans > (png_uint_16)num)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Truncating incorrect info tRNS chunk length");
|
|
|
|
info_ptr->num_trans = (png_uint_16)num;
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
1996-06-05 16:50:50 -04:00
|
|
|
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_IEND(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
|
|
|
{
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_IEND");
|
1997-05-16 03:46:07 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR) || !(png_ptr->mode & PNG_HAVE_IDAT))
|
|
|
|
{
|
|
|
|
png_error(png_ptr, "No image in file");
|
|
|
|
}
|
|
|
|
|
2000-02-05 00:40:16 -05:00
|
|
|
png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND);
|
1997-01-17 02:34:35 -05:00
|
|
|
|
|
|
|
if (length != 0)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Incorrect IEND chunk length");
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_crc_finish(png_ptr, length);
|
2004-08-04 07:34:52 -04:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
PNG_UNUSED(info_ptr) /* Quiet compiler warnings about unused info_ptr */
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_gAMA_SUPPORTED
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_gAMA(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2000-02-05 00:40:16 -05:00
|
|
|
png_fixed_point igamma;
|
1995-07-20 03:43:20 -04:00
|
|
|
png_byte buf[4];
|
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_gAMA");
|
1997-05-16 03:46:07 -04:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before gAMA");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid gAMA after IDAT");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_PLTE)
|
|
|
|
/* Should be an error, but we can cope with it */
|
|
|
|
png_warning(png_ptr, "Out of place gAMA chunk");
|
1998-01-07 21:54:20 -05:00
|
|
|
|
2004-08-04 07:34:52 -04:00
|
|
|
if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_sRGB_SUPPORTED
|
2011-01-07 19:28:47 -05:00
|
|
|
&& !(info_ptr->valid & PNG_INFO_sRGB)
|
1998-01-07 21:54:20 -05:00
|
|
|
#endif
|
2011-01-07 19:28:47 -05:00
|
|
|
)
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Duplicate gAMA chunk");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
1996-06-05 16:50:50 -04:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
if (length != 4)
|
|
|
|
{
|
1996-01-10 03:56:49 -05:00
|
|
|
png_warning(png_ptr, "Incorrect gAMA chunk length");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
1995-07-20 03:43:20 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
png_crc_read(png_ptr, buf, 4);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
return;
|
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
igamma = png_get_fixed_point(NULL, buf);
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* Check for zero gamma or an error. */
|
|
|
|
if (igamma <= 0)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr,
|
|
|
|
"Ignoring gAMA chunk with out of range gamma");
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
# ifdef PNG_READ_sRGB_SUPPORTED
|
2006-03-10 11:19:04 -05:00
|
|
|
if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
|
2011-01-07 19:28:47 -05:00
|
|
|
{
|
2011-09-09 18:21:44 -04:00
|
|
|
if (PNG_OUT_OF_RANGE(igamma, 45500, 500))
|
1998-01-01 08:13:13 -05:00
|
|
|
{
|
2011-05-05 07:49:55 -04:00
|
|
|
PNG_WARNING_PARAMETERS(p)
|
|
|
|
png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_fixed, igamma);
|
|
|
|
png_formatted_warning(png_ptr, p,
|
|
|
|
"Ignoring incorrect gAMA value @1 when sRGB is also present");
|
1998-01-01 08:13:13 -05:00
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
}
|
|
|
|
# endif /* PNG_READ_sRGB_SUPPORTED */
|
1998-01-01 08:13:13 -05:00
|
|
|
|
2000-02-05 00:40:16 -05:00
|
|
|
# ifdef PNG_READ_GAMMA_SUPPORTED
|
2011-01-07 19:28:47 -05:00
|
|
|
/* Gamma correction on read is supported. */
|
|
|
|
png_ptr->gamma = igamma;
|
2000-02-05 00:40:16 -05:00
|
|
|
# endif
|
2011-01-07 19:28:47 -05:00
|
|
|
/* And set the 'info' structure members. */
|
1999-12-10 10:43:02 -05:00
|
|
|
png_set_gAMA_fixed(png_ptr, info_ptr, igamma);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_sBIT_SUPPORTED
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_size_t truelen;
|
1996-01-26 02:38:47 -05:00
|
|
|
png_byte buf[4];
|
1996-01-10 03:56:49 -05:00
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_sBIT");
|
1997-05-16 03:46:07 -04:00
|
|
|
|
1996-01-10 03:56:49 -05:00
|
|
|
buf[0] = buf[1] = buf[2] = buf[3] = 0;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before sBIT");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid sBIT after IDAT");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_PLTE)
|
1998-01-01 08:13:13 -05:00
|
|
|
{
|
1996-06-05 16:50:50 -04:00
|
|
|
/* Should be an error, but we can cope with it */
|
|
|
|
png_warning(png_ptr, "Out of place sBIT chunk");
|
1998-01-01 08:13:13 -05:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-08-04 07:34:52 -04:00
|
|
|
if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT))
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Duplicate sBIT chunk");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
1996-06-05 16:50:50 -04:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
|
1997-01-17 02:34:35 -05:00
|
|
|
truelen = 3;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
else
|
1997-05-16 03:46:07 -04:00
|
|
|
truelen = (png_size_t)png_ptr->channels;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2004-07-28 09:20:44 -04:00
|
|
|
if (length != truelen || length > 4)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1996-01-10 03:56:49 -05:00
|
|
|
png_warning(png_ptr, "Incorrect sBIT chunk length");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
1996-01-26 02:38:47 -05:00
|
|
|
return;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_crc_read(png_ptr, buf, truelen);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
return;
|
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
|
|
|
|
{
|
1995-12-19 04:22:19 -05:00
|
|
|
png_ptr->sig_bit.red = buf[0];
|
|
|
|
png_ptr->sig_bit.green = buf[1];
|
|
|
|
png_ptr->sig_bit.blue = buf[2];
|
|
|
|
png_ptr->sig_bit.alpha = buf[3];
|
1995-11-28 12:22:13 -05:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-11-28 12:22:13 -05:00
|
|
|
else
|
|
|
|
{
|
1996-01-26 02:38:47 -05:00
|
|
|
png_ptr->sig_bit.gray = buf[0];
|
1998-12-29 12:47:59 -05:00
|
|
|
png_ptr->sig_bit.red = buf[0];
|
|
|
|
png_ptr->sig_bit.green = buf[0];
|
|
|
|
png_ptr->sig_bit.blue = buf[0];
|
1995-12-19 04:22:19 -05:00
|
|
|
png_ptr->sig_bit.alpha = buf[1];
|
1995-11-28 12:22:13 -05:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_set_sBIT(png_ptr, info_ptr, &(png_ptr->sig_bit));
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_cHRM_SUPPORTED
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2006-06-16 08:52:03 -04:00
|
|
|
png_byte buf[32];
|
2011-01-07 19:28:47 -05:00
|
|
|
png_fixed_point x_white, y_white, x_red, y_red, x_green, y_green, x_blue,
|
|
|
|
y_blue;
|
2002-02-22 00:14:23 -05:00
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_cHRM");
|
1997-05-16 03:46:07 -04:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
2000-02-05 00:40:16 -05:00
|
|
|
png_error(png_ptr, "Missing IHDR before cHRM");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid cHRM after IDAT");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_PLTE)
|
|
|
|
/* Should be an error, but we can cope with it */
|
|
|
|
png_warning(png_ptr, "Missing PLTE before cHRM");
|
1998-01-07 21:54:20 -05:00
|
|
|
|
2004-08-04 07:34:52 -04:00
|
|
|
if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM)
|
2011-01-07 19:28:47 -05:00
|
|
|
# ifdef PNG_READ_sRGB_SUPPORTED
|
|
|
|
&& !(info_ptr->valid & PNG_INFO_sRGB)
|
|
|
|
# endif
|
1998-01-07 21:54:20 -05:00
|
|
|
)
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Duplicate cHRM chunk");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
1996-06-05 16:50:50 -04:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
if (length != 32)
|
|
|
|
{
|
1996-01-10 03:56:49 -05:00
|
|
|
png_warning(png_ptr, "Incorrect cHRM chunk length");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
1996-01-26 02:38:47 -05:00
|
|
|
return;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
2006-06-16 08:52:03 -04:00
|
|
|
png_crc_read(png_ptr, buf, 32);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2006-06-16 08:52:03 -04:00
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
return;
|
1997-01-17 02:34:35 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
x_white = png_get_fixed_point(NULL, buf);
|
|
|
|
y_white = png_get_fixed_point(NULL, buf + 4);
|
|
|
|
x_red = png_get_fixed_point(NULL, buf + 8);
|
|
|
|
y_red = png_get_fixed_point(NULL, buf + 12);
|
|
|
|
x_green = png_get_fixed_point(NULL, buf + 16);
|
|
|
|
y_green = png_get_fixed_point(NULL, buf + 20);
|
|
|
|
x_blue = png_get_fixed_point(NULL, buf + 24);
|
|
|
|
y_blue = png_get_fixed_point(NULL, buf + 28);
|
2011-01-06 10:01:04 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
if (x_white == PNG_FIXED_ERROR ||
|
|
|
|
y_white == PNG_FIXED_ERROR ||
|
|
|
|
x_red == PNG_FIXED_ERROR ||
|
|
|
|
y_red == PNG_FIXED_ERROR ||
|
|
|
|
x_green == PNG_FIXED_ERROR ||
|
|
|
|
y_green == PNG_FIXED_ERROR ||
|
|
|
|
x_blue == PNG_FIXED_ERROR ||
|
|
|
|
y_blue == PNG_FIXED_ERROR)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Ignoring cHRM chunk with negative chromaticities");
|
|
|
|
return;
|
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_sRGB_SUPPORTED
|
2006-06-16 08:52:03 -04:00
|
|
|
if ((info_ptr != NULL) && (info_ptr->valid & PNG_INFO_sRGB))
|
2011-01-07 19:28:47 -05:00
|
|
|
{
|
|
|
|
if (PNG_OUT_OF_RANGE(x_white, 31270, 1000) ||
|
|
|
|
PNG_OUT_OF_RANGE(y_white, 32900, 1000) ||
|
2011-09-09 18:21:44 -04:00
|
|
|
PNG_OUT_OF_RANGE(x_red, 64000, 1000) ||
|
2011-01-07 19:28:47 -05:00
|
|
|
PNG_OUT_OF_RANGE(y_red, 33000, 1000) ||
|
|
|
|
PNG_OUT_OF_RANGE(x_green, 30000, 1000) ||
|
2011-09-09 18:21:44 -04:00
|
|
|
PNG_OUT_OF_RANGE(y_green, 60000, 1000) ||
|
2011-01-07 19:28:47 -05:00
|
|
|
PNG_OUT_OF_RANGE(x_blue, 15000, 1000) ||
|
|
|
|
PNG_OUT_OF_RANGE(y_blue, 6000, 1000))
|
2010-05-06 10:44:04 -04:00
|
|
|
{
|
2011-05-05 07:49:55 -04:00
|
|
|
PNG_WARNING_PARAMETERS(p)
|
|
|
|
|
|
|
|
png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_fixed, x_white);
|
|
|
|
png_warning_parameter_signed(p, 2, PNG_NUMBER_FORMAT_fixed, y_white);
|
|
|
|
png_warning_parameter_signed(p, 3, PNG_NUMBER_FORMAT_fixed, x_red);
|
|
|
|
png_warning_parameter_signed(p, 4, PNG_NUMBER_FORMAT_fixed, y_red);
|
|
|
|
png_warning_parameter_signed(p, 5, PNG_NUMBER_FORMAT_fixed, x_green);
|
|
|
|
png_warning_parameter_signed(p, 6, PNG_NUMBER_FORMAT_fixed, y_green);
|
|
|
|
png_warning_parameter_signed(p, 7, PNG_NUMBER_FORMAT_fixed, x_blue);
|
|
|
|
png_warning_parameter_signed(p, 8, PNG_NUMBER_FORMAT_fixed, y_blue);
|
|
|
|
|
|
|
|
png_formatted_warning(png_ptr, p,
|
|
|
|
"Ignoring incorrect cHRM white(@1,@2) r(@3,@4)g(@5,@6)b(@7,@8) "
|
|
|
|
"when sRGB is also present");
|
1998-01-01 08:13:13 -05:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
return;
|
|
|
|
}
|
1998-01-01 08:13:13 -05:00
|
|
|
#endif /* PNG_READ_sRGB_SUPPORTED */
|
|
|
|
|
2011-05-12 22:48:29 -04:00
|
|
|
#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
|
|
|
|
/* Store the _white values as default coefficients for the rgb to gray
|
2011-08-25 17:19:44 -04:00
|
|
|
* operation if it is supported. Check if the transform is already set to
|
|
|
|
* avoid destroying the transform values.
|
2011-05-12 22:48:29 -04:00
|
|
|
*/
|
2011-08-25 17:19:44 -04:00
|
|
|
if (!png_ptr->rgb_to_gray_coefficients_set)
|
2011-05-12 22:48:29 -04:00
|
|
|
{
|
2011-08-25 17:19:44 -04:00
|
|
|
/* png_set_background has not been called and we haven't seen an sRGB
|
|
|
|
* chunk yet. Find the XYZ of the three end points.
|
2011-05-12 22:48:29 -04:00
|
|
|
*/
|
2011-08-25 17:19:44 -04:00
|
|
|
png_XYZ XYZ;
|
|
|
|
png_xy xy;
|
|
|
|
|
|
|
|
xy.redx = x_red;
|
|
|
|
xy.redy = y_red;
|
|
|
|
xy.greenx = x_green;
|
|
|
|
xy.greeny = y_green;
|
|
|
|
xy.bluex = x_blue;
|
|
|
|
xy.bluey = y_blue;
|
|
|
|
xy.whitex = x_white;
|
|
|
|
xy.whitey = y_white;
|
|
|
|
|
|
|
|
if (png_XYZ_from_xy_checked(png_ptr, &XYZ, xy))
|
2011-05-12 22:48:29 -04:00
|
|
|
{
|
2011-08-25 17:19:44 -04:00
|
|
|
/* The success case, because XYZ_from_xy normalises to a reference
|
|
|
|
* white Y of 1.0 we just need to scale the numbers. This should
|
|
|
|
* always work just fine. It is an internal error if this overflows.
|
2011-05-12 22:48:29 -04:00
|
|
|
*/
|
2011-08-25 17:19:44 -04:00
|
|
|
{
|
|
|
|
png_fixed_point r, g, b;
|
|
|
|
if (png_muldiv(&r, XYZ.redY, 32768, PNG_FP_1) &&
|
|
|
|
r >= 0 && r <= 32768 &&
|
|
|
|
png_muldiv(&g, XYZ.greenY, 32768, PNG_FP_1) &&
|
|
|
|
g >= 0 && g <= 32768 &&
|
|
|
|
png_muldiv(&b, XYZ.blueY, 32768, PNG_FP_1) &&
|
|
|
|
b >= 0 && b <= 32768 &&
|
|
|
|
r+g+b <= 32769)
|
|
|
|
{
|
|
|
|
/* We allow 0 coefficients here. r+g+b may be 32769 if two or
|
|
|
|
* all of the coefficients were rounded up. Handle this by
|
|
|
|
* reducing the *largest* coefficient by 1; this matches the
|
|
|
|
* approach used for the default coefficients in pngrtran.c
|
|
|
|
*/
|
|
|
|
int add = 0;
|
|
|
|
|
|
|
|
if (r+g+b > 32768)
|
|
|
|
add = -1;
|
|
|
|
else if (r+g+b < 32768)
|
|
|
|
add = 1;
|
|
|
|
|
|
|
|
if (add != 0)
|
|
|
|
{
|
|
|
|
if (g >= r && g >= b)
|
|
|
|
g += add;
|
|
|
|
else if (r >= g && r >= b)
|
|
|
|
r += add;
|
|
|
|
else
|
|
|
|
b += add;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check for an internal error. */
|
|
|
|
if (r+g+b != 32768)
|
|
|
|
png_error(png_ptr,
|
|
|
|
"internal error handling cHRM coefficients");
|
|
|
|
|
|
|
|
png_ptr->rgb_to_gray_red_coeff = (png_uint_16)r;
|
|
|
|
png_ptr->rgb_to_gray_green_coeff = (png_uint_16)g;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is a png_error at present even though it could be ignored -
|
|
|
|
* it should never happen, but it is important that if it does, the
|
|
|
|
* bug is fixed.
|
|
|
|
*/
|
|
|
|
else
|
|
|
|
png_error(png_ptr, "internal error handling cHRM->XYZ");
|
|
|
|
}
|
2011-05-12 22:48:29 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
png_set_cHRM_fixed(png_ptr, info_ptr, x_white, y_white, x_red, y_red,
|
|
|
|
x_green, y_green, x_blue, y_blue);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_sRGB_SUPPORTED
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1998-01-01 08:13:13 -05:00
|
|
|
png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
|
|
|
{
|
1998-01-16 23:06:18 -05:00
|
|
|
int intent;
|
1998-01-01 08:13:13 -05:00
|
|
|
png_byte buf[1];
|
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_sRGB");
|
1998-01-01 08:13:13 -05:00
|
|
|
|
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before sRGB");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1998-01-01 08:13:13 -05:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid sRGB after IDAT");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1998-01-01 08:13:13 -05:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_PLTE)
|
|
|
|
/* Should be an error, but we can cope with it */
|
|
|
|
png_warning(png_ptr, "Out of place sRGB chunk");
|
1998-01-07 21:54:20 -05:00
|
|
|
|
2004-08-04 07:34:52 -04:00
|
|
|
if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
|
1998-01-01 08:13:13 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Duplicate sRGB chunk");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (length != 1)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Incorrect sRGB chunk length");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
png_crc_read(png_ptr, buf, 1);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1998-01-01 08:13:13 -05:00
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
return;
|
|
|
|
|
|
|
|
intent = buf[0];
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Check for bad intent */
|
1998-01-30 22:45:12 -05:00
|
|
|
if (intent >= PNG_sRGB_INTENT_LAST)
|
1998-01-01 08:13:13 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Unknown sRGB intent");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1998-01-30 22:45:12 -05:00
|
|
|
#if defined(PNG_READ_gAMA_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED)
|
2006-03-10 11:19:04 -05:00
|
|
|
if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA))
|
2000-02-05 00:40:16 -05:00
|
|
|
{
|
2011-09-09 18:21:44 -04:00
|
|
|
if (PNG_OUT_OF_RANGE(info_ptr->gamma, 45500, 500))
|
1998-01-07 21:54:20 -05:00
|
|
|
{
|
2011-05-05 07:49:55 -04:00
|
|
|
PNG_WARNING_PARAMETERS(p)
|
|
|
|
|
|
|
|
png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_fixed,
|
|
|
|
info_ptr->gamma);
|
|
|
|
|
|
|
|
png_formatted_warning(png_ptr, p,
|
|
|
|
"Ignoring incorrect gAMA value @1 when sRGB is also present");
|
1998-01-07 21:54:20 -05:00
|
|
|
}
|
2000-02-05 00:40:16 -05:00
|
|
|
}
|
1998-01-07 21:54:20 -05:00
|
|
|
#endif /* PNG_READ_gAMA_SUPPORTED */
|
|
|
|
|
|
|
|
#ifdef PNG_READ_cHRM_SUPPORTED
|
2006-03-10 11:19:04 -05:00
|
|
|
if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
|
2011-01-07 19:28:47 -05:00
|
|
|
if (PNG_OUT_OF_RANGE(info_ptr->x_white, 31270, 1000) ||
|
|
|
|
PNG_OUT_OF_RANGE(info_ptr->y_white, 32900, 1000) ||
|
2011-09-09 18:21:44 -04:00
|
|
|
PNG_OUT_OF_RANGE(info_ptr->x_red, 64000, 1000) ||
|
2011-01-07 19:28:47 -05:00
|
|
|
PNG_OUT_OF_RANGE(info_ptr->y_red, 33000, 1000) ||
|
|
|
|
PNG_OUT_OF_RANGE(info_ptr->x_green, 30000, 1000) ||
|
2011-09-09 18:21:44 -04:00
|
|
|
PNG_OUT_OF_RANGE(info_ptr->y_green, 60000, 1000) ||
|
2011-01-07 19:28:47 -05:00
|
|
|
PNG_OUT_OF_RANGE(info_ptr->x_blue, 15000, 1000) ||
|
|
|
|
PNG_OUT_OF_RANGE(info_ptr->y_blue, 6000, 1000))
|
|
|
|
{
|
|
|
|
png_warning(png_ptr,
|
|
|
|
"Ignoring incorrect cHRM value when sRGB is also present");
|
|
|
|
}
|
1998-01-07 21:54:20 -05:00
|
|
|
#endif /* PNG_READ_cHRM_SUPPORTED */
|
1998-01-01 08:13:13 -05:00
|
|
|
|
2011-08-25 17:19:44 -04:00
|
|
|
/* This is recorded for use when handling the cHRM chunk above. An sRGB
|
|
|
|
* chunk unconditionally overwrites the coefficients for grayscale conversion
|
|
|
|
* too.
|
|
|
|
*/
|
|
|
|
png_ptr->is_sRGB = 1;
|
|
|
|
|
|
|
|
# ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
|
|
|
|
/* Don't overwrite user supplied values: */
|
|
|
|
if (!png_ptr->rgb_to_gray_coefficients_set)
|
|
|
|
{
|
|
|
|
/* These numbers come from the sRGB specification (or, since one has to
|
|
|
|
* pay much money to get a copy, the wikipedia sRGB page) the
|
|
|
|
* chromaticity values quoted have been inverted to get the reverse
|
|
|
|
* transformation from RGB to XYZ and the 'Y' coefficients scaled by
|
|
|
|
* 32768 (then rounded).
|
|
|
|
*
|
|
|
|
* sRGB and ITU Rec-709 both truncate the values for the D65 white
|
|
|
|
* point to four digits and, even though it actually stores five
|
|
|
|
* digits, the PNG spec gives the truncated value.
|
|
|
|
*
|
|
|
|
* This means that when the chromaticities are converted back to XYZ
|
|
|
|
* end points we end up with (6968,23435,2366), which, as described in
|
|
|
|
* pngrtran.c, would overflow. If the five digit precision and up is
|
|
|
|
* used we get, instead:
|
|
|
|
*
|
|
|
|
* 6968*R + 23435*G + 2365*B
|
|
|
|
*
|
|
|
|
* (Notice that this rounds the blue coefficient down, rather than the
|
|
|
|
* choice used in pngrtran.c which is to round the green one down.)
|
|
|
|
*/
|
|
|
|
png_ptr->rgb_to_gray_red_coeff = 6968; /* 0.212639005871510 */
|
|
|
|
png_ptr->rgb_to_gray_green_coeff = 23434; /* 0.715168678767756 */
|
|
|
|
/* png_ptr->rgb_to_gray_blue_coeff = 2366; 0.072192315360734 */
|
|
|
|
|
|
|
|
/* The following keeps the cHRM chunk from destroying the
|
|
|
|
* coefficients again in the event that it follows the sRGB chunk.
|
|
|
|
*/
|
|
|
|
png_ptr->rgb_to_gray_coefficients_set = 1;
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
|
1998-01-07 21:54:20 -05:00
|
|
|
png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, intent);
|
1998-01-01 08:13:13 -05:00
|
|
|
}
|
1998-01-07 21:54:20 -05:00
|
|
|
#endif /* PNG_READ_sRGB_SUPPORTED */
|
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_iCCP_SUPPORTED
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1999-12-10 10:43:02 -05:00
|
|
|
png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
|
|
|
/* Note: this does not properly handle chunks that are > 64K under DOS */
|
|
|
|
{
|
|
|
|
png_byte compression_type;
|
2002-02-22 00:14:23 -05:00
|
|
|
png_bytep pC;
|
1999-12-10 10:43:02 -05:00
|
|
|
png_charp profile;
|
|
|
|
png_uint_32 skip = 0;
|
2011-01-07 19:28:47 -05:00
|
|
|
png_uint_32 profile_size;
|
|
|
|
png_alloc_size_t profile_length;
|
2000-04-01 22:10:05 -05:00
|
|
|
png_size_t slength, prefix_length, data_length;
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_iCCP");
|
1999-12-10 10:43:02 -05:00
|
|
|
|
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before iCCP");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid iCCP after IDAT");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_PLTE)
|
|
|
|
/* Should be an error, but we can cope with it */
|
|
|
|
png_warning(png_ptr, "Out of place iCCP chunk");
|
|
|
|
|
2004-08-04 07:34:52 -04:00
|
|
|
if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP))
|
1999-12-10 10:43:02 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Duplicate iCCP chunk");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef PNG_MAX_MALLOC_64K
|
|
|
|
if (length > (png_uint_32)65535L)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "iCCP chunk too large to fit in memory");
|
|
|
|
skip = length - (png_uint_32)65535L;
|
|
|
|
length = (png_uint_32)65535L;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
|
1999-12-10 10:43:02 -05:00
|
|
|
slength = (png_size_t)length;
|
2008-07-21 09:05:57 -04:00
|
|
|
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
|
1999-12-10 10:43:02 -05:00
|
|
|
|
|
|
|
if (png_crc_finish(png_ptr, skip))
|
|
|
|
{
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
1999-12-10 10:43:02 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
png_ptr->chunkdata[slength] = 0x00;
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
for (profile = png_ptr->chunkdata; *profile; profile++)
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Empty loop to find end of name */ ;
|
2000-06-04 15:29:29 -04:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
++profile;
|
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
/* There should be at least one zero (the compression type byte)
|
|
|
|
* following the separator, and we should be on it
|
|
|
|
*/
|
2011-01-07 19:28:47 -05:00
|
|
|
if (profile >= png_ptr->chunkdata + slength - 1)
|
1999-12-10 10:43:02 -05:00
|
|
|
{
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
2000-11-10 13:26:19 -05:00
|
|
|
png_warning(png_ptr, "Malformed iCCP chunk");
|
2000-04-14 15:20:47 -04:00
|
|
|
return;
|
1999-12-10 10:43:02 -05:00
|
|
|
}
|
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Compression_type should always be zero */
|
1999-12-10 10:43:02 -05:00
|
|
|
compression_type = *profile++;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2000-11-10 13:26:19 -05:00
|
|
|
if (compression_type)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Ignoring nonzero compression type in iCCP chunk");
|
2008-07-10 10:13:13 -04:00
|
|
|
compression_type = 0x00; /* Reset it to zero (libpng-1.0.6 through 1.0.8
|
2000-11-10 13:26:19 -05:00
|
|
|
wrote nonzero) */
|
|
|
|
}
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
prefix_length = profile - png_ptr->chunkdata;
|
2008-07-25 09:51:18 -04:00
|
|
|
png_decompress_chunk(png_ptr, compression_type,
|
2011-01-07 19:28:47 -05:00
|
|
|
slength, prefix_length, &data_length);
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2000-11-10 13:26:19 -05:00
|
|
|
profile_length = data_length - prefix_length;
|
2001-01-12 16:13:06 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
if (prefix_length > data_length || profile_length < 4)
|
2001-06-23 09:03:17 -04:00
|
|
|
{
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
2001-06-23 09:03:17 -04:00
|
|
|
png_warning(png_ptr, "Profile size field missing from iCCP chunk");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2001-01-12 16:13:06 -05:00
|
|
|
/* Check the profile_size recorded in the first 32 bits of the ICC profile */
|
2008-07-21 09:05:57 -04:00
|
|
|
pC = (png_bytep)(png_ptr->chunkdata + prefix_length);
|
2011-01-07 19:28:47 -05:00
|
|
|
profile_size = ((*(pC )) << 24) |
|
|
|
|
((*(pC + 1)) << 16) |
|
|
|
|
((*(pC + 2)) << 8) |
|
|
|
|
((*(pC + 3)) );
|
2000-11-10 13:26:19 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* NOTE: the following guarantees that 'profile_length' fits into 32 bits,
|
|
|
|
* because profile_size is a 32 bit value.
|
|
|
|
*/
|
2008-07-10 10:13:13 -04:00
|
|
|
if (profile_size < profile_length)
|
2000-11-10 13:26:19 -05:00
|
|
|
profile_length = profile_size;
|
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* And the following guarantees that profile_size == profile_length. */
|
2008-07-10 10:13:13 -04:00
|
|
|
if (profile_size > profile_length)
|
2000-11-10 13:26:19 -05:00
|
|
|
{
|
2011-05-05 07:49:55 -04:00
|
|
|
PNG_WARNING_PARAMETERS(p)
|
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
2011-05-05 07:49:55 -04:00
|
|
|
|
|
|
|
png_warning_parameter_unsigned(p, 1, PNG_NUMBER_FORMAT_u, profile_size);
|
|
|
|
png_warning_parameter_unsigned(p, 2, PNG_NUMBER_FORMAT_u, profile_length);
|
|
|
|
png_formatted_warning(png_ptr, p,
|
|
|
|
"Ignoring iCCP chunk with declared size = @1 and actual length = @2");
|
2000-11-10 13:26:19 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
png_set_iCCP(png_ptr, info_ptr, png_ptr->chunkdata,
|
2011-01-07 19:28:47 -05:00
|
|
|
compression_type, (png_bytep)png_ptr->chunkdata + prefix_length,
|
|
|
|
profile_size);
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
1999-12-10 10:43:02 -05:00
|
|
|
}
|
|
|
|
#endif /* PNG_READ_iCCP_SUPPORTED */
|
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_sPLT_SUPPORTED
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1999-12-10 10:43:02 -05:00
|
|
|
png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
|
|
|
/* Note: this does not properly handle chunks that are > 64K under DOS */
|
|
|
|
{
|
|
|
|
png_bytep entry_start;
|
2000-03-21 06:13:06 -05:00
|
|
|
png_sPLT_t new_palette;
|
2000-06-04 15:29:29 -04:00
|
|
|
png_sPLT_entryp pp;
|
2011-01-07 19:28:47 -05:00
|
|
|
png_uint_32 data_length;
|
|
|
|
int entry_size, i;
|
1999-12-10 10:43:02 -05:00
|
|
|
png_uint_32 skip = 0;
|
|
|
|
png_size_t slength;
|
2011-01-07 19:28:47 -05:00
|
|
|
png_uint_32 dl;
|
|
|
|
png_size_t max_dl;
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_sPLT");
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2010-02-07 19:08:50 -05:00
|
|
|
#ifdef PNG_USER_LIMITS_SUPPORTED
|
2009-06-13 11:05:05 -04:00
|
|
|
|
2008-08-20 18:25:21 -04:00
|
|
|
if (png_ptr->user_chunk_cache_max != 0)
|
|
|
|
{
|
|
|
|
if (png_ptr->user_chunk_cache_max == 1)
|
|
|
|
{
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2008-08-20 18:25:21 -04:00
|
|
|
if (--png_ptr->user_chunk_cache_max == 1)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "No space in chunk cache for sPLT");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before sPLT");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid sPLT after IDAT");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef PNG_MAX_MALLOC_64K
|
|
|
|
if (length > (png_uint_32)65535L)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "sPLT chunk too large to fit in memory");
|
|
|
|
skip = length - (png_uint_32)65535L;
|
|
|
|
length = (png_uint_32)65535L;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
|
|
|
/* WARNING: this may break if size_t is less than 32 bits; it is assumed
|
|
|
|
* that the PNG_MAX_MALLOC_64K test is enabled in this case, but this is a
|
|
|
|
* potential breakage point if the types in pngconf.h aren't exactly right.
|
|
|
|
*/
|
2001-04-20 11:32:10 -04:00
|
|
|
slength = (png_size_t)length;
|
2008-07-21 09:05:57 -04:00
|
|
|
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
|
1999-12-10 10:43:02 -05:00
|
|
|
|
|
|
|
if (png_crc_finish(png_ptr, skip))
|
|
|
|
{
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
1999-12-10 10:43:02 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
png_ptr->chunkdata[slength] = 0x00;
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2010-02-07 19:08:50 -05:00
|
|
|
for (entry_start = (png_bytep)png_ptr->chunkdata; *entry_start;
|
|
|
|
entry_start++)
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Empty loop to find end of name */ ;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
++entry_start;
|
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
/* A sample depth should follow the separator, and we should be on it */
|
2008-07-21 09:05:57 -04:00
|
|
|
if (entry_start > (png_bytep)png_ptr->chunkdata + slength - 2)
|
1999-12-10 10:43:02 -05:00
|
|
|
{
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
2000-04-14 15:20:47 -04:00
|
|
|
png_warning(png_ptr, "malformed sPLT chunk");
|
|
|
|
return;
|
1999-12-10 10:43:02 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
new_palette.depth = *entry_start++;
|
2010-03-06 09:24:45 -05:00
|
|
|
entry_size = (new_palette.depth == 8 ? 6 : 10);
|
2011-01-07 19:28:47 -05:00
|
|
|
/* This must fit in a png_uint_32 because it is derived from the original
|
|
|
|
* chunk data length (and use 'length', not 'slength' here for clarity -
|
|
|
|
* they are guaranteed to be the same, see the tests above.)
|
|
|
|
*/
|
|
|
|
data_length = length - (png_uint_32)(entry_start -
|
|
|
|
(png_bytep)png_ptr->chunkdata);
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Integrity-check the data length */
|
1999-12-10 10:43:02 -05:00
|
|
|
if (data_length % entry_size)
|
|
|
|
{
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
2001-05-07 15:52:45 -04:00
|
|
|
png_warning(png_ptr, "sPLT chunk has bad length");
|
|
|
|
return;
|
1999-12-10 10:43:02 -05:00
|
|
|
}
|
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
dl = (png_int_32)(data_length / entry_size);
|
|
|
|
max_dl = PNG_SIZE_MAX / png_sizeof(png_sPLT_entry);
|
|
|
|
|
|
|
|
if (dl > max_dl)
|
2004-07-28 09:20:44 -04:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "sPLT chunk too long");
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
|
|
|
new_palette.nentries = (png_int_32)(data_length / entry_size);
|
|
|
|
|
2004-07-28 09:20:44 -04:00
|
|
|
new_palette.entries = (png_sPLT_entryp)png_malloc_warn(
|
2008-07-10 10:13:13 -04:00
|
|
|
png_ptr, new_palette.nentries * png_sizeof(png_sPLT_entry));
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-07-28 09:20:44 -04:00
|
|
|
if (new_palette.entries == NULL)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "sPLT chunk requires too much memory");
|
|
|
|
return;
|
|
|
|
}
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2009-08-31 09:42:02 -04:00
|
|
|
#ifdef PNG_POINTER_INDEXING_SUPPORTED
|
1999-12-10 10:43:02 -05:00
|
|
|
for (i = 0; i < new_palette.nentries; i++)
|
|
|
|
{
|
2009-10-07 13:44:35 -04:00
|
|
|
pp = new_palette.entries + i;
|
1999-12-10 10:43:02 -05:00
|
|
|
|
|
|
|
if (new_palette.depth == 8)
|
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
pp->red = *entry_start++;
|
|
|
|
pp->green = *entry_start++;
|
|
|
|
pp->blue = *entry_start++;
|
|
|
|
pp->alpha = *entry_start++;
|
1999-12-10 10:43:02 -05:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
else
|
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
pp->red = png_get_uint_16(entry_start); entry_start += 2;
|
|
|
|
pp->green = png_get_uint_16(entry_start); entry_start += 2;
|
|
|
|
pp->blue = png_get_uint_16(entry_start); entry_start += 2;
|
|
|
|
pp->alpha = png_get_uint_16(entry_start); entry_start += 2;
|
1999-12-10 10:43:02 -05:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
pp->frequency = png_get_uint_16(entry_start); entry_start += 2;
|
|
|
|
}
|
2000-06-04 15:29:29 -04:00
|
|
|
#else
|
|
|
|
pp = new_palette.entries;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2000-06-04 15:29:29 -04:00
|
|
|
for (i = 0; i < new_palette.nentries; i++)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (new_palette.depth == 8)
|
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
pp[i].red = *entry_start++;
|
|
|
|
pp[i].green = *entry_start++;
|
|
|
|
pp[i].blue = *entry_start++;
|
|
|
|
pp[i].alpha = *entry_start++;
|
2000-06-04 15:29:29 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2000-06-04 15:29:29 -04:00
|
|
|
else
|
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
pp[i].red = png_get_uint_16(entry_start); entry_start += 2;
|
|
|
|
pp[i].green = png_get_uint_16(entry_start); entry_start += 2;
|
|
|
|
pp[i].blue = png_get_uint_16(entry_start); entry_start += 2;
|
|
|
|
pp[i].alpha = png_get_uint_16(entry_start); entry_start += 2;
|
2000-06-04 15:29:29 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-03-21 19:05:40 -04:00
|
|
|
pp[i].frequency = png_get_uint_16(entry_start); entry_start += 2;
|
2000-06-04 15:29:29 -04:00
|
|
|
}
|
|
|
|
#endif
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Discard all chunk data except the name and stash that */
|
2008-07-21 09:05:57 -04:00
|
|
|
new_palette.name = png_ptr->chunkdata;
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2000-02-18 14:48:52 -05:00
|
|
|
png_set_sPLT(png_ptr, info_ptr, &new_palette, 1);
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
1999-12-10 10:43:02 -05:00
|
|
|
png_free(png_ptr, new_palette.entries);
|
|
|
|
}
|
|
|
|
#endif /* PNG_READ_sPLT_SUPPORTED */
|
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_tRNS_SUPPORTED
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2002-06-20 07:54:34 -04:00
|
|
|
png_byte readbuf[PNG_MAX_PALETTE_LENGTH];
|
2000-12-28 08:50:05 -05:00
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_tRNS");
|
1997-05-16 03:46:07 -04:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before tRNS");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid tRNS after IDAT");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2000-02-05 00:40:16 -05:00
|
|
|
else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
1998-02-08 21:56:40 -05:00
|
|
|
png_warning(png_ptr, "Duplicate tRNS chunk");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
1996-06-05 16:50:50 -04:00
|
|
|
|
2004-08-04 07:34:52 -04:00
|
|
|
if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2004-08-04 07:34:52 -04:00
|
|
|
png_byte buf[2];
|
|
|
|
|
|
|
|
if (length != 2)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1996-01-10 03:56:49 -05:00
|
|
|
png_warning(png_ptr, "Incorrect tRNS chunk length");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
1995-07-20 03:43:20 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2004-08-04 07:34:52 -04:00
|
|
|
png_crc_read(png_ptr, buf, 2);
|
|
|
|
png_ptr->num_trans = 1;
|
2008-10-06 11:16:17 -04:00
|
|
|
png_ptr->trans_color.gray = png_get_uint_16(buf);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
|
|
|
|
{
|
|
|
|
png_byte buf[6];
|
|
|
|
|
|
|
|
if (length != 6)
|
|
|
|
{
|
1996-01-10 03:56:49 -05:00
|
|
|
png_warning(png_ptr, "Incorrect tRNS chunk length");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
1995-07-20 03:43:20 -04:00
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_crc_read(png_ptr, buf, (png_size_t)length);
|
1998-01-01 08:13:13 -05:00
|
|
|
png_ptr->num_trans = 1;
|
2008-10-06 11:16:17 -04:00
|
|
|
png_ptr->trans_color.red = png_get_uint_16(buf);
|
|
|
|
png_ptr->trans_color.green = png_get_uint_16(buf + 2);
|
|
|
|
png_ptr->trans_color.blue = png_get_uint_16(buf + 4);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-08-04 07:34:52 -04:00
|
|
|
else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2004-08-04 07:34:52 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_PLTE))
|
|
|
|
{
|
|
|
|
/* Should be an error, but we can cope with it. */
|
|
|
|
png_warning(png_ptr, "Missing PLTE before tRNS");
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-08-04 07:34:52 -04:00
|
|
|
if (length > (png_uint_32)png_ptr->num_palette ||
|
|
|
|
length > PNG_MAX_PALETTE_LENGTH)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1996-01-10 03:56:49 -05:00
|
|
|
png_warning(png_ptr, "Incorrect tRNS chunk length");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
1996-01-26 02:38:47 -05:00
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-08-04 07:34:52 -04:00
|
|
|
if (length == 0)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Zero length tRNS chunk");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-08-04 07:34:52 -04:00
|
|
|
png_crc_read(png_ptr, readbuf, (png_size_t)length);
|
|
|
|
png_ptr->num_trans = (png_uint_16)length;
|
1996-01-26 02:38:47 -05:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1996-01-26 02:38:47 -05:00
|
|
|
else
|
1996-06-05 16:50:50 -04:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "tRNS chunk not allowed with alpha channel");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
1996-06-05 16:50:50 -04:00
|
|
|
return;
|
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_crc_finish(png_ptr, 0))
|
2007-05-15 17:16:34 -04:00
|
|
|
{
|
|
|
|
png_ptr->num_trans = 0;
|
1997-01-17 02:34:35 -05:00
|
|
|
return;
|
2007-05-15 17:16:34 -04:00
|
|
|
}
|
1997-01-17 02:34:35 -05:00
|
|
|
|
2000-12-28 08:50:05 -05:00
|
|
|
png_set_tRNS(png_ptr, info_ptr, readbuf, png_ptr->num_trans,
|
2011-01-07 19:28:47 -05:00
|
|
|
&(png_ptr->trans_color));
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_bKGD_SUPPORTED
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_size_t truelen;
|
1995-07-20 03:43:20 -04:00
|
|
|
png_byte buf[6];
|
2011-05-12 22:48:29 -04:00
|
|
|
png_color_16 background;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_bKGD");
|
1997-05-16 03:46:07 -04:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before bKGD");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid bKGD after IDAT");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
|
2011-01-07 19:28:47 -05:00
|
|
|
!(png_ptr->mode & PNG_HAVE_PLTE))
|
1996-06-05 16:50:50 -04:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Missing PLTE before bKGD");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2000-02-05 00:40:16 -05:00
|
|
|
else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD))
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Duplicate bKGD chunk");
|
|
|
|
png_crc_finish(png_ptr, length);
|
1996-06-05 16:50:50 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
|
|
|
|
truelen = 1;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
else if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
|
|
|
|
truelen = 6;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
else
|
|
|
|
truelen = 2;
|
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (length != truelen)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1996-01-26 02:38:47 -05:00
|
|
|
png_warning(png_ptr, "Incorrect bKGD chunk length");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
1995-07-20 03:43:20 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_crc_read(png_ptr, buf, truelen);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
return;
|
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
/* We convert the index value into RGB components so that we can allow
|
|
|
|
* arbitrary RGB values for background when we have transparency, and
|
|
|
|
* so it is easy to determine the RGB values of the background color
|
2011-01-07 19:28:47 -05:00
|
|
|
* from the info_ptr struct.
|
|
|
|
*/
|
1995-07-20 03:43:20 -04:00
|
|
|
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
|
1996-06-05 16:50:50 -04:00
|
|
|
{
|
2011-05-12 22:48:29 -04:00
|
|
|
background.index = buf[0];
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2008-07-10 10:13:13 -04:00
|
|
|
if (info_ptr && info_ptr->num_palette)
|
1999-09-17 13:27:26 -04:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
if (buf[0] >= info_ptr->num_palette)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Incorrect bKGD chunk index value");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-05-12 22:48:29 -04:00
|
|
|
background.red = (png_uint_16)png_ptr->palette[buf[0]].red;
|
|
|
|
background.green = (png_uint_16)png_ptr->palette[buf[0]].green;
|
|
|
|
background.blue = (png_uint_16)png_ptr->palette[buf[0]].blue;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-05-12 22:48:29 -04:00
|
|
|
else
|
|
|
|
background.red = background.green = background.blue = 0;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-05-12 22:48:29 -04:00
|
|
|
background.gray = 0;
|
1996-06-05 16:50:50 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
else if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) /* GRAY */
|
1996-06-05 16:50:50 -04:00
|
|
|
{
|
2011-05-12 22:48:29 -04:00
|
|
|
background.index = 0;
|
|
|
|
background.red =
|
|
|
|
background.green =
|
|
|
|
background.blue =
|
|
|
|
background.gray = png_get_uint_16(buf);
|
1996-06-05 16:50:50 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
else
|
|
|
|
{
|
2011-05-12 22:48:29 -04:00
|
|
|
background.index = 0;
|
|
|
|
background.red = png_get_uint_16(buf);
|
|
|
|
background.green = png_get_uint_16(buf + 2);
|
|
|
|
background.blue = png_get_uint_16(buf + 4);
|
|
|
|
background.gray = 0;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
2011-05-12 22:48:29 -04:00
|
|
|
png_set_bKGD(png_ptr, info_ptr, &background);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_hIST_SUPPORTED
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2004-07-28 09:20:44 -04:00
|
|
|
unsigned int num, i;
|
2002-06-20 07:54:34 -04:00
|
|
|
png_uint_16 readbuf[PNG_MAX_PALETTE_LENGTH];
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_hIST");
|
1997-05-16 03:46:07 -04:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before hIST");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid hIST after IDAT");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
else if (!(png_ptr->mode & PNG_HAVE_PLTE))
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Missing PLTE before hIST");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2000-02-05 00:40:16 -05:00
|
|
|
else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST))
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Duplicate hIST chunk");
|
|
|
|
png_crc_finish(png_ptr, length);
|
1996-06-05 16:50:50 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2004-07-28 09:20:44 -04:00
|
|
|
num = length / 2 ;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
|
|
|
if (num != (unsigned int)png_ptr->num_palette || num >
|
|
|
|
(unsigned int)PNG_MAX_PALETTE_LENGTH)
|
1996-01-26 02:38:47 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Incorrect hIST chunk length");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
1996-01-26 02:38:47 -05:00
|
|
|
return;
|
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1996-01-26 02:38:47 -05:00
|
|
|
for (i = 0; i < num; i++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
png_byte buf[2];
|
|
|
|
|
|
|
|
png_crc_read(png_ptr, buf, 2);
|
2000-12-28 08:50:05 -05:00
|
|
|
readbuf[i] = png_get_uint_16(buf);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1997-01-17 02:34:35 -05:00
|
|
|
|
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
return;
|
|
|
|
|
2000-12-28 08:50:05 -05:00
|
|
|
png_set_hIST(png_ptr, info_ptr, readbuf);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_pHYs_SUPPORTED
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_pHYs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
png_byte buf[9];
|
|
|
|
png_uint_32 res_x, res_y;
|
|
|
|
int unit_type;
|
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_pHYs");
|
1997-05-16 03:46:07 -04:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
2000-05-29 09:58:03 -04:00
|
|
|
png_error(png_ptr, "Missing IHDR before pHYs");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
2000-05-29 09:58:03 -04:00
|
|
|
png_warning(png_ptr, "Invalid pHYs after IDAT");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2000-02-05 00:40:16 -05:00
|
|
|
else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
2000-05-29 09:58:03 -04:00
|
|
|
png_warning(png_ptr, "Duplicate pHYs chunk");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
1996-06-05 16:50:50 -04:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
if (length != 9)
|
|
|
|
{
|
1996-01-26 02:38:47 -05:00
|
|
|
png_warning(png_ptr, "Incorrect pHYs chunk length");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
1995-07-20 03:43:20 -04:00
|
|
|
return;
|
1996-01-26 02:38:47 -05:00
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
png_crc_read(png_ptr, buf, 9);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
return;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
res_x = png_get_uint_32(buf);
|
|
|
|
res_y = png_get_uint_32(buf + 4);
|
|
|
|
unit_type = buf[8];
|
1997-05-16 03:46:07 -04:00
|
|
|
png_set_pHYs(png_ptr, info_ptr, res_x, res_y, unit_type);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_oFFs_SUPPORTED
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_oFFs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
png_byte buf[9];
|
1999-12-10 10:43:02 -05:00
|
|
|
png_int_32 offset_x, offset_y;
|
1995-07-20 03:43:20 -04:00
|
|
|
int unit_type;
|
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_oFFs");
|
1997-05-16 03:46:07 -04:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before oFFs");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid oFFs after IDAT");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2000-02-05 00:40:16 -05:00
|
|
|
else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Duplicate oFFs chunk");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
1996-06-05 16:50:50 -04:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
if (length != 9)
|
|
|
|
{
|
1996-01-26 02:38:47 -05:00
|
|
|
png_warning(png_ptr, "Incorrect oFFs chunk length");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
1995-07-20 03:43:20 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1996-01-26 02:38:47 -05:00
|
|
|
png_crc_read(png_ptr, buf, 9);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
return;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
offset_x = png_get_int_32(buf);
|
|
|
|
offset_y = png_get_int_32(buf + 4);
|
1995-07-20 03:43:20 -04:00
|
|
|
unit_type = buf[8];
|
1997-05-16 03:46:07 -04:00
|
|
|
png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y, unit_type);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_pCAL_SUPPORTED
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Read the pCAL chunk (described in the PNG Extensions document) */
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1997-05-16 03:46:07 -04:00
|
|
|
png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
|
|
|
{
|
|
|
|
png_int_32 X0, X1;
|
|
|
|
png_byte type, nparams;
|
|
|
|
png_charp buf, units, endptr;
|
|
|
|
png_charpp params;
|
1998-02-08 21:56:40 -05:00
|
|
|
png_size_t slength;
|
1997-05-16 03:46:07 -04:00
|
|
|
int i;
|
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_pCAL");
|
1997-05-16 03:46:07 -04:00
|
|
|
|
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before pCAL");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid pCAL after IDAT");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2000-02-05 00:40:16 -05:00
|
|
|
else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL))
|
1997-05-16 03:46:07 -04:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Duplicate pCAL chunk");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
png_debug1(2, "Allocating and reading pCAL chunk data (%u bytes)",
|
|
|
|
length + 1);
|
2008-07-21 11:34:34 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-01-06 10:01:04 -05:00
|
|
|
if (png_ptr->chunkdata == NULL)
|
2011-01-07 19:28:47 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "No memory for pCAL purpose");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1998-02-08 21:56:40 -05:00
|
|
|
slength = (png_size_t)length;
|
2008-07-21 11:34:34 -04:00
|
|
|
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
|
1997-05-16 03:46:07 -04:00
|
|
|
|
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
{
|
2008-07-21 11:34:34 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
1997-05-16 03:46:07 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
png_ptr->chunkdata[slength] = 0x00; /* Null terminate the last string */
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(3, "Finding end of pCAL purpose string");
|
2008-07-21 11:34:34 -04:00
|
|
|
for (buf = png_ptr->chunkdata; *buf; buf++)
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Empty loop */ ;
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2008-07-21 11:34:34 -04:00
|
|
|
endptr = png_ptr->chunkdata + slength;
|
1997-05-16 03:46:07 -04:00
|
|
|
|
|
|
|
/* We need to have at least 12 bytes after the purpose string
|
2011-01-07 19:28:47 -05:00
|
|
|
* in order to get the parameter information.
|
|
|
|
*/
|
1997-05-16 03:46:07 -04:00
|
|
|
if (endptr <= buf + 12)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid pCAL data");
|
2008-07-21 11:34:34 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
1997-05-16 03:46:07 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(3, "Reading pCAL X0, X1, type, nparams, and units");
|
1997-05-16 03:46:07 -04:00
|
|
|
X0 = png_get_int_32((png_bytep)buf+1);
|
|
|
|
X1 = png_get_int_32((png_bytep)buf+5);
|
|
|
|
type = buf[9];
|
|
|
|
nparams = buf[10];
|
|
|
|
units = buf + 11;
|
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(3, "Checking pCAL equation type and number of parameters");
|
1997-05-16 03:46:07 -04:00
|
|
|
/* Check that we have the right number of parameters for known
|
2011-01-07 19:28:47 -05:00
|
|
|
* equation types.
|
|
|
|
*/
|
1997-05-16 03:46:07 -04:00
|
|
|
if ((type == PNG_EQUATION_LINEAR && nparams != 2) ||
|
|
|
|
(type == PNG_EQUATION_BASE_E && nparams != 3) ||
|
|
|
|
(type == PNG_EQUATION_ARBITRARY && nparams != 3) ||
|
|
|
|
(type == PNG_EQUATION_HYPERBOLIC && nparams != 4))
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid pCAL parameters for equation type");
|
2008-07-21 11:34:34 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
1997-05-16 03:46:07 -04:00
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
else if (type >= PNG_EQUATION_LAST)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
|
|
|
|
}
|
|
|
|
|
1998-04-21 16:03:57 -04:00
|
|
|
for (buf = units; *buf; buf++)
|
1998-03-15 19:20:23 -05:00
|
|
|
/* Empty loop to move past the units string. */ ;
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(3, "Allocating pCAL parameters array");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2006-08-19 14:59:24 -04:00
|
|
|
params = (png_charpp)png_malloc_warn(png_ptr,
|
2011-01-07 19:28:47 -05:00
|
|
|
(png_size_t)(nparams * png_sizeof(png_charp)));
|
|
|
|
|
2002-05-25 12:12:10 -04:00
|
|
|
if (params == NULL)
|
2011-01-07 19:28:47 -05:00
|
|
|
{
|
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
|
|
|
png_warning(png_ptr, "No memory for pCAL params");
|
|
|
|
return;
|
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
|
|
|
|
/* Get pointers to the start of each parameter string. */
|
1998-02-07 11:20:57 -05:00
|
|
|
for (i = 0; i < (int)nparams; i++)
|
1997-05-16 03:46:07 -04:00
|
|
|
{
|
|
|
|
buf++; /* Skip the null string terminator from previous parameter. */
|
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug1(3, "Reading pCAL parameter %d", i);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2008-07-10 10:13:13 -04:00
|
|
|
for (params[i] = buf; buf <= endptr && *buf != 0x00; buf++)
|
1998-03-15 19:20:23 -05:00
|
|
|
/* Empty loop to move past each parameter string */ ;
|
1997-05-16 03:46:07 -04:00
|
|
|
|
|
|
|
/* Make sure we haven't run out of data yet */
|
|
|
|
if (buf > endptr)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid pCAL data");
|
2008-07-21 11:34:34 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
1997-05-16 03:46:07 -04:00
|
|
|
png_free(png_ptr, params);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-21 11:34:34 -04:00
|
|
|
png_set_pCAL(png_ptr, info_ptr, png_ptr->chunkdata, X0, X1, type, nparams,
|
1997-05-16 03:46:07 -04:00
|
|
|
units, params);
|
|
|
|
|
2008-07-21 11:34:34 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
1997-05-16 03:46:07 -04:00
|
|
|
png_free(png_ptr, params);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_sCAL_SUPPORTED
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Read the sCAL chunk */
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1999-12-10 10:43:02 -05:00
|
|
|
png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
|
|
|
{
|
2011-01-16 20:32:22 -05:00
|
|
|
png_size_t slength, i;
|
2011-01-07 19:28:47 -05:00
|
|
|
int state;
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_sCAL");
|
1999-12-10 10:43:02 -05:00
|
|
|
|
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before sCAL");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid sCAL after IDAT");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2000-02-05 00:40:16 -05:00
|
|
|
else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL))
|
1999-12-10 10:43:02 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Duplicate sCAL chunk");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-06-10 18:45:48 -04:00
|
|
|
/* Need unit type, width, \0, height: minimum 4 bytes */
|
|
|
|
else if (length < 4)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "sCAL chunk too short");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
png_debug1(2, "Allocating and reading sCAL chunk data (%u bytes)",
|
2008-07-10 10:13:13 -04:00
|
|
|
length + 1);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2008-07-21 11:34:34 -04:00
|
|
|
png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2008-07-21 11:34:34 -04:00
|
|
|
if (png_ptr->chunkdata == NULL)
|
2008-07-10 10:13:13 -04:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Out of memory while processing sCAL chunk");
|
2011-01-07 19:28:47 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
2008-07-10 10:13:13 -04:00
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
slength = (png_size_t)length;
|
2008-07-21 11:34:34 -04:00
|
|
|
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
|
2011-01-07 19:28:47 -05:00
|
|
|
png_ptr->chunkdata[slength] = 0x00; /* Null terminate the last string */
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2010-07-29 18:39:14 -04:00
|
|
|
if (png_crc_finish(png_ptr, 0))
|
2000-04-14 15:20:47 -04:00
|
|
|
{
|
2010-06-22 14:03:32 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
2008-07-10 10:13:13 -04:00
|
|
|
return;
|
2000-04-14 15:20:47 -04:00
|
|
|
}
|
2010-05-06 10:44:04 -04:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* Validate the unit. */
|
|
|
|
if (png_ptr->chunkdata[0] != 1 && png_ptr->chunkdata[0] != 2)
|
2006-08-19 14:59:24 -04:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_warning(png_ptr, "Invalid sCAL ignored: invalid unit");
|
2010-06-22 14:03:32 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
2006-08-19 14:59:24 -04:00
|
|
|
return;
|
|
|
|
}
|
2010-05-06 10:44:04 -04:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* Validate the ASCII numbers, need two ASCII numbers separated by
|
|
|
|
* a '\0' and they need to fit exactly in the chunk data.
|
|
|
|
*/
|
2011-06-10 18:45:48 -04:00
|
|
|
i = 1;
|
2011-01-07 19:28:47 -05:00
|
|
|
state = 0;
|
2010-10-23 18:29:13 -04:00
|
|
|
|
2011-06-18 14:37:11 -04:00
|
|
|
if (!png_check_fp_number(png_ptr->chunkdata, slength, &state, &i) ||
|
2011-01-16 20:32:22 -05:00
|
|
|
i >= slength || png_ptr->chunkdata[i++] != 0)
|
2011-01-07 19:28:47 -05:00
|
|
|
png_warning(png_ptr, "Invalid sCAL chunk ignored: bad width format");
|
|
|
|
|
2011-06-18 14:37:11 -04:00
|
|
|
else if (!PNG_FP_IS_POSITIVE(state))
|
|
|
|
png_warning(png_ptr, "Invalid sCAL chunk ignored: non-positive width");
|
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
else
|
1999-12-10 10:43:02 -05:00
|
|
|
{
|
2011-01-16 20:32:22 -05:00
|
|
|
png_size_t heighti = i;
|
2010-10-23 18:29:13 -04:00
|
|
|
|
2011-06-10 18:45:48 -04:00
|
|
|
state = 0;
|
2011-06-18 14:37:11 -04:00
|
|
|
if (!png_check_fp_number(png_ptr->chunkdata, slength, &state, &i) ||
|
2011-01-16 20:32:22 -05:00
|
|
|
i != slength)
|
2011-01-07 19:28:47 -05:00
|
|
|
png_warning(png_ptr, "Invalid sCAL chunk ignored: bad height format");
|
2010-10-23 18:29:13 -04:00
|
|
|
|
2011-06-18 14:37:11 -04:00
|
|
|
else if (!PNG_FP_IS_POSITIVE(state))
|
|
|
|
png_warning(png_ptr,
|
|
|
|
"Invalid sCAL chunk ignored: non-positive height");
|
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
else
|
|
|
|
/* This is the (only) success case. */
|
|
|
|
png_set_sCAL_s(png_ptr, info_ptr, png_ptr->chunkdata[0],
|
|
|
|
png_ptr->chunkdata+1, png_ptr->chunkdata+heighti);
|
|
|
|
}
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* Clean up - just free the temporarily allocated buffer. */
|
2008-07-21 11:34:34 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
1999-12-10 10:43:02 -05:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_tIME_SUPPORTED
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_tIME(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
png_byte buf[7];
|
|
|
|
png_time mod_time;
|
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_tIME");
|
1997-05-16 03:46:07 -04:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
1997-01-17 02:34:35 -05:00
|
|
|
png_error(png_ptr, "Out of place tIME chunk");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2000-02-05 00:40:16 -05:00
|
|
|
else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME))
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Duplicate tIME chunk");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
png_ptr->mode |= PNG_AFTER_IDAT;
|
1996-06-05 16:50:50 -04:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
if (length != 7)
|
|
|
|
{
|
1996-01-26 02:38:47 -05:00
|
|
|
png_warning(png_ptr, "Incorrect tIME chunk length");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
1995-07-20 03:43:20 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
png_crc_read(png_ptr, buf, 7);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
return;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
mod_time.second = buf[6];
|
|
|
|
mod_time.minute = buf[5];
|
|
|
|
mod_time.hour = buf[4];
|
|
|
|
mod_time.day = buf[3];
|
|
|
|
mod_time.month = buf[2];
|
1996-01-26 02:38:47 -05:00
|
|
|
mod_time.year = png_get_uint_16(buf);
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_set_tIME(png_ptr, info_ptr, &mod_time);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_tEXt_SUPPORTED
|
1997-05-16 03:46:07 -04:00
|
|
|
/* Note: this does not properly handle chunks that are > 64K under DOS */
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_textp text_ptr;
|
1996-01-26 02:38:47 -05:00
|
|
|
png_charp key;
|
1995-12-19 04:22:19 -05:00
|
|
|
png_charp text;
|
1997-05-16 03:46:07 -04:00
|
|
|
png_uint_32 skip = 0;
|
1998-02-08 21:56:40 -05:00
|
|
|
png_size_t slength;
|
2002-05-25 12:12:10 -04:00
|
|
|
int ret;
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_tEXt");
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2010-02-07 19:08:50 -05:00
|
|
|
#ifdef PNG_USER_LIMITS_SUPPORTED
|
2008-08-20 18:25:21 -04:00
|
|
|
if (png_ptr->user_chunk_cache_max != 0)
|
|
|
|
{
|
|
|
|
if (png_ptr->user_chunk_cache_max == 1)
|
|
|
|
{
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2008-08-20 18:25:21 -04:00
|
|
|
if (--png_ptr->user_chunk_cache_max == 1)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "No space in chunk cache for tEXt");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before tEXt");
|
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
png_ptr->mode |= PNG_AFTER_IDAT;
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
#ifdef PNG_MAX_MALLOC_64K
|
1998-01-01 08:13:13 -05:00
|
|
|
if (length > (png_uint_32)65535L)
|
1997-05-16 03:46:07 -04:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "tEXt chunk too large to fit in memory");
|
1998-01-01 08:13:13 -05:00
|
|
|
skip = length - (png_uint_32)65535L;
|
|
|
|
length = (png_uint_32)65535L;
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-10-25 21:03:28 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
|
|
|
|
png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2008-10-25 21:03:28 -04:00
|
|
|
if (png_ptr->chunkdata == NULL)
|
2002-05-25 12:12:10 -04:00
|
|
|
{
|
2006-08-19 14:59:24 -04:00
|
|
|
png_warning(png_ptr, "No memory to process text chunk");
|
2002-05-25 12:12:10 -04:00
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1998-02-08 21:56:40 -05:00
|
|
|
slength = (png_size_t)length;
|
2008-10-25 21:03:28 -04:00
|
|
|
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
|
1997-05-16 03:46:07 -04:00
|
|
|
|
|
|
|
if (png_crc_finish(png_ptr, skip))
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
2008-10-25 21:03:28 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
1997-01-17 02:34:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-10-25 21:03:28 -04:00
|
|
|
key = png_ptr->chunkdata;
|
|
|
|
|
1998-02-08 21:56:40 -05:00
|
|
|
key[slength] = 0x00;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
for (text = key; *text; text++)
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Empty loop to find end of key */ ;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1998-02-08 21:56:40 -05:00
|
|
|
if (text != key + slength)
|
1995-07-20 03:43:20 -04:00
|
|
|
text++;
|
|
|
|
|
2008-07-10 10:13:13 -04:00
|
|
|
text_ptr = (png_textp)png_malloc_warn(png_ptr,
|
2011-01-07 19:28:47 -05:00
|
|
|
png_sizeof(png_text));
|
|
|
|
|
2002-05-25 12:12:10 -04:00
|
|
|
if (text_ptr == NULL)
|
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_warning(png_ptr, "Not enough memory to process text chunk");
|
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
|
|
|
return;
|
2002-05-25 12:12:10 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
|
|
|
|
text_ptr->key = key;
|
2000-02-05 00:40:16 -05:00
|
|
|
text_ptr->lang = NULL;
|
|
|
|
text_ptr->lang_key = NULL;
|
2000-05-06 15:09:57 -04:00
|
|
|
text_ptr->itxt_length = 0;
|
1997-05-16 03:46:07 -04:00
|
|
|
text_ptr->text = text;
|
2000-02-05 00:40:16 -05:00
|
|
|
text_ptr->text_length = png_strlen(text);
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2008-07-10 10:13:13 -04:00
|
|
|
ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2008-10-25 21:03:28 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
2001-04-20 11:32:10 -04:00
|
|
|
png_free(png_ptr, text_ptr);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2002-05-25 12:12:10 -04:00
|
|
|
if (ret)
|
2011-01-07 19:28:47 -05:00
|
|
|
png_warning(png_ptr, "Insufficient memory to process text chunk");
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_zTXt_SUPPORTED
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Note: this does not correctly handle chunks that are > 64K under DOS */
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_textp text_ptr;
|
1995-12-19 04:22:19 -05:00
|
|
|
png_charp text;
|
2000-03-21 06:13:06 -05:00
|
|
|
int comp_type;
|
2002-05-25 12:12:10 -04:00
|
|
|
int ret;
|
2000-04-01 22:10:05 -05:00
|
|
|
png_size_t slength, prefix_len, data_len;
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_zTXt");
|
2008-08-20 18:25:21 -04:00
|
|
|
|
2010-02-07 19:08:50 -05:00
|
|
|
#ifdef PNG_USER_LIMITS_SUPPORTED
|
2008-08-20 18:25:21 -04:00
|
|
|
if (png_ptr->user_chunk_cache_max != 0)
|
|
|
|
{
|
|
|
|
if (png_ptr->user_chunk_cache_max == 1)
|
|
|
|
{
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2008-08-20 18:25:21 -04:00
|
|
|
if (--png_ptr->user_chunk_cache_max == 1)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "No space in chunk cache for zTXt");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before zTXt");
|
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
png_ptr->mode |= PNG_AFTER_IDAT;
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
#ifdef PNG_MAX_MALLOC_64K
|
|
|
|
/* We will no doubt have problems with chunks even half this size, but
|
2011-01-07 19:28:47 -05:00
|
|
|
* there is no hard and fast rule to tell us where to stop.
|
|
|
|
*/
|
1998-01-01 08:13:13 -05:00
|
|
|
if (length > (png_uint_32)65535L)
|
1997-05-16 03:46:07 -04:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_warning(png_ptr, "zTXt chunk too large to fit in memory");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-10-25 21:03:28 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
2008-07-21 09:05:57 -04:00
|
|
|
png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
if (png_ptr->chunkdata == NULL)
|
2002-05-25 12:12:10 -04:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_warning(png_ptr, "Out of memory processing zTXt chunk");
|
|
|
|
return;
|
2002-05-25 12:12:10 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2002-05-25 12:12:10 -04:00
|
|
|
slength = (png_size_t)length;
|
2008-07-21 09:05:57 -04:00
|
|
|
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
{
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
1997-01-17 02:34:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
png_ptr->chunkdata[slength] = 0x00;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
for (text = png_ptr->chunkdata; *text; text++)
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Empty loop */ ;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
/* zTXt must have some text after the chunkdataword */
|
2008-07-21 09:05:57 -04:00
|
|
|
if (text >= png_ptr->chunkdata + slength - 2)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2008-07-10 10:13:13 -04:00
|
|
|
png_warning(png_ptr, "Truncated zTXt chunk");
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
2008-07-10 10:13:13 -04:00
|
|
|
return;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
else
|
1996-06-05 16:50:50 -04:00
|
|
|
{
|
1999-12-10 10:43:02 -05:00
|
|
|
comp_type = *(++text);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2000-12-23 15:27:39 -05:00
|
|
|
if (comp_type != PNG_TEXT_COMPRESSION_zTXt)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Unknown compression type in zTXt chunk");
|
|
|
|
comp_type = PNG_TEXT_COMPRESSION_zTXt;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
text++; /* Skip the compression_method byte */
|
1999-12-10 10:43:02 -05:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
prefix_len = text - png_ptr->chunkdata;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2008-07-25 09:51:18 -04:00
|
|
|
png_decompress_chunk(png_ptr, comp_type,
|
2011-01-07 19:28:47 -05:00
|
|
|
(png_size_t)length, prefix_len, &data_len);
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2008-07-10 10:13:13 -04:00
|
|
|
text_ptr = (png_textp)png_malloc_warn(png_ptr,
|
2011-01-07 19:28:47 -05:00
|
|
|
png_sizeof(png_text));
|
|
|
|
|
2002-05-25 12:12:10 -04:00
|
|
|
if (text_ptr == NULL)
|
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_warning(png_ptr, "Not enough memory to process zTXt chunk");
|
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
|
|
|
return;
|
2002-05-25 12:12:10 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2001-04-20 11:32:10 -04:00
|
|
|
text_ptr->compression = comp_type;
|
2008-07-21 09:05:57 -04:00
|
|
|
text_ptr->key = png_ptr->chunkdata;
|
2001-04-20 11:32:10 -04:00
|
|
|
text_ptr->lang = NULL;
|
|
|
|
text_ptr->lang_key = NULL;
|
|
|
|
text_ptr->itxt_length = 0;
|
2008-07-21 09:05:57 -04:00
|
|
|
text_ptr->text = png_ptr->chunkdata + prefix_len;
|
2001-04-20 11:32:10 -04:00
|
|
|
text_ptr->text_length = data_len;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2008-07-10 10:13:13 -04:00
|
|
|
ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
|
1996-06-05 16:50:50 -04:00
|
|
|
|
2001-04-20 11:32:10 -04:00
|
|
|
png_free(png_ptr, text_ptr);
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2002-05-25 12:12:10 -04:00
|
|
|
if (ret)
|
2011-01-07 19:28:47 -05:00
|
|
|
png_error(png_ptr, "Insufficient memory to store zTXt chunk");
|
1999-12-10 10:43:02 -05:00
|
|
|
}
|
|
|
|
#endif
|
1996-06-05 16:50:50 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_iTXt_SUPPORTED
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Note: this does not correctly handle chunks that are > 64K under DOS */
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1999-12-10 10:43:02 -05:00
|
|
|
png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
|
|
|
{
|
|
|
|
png_textp text_ptr;
|
2000-02-05 00:40:16 -05:00
|
|
|
png_charp key, lang, text, lang_key;
|
2000-03-21 06:13:06 -05:00
|
|
|
int comp_flag;
|
2000-02-05 00:40:16 -05:00
|
|
|
int comp_type = 0;
|
2002-05-25 12:12:10 -04:00
|
|
|
int ret;
|
2000-04-01 22:10:05 -05:00
|
|
|
png_size_t slength, prefix_len, data_len;
|
1996-06-05 16:50:50 -04:00
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_iTXt");
|
1996-06-05 16:50:50 -04:00
|
|
|
|
2010-02-07 19:08:50 -05:00
|
|
|
#ifdef PNG_USER_LIMITS_SUPPORTED
|
2008-08-20 18:25:21 -04:00
|
|
|
if (png_ptr->user_chunk_cache_max != 0)
|
|
|
|
{
|
|
|
|
if (png_ptr->user_chunk_cache_max == 1)
|
|
|
|
{
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2008-08-20 18:25:21 -04:00
|
|
|
if (--png_ptr->user_chunk_cache_max == 1)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "No space in chunk cache for iTXt");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before iTXt");
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
png_ptr->mode |= PNG_AFTER_IDAT;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
#ifdef PNG_MAX_MALLOC_64K
|
|
|
|
/* We will no doubt have problems with chunks even half this size, but
|
2011-01-07 19:28:47 -05:00
|
|
|
* there is no hard and fast rule to tell us where to stop.
|
|
|
|
*/
|
1999-12-10 10:43:02 -05:00
|
|
|
if (length > (png_uint_32)65535L)
|
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_warning(png_ptr, "iTXt chunk too large to fit in memory");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1999-12-10 10:43:02 -05:00
|
|
|
#endif
|
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
if (png_ptr->chunkdata == NULL)
|
2002-05-25 12:12:10 -04:00
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_warning(png_ptr, "No memory to process iTXt chunk");
|
|
|
|
return;
|
2002-05-25 12:12:10 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2001-04-20 11:32:10 -04:00
|
|
|
slength = (png_size_t)length;
|
2008-07-21 09:05:57 -04:00
|
|
|
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
if (png_crc_finish(png_ptr, 0))
|
1997-05-16 03:46:07 -04:00
|
|
|
{
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
1999-12-10 10:43:02 -05:00
|
|
|
return;
|
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
png_ptr->chunkdata[slength] = 0x00;
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
for (lang = png_ptr->chunkdata; *lang; lang++)
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Empty loop */ ;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
lang++; /* Skip NUL separator */
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2000-02-05 00:40:16 -05:00
|
|
|
/* iTXt must have a language tag (possibly empty), two compression bytes,
|
2009-05-20 13:45:29 -04:00
|
|
|
* translated keyword (possibly empty), and possibly some text after the
|
|
|
|
* keyword
|
|
|
|
*/
|
2000-02-05 00:40:16 -05:00
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
if (lang >= png_ptr->chunkdata + slength - 3)
|
1999-12-10 10:43:02 -05:00
|
|
|
{
|
2008-07-10 10:13:13 -04:00
|
|
|
png_warning(png_ptr, "Truncated iTXt chunk");
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
2008-07-10 10:13:13 -04:00
|
|
|
return;
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
else
|
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
comp_flag = *lang++;
|
|
|
|
comp_type = *lang++;
|
1999-12-10 10:43:02 -05:00
|
|
|
}
|
|
|
|
|
2000-02-05 00:40:16 -05:00
|
|
|
for (lang_key = lang; *lang_key; lang_key++)
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Empty loop */ ;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
lang_key++; /* Skip NUL separator */
|
2000-02-05 00:40:16 -05:00
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
if (lang_key >= png_ptr->chunkdata + slength)
|
2008-07-10 10:13:13 -04:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Truncated iTXt chunk");
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
2008-07-10 10:13:13 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2000-02-05 00:40:16 -05:00
|
|
|
for (text = lang_key; *text; text++)
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Empty loop */ ;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
text++; /* Skip NUL separator */
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
if (text >= png_ptr->chunkdata + slength)
|
2008-07-10 10:13:13 -04:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Malformed iTXt chunk");
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
2008-07-10 10:13:13 -04:00
|
|
|
return;
|
|
|
|
}
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
prefix_len = text - png_ptr->chunkdata;
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
key=png_ptr->chunkdata;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
if (comp_flag)
|
2011-01-07 19:28:47 -05:00
|
|
|
png_decompress_chunk(png_ptr, comp_type,
|
|
|
|
(size_t)length, prefix_len, &data_len);
|
|
|
|
|
2000-04-01 22:10:05 -05:00
|
|
|
else
|
2011-01-07 19:28:47 -05:00
|
|
|
data_len = png_strlen(png_ptr->chunkdata + prefix_len);
|
|
|
|
|
2008-07-10 10:13:13 -04:00
|
|
|
text_ptr = (png_textp)png_malloc_warn(png_ptr,
|
2011-01-07 19:28:47 -05:00
|
|
|
png_sizeof(png_text));
|
|
|
|
|
2002-05-25 12:12:10 -04:00
|
|
|
if (text_ptr == NULL)
|
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_warning(png_ptr, "Not enough memory to process iTXt chunk");
|
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
|
|
|
return;
|
2002-05-25 12:12:10 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2001-04-20 11:32:10 -04:00
|
|
|
text_ptr->compression = (int)comp_flag + 1;
|
2008-07-21 09:05:57 -04:00
|
|
|
text_ptr->lang_key = png_ptr->chunkdata + (lang_key - key);
|
|
|
|
text_ptr->lang = png_ptr->chunkdata + (lang - key);
|
2001-04-20 11:32:10 -04:00
|
|
|
text_ptr->itxt_length = data_len;
|
|
|
|
text_ptr->text_length = 0;
|
2008-07-21 09:05:57 -04:00
|
|
|
text_ptr->key = png_ptr->chunkdata;
|
|
|
|
text_ptr->text = png_ptr->chunkdata + prefix_len;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2008-07-10 10:13:13 -04:00
|
|
|
ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2001-04-20 11:32:10 -04:00
|
|
|
png_free(png_ptr, text_ptr);
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2002-05-25 12:12:10 -04:00
|
|
|
if (ret)
|
2011-01-07 19:28:47 -05:00
|
|
|
png_error(png_ptr, "Insufficient memory to store iTXt chunk");
|
1999-12-10 10:43:02 -05:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
/* This function is called when we haven't found a handler for a
|
2011-01-07 19:28:47 -05:00
|
|
|
* chunk. If there isn't a problem with the chunk itself (ie bad
|
|
|
|
* chunk name, CRC, or a critical chunk), the chunk is silently ignored
|
|
|
|
* -- unless the PNG_FLAG_UNKNOWN_CHUNKS_SUPPORTED flag is on in which
|
|
|
|
* case it will be saved away to be written out later.
|
|
|
|
*/
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
|
|
|
{
|
1999-12-10 10:43:02 -05:00
|
|
|
png_uint_32 skip = 0;
|
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_handle_unknown");
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2010-02-07 19:08:50 -05:00
|
|
|
#ifdef PNG_USER_LIMITS_SUPPORTED
|
2008-08-20 18:25:21 -04:00
|
|
|
if (png_ptr->user_chunk_cache_max != 0)
|
|
|
|
{
|
|
|
|
if (png_ptr->user_chunk_cache_max == 1)
|
|
|
|
{
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2008-08-20 18:25:21 -04:00
|
|
|
if (--png_ptr->user_chunk_cache_max == 1)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "No space in chunk cache for unknown chunk");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
if (png_ptr->mode & PNG_HAVE_IDAT)
|
2000-02-05 00:40:16 -05:00
|
|
|
{
|
2011-09-22 13:41:58 -04:00
|
|
|
if (png_ptr->chunk_name != png_IDAT)
|
2000-02-05 00:40:16 -05:00
|
|
|
png_ptr->mode |= PNG_AFTER_IDAT;
|
|
|
|
}
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2011-09-22 13:41:58 -04:00
|
|
|
if (PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
|
2011-09-22 13:41:58 -04:00
|
|
|
if (png_chunk_unknown_handling(png_ptr, png_ptr->chunk_name) !=
|
2011-01-07 19:28:47 -05:00
|
|
|
PNG_HANDLE_CHUNK_ALWAYS
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
|
2011-01-07 19:28:47 -05:00
|
|
|
&& png_ptr->read_user_chunk_fn == NULL
|
2000-02-05 00:40:16 -05:00
|
|
|
#endif
|
2011-01-07 19:28:47 -05:00
|
|
|
)
|
2000-05-01 10:31:54 -04:00
|
|
|
#endif
|
2011-01-07 19:28:47 -05:00
|
|
|
png_chunk_error(png_ptr, "unknown critical chunk");
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
|
2009-06-13 11:05:05 -04:00
|
|
|
if ((png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
|
2009-06-13 11:05:05 -04:00
|
|
|
|| (png_ptr->read_user_chunk_fn != NULL)
|
|
|
|
#endif
|
2011-01-07 19:28:47 -05:00
|
|
|
)
|
1999-12-10 10:43:02 -05:00
|
|
|
{
|
|
|
|
#ifdef PNG_MAX_MALLOC_64K
|
2011-09-22 13:41:58 -04:00
|
|
|
if (length > 65535)
|
2011-01-07 19:28:47 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "unknown chunk too large to fit in memory");
|
2011-09-22 13:41:58 -04:00
|
|
|
skip = length - 65535;
|
|
|
|
length = 65535;
|
2011-01-07 19:28:47 -05:00
|
|
|
}
|
1999-12-10 10:43:02 -05:00
|
|
|
#endif
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-09-22 13:41:58 -04:00
|
|
|
/* TODO: this code is very close to the unknown handling in pngpread.c,
|
|
|
|
* maybe it can be put into a common utility routine?
|
|
|
|
* png_struct::unknown_chunk is just used as a temporary variable, along
|
|
|
|
* with the data into which the chunk is read. These can be eliminated.
|
|
|
|
*/
|
|
|
|
PNG_CSTRING_FROM_CHUNK(png_ptr->unknown_chunk.name, png_ptr->chunk_name);
|
2011-01-07 19:28:47 -05:00
|
|
|
png_ptr->unknown_chunk.size = (png_size_t)length;
|
|
|
|
|
|
|
|
if (length == 0)
|
2008-07-10 10:13:13 -04:00
|
|
|
png_ptr->unknown_chunk.data = NULL;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
|
|
|
else
|
|
|
|
{
|
2008-07-10 10:13:13 -04:00
|
|
|
png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
|
2011-09-22 13:41:58 -04:00
|
|
|
png_crc_read(png_ptr, png_ptr->unknown_chunk.data, length);
|
2011-01-07 19:28:47 -05:00
|
|
|
}
|
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
|
2011-01-07 19:28:47 -05:00
|
|
|
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)
|
|
|
|
{
|
2011-09-22 13:41:58 -04:00
|
|
|
if (PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
|
2011-01-07 19:28:47 -05:00
|
|
|
{
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
|
2011-09-22 13:41:58 -04:00
|
|
|
if (png_chunk_unknown_handling(png_ptr, png_ptr->chunk_name) !=
|
2011-01-07 19:28:47 -05:00
|
|
|
PNG_HANDLE_CHUNK_ALWAYS)
|
2009-06-13 11:05:05 -04:00
|
|
|
#endif
|
2011-01-07 19:28:47 -05:00
|
|
|
png_chunk_error(png_ptr, "unknown critical chunk");
|
|
|
|
}
|
|
|
|
|
|
|
|
png_set_unknown_chunks(png_ptr, info_ptr,
|
|
|
|
&png_ptr->unknown_chunk, 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
2000-02-05 00:40:16 -05:00
|
|
|
#endif
|
2011-01-07 19:28:47 -05:00
|
|
|
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;
|
1999-12-10 10:43:02 -05:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
else
|
|
|
|
#endif
|
2000-02-05 00:40:16 -05:00
|
|
|
skip = length;
|
1998-02-08 21:56:40 -05:00
|
|
|
|
1999-12-10 10:43:02 -05:00
|
|
|
png_crc_finish(png_ptr, skip);
|
2000-02-05 00:40:16 -05:00
|
|
|
|
2009-09-23 12:32:37 -04:00
|
|
|
#ifndef PNG_READ_USER_CHUNKS_SUPPORTED
|
2011-01-07 19:28:47 -05:00
|
|
|
PNG_UNUSED(info_ptr) /* Quiet compiler warnings about unused info_ptr */
|
2000-02-05 00:40:16 -05:00
|
|
|
#endif
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
/* This function is called to verify that a chunk name is valid.
|
2011-01-07 19:28:47 -05:00
|
|
|
* This function can't have the "critical chunk check" incorporated
|
|
|
|
* into it, since in the future we will need to be able to call user
|
|
|
|
* functions to handle unknown critical chunks after we check that
|
|
|
|
* the chunk name itself is valid.
|
|
|
|
*/
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2011-09-22 13:41:58 -04:00
|
|
|
/* Bit hacking: the test for an invalid byte in the 4 byte chunk name is:
|
|
|
|
*
|
|
|
|
* ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
|
|
|
|
*/
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
2011-09-22 13:41:58 -04:00
|
|
|
png_check_chunk_name(png_structp png_ptr, png_uint_32 chunk_name)
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
2011-09-22 13:41:58 -04:00
|
|
|
int i;
|
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_check_chunk_name");
|
2011-09-22 13:41:58 -04:00
|
|
|
|
|
|
|
for (i=1; i<=4; ++i)
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
2011-09-22 13:41:58 -04:00
|
|
|
int c = chunk_name & 0xff;
|
|
|
|
|
|
|
|
if (c < 65 || c > 122 || (c > 90 && c < 97))
|
|
|
|
png_chunk_error(png_ptr, "invalid chunk type");
|
|
|
|
|
|
|
|
chunk_name >>= 8;
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-06-14 15:43:31 -04:00
|
|
|
/* Combines the row recently read in with the existing pixels in the
|
2011-01-07 19:28:47 -05:00
|
|
|
* row. This routine takes care of alpha and transparency if requested.
|
|
|
|
* This routine also handles the two methods of progressive display
|
|
|
|
* of interlaced images, depending on the mask value.
|
|
|
|
* The mask value describes which pixels are to be combined with
|
|
|
|
* the row. The pattern always repeats every 8 pixels, so just 8
|
|
|
|
* bits are needed. A one indicates the pixel is to be combined,
|
|
|
|
* a zero indicates the pixel is to be skipped. This is in addition
|
|
|
|
* to any alpha or transparency value associated with the pixel. If
|
|
|
|
* you want all pixels to be combined, pass 0xff (255) in mask.
|
|
|
|
*/
|
2008-07-10 10:13:13 -04:00
|
|
|
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
2001-01-12 16:13:06 -05:00
|
|
|
png_combine_row(png_structp png_ptr, png_bytep row, int mask)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2011-09-22 13:41:58 -04:00
|
|
|
int pixel_depth = png_ptr->transformed_pixel_depth;
|
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_combine_row");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-09-22 13:41:58 -04:00
|
|
|
/* Added in 1.5.6: it should not be possible to enter this routine until at
|
|
|
|
* least one row has been read from the PNG data and transformed.
|
|
|
|
*/
|
|
|
|
if (pixel_depth == 0)
|
|
|
|
png_error(png_ptr, "internal row logic error");
|
|
|
|
|
|
|
|
/* Added in 1.5.4: the pixel depth should match the information returned by
|
|
|
|
* any call to png_read_update_info at this point. Do not continue if we got
|
2011-05-15 19:52:39 -04:00
|
|
|
* this wrong.
|
|
|
|
*/
|
|
|
|
if (png_ptr->info_rowbytes != 0 && png_ptr->info_rowbytes !=
|
2011-09-22 13:41:58 -04:00
|
|
|
PNG_ROWBYTES(pixel_depth, png_ptr->width))
|
2011-05-15 19:52:39 -04:00
|
|
|
png_error(png_ptr, "internal row size calculation error");
|
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
if (mask == 0xff)
|
|
|
|
{
|
1995-09-26 06:22:39 -04:00
|
|
|
png_memcpy(row, png_ptr->row_buf + 1,
|
2011-09-22 13:41:58 -04:00
|
|
|
PNG_ROWBYTES(pixel_depth, png_ptr->width));
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
else
|
|
|
|
{
|
2011-09-22 13:41:58 -04:00
|
|
|
switch (pixel_depth)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
case 1:
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_bytep sp = png_ptr->row_buf + 1;
|
|
|
|
png_bytep dp = row;
|
2004-11-27 19:22:29 -05:00
|
|
|
int s_inc, s_start, s_end;
|
|
|
|
int m = 0x80;
|
|
|
|
int shift;
|
1998-05-02 13:52:25 -04:00
|
|
|
png_uint_32 i;
|
2004-11-27 19:22:29 -05:00
|
|
|
png_uint_32 row_width = png_ptr->width;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_PACKSWAP_SUPPORTED
|
1997-05-16 03:46:07 -04:00
|
|
|
if (png_ptr->transformations & PNG_PACKSWAP)
|
2004-11-27 19:22:29 -05:00
|
|
|
{
|
|
|
|
s_start = 0;
|
|
|
|
s_end = 7;
|
|
|
|
s_inc = 1;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
1997-05-16 03:46:07 -04:00
|
|
|
#endif
|
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
s_start = 7;
|
|
|
|
s_end = 0;
|
|
|
|
s_inc = -1;
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
2004-11-27 19:22:29 -05:00
|
|
|
|
|
|
|
shift = s_start;
|
|
|
|
|
|
|
|
for (i = 0; i < row_width; i++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
if (m & mask)
|
|
|
|
{
|
|
|
|
int value;
|
|
|
|
|
|
|
|
value = (*sp >> shift) & 0x01;
|
|
|
|
*dp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
|
|
|
|
*dp |= (png_byte)(value << shift);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (shift == s_end)
|
|
|
|
{
|
|
|
|
shift = s_start;
|
|
|
|
sp++;
|
|
|
|
dp++;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
|
|
|
shift += s_inc;
|
|
|
|
|
|
|
|
if (m == 1)
|
|
|
|
m = 0x80;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
|
|
|
m >>= 1;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
case 2:
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_bytep sp = png_ptr->row_buf + 1;
|
|
|
|
png_bytep dp = row;
|
2004-11-27 19:22:29 -05:00
|
|
|
int s_start, s_end, s_inc;
|
2004-11-24 08:50:16 -05:00
|
|
|
int m = 0x80;
|
2004-11-27 19:22:29 -05:00
|
|
|
int shift;
|
|
|
|
png_uint_32 i;
|
|
|
|
png_uint_32 row_width = png_ptr->width;
|
|
|
|
int value;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_PACKSWAP_SUPPORTED
|
1997-05-16 03:46:07 -04:00
|
|
|
if (png_ptr->transformations & PNG_PACKSWAP)
|
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
s_start = 0;
|
|
|
|
s_end = 6;
|
|
|
|
s_inc = 2;
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
|
|
|
#endif
|
1997-05-16 03:46:07 -04:00
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
s_start = 6;
|
|
|
|
s_end = 0;
|
|
|
|
s_inc = -2;
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
2004-11-27 19:22:29 -05:00
|
|
|
|
|
|
|
shift = s_start;
|
|
|
|
|
|
|
|
for (i = 0; i < row_width; i++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
if (m & mask)
|
|
|
|
{
|
|
|
|
value = (*sp >> shift) & 0x03;
|
|
|
|
*dp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
|
|
|
|
*dp |= (png_byte)(value << shift);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (shift == s_end)
|
|
|
|
{
|
|
|
|
shift = s_start;
|
|
|
|
sp++;
|
|
|
|
dp++;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
|
|
|
shift += s_inc;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
if (m == 1)
|
|
|
|
m = 0x80;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
|
|
|
m >>= 1;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
case 4:
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_bytep sp = png_ptr->row_buf + 1;
|
|
|
|
png_bytep dp = row;
|
2004-11-27 19:22:29 -05:00
|
|
|
int s_start, s_end, s_inc;
|
2004-11-24 08:50:16 -05:00
|
|
|
int m = 0x80;
|
2004-11-27 19:22:29 -05:00
|
|
|
int shift;
|
|
|
|
png_uint_32 i;
|
|
|
|
png_uint_32 row_width = png_ptr->width;
|
|
|
|
int value;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_PACKSWAP_SUPPORTED
|
1997-05-16 03:46:07 -04:00
|
|
|
if (png_ptr->transformations & PNG_PACKSWAP)
|
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
s_start = 0;
|
|
|
|
s_end = 4;
|
|
|
|
s_inc = 4;
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
|
|
|
#endif
|
1997-05-16 03:46:07 -04:00
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
s_start = 4;
|
|
|
|
s_end = 0;
|
|
|
|
s_inc = -4;
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
2004-11-27 19:22:29 -05:00
|
|
|
shift = s_start;
|
|
|
|
|
|
|
|
for (i = 0; i < row_width; i++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
if (m & mask)
|
|
|
|
{
|
|
|
|
value = (*sp >> shift) & 0xf;
|
|
|
|
*dp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
|
|
|
|
*dp |= (png_byte)(value << shift);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (shift == s_end)
|
|
|
|
{
|
|
|
|
shift = s_start;
|
|
|
|
sp++;
|
|
|
|
dp++;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
|
|
|
shift += s_inc;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
if (m == 1)
|
|
|
|
m = 0x80;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
|
|
|
m >>= 1;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
default:
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_bytep sp = png_ptr->row_buf + 1;
|
|
|
|
png_bytep dp = row;
|
2011-09-22 13:41:58 -04:00
|
|
|
png_size_t pixel_bytes = pixel_depth >> 3;
|
1998-05-02 13:52:25 -04:00
|
|
|
png_uint_32 i;
|
2004-11-27 19:22:29 -05:00
|
|
|
png_uint_32 row_width = png_ptr->width;
|
|
|
|
png_byte m = 0x80;
|
|
|
|
|
|
|
|
for (i = 0; i < row_width; i++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
if (m & mask)
|
|
|
|
{
|
|
|
|
png_memcpy(dp, sp, pixel_bytes);
|
|
|
|
}
|
|
|
|
|
|
|
|
sp += pixel_bytes;
|
|
|
|
dp += pixel_bytes;
|
|
|
|
|
|
|
|
if (m == 1)
|
|
|
|
m = 0x80;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
|
|
|
m >>= 1;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-01-12 16:13:06 -05:00
|
|
|
#ifdef PNG_READ_INTERLACING_SUPPORTED
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
2011-09-22 13:41:58 -04:00
|
|
|
png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
|
|
|
|
png_uint_32 transformations /* Because these may affect the byte layout */)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
|
|
|
|
/* Offset to next interlace block */
|
2011-09-22 13:41:58 -04:00
|
|
|
static PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_do_read_interlace");
|
2004-11-27 19:22:29 -05:00
|
|
|
if (row != NULL && row_info != NULL)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
png_uint_32 final_width;
|
|
|
|
|
|
|
|
final_width = row_info->width * png_pass_inc[pass];
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
switch (row_info->pixel_depth)
|
|
|
|
{
|
|
|
|
case 1:
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 3);
|
|
|
|
png_bytep dp = row + (png_size_t)((final_width - 1) >> 3);
|
2004-11-27 19:22:29 -05:00
|
|
|
int sshift, dshift;
|
|
|
|
int s_start, s_end, s_inc;
|
|
|
|
int jstop = png_pass_inc[pass];
|
|
|
|
png_byte v;
|
1995-07-20 03:43:20 -04:00
|
|
|
png_uint_32 i;
|
2004-11-27 19:22:29 -05:00
|
|
|
int j;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_PACKSWAP_SUPPORTED
|
1997-05-16 03:46:07 -04:00
|
|
|
if (transformations & PNG_PACKSWAP)
|
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
sshift = (int)((row_info->width + 7) & 0x07);
|
|
|
|
dshift = (int)((final_width + 7) & 0x07);
|
|
|
|
s_start = 7;
|
|
|
|
s_end = 0;
|
|
|
|
s_inc = -1;
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
1997-05-16 03:46:07 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
sshift = 7 - (int)((row_info->width + 7) & 0x07);
|
|
|
|
dshift = 7 - (int)((final_width + 7) & 0x07);
|
|
|
|
s_start = 0;
|
|
|
|
s_end = 7;
|
|
|
|
s_inc = 1;
|
|
|
|
}
|
2004-11-24 08:50:16 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
for (i = 0; i < row_info->width; i++)
|
|
|
|
{
|
|
|
|
v = (png_byte)((*sp >> sshift) & 0x01);
|
|
|
|
for (j = 0; j < jstop; j++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
*dp &= (png_byte)((0x7f7f >> (7 - dshift)) & 0xff);
|
|
|
|
*dp |= (png_byte)(v << dshift);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
if (dshift == s_end)
|
|
|
|
{
|
|
|
|
dshift = s_start;
|
|
|
|
dp--;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
|
|
|
dshift += s_inc;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
if (sshift == s_end)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
sshift = s_start;
|
1995-07-20 03:43:20 -04:00
|
|
|
sp--;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
|
|
|
sshift += s_inc;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
case 2:
|
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
png_bytep sp = row + (png_uint_32)((row_info->width - 1) >> 2);
|
|
|
|
png_bytep dp = row + (png_uint_32)((final_width - 1) >> 2);
|
|
|
|
int sshift, dshift;
|
|
|
|
int s_start, s_end, s_inc;
|
|
|
|
int jstop = png_pass_inc[pass];
|
1997-05-16 03:46:07 -04:00
|
|
|
png_uint_32 i;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_PACKSWAP_SUPPORTED
|
1997-05-16 03:46:07 -04:00
|
|
|
if (transformations & PNG_PACKSWAP)
|
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
sshift = (int)(((row_info->width + 3) & 0x03) << 1);
|
|
|
|
dshift = (int)(((final_width + 3) & 0x03) << 1);
|
|
|
|
s_start = 6;
|
|
|
|
s_end = 0;
|
|
|
|
s_inc = -2;
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
1997-05-16 03:46:07 -04:00
|
|
|
#endif
|
2004-11-27 19:22:29 -05:00
|
|
|
{
|
|
|
|
sshift = (int)((3 - ((row_info->width + 3) & 0x03)) << 1);
|
|
|
|
dshift = (int)((3 - ((final_width + 3) & 0x03)) << 1);
|
|
|
|
s_start = 0;
|
|
|
|
s_end = 6;
|
|
|
|
s_inc = 2;
|
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
for (i = 0; i < row_info->width; i++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
png_byte v;
|
|
|
|
int j;
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
v = (png_byte)((*sp >> sshift) & 0x03);
|
|
|
|
for (j = 0; j < jstop; j++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
*dp &= (png_byte)((0x3f3f >> (6 - dshift)) & 0xff);
|
|
|
|
*dp |= (png_byte)(v << dshift);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
if (dshift == s_end)
|
|
|
|
{
|
|
|
|
dshift = s_start;
|
|
|
|
dp--;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
|
|
|
dshift += s_inc;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
if (sshift == s_end)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
sshift = s_start;
|
1995-07-20 03:43:20 -04:00
|
|
|
sp--;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
|
|
|
sshift += s_inc;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
case 4:
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 1);
|
|
|
|
png_bytep dp = row + (png_size_t)((final_width - 1) >> 1);
|
2004-11-27 19:22:29 -05:00
|
|
|
int sshift, dshift;
|
|
|
|
int s_start, s_end, s_inc;
|
1995-07-20 03:43:20 -04:00
|
|
|
png_uint_32 i;
|
2004-11-27 19:22:29 -05:00
|
|
|
int jstop = png_pass_inc[pass];
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_PACKSWAP_SUPPORTED
|
1997-05-16 03:46:07 -04:00
|
|
|
if (transformations & PNG_PACKSWAP)
|
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
sshift = (int)(((row_info->width + 1) & 0x01) << 2);
|
|
|
|
dshift = (int)(((final_width + 1) & 0x01) << 2);
|
|
|
|
s_start = 4;
|
|
|
|
s_end = 0;
|
|
|
|
s_inc = -4;
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
1997-05-16 03:46:07 -04:00
|
|
|
#endif
|
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
sshift = (int)((1 - ((row_info->width + 1) & 0x01)) << 2);
|
|
|
|
dshift = (int)((1 - ((final_width + 1) & 0x01)) << 2);
|
|
|
|
s_start = 0;
|
|
|
|
s_end = 4;
|
|
|
|
s_inc = 4;
|
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
for (i = 0; i < row_info->width; i++)
|
|
|
|
{
|
|
|
|
png_byte v = (png_byte)((*sp >> sshift) & 0xf);
|
|
|
|
int j;
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
for (j = 0; j < jstop; j++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
*dp &= (png_byte)((0xf0f >> (4 - dshift)) & 0xff);
|
|
|
|
*dp |= (png_byte)(v << dshift);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
if (dshift == s_end)
|
|
|
|
{
|
|
|
|
dshift = s_start;
|
|
|
|
dp--;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
|
|
|
dshift += s_inc;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
if (sshift == s_end)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
sshift = s_start;
|
1995-07-20 03:43:20 -04:00
|
|
|
sp--;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
else
|
|
|
|
sshift += s_inc;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_size_t pixel_bytes = (row_info->pixel_depth >> 3);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2010-02-07 19:08:50 -05:00
|
|
|
png_bytep sp = row + (png_size_t)(row_info->width - 1)
|
|
|
|
* pixel_bytes;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
png_bytep dp = row + (png_size_t)(final_width - 1) * pixel_bytes;
|
|
|
|
|
|
|
|
int jstop = png_pass_inc[pass];
|
1997-05-16 03:46:07 -04:00
|
|
|
png_uint_32 i;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
for (i = 0; i < row_info->width; i++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2004-11-27 19:22:29 -05:00
|
|
|
png_byte v[8];
|
|
|
|
int j;
|
|
|
|
|
|
|
|
png_memcpy(v, sp, pixel_bytes);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
for (j = 0; j < jstop; j++)
|
|
|
|
{
|
|
|
|
png_memcpy(dp, v, pixel_bytes);
|
|
|
|
dp -= pixel_bytes;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2004-11-27 19:22:29 -05:00
|
|
|
sp -= pixel_bytes;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
row_info->width = final_width;
|
2008-07-10 10:13:13 -04:00
|
|
|
row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, final_width);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
2009-09-23 12:32:37 -04:00
|
|
|
#ifndef PNG_READ_PACKSWAP_SUPPORTED
|
2011-01-07 19:28:47 -05:00
|
|
|
PNG_UNUSED(transformations) /* Silence compiler warning */
|
2000-05-29 09:58:03 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
2001-01-12 16:13:06 -05:00
|
|
|
#endif /* PNG_READ_INTERLACING_SUPPORTED */
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2011-09-22 13:41:58 -04:00
|
|
|
/* 1.5.6: Changed to just take a png_row_info (not png_ptr) and to ignore bad
|
|
|
|
* adaptive filter bytes.
|
|
|
|
*/
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
2011-09-22 13:41:58 -04:00
|
|
|
png_read_filter_row(png_row_infop row_info, png_bytep row,
|
|
|
|
png_const_bytep prev_row, int filter)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
|
|
|
switch (filter)
|
|
|
|
{
|
|
|
|
case PNG_FILTER_VALUE_NONE:
|
|
|
|
break;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1998-04-21 16:03:57 -04:00
|
|
|
case PNG_FILTER_VALUE_SUB:
|
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_size_t i;
|
|
|
|
png_size_t istop = row_info->rowbytes;
|
|
|
|
unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
|
1998-05-02 13:52:25 -04:00
|
|
|
png_bytep rp = row + bpp;
|
|
|
|
png_bytep lp = row;
|
1998-04-21 16:03:57 -04:00
|
|
|
|
1998-05-02 13:52:25 -04:00
|
|
|
for (i = bpp; i < istop; i++)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
1998-05-21 10:27:50 -04:00
|
|
|
*rp = (png_byte)(((int)(*rp) + (int)(*lp++)) & 0xff);
|
|
|
|
rp++;
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case PNG_FILTER_VALUE_UP:
|
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_size_t i;
|
|
|
|
png_size_t istop = row_info->rowbytes;
|
1998-05-02 13:52:25 -04:00
|
|
|
png_bytep rp = row;
|
2011-01-07 19:28:47 -05:00
|
|
|
png_const_bytep pp = prev_row;
|
1998-04-21 16:03:57 -04:00
|
|
|
|
1998-05-02 13:52:25 -04:00
|
|
|
for (i = 0; i < istop; i++)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
1998-05-21 10:27:50 -04:00
|
|
|
*rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
|
|
|
|
rp++;
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case PNG_FILTER_VALUE_AVG:
|
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_size_t i;
|
1998-05-02 13:52:25 -04:00
|
|
|
png_bytep rp = row;
|
2011-01-07 19:28:47 -05:00
|
|
|
png_const_bytep pp = prev_row;
|
1998-05-02 13:52:25 -04:00
|
|
|
png_bytep lp = row;
|
2011-01-07 19:28:47 -05:00
|
|
|
unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
|
|
|
|
png_size_t istop = row_info->rowbytes - bpp;
|
1998-04-21 16:03:57 -04:00
|
|
|
|
1998-05-02 13:52:25 -04:00
|
|
|
for (i = 0; i < bpp; i++)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
1998-05-21 10:27:50 -04:00
|
|
|
*rp = (png_byte)(((int)(*rp) +
|
2011-01-07 19:28:47 -05:00
|
|
|
((int)(*pp++) / 2 )) & 0xff);
|
|
|
|
|
1998-05-21 10:27:50 -04:00
|
|
|
rp++;
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
1998-12-29 12:47:59 -05:00
|
|
|
|
1998-05-21 10:27:50 -04:00
|
|
|
for (i = 0; i < istop; i++)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
1998-05-21 10:27:50 -04:00
|
|
|
*rp = (png_byte)(((int)(*rp) +
|
2011-01-07 19:28:47 -05:00
|
|
|
(int)(*pp++ + *lp++) / 2 ) & 0xff);
|
|
|
|
|
1998-05-21 10:27:50 -04:00
|
|
|
rp++;
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case PNG_FILTER_VALUE_PAETH:
|
|
|
|
{
|
2011-01-07 19:28:47 -05:00
|
|
|
png_size_t i;
|
1998-05-02 13:52:25 -04:00
|
|
|
png_bytep rp = row;
|
2011-01-07 19:28:47 -05:00
|
|
|
png_const_bytep pp = prev_row;
|
1998-05-02 13:52:25 -04:00
|
|
|
png_bytep lp = row;
|
2011-01-07 19:28:47 -05:00
|
|
|
png_const_bytep cp = prev_row;
|
|
|
|
unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
|
|
|
|
png_size_t istop=row_info->rowbytes - bpp;
|
1998-05-02 13:52:25 -04:00
|
|
|
|
|
|
|
for (i = 0; i < bpp; i++)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
1998-05-21 10:27:50 -04:00
|
|
|
*rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
|
|
|
|
rp++;
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
for (i = 0; i < istop; i++) /* Use leftover rp,pp */
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
|
|
|
int a, b, c, pa, pb, pc, p;
|
|
|
|
|
1998-05-02 13:52:25 -04:00
|
|
|
a = *lp++;
|
|
|
|
b = *pp++;
|
|
|
|
c = *cp++;
|
|
|
|
|
|
|
|
p = b - c;
|
|
|
|
pc = a - c;
|
1998-04-21 16:03:57 -04:00
|
|
|
|
|
|
|
#ifdef PNG_USE_ABS
|
1998-05-02 13:52:25 -04:00
|
|
|
pa = abs(p);
|
|
|
|
pb = abs(pc);
|
|
|
|
pc = abs(p + pc);
|
1998-04-21 16:03:57 -04:00
|
|
|
#else
|
2010-03-06 09:24:45 -05:00
|
|
|
pa = p < 0 ? -p : p;
|
|
|
|
pb = pc < 0 ? -pc : pc;
|
|
|
|
pc = (p + pc) < 0 ? -(p + pc) : p + pc;
|
1998-04-21 16:03:57 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
if (pa <= pb && pa <= pc)
|
|
|
|
p = a;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1998-04-21 16:03:57 -04:00
|
|
|
else if (pb <= pc)
|
|
|
|
p = b;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1998-04-21 16:03:57 -04:00
|
|
|
else
|
|
|
|
p = c;
|
|
|
|
*/
|
|
|
|
|
2010-03-06 09:24:45 -05:00
|
|
|
p = (pa <= pb && pa <= pc) ? a : (pb <= pc) ? b : c;
|
1998-04-21 16:03:57 -04:00
|
|
|
|
1998-05-21 10:27:50 -04:00
|
|
|
*rp = (png_byte)(((int)(*rp) + p) & 0xff);
|
|
|
|
rp++;
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
2011-09-22 13:41:58 -04:00
|
|
|
/* NOT REACHED */
|
2010-07-31 14:45:04 -04:00
|
|
|
break;
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-08-31 09:42:02 -04:00
|
|
|
#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1995-12-19 04:22:19 -05:00
|
|
|
png_read_finish_row(png_structp png_ptr)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2008-07-10 10:13:13 -04:00
|
|
|
#ifdef PNG_READ_INTERLACING_SUPPORTED
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Start of interlace block */
|
2011-09-22 13:41:58 -04:00
|
|
|
static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Offset to next interlace block */
|
2011-09-22 13:41:58 -04:00
|
|
|
static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Start of interlace block in the y direction */
|
2011-09-22 13:41:58 -04:00
|
|
|
static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Offset to next interlace block in the y direction */
|
2011-09-22 13:41:58 -04:00
|
|
|
static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
|
2008-07-10 10:13:13 -04:00
|
|
|
#endif /* PNG_READ_INTERLACING_SUPPORTED */
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_read_finish_row");
|
1995-07-20 03:43:20 -04:00
|
|
|
png_ptr->row_number++;
|
|
|
|
if (png_ptr->row_number < png_ptr->num_rows)
|
|
|
|
return;
|
|
|
|
|
2008-07-10 10:13:13 -04:00
|
|
|
#ifdef PNG_READ_INTERLACING_SUPPORTED
|
1995-07-20 03:43:20 -04:00
|
|
|
if (png_ptr->interlaced)
|
|
|
|
{
|
|
|
|
png_ptr->row_number = 0;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-10-05 17:23:53 -04:00
|
|
|
/* TO DO: don't do this if prev_row isn't needed (requires
|
|
|
|
* read-ahead of the next row's filter byte.
|
|
|
|
*/
|
2011-01-07 19:28:47 -05:00
|
|
|
png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
|
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
do
|
|
|
|
{
|
|
|
|
png_ptr->pass++;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
if (png_ptr->pass >= 7)
|
|
|
|
break;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04: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];
|
2004-08-04 07:34:52 -04:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
if (!(png_ptr->transformations & PNG_INTERLACE))
|
|
|
|
{
|
|
|
|
png_ptr->num_rows = (png_ptr->height +
|
2011-01-07 19:28:47 -05:00
|
|
|
png_pass_yinc[png_ptr->pass] - 1 -
|
|
|
|
png_pass_ystart[png_ptr->pass]) /
|
|
|
|
png_pass_yinc[png_ptr->pass];
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1998-06-14 15:43:31 -04:00
|
|
|
else /* if (png_ptr->transformations & PNG_INTERLACE) */
|
2011-01-07 19:28:47 -05:00
|
|
|
break; /* libpng deinterlacing sees every row */
|
|
|
|
|
|
|
|
} while (png_ptr->num_rows == 0 || png_ptr->iwidth == 0);
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
if (png_ptr->pass < 7)
|
|
|
|
return;
|
|
|
|
}
|
2008-07-10 10:13:13 -04:00
|
|
|
#endif /* PNG_READ_INTERLACING_SUPPORTED */
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
char extra;
|
|
|
|
int ret;
|
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->zstream.next_out = (Byte *)&extra;
|
|
|
|
png_ptr->zstream.avail_out = (uInt)1;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2008-07-10 10:13:13 -04:00
|
|
|
for (;;)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-01-17 02:34:35 -05:00
|
|
|
if (!(png_ptr->zstream.avail_in))
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
while (!png_ptr->idat_size)
|
|
|
|
{
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, 0);
|
2011-01-07 19:28:47 -05:00
|
|
|
png_ptr->idat_size = png_read_chunk_header(png_ptr);
|
2011-09-22 13:41:58 -04:00
|
|
|
if (png_ptr->chunk_name != png_IDAT)
|
1995-12-19 04:22:19 -05:00
|
|
|
png_error(png_ptr, "Not enough image data");
|
2011-01-06 10:01:04 -05:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
|
|
|
|
png_ptr->zstream.next_in = png_ptr->zbuf;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
if (png_ptr->zbuf_size > png_ptr->idat_size)
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zstream.avail_in);
|
|
|
|
png_ptr->idat_size -= png_ptr->zstream.avail_in;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
if (ret == Z_STREAM_END)
|
|
|
|
{
|
1997-01-17 02:34:35 -05:00
|
|
|
if (!(png_ptr->zstream.avail_out) || png_ptr->zstream.avail_in ||
|
2011-01-07 19:28:47 -05:00
|
|
|
png_ptr->idat_size)
|
2002-08-06 19:06:11 -04:00
|
|
|
png_warning(png_ptr, "Extra compressed data");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->mode |= PNG_AFTER_IDAT;
|
|
|
|
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
|
1995-07-20 03:43:20 -04:00
|
|
|
break;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
if (ret != Z_OK)
|
2010-03-06 09:24:45 -05:00
|
|
|
png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
|
2011-01-07 19:28:47 -05:00
|
|
|
"Decompression Error");
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (!(png_ptr->zstream.avail_out))
|
2002-08-06 19:06:11 -04:00
|
|
|
{
|
2006-08-19 14:59:24 -04:00
|
|
|
png_warning(png_ptr, "Extra compressed data");
|
2002-08-06 19:06:11 -04:00
|
|
|
png_ptr->mode |= PNG_AFTER_IDAT;
|
|
|
|
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
|
|
|
|
break;
|
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1998-03-07 15:33:00 -05:00
|
|
|
}
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->zstream.avail_out = 0;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_ptr->idat_size || png_ptr->zstream.avail_in)
|
2002-08-06 19:06:11 -04:00
|
|
|
png_warning(png_ptr, "Extra compression data");
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
inflateReset(&png_ptr->zstream);
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->mode |= PNG_AFTER_IDAT;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
2009-08-31 09:42:02 -04:00
|
|
|
#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
1995-12-19 04:22:19 -05:00
|
|
|
png_read_start_row(png_structp png_ptr)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2008-07-10 10:13:13 -04:00
|
|
|
#ifdef PNG_READ_INTERLACING_SUPPORTED
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Start of interlace block */
|
2011-09-22 13:41:58 -04:00
|
|
|
static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Offset to next interlace block */
|
2011-09-22 13:41:58 -04:00
|
|
|
static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Start of interlace block in the y direction */
|
2011-09-22 13:41:58 -04:00
|
|
|
static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Offset to next interlace block in the y direction */
|
2011-09-22 13:41:58 -04:00
|
|
|
static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
|
1999-11-29 00:32:18 -05:00
|
|
|
#endif
|
1999-12-10 10:43:02 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
int max_pixel_depth;
|
2006-08-19 14:59:24 -04:00
|
|
|
png_size_t row_bytes;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2008-08-05 08:44:42 -04:00
|
|
|
png_debug(1, "in png_read_start_row");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->zstream.avail_in = 0;
|
2011-04-17 19:34:22 -04:00
|
|
|
#ifdef PNG_READ_TRANSFORMS_SUPPORTED
|
1995-07-20 03:43:20 -04:00
|
|
|
png_init_read_transformations(png_ptr);
|
2011-04-17 19:34:22 -04:00
|
|
|
#endif
|
2008-07-10 10:13:13 -04:00
|
|
|
#ifdef PNG_READ_INTERLACING_SUPPORTED
|
1995-07-20 03:43:20 -04:00
|
|
|
if (png_ptr->interlaced)
|
|
|
|
{
|
|
|
|
if (!(png_ptr->transformations & PNG_INTERLACE))
|
|
|
|
png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
|
2011-01-07 19:28:47 -05:00
|
|
|
png_pass_ystart[0]) / png_pass_yinc[0];
|
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
else
|
|
|
|
png_ptr->num_rows = png_ptr->height;
|
|
|
|
|
|
|
|
png_ptr->iwidth = (png_ptr->width +
|
2011-01-07 19:28:47 -05:00
|
|
|
png_pass_inc[png_ptr->pass] - 1 -
|
|
|
|
png_pass_start[png_ptr->pass]) /
|
|
|
|
png_pass_inc[png_ptr->pass];
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
else
|
2008-07-10 10:13:13 -04:00
|
|
|
#endif /* PNG_READ_INTERLACING_SUPPORTED */
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
png_ptr->num_rows = png_ptr->height;
|
|
|
|
png_ptr->iwidth = png_ptr->width;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
max_pixel_depth = png_ptr->pixel_depth;
|
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_PACK_SUPPORTED
|
1995-07-20 03:43:20 -04:00
|
|
|
if ((png_ptr->transformations & PNG_PACK) && png_ptr->bit_depth < 8)
|
|
|
|
max_pixel_depth = 8;
|
1995-09-26 06:22:39 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_EXPAND_SUPPORTED
|
1996-06-05 16:50:50 -04:00
|
|
|
if (png_ptr->transformations & PNG_EXPAND)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
|
|
|
|
{
|
|
|
|
if (png_ptr->num_trans)
|
|
|
|
max_pixel_depth = 32;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
else
|
|
|
|
max_pixel_depth = 24;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
|
|
|
|
{
|
|
|
|
if (max_pixel_depth < 8)
|
|
|
|
max_pixel_depth = 8;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
if (png_ptr->num_trans)
|
|
|
|
max_pixel_depth *= 2;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
|
|
|
|
{
|
|
|
|
if (png_ptr->num_trans)
|
|
|
|
{
|
|
|
|
max_pixel_depth *= 4;
|
|
|
|
max_pixel_depth /= 3;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2011-02-12 10:01:20 -05:00
|
|
|
#ifdef PNG_READ_EXPAND_16_SUPPORTED
|
|
|
|
if (png_ptr->transformations & PNG_EXPAND_16)
|
|
|
|
{
|
|
|
|
# ifdef PNG_READ_EXPAND_SUPPORTED
|
|
|
|
/* In fact it is an error if it isn't supported, but checking is
|
|
|
|
* the safe way.
|
|
|
|
*/
|
|
|
|
if (png_ptr->transformations & PNG_EXPAND)
|
|
|
|
{
|
|
|
|
if (png_ptr->bit_depth < 16)
|
|
|
|
max_pixel_depth *= 2;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
# endif
|
|
|
|
png_ptr->transformations &= ~PNG_EXPAND_16;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_FILLER_SUPPORTED
|
1995-09-26 06:22:39 -04:00
|
|
|
if (png_ptr->transformations & (PNG_FILLER))
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1998-05-09 11:02:29 -04:00
|
|
|
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
|
|
|
|
max_pixel_depth = 32;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1998-05-09 11:02:29 -04:00
|
|
|
else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
|
|
|
if (max_pixel_depth <= 8)
|
|
|
|
max_pixel_depth = 16;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1998-04-21 16:03:57 -04:00
|
|
|
else
|
|
|
|
max_pixel_depth = 32;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1998-04-21 16:03:57 -04:00
|
|
|
else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
|
|
|
|
{
|
|
|
|
if (max_pixel_depth <= 32)
|
|
|
|
max_pixel_depth = 32;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1998-04-21 16:03:57 -04:00
|
|
|
else
|
|
|
|
max_pixel_depth = 64;
|
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
|
1995-07-20 03:43:20 -04:00
|
|
|
if (png_ptr->transformations & PNG_GRAY_TO_RGB)
|
|
|
|
{
|
1998-12-29 12:47:59 -05:00
|
|
|
if (
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_EXPAND_SUPPORTED
|
2011-01-07 19:28:47 -05:00
|
|
|
(png_ptr->num_trans && (png_ptr->transformations & PNG_EXPAND)) ||
|
1998-12-29 12:47:59 -05:00
|
|
|
#endif
|
2009-09-23 12:22:08 -04:00
|
|
|
#ifdef PNG_READ_FILLER_SUPPORTED
|
2011-01-07 19:28:47 -05:00
|
|
|
(png_ptr->transformations & (PNG_FILLER)) ||
|
1998-12-29 12:47:59 -05:00
|
|
|
#endif
|
2011-01-07 19:28:47 -05:00
|
|
|
png_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
if (max_pixel_depth <= 16)
|
|
|
|
max_pixel_depth = 32;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1998-12-29 12:47:59 -05:00
|
|
|
else
|
1995-07-20 03:43:20 -04:00
|
|
|
max_pixel_depth = 64;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
else
|
|
|
|
{
|
|
|
|
if (max_pixel_depth <= 8)
|
2011-01-07 19:28:47 -05:00
|
|
|
{
|
|
|
|
if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
|
2000-02-18 14:48:52 -05:00
|
|
|
max_pixel_depth = 32;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
|
|
|
else
|
2000-02-18 14:48:52 -05:00
|
|
|
max_pixel_depth = 24;
|
2011-01-07 19:28:47 -05:00
|
|
|
}
|
|
|
|
|
2000-02-18 14:48:52 -05:00
|
|
|
else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
|
|
|
|
max_pixel_depth = 64;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1998-12-29 12:47:59 -05:00
|
|
|
else
|
1995-07-20 03:43:20 -04:00
|
|
|
max_pixel_depth = 48;
|
|
|
|
}
|
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2000-05-01 10:31:54 -04:00
|
|
|
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) && \
|
|
|
|
defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
|
2008-07-10 10:13:13 -04:00
|
|
|
if (png_ptr->transformations & PNG_USER_TRANSFORM)
|
2011-01-07 19:28:47 -05:00
|
|
|
{
|
2011-09-22 13:41:58 -04:00
|
|
|
int user_pixel_depth = png_ptr->user_transform_depth *
|
1999-10-01 15:22:25 -04:00
|
|
|
png_ptr->user_transform_channels;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
|
|
|
if (user_pixel_depth > max_pixel_depth)
|
2011-09-22 13:41:58 -04:00
|
|
|
max_pixel_depth = user_pixel_depth;
|
2011-01-07 19:28:47 -05:00
|
|
|
}
|
1999-10-01 15:22:25 -04:00
|
|
|
#endif
|
|
|
|
|
2011-09-22 13:41:58 -04:00
|
|
|
/* This value is stored in png_struct and double checked in the row read
|
|
|
|
* code.
|
|
|
|
*/
|
|
|
|
png_ptr->maximum_pixel_depth = (png_byte)max_pixel_depth;
|
|
|
|
png_ptr->transformed_pixel_depth = 0; /* calculated on demand */
|
|
|
|
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Align the width on the next larger 8 pixels. Mainly used
|
|
|
|
* for interlacing
|
|
|
|
*/
|
1998-05-09 11:02:29 -04:00
|
|
|
row_bytes = ((png_ptr->width + 7) & ~((png_uint_32)7));
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Calculate the maximum bytes needed, adding a byte and a pixel
|
|
|
|
* for safety's sake
|
|
|
|
*/
|
2008-07-10 10:13:13 -04:00
|
|
|
row_bytes = PNG_ROWBYTES(max_pixel_depth, row_bytes) +
|
2011-01-07 19:28:47 -05:00
|
|
|
1 + ((max_pixel_depth + 7) >> 3);
|
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
#ifdef PNG_MAX_MALLOC_64K
|
1998-05-09 11:02:29 -04:00
|
|
|
if (row_bytes > (png_uint_32)65536L)
|
1996-06-05 16:50:50 -04:00
|
|
|
png_error(png_ptr, "This image requires a row greater than 64KB");
|
1995-07-20 03:43:20 -04:00
|
|
|
#endif
|
2008-07-10 10:13:13 -04:00
|
|
|
|
2009-11-20 22:15:06 -05:00
|
|
|
if (row_bytes + 48 > png_ptr->old_big_row_buf_size)
|
2008-07-10 10:13:13 -04:00
|
|
|
{
|
|
|
|
png_free(png_ptr, png_ptr->big_row_buf);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2009-03-09 16:31:08 -04:00
|
|
|
if (png_ptr->interlaced)
|
2010-01-01 11:24:25 -05:00
|
|
|
png_ptr->big_row_buf = (png_bytep)png_calloc(png_ptr,
|
|
|
|
row_bytes + 48);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2010-01-01 11:24:25 -05:00
|
|
|
else
|
|
|
|
png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr,
|
|
|
|
row_bytes + 48);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2009-11-20 22:15:06 -05:00
|
|
|
png_ptr->old_big_row_buf_size = row_bytes + 48;
|
|
|
|
|
|
|
|
#ifdef PNG_ALIGNED_MEMORY_SUPPORTED
|
|
|
|
/* Use 16-byte aligned memory for row_buf with at least 16 bytes
|
|
|
|
* of padding before and after row_buf.
|
|
|
|
*/
|
2011-01-07 19:28:47 -05:00
|
|
|
png_ptr->row_buf = png_ptr->big_row_buf + 32 -
|
|
|
|
(((png_alloc_size_t)png_ptr->big_row_buf + 15) & 0x0F);
|
|
|
|
|
2009-11-20 22:15:06 -05:00
|
|
|
png_ptr->old_big_row_buf_size = row_bytes + 48;
|
|
|
|
#else
|
|
|
|
/* Use 32 bytes of padding before and 16 bytes after row_buf. */
|
2009-03-21 09:15:32 -04:00
|
|
|
png_ptr->row_buf = png_ptr->big_row_buf + 32;
|
2009-11-20 22:15:06 -05:00
|
|
|
#endif
|
|
|
|
png_ptr->old_big_row_buf_size = row_bytes + 48;
|
2008-07-10 10:13:13 -04:00
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
#ifdef PNG_MAX_MALLOC_64K
|
2011-01-07 19:28:47 -05:00
|
|
|
if (png_ptr->rowbytes > 65535)
|
1996-06-05 16:50:50 -04:00
|
|
|
png_error(png_ptr, "This image requires a row greater than 64KB");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
#endif
|
2011-01-07 19:28:47 -05:00
|
|
|
if (png_ptr->rowbytes > (PNG_SIZE_MAX - 1))
|
2006-08-19 14:59:24 -04:00
|
|
|
png_error(png_ptr, "Row has too many bytes to allocate in memory");
|
2008-07-10 10:13:13 -04:00
|
|
|
|
2009-10-13 10:23:39 -04:00
|
|
|
if (png_ptr->rowbytes + 1 > png_ptr->old_prev_row_size)
|
2008-07-10 10:13:13 -04:00
|
|
|
{
|
2009-10-13 10:23:39 -04:00
|
|
|
png_free(png_ptr, png_ptr->prev_row);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
|
|
|
png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, png_ptr->rowbytes + 1);
|
|
|
|
|
2009-10-13 10:23:39 -04:00
|
|
|
png_ptr->old_prev_row_size = png_ptr->rowbytes + 1;
|
2008-07-10 10:13:13 -04:00
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
|
2006-08-19 14:59:24 -04:00
|
|
|
png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
png_debug1(3, "width = %u,", png_ptr->width);
|
|
|
|
png_debug1(3, "height = %u,", png_ptr->height);
|
|
|
|
png_debug1(3, "iwidth = %u,", png_ptr->iwidth);
|
|
|
|
png_debug1(3, "num_rows = %u,", png_ptr->num_rows);
|
2011-01-14 22:18:37 -05:00
|
|
|
png_debug1(3, "rowbytes = %lu,", (unsigned long)png_ptr->rowbytes);
|
|
|
|
png_debug1(3, "irowbytes = %lu",
|
|
|
|
(unsigned long)PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1);
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
png_ptr->flags |= PNG_FLAG_ROW_INIT;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
2006-02-20 23:09:05 -05:00
|
|
|
#endif /* PNG_READ_SUPPORTED */
|