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-12-22 09:21:00 -05:00
|
|
|
* Last changed in libpng 1.6.0 [(PENDING RELEASE)]
|
2012-01-01 15:45:04 -05:00
|
|
|
* Copyright (c) 1998-2012 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-12-24 10:12:00 -05:00
|
|
|
png_get_uint_31(png_const_structrp png_ptr, png_const_bytep buf)
|
2011-01-07 19:28:47 -05:00
|
|
|
{
|
|
|
|
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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_get_fixed_point(png_structrp 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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_read_sig(png_structrp png_ptr, png_inforp info_ptr)
|
2011-01-07 19:28:47 -05:00
|
|
|
{
|
|
|
|
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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_read_chunk_header(png_structrp png_ptr)
|
2006-08-19 14:59:24 -04:00
|
|
|
{
|
|
|
|
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 */
|
2012-03-03 22:10:26 -05:00
|
|
|
png_crc_read(png_structrp png_ptr, png_bytep buf, png_uint_32 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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_crc_finish(png_structrp png_ptr, png_uint_32 skip)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
png_uint_32 i;
|
|
|
|
uInt istop = png_ptr->zbuf_size;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
for (i = 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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_crc_error(png_structrp png_ptr)
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2012-03-05 21:57:40 -05:00
|
|
|
/* png_inflate_claim: claim the zstream for some nefarious purpose that involves
|
|
|
|
* decompression.
|
|
|
|
*/
|
|
|
|
void /* PRIVATE */
|
|
|
|
png_inflate_claim(png_structrp png_ptr)
|
|
|
|
{
|
|
|
|
/* Implementation note: unlike 'png_deflate_claim' this internal function
|
|
|
|
* does not take the size of the data as an argument. Some efficiency could
|
|
|
|
* be gained by using this when it is known *if* the zlib stream itself does
|
|
|
|
* not record the number, however this is a chimera: the original writer of
|
|
|
|
* the PNG may have selected a lower window size, and we really must follow
|
|
|
|
* that because, for systems with with limited capabilities, we would
|
|
|
|
* otherwise reject the applications attempts to use a smaller window size.
|
|
|
|
* (zlib doesn't have an interface to say "this or lower"!)
|
|
|
|
*/
|
|
|
|
if (!(png_ptr->flags & PNG_FLAG_ZSTREAM_IN_USE))
|
|
|
|
{
|
|
|
|
int ret; /* zlib return code */
|
|
|
|
|
|
|
|
/* Do this for safety now. */
|
|
|
|
png_ptr->flags &= ~PNG_FLAG_ZSTREAM_ENDED;
|
|
|
|
|
|
|
|
if (png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED)
|
|
|
|
ret = inflateReset(&png_ptr->zstream);
|
|
|
|
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ret = inflateInit(&png_ptr->zstream);
|
|
|
|
|
|
|
|
if (ret == Z_OK)
|
|
|
|
png_ptr->flags |= PNG_FLAG_ZSTREAM_INITIALIZED;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret == Z_OK)
|
|
|
|
png_ptr->flags |= PNG_FLAG_ZSTREAM_IN_USE;
|
|
|
|
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* A problem; the flags are set ok, but we need a credible error
|
|
|
|
* message.
|
|
|
|
*/
|
|
|
|
if (png_ptr->zstream.msg != NULL)
|
|
|
|
png_error(png_ptr, png_ptr->zstream.msg);
|
|
|
|
|
|
|
|
else
|
|
|
|
png_error(png_ptr, "zlib initialization error");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
png_error(png_ptr, "zstream already in use (internal error)");
|
|
|
|
}
|
|
|
|
|
2011-04-01 14:15:36 -04:00
|
|
|
#ifdef PNG_READ_COMPRESSED_TEXT_SUPPORTED
|
2012-03-03 22:10:26 -05:00
|
|
|
/* png_inflate: returns one of the following error codes. If output is not NULL
|
|
|
|
* the uncompressed data is placed there, up to output_size. output_size is
|
|
|
|
* adjusted to the actual amount of uncompressed data. If
|
|
|
|
* PNG_INFLATE_TRUNCATED is returned partial output will have been produced; no
|
|
|
|
* error or warning is produced in this case.
|
|
|
|
*/
|
|
|
|
#define PNG_INFLATE_OK 1
|
|
|
|
#define PNG_INFLATE_TRUNCATED 2 /* output_size will be unchanged */
|
|
|
|
#define PNG_INFLATE_ERROR 3 /* a chunk warning has been output */
|
|
|
|
|
|
|
|
static void
|
|
|
|
stash_error(png_structrp png_ptr, png_const_charp message)
|
2010-02-07 19:08:50 -05:00
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
size_t len = strlen(message);
|
|
|
|
|
|
|
|
if (len >= png_ptr->zbuf_size)
|
|
|
|
len = png_ptr->zbuf_size-1;
|
|
|
|
|
|
|
|
memcpy(png_ptr->zbuf, message, len);
|
|
|
|
png_ptr->zbuf[len] = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
png_inflate(png_structrp png_ptr, png_bytep data, png_uint_32 input_size,
|
|
|
|
png_bytep output, png_alloc_size_t *output_size)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
png_alloc_size_t avail_out = *output_size;
|
|
|
|
png_uint_32 avail_in = input_size;
|
|
|
|
|
2011-01-07 19:28:47 -05:00
|
|
|
/* 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;
|
2012-03-03 22:10:26 -05:00
|
|
|
/* avail_in and avail_out are set below from 'size' */
|
2011-01-07 19:28:47 -05:00
|
|
|
png_ptr->zstream.avail_in = 0;
|
2012-03-03 22:10:26 -05:00
|
|
|
png_ptr->zstream.avail_out = 0;
|
|
|
|
|
|
|
|
/* Read directly into the output if it is available (this is set to
|
|
|
|
* png_ptr->zbuf below if output is NULL).
|
|
|
|
*/
|
|
|
|
if (output != NULL)
|
|
|
|
png_ptr->zstream.next_out = output;
|
2010-02-12 21:12:56 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
do
|
2010-02-07 19:08:50 -05:00
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
uInt avail;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* zlib INPUT BUFFER */
|
2011-10-27 13:05:58 -04:00
|
|
|
/* The setting of 'avail_in' used to be outside the loop; by setting it
|
2011-01-07 19:28:47 -05:00
|
|
|
* 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
|
2011-11-26 19:21:02 -05:00
|
|
|
* window save (png_memcpy of up to 32768 output bytes) every ZLIB_IO_MAX
|
2011-01-07 19:28:47 -05:00
|
|
|
* input bytes.
|
|
|
|
*/
|
2012-03-03 22:10:26 -05:00
|
|
|
avail_in += png_ptr->zstream.avail_in; /* not consumed last time */
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
avail = ZLIB_IO_MAX;
|
2010-09-10 23:05:27 -04:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (avail_in < avail)
|
|
|
|
avail = (uInt)avail_in; /* safe: < than ZLIB_IO_MAX */
|
2010-02-07 19:08:50 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
avail_in -= avail;
|
|
|
|
png_ptr->zstream.avail_in = avail;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* zlib OUTPUT BUFFER */
|
|
|
|
avail_out += png_ptr->zstream.avail_out; /* not written last time */
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
avail = ZLIB_IO_MAX; /* maximum zlib can process */
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (output == NULL)
|
|
|
|
{
|
|
|
|
/* Reset the output buffer each time round if output is NULL and make
|
|
|
|
* available the full buffer, up to 'remaining_space'
|
|
|
|
*/
|
|
|
|
png_ptr->zstream.next_out = png_ptr->zbuf;
|
|
|
|
if (png_ptr->zbuf_size < avail)
|
|
|
|
avail = png_ptr->zbuf_size;
|
2011-01-07 19:28:47 -05:00
|
|
|
}
|
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (avail_out < avail)
|
|
|
|
avail = (uInt)avail_out; /* safe: < ZLIB_IO_MAX */
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
png_ptr->zstream.avail_out = avail;
|
|
|
|
avail_out -= avail;
|
|
|
|
|
|
|
|
/* zlib inflate call */
|
|
|
|
/* In fact 'avail_out' may be 0 at this point, that happens at the end of
|
|
|
|
* the read when the final LZ end code was not passed at the end of the
|
|
|
|
* previous chunk of input data. Tell zlib if we have reached the end of
|
|
|
|
* the output buffer.
|
|
|
|
*
|
|
|
|
* TODO: this prevents multiple calls to inflate, but may help inflate
|
|
|
|
* avoid overhead. Make using Z_FINISH an option for the caller.
|
2011-01-07 19:28:47 -05:00
|
|
|
*/
|
2012-03-03 22:10:26 -05:00
|
|
|
ret = inflate(&png_ptr->zstream, avail_out > 0 ? Z_NO_FLUSH : Z_FINISH);
|
|
|
|
} while (ret == Z_OK);
|
|
|
|
|
|
|
|
/* Claw back the 'size' and 'remaining_space' byte counts. */
|
|
|
|
avail_in += png_ptr->zstream.avail_in;
|
|
|
|
avail_out += png_ptr->zstream.avail_out;
|
|
|
|
|
|
|
|
/* Always reset the zstream, it must be left in inflateInit state.
|
|
|
|
*
|
|
|
|
* TODO: don't do this on Z_BUF_ERROR and no remaining space, then the
|
|
|
|
* caller can use png_inflate incrementally. Also change to using the
|
|
|
|
* same approach as in the write code - init and reset only on demand.
|
|
|
|
*/
|
|
|
|
png_ptr->zstream.next_in = NULL;
|
|
|
|
png_ptr->zstream.avail_in = 0;
|
|
|
|
png_ptr->zstream.next_out = NULL;
|
|
|
|
png_ptr->zstream.avail_out = 0;
|
|
|
|
inflateReset(&png_ptr->zstream);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* Update the output size if the output was not filled.
|
|
|
|
*
|
|
|
|
* TODO: do this with 'size' as well, not currently a parameter.
|
|
|
|
*/
|
|
|
|
if (avail_out > 0)
|
|
|
|
*output_size -= avail_out;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* Error messages are stashed in png_ptr->zbuf, to avoid any errors in the
|
|
|
|
* errors do this first:
|
|
|
|
*/
|
|
|
|
png_ptr->zbuf[0] = 0;
|
2011-05-05 07:49:55 -04:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
switch (ret)
|
|
|
|
{
|
|
|
|
case Z_STREAM_END:
|
2012-03-05 21:57:40 -05:00
|
|
|
png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
|
2012-03-03 22:10:26 -05:00
|
|
|
return PNG_INFLATE_OK;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
case Z_BUF_ERROR: /* no progress in zlib */
|
|
|
|
if (avail_out > 0) /* input truncated */
|
2010-03-06 09:18:03 -05:00
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
stash_error(png_ptr, "LZ data truncated");
|
|
|
|
return PNG_INFLATE_ERROR;
|
|
|
|
}
|
2010-05-06 10:44:04 -04:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
else if (avail_in > 0) /* output truncated */
|
|
|
|
{
|
|
|
|
/* TODO: currently restarting a partial read isn't supporte because
|
|
|
|
* of the inflateReset above, change this to do the Reset/Init on
|
|
|
|
* demand.
|
|
|
|
*/
|
|
|
|
stash_error(png_ptr, "uncompressed data too large");
|
|
|
|
return PNG_INFLATE_TRUNCATED;
|
2010-03-06 09:18:03 -05:00
|
|
|
}
|
2010-02-12 21:12:56 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
default:
|
|
|
|
/* Everything else is an error, expect 'Z_DATA_ERROR' and
|
|
|
|
* zstream.msg to be non-NULL. In any case just copy something
|
|
|
|
* into zbuf and return the error code.
|
|
|
|
*/
|
|
|
|
if (png_ptr->zstream.msg != NULL)
|
|
|
|
stash_error(png_ptr, png_ptr->zstream.msg);
|
2010-02-07 19:08:50 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
else
|
|
|
|
stash_error(png_ptr, "LZ data damaged");
|
|
|
|
|
|
|
|
return PNG_INFLATE_ERROR;
|
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).
|
|
|
|
*/
|
2012-03-03 22:10:26 -05:00
|
|
|
static png_const_charp
|
|
|
|
png_decompress_chunk(png_structrp png_ptr, png_uint_32 chunklength,
|
|
|
|
png_uint_32 prefix_size,
|
|
|
|
png_alloc_size_t *newlength /* must be initialized to the maximum! */,
|
|
|
|
int terminate /*add a '\0' to the end of the uncompressed data*/)
|
1999-12-10 10:43:02 -05:00
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
/* TODO: implement different limits for different types of chunk.
|
|
|
|
*
|
|
|
|
* The caller supplies *newlength set to the maximum length of the
|
|
|
|
* uncompressed data, but this routine allocates space for the prefix and
|
|
|
|
* maybe a '\0' terminator too. We have to assume that 'prefix_size' is
|
|
|
|
* limited only by the maximum chunk size.
|
|
|
|
*/
|
|
|
|
png_alloc_size_t limit = PNG_SIZE_MAX;
|
|
|
|
|
2012-03-05 21:57:40 -05:00
|
|
|
png_inflate_claim(png_ptr);
|
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
# ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
|
|
|
|
if (png_ptr->user_chunk_malloc_max > 0 &&
|
|
|
|
png_ptr->user_chunk_malloc_max < limit)
|
|
|
|
limit = png_ptr->user_chunk_malloc_max;
|
|
|
|
# elif PNG_USER_CHUNK_MALLOC_MAX > 0
|
|
|
|
if (PNG_USER_CHUNK_MALLOC_MAX < limit)
|
|
|
|
limit = PNG_USER_CHUNK_MALLOC_MAX;
|
|
|
|
# endif
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (limit >= prefix_size + (terminate != 0))
|
2010-02-12 12:17:22 -05:00
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
limit -= prefix_size + (terminate != 0);
|
2010-02-12 21:12:56 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (limit < *newlength)
|
|
|
|
*newlength = limit;
|
2010-02-12 21:12:56 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
switch (png_inflate(png_ptr,
|
|
|
|
(png_bytep)png_ptr->chunkdata + prefix_size,
|
|
|
|
chunklength - prefix_size, NULL /* output */, newlength))
|
2011-01-06 10:01:04 -05:00
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
case PNG_INFLATE_OK:
|
|
|
|
/* Success (maybe) - really uncompress the chunk. */
|
2011-01-07 19:28:47 -05:00
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
/* Because of the limit checks above we know that the new,
|
|
|
|
* expanded, size will fit in a size_t (let alone an
|
|
|
|
* png_alloc_size_t). Use png_malloc_base here to avoid an
|
|
|
|
* extra OOM message.
|
|
|
|
*/
|
|
|
|
png_alloc_size_t new_size = *newlength;
|
|
|
|
png_bytep text = png_voidcast(png_bytep, png_malloc_base(
|
|
|
|
png_ptr, prefix_size + new_size + (terminate != 0)));
|
2010-02-12 12:17:22 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (text == NULL)
|
|
|
|
break; /* out of memory */
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* This should now work, although it is possible a logic
|
|
|
|
* error might result.
|
|
|
|
*/
|
|
|
|
switch (png_inflate(png_ptr, (png_bytep)png_ptr->chunkdata +
|
|
|
|
prefix_size, chunklength - prefix_size, text + prefix_size,
|
|
|
|
newlength))
|
|
|
|
{
|
|
|
|
case PNG_INFLATE_OK:
|
|
|
|
if (new_size == *newlength)
|
|
|
|
{
|
|
|
|
if (terminate)
|
|
|
|
text[prefix_size + *newlength] = 0;
|
|
|
|
|
|
|
|
if (prefix_size > 0)
|
|
|
|
png_memcpy(text, png_ptr->chunkdata, prefix_size);
|
|
|
|
|
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = (png_charp)text;
|
2012-03-05 21:57:40 -05:00
|
|
|
png_ptr->flags &= ~PNG_FLAG_ZSTREAM_IN_USE;
|
2012-03-03 22:10:26 -05:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is an unexpected internal error. */
|
|
|
|
/* FALL THROUGH */
|
|
|
|
|
|
|
|
case PNG_INFLATE_TRUNCATED:
|
|
|
|
png_free(png_ptr, text);
|
2012-03-05 21:57:40 -05:00
|
|
|
png_ptr->flags &= ~PNG_FLAG_ZSTREAM_IN_USE;
|
2012-03-03 22:10:26 -05:00
|
|
|
return "libpng inflate error";
|
|
|
|
|
|
|
|
default: /* PNG_INFLATE_ERROR */
|
|
|
|
png_free(png_ptr, text);
|
2012-03-05 21:57:40 -05:00
|
|
|
png_ptr->flags &= ~PNG_FLAG_ZSTREAM_IN_USE;
|
2012-03-03 22:10:26 -05:00
|
|
|
return (png_const_charp)png_ptr->zbuf;
|
|
|
|
}
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
case PNG_INFLATE_TRUNCATED:
|
|
|
|
/* This means that there wasn't enough space to uncompress the
|
|
|
|
* chunk.
|
|
|
|
*/
|
|
|
|
break;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
default: /* PNG_INFLATE_ERROR */
|
|
|
|
/* png_inflate puts the error message in zbuf. */
|
2012-03-05 21:57:40 -05:00
|
|
|
png_ptr->flags &= ~PNG_FLAG_ZSTREAM_IN_USE;
|
2012-03-03 22:10:26 -05:00
|
|
|
return (png_const_charp)png_ptr->zbuf;
|
2011-01-07 19:28:47 -05:00
|
|
|
}
|
1999-12-10 10:43:02 -05:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* out of memory returns. */
|
2012-03-05 21:57:40 -05:00
|
|
|
png_ptr->flags &= ~PNG_FLAG_ZSTREAM_IN_USE;
|
2012-03-03 22:10:26 -05:00
|
|
|
return "insufficient memory";
|
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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_IHDR(png_structrp png_ptr, png_inforp 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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_PLTE(png_structrp png_ptr, png_inforp 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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_IEND(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_gAMA(png_structrp png_ptr, png_inforp 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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
unsigned int 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
|
2012-03-03 22:10:26 -05:00
|
|
|
truelen = 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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_cHRM(png_structrp png_ptr, png_inforp 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 */
|
2011-10-26 09:36:21 -04:00
|
|
|
png_warning(png_ptr, "Out of place cHRM 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_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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_sRGB(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
|
1998-01-01 08:13:13 -05:00
|
|
|
{
|
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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
|
1999-12-10 10:43:02 -05:00
|
|
|
/* Note: this does not properly handle chunks that are > 64K under DOS */
|
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
png_uint_32 keyword_length;
|
|
|
|
png_const_charp error_message = NULL;
|
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_crc_finish(png_ptr, length);
|
2012-03-03 22:10:26 -05:00
|
|
|
png_chunk_benign_error(png_ptr, "Invalid iCCP after IDAT");
|
1999-12-10 10:43:02 -05:00
|
|
|
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)
|
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
/* Ignore out-of-place iCCP chunks because other implementations may
|
|
|
|
* *have* to do so, so it is misleading if libpng handles them.
|
|
|
|
*/
|
1999-12-10 10:43:02 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
2012-03-03 22:10:26 -05:00
|
|
|
png_chunk_benign_error(png_ptr, "Out of place iCCP chunk");
|
1999-12-10 10:43:02 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (info_ptr != NULL && (info_ptr->valid & (PNG_INFO_iCCP|PNG_INFO_sRGB)))
|
1999-12-10 10:43:02 -05:00
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
png_chunk_benign_error(png_ptr, "Duplicate color profile");
|
|
|
|
return;
|
1999-12-10 10:43:02 -05:00
|
|
|
}
|
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
2012-03-03 22:10:26 -05:00
|
|
|
/* TODO: read the chunk in pieces, validating it as we go. */
|
|
|
|
png_ptr->chunkdata = png_voidcast(png_charp, png_malloc(png_ptr, length));
|
|
|
|
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, length);
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (png_crc_finish(png_ptr, 0))
|
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
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* TODO: also check that the keyword contents match the spec! */
|
|
|
|
for (keyword_length = 0;
|
|
|
|
keyword_length < length && png_ptr->chunkdata[keyword_length] != 0;
|
|
|
|
++keyword_length)
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Empty loop to find end of name */ ;
|
2000-06-04 15:29:29 -04:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (keyword_length > 79 || keyword_length < 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;
|
2012-03-03 22:10:26 -05:00
|
|
|
png_chunk_benign_error(png_ptr, "Bad iCCP keyword");
|
2000-04-14 15:20:47 -04:00
|
|
|
return;
|
1999-12-10 10:43:02 -05:00
|
|
|
}
|
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* There should be at least one zero (the compression type byte) following
|
|
|
|
* the separator followed by some LZ data; check for at least one byte.
|
|
|
|
* Since a chunk length is no more than 2^31 the addition below is safe.
|
|
|
|
*/
|
|
|
|
if (keyword_length + 3 >= length)
|
2000-11-10 13:26:19 -05:00
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
|
|
|
png_chunk_benign_error(png_ptr, "iCCP chunk too short");
|
|
|
|
return;
|
2000-11-10 13:26:19 -05:00
|
|
|
}
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* We only understand '0' compression - deflate - so if we get a different
|
|
|
|
* value we can't safely decode the chunk.
|
|
|
|
*/
|
|
|
|
if (png_ptr->chunkdata[keyword_length+1] != PNG_COMPRESSION_TYPE_BASE)
|
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;
|
2012-03-03 22:10:26 -05:00
|
|
|
png_chunk_benign_error(png_ptr, "Bad compression type in iCCP chunk");
|
2001-06-23 09:03:17 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
{
|
|
|
|
png_alloc_size_t uncompressed_length;
|
2000-11-10 13:26:19 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* TODO: this is slightly broken, an ICC profile can be up to 2^32-1 bytes
|
|
|
|
* in length, but it is stored here with the keyword and the compression
|
|
|
|
* type prefixed to it. This means that on 32-bit systems the code can't
|
|
|
|
* accept, or express, the maximum length.
|
|
|
|
*/
|
|
|
|
if (PNG_SIZE_MAX > 0xffffffffU/*ICC profile maximum*/)
|
|
|
|
uncompressed_length = 0xffffffffU;
|
2000-11-10 13:26:19 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
else
|
|
|
|
uncompressed_length = PNG_SIZE_MAX;
|
2011-05-05 07:49:55 -04:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* TODO: at present png_decompress_chunk imposes a single application
|
|
|
|
* level memory limit, this should be split to different values for iCCP
|
|
|
|
* and text chunks.
|
|
|
|
*/
|
|
|
|
error_message = png_decompress_chunk(png_ptr, length, keyword_length+2,
|
|
|
|
&uncompressed_length, 0/*do not terminate*/);
|
2011-05-05 07:49:55 -04:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (error_message == NULL)
|
|
|
|
{
|
|
|
|
/* It worked; png_ptr->chunkdata now contains the full uncompressed ICC
|
|
|
|
* profile. The cast below is safe because of the checks above, the
|
|
|
|
* final uncompressed length can be at most 2^32-1
|
|
|
|
*/
|
|
|
|
png_uint_32 profile_length = (png_uint_32)uncompressed_length;
|
|
|
|
png_bytep profile = (png_bytep)png_ptr->chunkdata + (keyword_length+2);
|
|
|
|
|
|
|
|
/* Now perform some basic checks.
|
|
|
|
*
|
|
|
|
* TODO: do a lot more checks, the format is pretty simple, at least
|
|
|
|
* check that the whole tag table is there.
|
|
|
|
*/
|
|
|
|
if (profile_length > 132 && png_get_uint_32(profile) == profile_length)
|
|
|
|
png_set_iCCP(png_ptr, info_ptr, png_ptr->chunkdata,
|
|
|
|
PNG_COMPRESSION_TYPE_BASE, profile, profile_length);
|
|
|
|
|
|
|
|
else
|
|
|
|
error_message = "Malformed ICC profile";
|
|
|
|
}
|
2000-11-10 13:26:19 -05:00
|
|
|
}
|
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
|
|
|
png_ptr->chunkdata = NULL;
|
2012-03-03 22:10:26 -05:00
|
|
|
|
|
|
|
if (error_message != NULL)
|
|
|
|
png_chunk_benign_error(png_ptr, error_message);
|
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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
|
1999-12-10 10:43:02 -05:00
|
|
|
/* 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.
|
|
|
|
*/
|
2012-03-03 22:10:26 -05:00
|
|
|
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, length);
|
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;
|
|
|
|
}
|
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
slength = length;
|
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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_tRNS(png_structrp png_ptr, png_inforp 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
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
png_crc_read(png_ptr, buf, 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
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
png_crc_read(png_ptr, readbuf, length);
|
2004-08-04 07:34:52 -04:00
|
|
|
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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
unsigned int 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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_hIST(png_structrp png_ptr, png_inforp 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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_pHYs(png_structrp png_ptr, png_inforp 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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_oFFs(png_structrp png_ptr, png_inforp 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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
|
1997-05-16 03:46:07 -04:00
|
|
|
{
|
|
|
|
png_int_32 X0, X1;
|
|
|
|
png_byte type, nparams;
|
|
|
|
png_charp buf, units, endptr;
|
|
|
|
png_charpp params;
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, length);
|
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;
|
|
|
|
}
|
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
png_ptr->chunkdata[length] = 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
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
endptr = png_ptr->chunkdata + length;
|
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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
|
1999-12-10 10:43:02 -05:00
|
|
|
{
|
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
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, length);
|
|
|
|
slength = length;
|
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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_tIME(png_structrp png_ptr, png_inforp 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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_tEXt(png_structrp png_ptr, png_inforp 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;
|
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
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, length);
|
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;
|
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
key[length] = 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
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (text != key + length)
|
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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
png_const_charp errmsg = NULL;
|
|
|
|
png_uint_32 keyword_length;
|
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;
|
|
|
|
|
2008-10-25 21:03:28 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
2012-03-03 22:10:26 -05:00
|
|
|
png_ptr->chunkdata = png_voidcast(png_charp, png_malloc_warn(png_ptr,
|
|
|
|
length));
|
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
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
png_chunk_benign_error(png_ptr, "insufficient memory");
|
2011-01-07 19:28:47 -05:00
|
|
|
return;
|
2002-05-25 12:12:10 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, length);
|
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;
|
|
|
|
}
|
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* TODO: also check that the keyword contents match the spec! */
|
|
|
|
for (keyword_length = 0;
|
|
|
|
keyword_length < length && png_ptr->chunkdata[keyword_length] != 0;
|
|
|
|
++keyword_length)
|
|
|
|
/* Empty loop to find end of name */ ;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (keyword_length > 79 || keyword_length < 1)
|
|
|
|
errmsg = "bad keyword";
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* zTXt must have some LZ data after the keyword, although it may expand to
|
|
|
|
* zero bytes; we need a '\0' at the end of the keyword, the compression type
|
|
|
|
* then the LZ data:
|
|
|
|
*/
|
|
|
|
else if (keyword_length + 3 > length)
|
|
|
|
errmsg = "truncated";
|
|
|
|
|
|
|
|
else if (png_ptr->chunkdata[keyword_length+1] != PNG_COMPRESSION_TYPE_BASE)
|
|
|
|
errmsg = "unknown compression type";
|
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
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
png_alloc_size_t uncompressed_length = PNG_SIZE_MAX;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* TODO: at present png_decompress_chunk imposes a single application
|
|
|
|
* level memory limit, this should be split to different values for iCCP
|
|
|
|
* and text chunks.
|
|
|
|
*/
|
|
|
|
errmsg = png_decompress_chunk(png_ptr, length, keyword_length+2,
|
|
|
|
&uncompressed_length, 1/*terminate*/);
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (errmsg == NULL)
|
|
|
|
{
|
|
|
|
png_text text;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* It worked; png_ptr->chunkdata now looks like a tEXt chunk except for
|
|
|
|
* the extra compression type byte and the fact that it isn't
|
|
|
|
* necessarily '\0' terminated.
|
|
|
|
*/
|
|
|
|
png_ptr->chunkdata[uncompressed_length+(keyword_length+2)] = 0;
|
|
|
|
|
|
|
|
text.compression = PNG_TEXT_COMPRESSION_zTXt;
|
|
|
|
text.key = png_ptr->chunkdata;
|
|
|
|
text.text = png_ptr->chunkdata + keyword_length+2;
|
|
|
|
text.text_length = uncompressed_length;
|
|
|
|
text.itxt_length = 0;
|
|
|
|
text.lang = NULL;
|
|
|
|
text.lang_key = NULL;
|
|
|
|
|
|
|
|
if (png_set_text_2(png_ptr, info_ptr, &text, 1))
|
|
|
|
errmsg = "insufficient memory to store zTXt chunk";
|
|
|
|
}
|
2002-05-25 12:12:10 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
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
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (errmsg != NULL)
|
|
|
|
png_chunk_benign_error(png_ptr, errmsg);
|
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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
|
1999-12-10 10:43:02 -05:00
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
png_const_charp errmsg = NULL;
|
|
|
|
png_uint_32 prefix_length;
|
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
|
|
|
|
2008-07-21 09:05:57 -04:00
|
|
|
png_free(png_ptr, png_ptr->chunkdata);
|
2012-03-03 22:10:26 -05:00
|
|
|
png_ptr->chunkdata = png_voidcast(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
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
png_chunk_benign_error(png_ptr, "insufficient memory");
|
2011-01-07 19:28:47 -05:00
|
|
|
return;
|
2002-05-25 12:12:10 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, length);
|
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
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* First the keyword. */
|
|
|
|
for (prefix_length=0;
|
|
|
|
prefix_length < length && png_ptr->chunkdata[prefix_length] != 0;
|
|
|
|
++prefix_length)
|
2009-05-20 13:45:29 -04:00
|
|
|
/* Empty loop */ ;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* Perform a basic check on the keyword length here. */
|
|
|
|
if (prefix_length > 79 || prefix_length < 1)
|
|
|
|
errmsg = "bad keyword";
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* Expect keyword, compression flag, compression type, language, translated
|
|
|
|
* keyword (both may be empty but are 0 terminated) then the text, which may
|
|
|
|
* be empty.
|
2009-05-20 13:45:29 -04:00
|
|
|
*/
|
2012-03-03 22:10:26 -05:00
|
|
|
else if (prefix_length + 5 > length)
|
|
|
|
errmsg = "truncated";
|
2000-02-05 00:40:16 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
else if (png_ptr->chunkdata[prefix_length+1] == 0 ||
|
|
|
|
(png_ptr->chunkdata[prefix_length+1] == 1 &&
|
|
|
|
png_ptr->chunkdata[prefix_length+2] == PNG_COMPRESSION_TYPE_BASE))
|
1999-12-10 10:43:02 -05:00
|
|
|
{
|
2012-03-03 22:10:26 -05:00
|
|
|
int compressed = png_ptr->chunkdata[prefix_length+1] != 0;
|
|
|
|
png_uint_32 language_offset, translated_keyword_offset;
|
|
|
|
png_alloc_size_t uncompressed_length = 0;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* Now the language tag */
|
|
|
|
prefix_length += 3;
|
|
|
|
language_offset = prefix_length;
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
for (; prefix_length < length && png_ptr->chunkdata[prefix_length] != 0;
|
|
|
|
++prefix_length)
|
|
|
|
/* Empty loop */ ;
|
2011-11-22 12:03:20 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* WARNING: the length may be invalid here, this is checked below. */
|
|
|
|
translated_keyword_offset = ++prefix_length;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
for (; prefix_length < length && png_ptr->chunkdata[prefix_length] != 0;
|
|
|
|
++prefix_length)
|
|
|
|
/* Empty loop */ ;
|
2000-02-05 00:40:16 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* prefix_length should now be at the trailing '\0' of the translated
|
|
|
|
* keyword, but it may already be over the end. None of this arithmetic
|
|
|
|
* can overflow because chunks are at most 2^31 bytes long, but on 16-bit
|
|
|
|
* systems the available allocaton may overflow.
|
|
|
|
*/
|
|
|
|
++prefix_length;
|
2008-07-10 10:13:13 -04:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (!compressed && prefix_length <= length)
|
|
|
|
uncompressed_length = length - prefix_length;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
else if (compressed && prefix_length < length)
|
|
|
|
{
|
|
|
|
uncompressed_length = PNG_SIZE_MAX;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
/* TODO: at present png_decompress_chunk imposes a single application
|
|
|
|
* level memory limit, this should be split to different values for
|
|
|
|
* iCCP and text chunks.
|
|
|
|
*/
|
|
|
|
errmsg = png_decompress_chunk(png_ptr, length, prefix_length,
|
|
|
|
&uncompressed_length, 1/*terminate*/);
|
|
|
|
}
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
else
|
|
|
|
errmsg = "truncated";
|
1999-12-10 10:43:02 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (errmsg == NULL)
|
|
|
|
{
|
|
|
|
png_text text;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
png_ptr->chunkdata[uncompressed_length+prefix_length] = 0;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (compressed)
|
|
|
|
text.compression = PNG_ITXT_COMPRESSION_NONE;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
else
|
|
|
|
text.compression = PNG_ITXT_COMPRESSION_zTXt;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
text.key = png_ptr->chunkdata;
|
|
|
|
text.lang = png_ptr->chunkdata + language_offset;
|
|
|
|
text.lang_key = png_ptr->chunkdata + translated_keyword_offset;
|
|
|
|
text.text = png_ptr->chunkdata + prefix_length;
|
|
|
|
text.text_length = 0;
|
|
|
|
text.itxt_length = uncompressed_length;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (png_set_text_2(png_ptr, info_ptr, &text, 1))
|
|
|
|
errmsg = "insufficient memory";
|
|
|
|
}
|
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
else
|
|
|
|
errmsg = "bad compression info";
|
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;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2012-03-03 22:10:26 -05:00
|
|
|
if (errmsg != NULL)
|
|
|
|
png_chunk_benign_error(png_ptr, errmsg);
|
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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
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-12-24 10:12:00 -05:00
|
|
|
png_check_chunk_name(png_structrp 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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-11-07 23:33:49 -05:00
|
|
|
/* Combines the row recently read in with the existing pixels in the 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 'display' value; if 'display' is true then the whole row
|
|
|
|
* (dp) is filled from the start by replicating the available pixels. If
|
|
|
|
* 'display' is false only those pixels present in the pass are filled in.
|
2011-01-07 19:28:47 -05:00
|
|
|
*/
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2011-10-11 17:01:33 -04:00
|
|
|
unsigned int pixel_depth = png_ptr->transformed_pixel_depth;
|
|
|
|
png_const_bytep sp = png_ptr->row_buf + 1;
|
2011-10-06 23:27:16 -04:00
|
|
|
png_uint_32 row_width = png_ptr->width;
|
2011-10-11 17:01:33 -04:00
|
|
|
unsigned int pass = png_ptr->pass;
|
2011-10-16 23:52:56 -04:00
|
|
|
png_bytep end_ptr = 0;
|
|
|
|
png_byte end_byte = 0;
|
|
|
|
unsigned int end_mask;
|
2011-09-22 13:41:58 -04:00
|
|
|
|
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-10-06 23:27:16 -04:00
|
|
|
PNG_ROWBYTES(pixel_depth, row_width))
|
2011-05-15 19:52:39 -04:00
|
|
|
png_error(png_ptr, "internal row size calculation error");
|
|
|
|
|
2011-10-06 23:27:16 -04:00
|
|
|
/* Don't expect this to ever happen: */
|
|
|
|
if (row_width == 0)
|
|
|
|
png_error(png_ptr, "internal row width error");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-10-16 23:52:56 -04:00
|
|
|
/* Preserve the last byte in cases where only part of it will be overwritten,
|
|
|
|
* the multiply below may overflow, we don't care because ANSI-C guarantees
|
|
|
|
* we get the low bits.
|
|
|
|
*/
|
|
|
|
end_mask = (pixel_depth * row_width) & 7;
|
|
|
|
if (end_mask != 0)
|
|
|
|
{
|
2011-10-27 13:05:58 -04:00
|
|
|
/* end_ptr == NULL is a flag to say do nothing */
|
2011-10-16 23:52:56 -04:00
|
|
|
end_ptr = dp + PNG_ROWBYTES(pixel_depth, row_width) - 1;
|
|
|
|
end_byte = *end_ptr;
|
|
|
|
# ifdef PNG_READ_PACKSWAP_SUPPORTED
|
|
|
|
if (png_ptr->transformations & PNG_PACKSWAP) /* little-endian byte */
|
|
|
|
end_mask = 0xff << end_mask;
|
|
|
|
|
|
|
|
else /* big-endian byte */
|
|
|
|
# endif
|
|
|
|
end_mask = 0xff >> end_mask;
|
|
|
|
/* end_mask is now the bits to *keep* from the destination row */
|
|
|
|
}
|
|
|
|
|
2011-10-27 13:05:58 -04:00
|
|
|
/* For non-interlaced images this reduces to a png_memcpy(). A png_memcpy()
|
|
|
|
* will also happen if interlacing isn't supported or if the application
|
|
|
|
* does not call png_set_interlace_handling(). In the latter cases the
|
|
|
|
* caller just gets a sequence of the unexpanded rows from each interlace
|
|
|
|
* pass.
|
2011-10-06 23:27:16 -04:00
|
|
|
*/
|
|
|
|
#ifdef PNG_READ_INTERLACING_SUPPORTED
|
|
|
|
if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE) &&
|
2011-10-11 17:01:33 -04:00
|
|
|
pass < 6 && (display == 0 ||
|
|
|
|
/* The following copies everything for 'display' on passes 0, 2 and 4. */
|
|
|
|
(display == 1 && (pass & 1) != 0)))
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2011-10-11 17:01:33 -04:00
|
|
|
/* Narrow images may have no bits in a pass; the caller should handle
|
|
|
|
* this, but this test is cheap:
|
2011-10-06 23:27:16 -04:00
|
|
|
*/
|
2011-10-11 17:01:33 -04:00
|
|
|
if (row_width <= PNG_PASS_START_COL(pass))
|
|
|
|
return;
|
2011-10-06 23:27:16 -04:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
if (pixel_depth < 8)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2011-11-07 23:33:49 -05:00
|
|
|
/* For pixel depths up to 4 bpp the 8-pixel mask can be expanded to fit
|
2011-10-11 17:01:33 -04:00
|
|
|
* into 32 bits, then a single loop over the bytes using the four byte
|
2011-10-27 13:05:58 -04:00
|
|
|
* values in the 32-bit mask can be used. For the 'display' option the
|
2011-10-11 17:01:33 -04:00
|
|
|
* expanded mask may also not require any masking within a byte. To
|
|
|
|
* make this work the PACKSWAP option must be taken into account - it
|
|
|
|
* simply requires the pixels to be reversed in each byte.
|
|
|
|
*
|
|
|
|
* The 'regular' case requires a mask for each of the first 6 passes,
|
|
|
|
* the 'display' case does a copy for the even passes in the range
|
2011-11-07 23:33:49 -05:00
|
|
|
* 0..6. This has already been handled in the test above.
|
2011-10-11 17:01:33 -04:00
|
|
|
*
|
|
|
|
* The masks are arranged as four bytes with the first byte to use in
|
|
|
|
* the lowest bits (little-endian) regardless of the order (PACKSWAP or
|
|
|
|
* not) of the pixels in each byte.
|
|
|
|
*
|
|
|
|
* NOTE: the whole of this logic depends on the caller of this function
|
|
|
|
* only calling it on rows appropriate to the pass. This function only
|
2011-11-07 23:33:49 -05:00
|
|
|
* understands the 'x' logic; the 'y' logic is handled by the caller.
|
2011-10-11 17:01:33 -04:00
|
|
|
*
|
|
|
|
* The following defines allow generation of compile time constant bit
|
|
|
|
* masks for each pixel depth and each possibility of swapped or not
|
2011-10-27 13:05:58 -04:00
|
|
|
* swapped bytes. Pass 'p' is in the range 0..6; 'x', a pixel index,
|
|
|
|
* is in the range 0..7; and the result is 1 if the pixel is to be
|
|
|
|
* copied in the pass, 0 if not. 'S' is for the sparkle method, 'B'
|
|
|
|
* for the block method.
|
|
|
|
*
|
2011-10-27 20:36:08 -04:00
|
|
|
* With some compilers a compile time expression of the general form:
|
2011-10-27 17:59:03 -04:00
|
|
|
*
|
2011-10-27 20:36:08 -04:00
|
|
|
* (shift >= 32) ? (a >> (shift-32)) : (b >> shift)
|
|
|
|
*
|
|
|
|
* Produces warnings with values of 'shift' in the range 33 to 63
|
2011-10-27 23:09:22 -04:00
|
|
|
* because the right hand side of the ?: expression is evaluated by
|
2011-10-27 20:36:08 -04:00
|
|
|
* the compiler even though it isn't used. Microsoft Visual C (various
|
|
|
|
* versions) and the Intel C compiler are known to do this. To avoid
|
|
|
|
* this the following macros are used in 1.5.6. This is a temporary
|
2011-11-07 23:33:49 -05:00
|
|
|
* solution to avoid destabilizing the code during the release process.
|
2011-10-27 17:59:03 -04:00
|
|
|
*/
|
2011-10-27 20:36:08 -04:00
|
|
|
# if PNG_USE_COMPILE_TIME_MASKS
|
2011-10-27 17:59:03 -04:00
|
|
|
# define PNG_LSR(x,s) ((x)>>((s) & 0x1f))
|
|
|
|
# define PNG_LSL(x,s) ((x)<<((s) & 0x1f))
|
2011-10-27 13:05:58 -04:00
|
|
|
# else
|
2011-10-27 17:59:03 -04:00
|
|
|
# define PNG_LSR(x,s) ((x)>>(s))
|
|
|
|
# define PNG_LSL(x,s) ((x)<<(s))
|
2011-10-27 13:05:58 -04:00
|
|
|
# endif
|
2011-10-27 17:59:03 -04:00
|
|
|
# define S_COPY(p,x) (((p)<4 ? PNG_LSR(0x80088822,(3-(p))*8+(7-(x))) :\
|
|
|
|
PNG_LSR(0xaa55ff00,(7-(p))*8+(7-(x)))) & 1)
|
|
|
|
# define B_COPY(p,x) (((p)<4 ? PNG_LSR(0xff0fff33,(3-(p))*8+(7-(x))) :\
|
|
|
|
PNG_LSR(0xff55ff00,(7-(p))*8+(7-(x)))) & 1)
|
2011-10-11 17:01:33 -04:00
|
|
|
|
|
|
|
/* Return a mask for pass 'p' pixel 'x' at depth 'd'. The mask is
|
|
|
|
* little endian - the first pixel is at bit 0 - however the extra
|
|
|
|
* parameter 's' can be set to cause the mask position to be swapped
|
|
|
|
* within each byte, to match the PNG format. This is done by XOR of
|
|
|
|
* the shift with 7, 6 or 4 for bit depths 1, 2 and 4.
|
|
|
|
*/
|
2011-10-27 17:59:03 -04:00
|
|
|
# define PIXEL_MASK(p,x,d,s) \
|
|
|
|
(PNG_LSL(((PNG_LSL(1U,(d)))-1),(((x)*(d))^((s)?8-(d):0))))
|
2011-10-11 17:01:33 -04:00
|
|
|
|
|
|
|
/* Hence generate the appropriate 'block' or 'sparkle' pixel copy mask.
|
|
|
|
*/
|
|
|
|
# define S_MASKx(p,x,d,s) (S_COPY(p,x)?PIXEL_MASK(p,x,d,s):0)
|
|
|
|
# define B_MASKx(p,x,d,s) (B_COPY(p,x)?PIXEL_MASK(p,x,d,s):0)
|
|
|
|
|
2011-10-27 13:05:58 -04:00
|
|
|
/* Combine 8 of these to get the full mask. For the 1-bpp and 2-bpp
|
|
|
|
* cases the result needs replicating, for the 4-bpp case the above
|
|
|
|
* generates a full 32 bits.
|
2011-10-11 17:01:33 -04:00
|
|
|
*/
|
|
|
|
# define MASK_EXPAND(m,d) ((m)*((d)==1?0x01010101:((d)==2?0x00010001:1)))
|
|
|
|
|
|
|
|
# define S_MASK(p,d,s) MASK_EXPAND(S_MASKx(p,0,d,s) + S_MASKx(p,1,d,s) +\
|
|
|
|
S_MASKx(p,2,d,s) + S_MASKx(p,3,d,s) + S_MASKx(p,4,d,s) +\
|
|
|
|
S_MASKx(p,5,d,s) + S_MASKx(p,6,d,s) + S_MASKx(p,7,d,s), d)
|
|
|
|
|
|
|
|
# define B_MASK(p,d,s) MASK_EXPAND(B_MASKx(p,0,d,s) + B_MASKx(p,1,d,s) +\
|
|
|
|
B_MASKx(p,2,d,s) + B_MASKx(p,3,d,s) + B_MASKx(p,4,d,s) +\
|
|
|
|
B_MASKx(p,5,d,s) + B_MASKx(p,6,d,s) + B_MASKx(p,7,d,s), d)
|
|
|
|
|
|
|
|
#if PNG_USE_COMPILE_TIME_MASKS
|
|
|
|
/* Utility macros to construct all the masks for a depth/swap
|
|
|
|
* combination. The 's' parameter says whether the format is PNG
|
2011-11-07 23:33:49 -05:00
|
|
|
* (big endian bytes) or not. Only the three odd-numbered passes are
|
2011-10-11 17:01:33 -04:00
|
|
|
* required for the display/block algorithm.
|
|
|
|
*/
|
|
|
|
# define S_MASKS(d,s) { S_MASK(0,d,s), S_MASK(1,d,s), S_MASK(2,d,s),\
|
|
|
|
S_MASK(3,d,s), S_MASK(4,d,s), S_MASK(5,d,s) }
|
|
|
|
|
|
|
|
# define B_MASKS(d,s) { B_MASK(1,d,s), S_MASK(3,d,s), S_MASK(5,d,s) }
|
|
|
|
|
|
|
|
# define DEPTH_INDEX(d) ((d)==1?0:((d)==2?1:2))
|
|
|
|
|
|
|
|
/* Hence the pre-compiled masks indexed by PACKSWAP (or not), depth and
|
|
|
|
* then pass:
|
|
|
|
*/
|
2011-11-07 23:33:49 -05:00
|
|
|
static PNG_CONST png_uint_32 row_mask[2/*PACKSWAP*/][3/*depth*/][6] =
|
|
|
|
{
|
2011-10-11 17:01:33 -04:00
|
|
|
/* Little-endian byte masks for PACKSWAP */
|
|
|
|
{ S_MASKS(1,0), S_MASKS(2,0), S_MASKS(4,0) },
|
|
|
|
/* Normal (big-endian byte) masks - PNG format */
|
|
|
|
{ S_MASKS(1,1), S_MASKS(2,1), S_MASKS(4,1) }
|
|
|
|
};
|
|
|
|
|
|
|
|
/* display_mask has only three entries for the odd passes, so index by
|
|
|
|
* pass>>1.
|
|
|
|
*/
|
2011-11-07 23:33:49 -05:00
|
|
|
static PNG_CONST png_uint_32 display_mask[2][3][3] =
|
|
|
|
{
|
2011-10-11 17:01:33 -04:00
|
|
|
/* Little-endian byte masks for PACKSWAP */
|
|
|
|
{ B_MASKS(1,0), B_MASKS(2,0), B_MASKS(4,0) },
|
|
|
|
/* Normal (big-endian byte) masks - PNG format */
|
|
|
|
{ B_MASKS(1,1), B_MASKS(2,1), B_MASKS(4,1) }
|
|
|
|
};
|
|
|
|
|
|
|
|
# define MASK(pass,depth,display,png)\
|
|
|
|
((display)?display_mask[png][DEPTH_INDEX(depth)][pass>>1]:\
|
|
|
|
row_mask[png][DEPTH_INDEX(depth)][pass])
|
|
|
|
|
|
|
|
#else /* !PNG_USE_COMPILE_TIME_MASKS */
|
|
|
|
/* This is the runtime alternative: it seems unlikely that this will
|
|
|
|
* ever be either smaller or faster than the compile time approach.
|
|
|
|
*/
|
|
|
|
# define MASK(pass,depth,display,png)\
|
|
|
|
((display)?B_MASK(pass,depth,png):S_MASK(pass,depth,png))
|
|
|
|
#endif /* !PNG_USE_COMPILE_TIME_MASKS */
|
|
|
|
|
|
|
|
/* Use the appropriate mask to copy the required bits. In some cases
|
|
|
|
* the byte mask will be 0 or 0xff, optimize these cases. row_width is
|
|
|
|
* the number of pixels, but the code copies bytes, so it is necessary
|
|
|
|
* to special case the end.
|
|
|
|
*/
|
|
|
|
png_uint_32 pixels_per_byte = 8 / pixel_depth;
|
|
|
|
png_uint_32 mask;
|
|
|
|
|
|
|
|
# ifdef PNG_READ_PACKSWAP_SUPPORTED
|
|
|
|
if (png_ptr->transformations & PNG_PACKSWAP)
|
|
|
|
mask = MASK(pass, pixel_depth, display, 0);
|
|
|
|
|
|
|
|
else
|
|
|
|
# endif
|
|
|
|
mask = MASK(pass, pixel_depth, display, 1);
|
|
|
|
|
|
|
|
for (;;)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2011-10-11 17:01:33 -04:00
|
|
|
png_uint_32 m;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
/* It doesn't matter in the following if png_uint_32 has more than
|
2011-10-27 13:05:58 -04:00
|
|
|
* 32 bits because the high bits always match those in m<<24; it is,
|
2011-10-11 17:01:33 -04:00
|
|
|
* however, essential to use OR here, not +, because of this.
|
|
|
|
*/
|
|
|
|
m = mask;
|
|
|
|
mask = (m >> 8) | (m << 24); /* rotate right to good compilers */
|
|
|
|
m &= 0xff;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
if (m != 0) /* something to copy */
|
1997-05-16 03:46:07 -04:00
|
|
|
{
|
2011-10-11 17:01:33 -04:00
|
|
|
if (m != 0xff)
|
|
|
|
*dp = (png_byte)((*dp & ~m) | (*sp & m));
|
|
|
|
else
|
|
|
|
*dp = *sp;
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
2004-11-27 19:22:29 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
/* NOTE: this may overwrite the last byte with garbage if the image
|
2011-10-27 13:05:58 -04:00
|
|
|
* is not an exact number of bytes wide; libpng has always done
|
2011-10-11 17:01:33 -04:00
|
|
|
* this.
|
|
|
|
*/
|
|
|
|
if (row_width <= pixels_per_byte)
|
2011-10-16 23:52:56 -04:00
|
|
|
break; /* May need to restore part of the last byte */
|
2004-11-27 19:22:29 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
row_width -= pixels_per_byte;
|
|
|
|
++dp;
|
|
|
|
++sp;
|
|
|
|
}
|
|
|
|
}
|
2004-11-27 19:22:29 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
else /* pixel_depth >= 8 */
|
|
|
|
{
|
|
|
|
unsigned int bytes_to_copy, bytes_to_jump;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
/* Validate the depth - it must be a multiple of 8 */
|
|
|
|
if (pixel_depth & 7)
|
|
|
|
png_error(png_ptr, "invalid user transform pixel depth");
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
pixel_depth >>= 3; /* now in bytes */
|
|
|
|
row_width *= pixel_depth;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
/* Regardless of pass number the Adam 7 interlace always results in a
|
|
|
|
* fixed number of pixels to copy then to skip. There may be a
|
|
|
|
* different number of pixels to skip at the start though.
|
|
|
|
*/
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2011-10-11 17:01:33 -04:00
|
|
|
unsigned int offset = PNG_PASS_START_COL(pass) * pixel_depth;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
row_width -= offset;
|
|
|
|
dp += offset;
|
|
|
|
sp += offset;
|
|
|
|
}
|
2004-11-27 19:22:29 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
/* Work out the bytes to copy. */
|
|
|
|
if (display)
|
|
|
|
{
|
|
|
|
/* When doing the 'block' algorithm the pixel in the pass gets
|
|
|
|
* replicated to adjacent pixels. This is why the even (0,2,4,6)
|
|
|
|
* passes are skipped above - the entire expanded row is copied.
|
2011-10-06 23:27:16 -04:00
|
|
|
*/
|
2011-10-11 17:01:33 -04:00
|
|
|
bytes_to_copy = (1<<((6-pass)>>1)) * pixel_depth;
|
2004-11-27 19:22:29 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
/* But don't allow this number to exceed the actual row width. */
|
|
|
|
if (bytes_to_copy > row_width)
|
|
|
|
bytes_to_copy = row_width;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
else /* normal row; Adam7 only ever gives us one pixel to copy. */
|
|
|
|
bytes_to_copy = pixel_depth;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
/* In Adam7 there is a constant offset between where the pixels go. */
|
|
|
|
bytes_to_jump = PNG_PASS_COL_OFFSET(pass) * pixel_depth;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
/* And simply copy these bytes. Some optimization is possible here,
|
2011-10-27 13:05:58 -04:00
|
|
|
* depending on the value of 'bytes_to_copy'. Special case the low
|
2011-10-11 17:01:33 -04:00
|
|
|
* byte counts, which we know to be frequent.
|
2011-10-16 23:52:56 -04:00
|
|
|
*
|
|
|
|
* Notice that these cases all 'return' rather than 'break' - this
|
|
|
|
* avoids an unnecessary test on whether to restore the last byte
|
|
|
|
* below.
|
2011-10-11 17:01:33 -04:00
|
|
|
*/
|
|
|
|
switch (bytes_to_copy)
|
|
|
|
{
|
|
|
|
case 1:
|
|
|
|
for (;;)
|
2011-10-06 23:27:16 -04:00
|
|
|
{
|
2011-10-11 17:01:33 -04:00
|
|
|
*dp = *sp;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
if (row_width <= bytes_to_jump)
|
|
|
|
return;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
dp += bytes_to_jump;
|
|
|
|
sp += bytes_to_jump;
|
|
|
|
row_width -= bytes_to_jump;
|
2011-10-06 23:27:16 -04:00
|
|
|
}
|
2011-10-07 19:36:37 -04:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
case 2:
|
2011-10-27 13:05:58 -04:00
|
|
|
/* There is a possibility of a partial copy at the end here; this
|
2011-10-11 17:01:33 -04:00
|
|
|
* slows the code down somewhat.
|
|
|
|
*/
|
2011-10-06 23:27:16 -04:00
|
|
|
do
|
2004-11-27 19:22:29 -05:00
|
|
|
{
|
2011-10-11 17:01:33 -04:00
|
|
|
dp[0] = sp[0], dp[1] = sp[1];
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
if (row_width <= bytes_to_jump)
|
|
|
|
return;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
sp += bytes_to_jump;
|
|
|
|
dp += bytes_to_jump;
|
|
|
|
row_width -= bytes_to_jump;
|
2011-10-06 23:27:16 -04:00
|
|
|
}
|
2011-10-11 17:01:33 -04:00
|
|
|
while (row_width > 1);
|
2004-11-27 19:22:29 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
/* And there can only be one byte left at this point: */
|
|
|
|
*dp = *sp;
|
|
|
|
return;
|
2011-10-07 19:36:37 -04:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
case 3:
|
|
|
|
/* This can only be the RGB case, so each copy is exactly one
|
|
|
|
* pixel and it is not necessary to check for a partial copy.
|
|
|
|
*/
|
|
|
|
for(;;)
|
2004-11-27 19:22:29 -05:00
|
|
|
{
|
2011-10-11 17:01:33 -04:00
|
|
|
dp[0] = sp[0], dp[1] = sp[1], dp[2] = sp[2];
|
2011-10-05 22:09:22 -04:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
if (row_width <= bytes_to_jump)
|
|
|
|
return;
|
2011-10-06 23:27:16 -04:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
sp += bytes_to_jump;
|
|
|
|
dp += bytes_to_jump;
|
|
|
|
row_width -= bytes_to_jump;
|
2004-11-27 19:22:29 -05:00
|
|
|
}
|
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
default:
|
|
|
|
#if PNG_ALIGN_TYPE != PNG_ALIGN_NONE
|
2011-10-27 13:05:58 -04:00
|
|
|
/* Check for double byte alignment and, if possible, use a
|
|
|
|
* 16-bit copy. Don't attempt this for narrow images - ones that
|
2011-10-11 17:01:33 -04:00
|
|
|
* are less than an interlace panel wide. Don't attempt it for
|
2011-11-07 23:33:49 -05:00
|
|
|
* wide bytes_to_copy either - use the png_memcpy there.
|
2011-10-11 17:01:33 -04:00
|
|
|
*/
|
2011-10-27 13:05:58 -04:00
|
|
|
if (bytes_to_copy < 16 /*else use png_memcpy*/ &&
|
2011-10-11 17:01:33 -04:00
|
|
|
png_isaligned(dp, png_uint_16) &&
|
|
|
|
png_isaligned(sp, png_uint_16) &&
|
|
|
|
bytes_to_copy % sizeof (png_uint_16) == 0 &&
|
|
|
|
bytes_to_jump % sizeof (png_uint_16) == 0)
|
2011-10-05 22:09:22 -04:00
|
|
|
{
|
2011-10-11 17:01:33 -04:00
|
|
|
/* Everything is aligned for png_uint_16 copies, but try for
|
|
|
|
* png_uint_32 first.
|
|
|
|
*/
|
|
|
|
if (png_isaligned(dp, png_uint_32) &&
|
|
|
|
png_isaligned(sp, png_uint_32) &&
|
|
|
|
bytes_to_copy % sizeof (png_uint_32) == 0 &&
|
|
|
|
bytes_to_jump % sizeof (png_uint_32) == 0)
|
|
|
|
{
|
|
|
|
png_uint_32p dp32 = (png_uint_32p)dp;
|
|
|
|
png_const_uint_32p sp32 = (png_const_uint_32p)sp;
|
|
|
|
unsigned int skip = (bytes_to_jump-bytes_to_copy) /
|
|
|
|
sizeof (png_uint_32);
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
size_t c = bytes_to_copy;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
*dp32++ = *sp32++;
|
|
|
|
c -= sizeof (png_uint_32);
|
|
|
|
}
|
|
|
|
while (c > 0);
|
|
|
|
|
|
|
|
if (row_width <= bytes_to_jump)
|
|
|
|
return;
|
|
|
|
|
|
|
|
dp32 += skip;
|
|
|
|
sp32 += skip;
|
|
|
|
row_width -= bytes_to_jump;
|
|
|
|
}
|
|
|
|
while (bytes_to_copy <= row_width);
|
|
|
|
|
|
|
|
/* Get to here when the row_width truncates the final copy.
|
|
|
|
* There will be 1-3 bytes left to copy, so don't try the
|
2011-10-27 13:05:58 -04:00
|
|
|
* 16-bit loop below.
|
2011-10-11 17:01:33 -04:00
|
|
|
*/
|
|
|
|
dp = (png_bytep)dp32;
|
|
|
|
sp = (png_const_bytep)sp32;
|
|
|
|
do
|
|
|
|
*dp++ = *sp++;
|
|
|
|
while (--row_width > 0);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-10-27 13:05:58 -04:00
|
|
|
/* Else do it in 16-bit quantities, but only if the size is
|
2011-10-11 17:01:33 -04:00
|
|
|
* not too large.
|
|
|
|
*/
|
|
|
|
else
|
|
|
|
{
|
|
|
|
png_uint_16p dp16 = (png_uint_16p)dp;
|
|
|
|
png_const_uint_16p sp16 = (png_const_uint_16p)sp;
|
|
|
|
unsigned int skip = (bytes_to_jump-bytes_to_copy) /
|
|
|
|
sizeof (png_uint_16);
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
size_t c = bytes_to_copy;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
*dp16++ = *sp16++;
|
|
|
|
c -= sizeof (png_uint_16);
|
|
|
|
}
|
|
|
|
while (c > 0);
|
|
|
|
|
|
|
|
if (row_width <= bytes_to_jump)
|
|
|
|
return;
|
|
|
|
|
|
|
|
dp16 += skip;
|
|
|
|
sp16 += skip;
|
|
|
|
row_width -= bytes_to_jump;
|
|
|
|
}
|
|
|
|
while (bytes_to_copy <= row_width);
|
|
|
|
|
2011-10-27 13:05:58 -04:00
|
|
|
/* End of row - 1 byte left, bytes_to_copy > row_width: */
|
2011-10-11 17:01:33 -04:00
|
|
|
dp = (png_bytep)dp16;
|
|
|
|
sp = (png_const_bytep)sp16;
|
|
|
|
do
|
|
|
|
*dp++ = *sp++;
|
|
|
|
while (--row_width > 0);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* PNG_ALIGN_ code */
|
2004-11-27 19:22:29 -05:00
|
|
|
|
2011-10-27 13:05:58 -04:00
|
|
|
/* The true default - use a png_memcpy: */
|
2011-10-11 17:01:33 -04:00
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
png_memcpy(dp, sp, bytes_to_copy);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
if (row_width <= bytes_to_jump)
|
|
|
|
return;
|
2011-10-06 23:27:16 -04:00
|
|
|
|
2011-10-11 17:01:33 -04:00
|
|
|
sp += bytes_to_jump;
|
|
|
|
dp += bytes_to_jump;
|
|
|
|
row_width -= bytes_to_jump;
|
|
|
|
if (bytes_to_copy > row_width)
|
|
|
|
bytes_to_copy = row_width;
|
2011-10-06 23:27:16 -04:00
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
2011-10-16 23:52:56 -04:00
|
|
|
|
|
|
|
/* NOT REACHED*/
|
2011-10-11 17:01:33 -04:00
|
|
|
} /* pixel_depth >= 8 */
|
2011-10-06 23:27:16 -04:00
|
|
|
|
2011-10-16 23:52:56 -04:00
|
|
|
/* Here if pixel_depth < 8 to check 'end_ptr' below. */
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
2011-10-11 17:01:33 -04:00
|
|
|
else
|
2011-10-06 23:27:16 -04:00
|
|
|
#endif
|
|
|
|
|
2011-10-27 13:05:58 -04:00
|
|
|
/* If here then the switch above wasn't used so just png_memcpy the whole row
|
2011-10-11 17:01:33 -04:00
|
|
|
* from the temporary row buffer (notice that this overwrites the end of the
|
|
|
|
* destination row if it is a partial byte.)
|
2011-10-06 23:27:16 -04:00
|
|
|
*/
|
|
|
|
png_memcpy(dp, sp, PNG_ROWBYTES(pixel_depth, row_width));
|
2011-10-16 23:52:56 -04:00
|
|
|
|
|
|
|
/* Restore the overwritten bits from the last byte if necessary. */
|
|
|
|
if (end_ptr != NULL)
|
|
|
|
*end_ptr = (png_byte)((end_byte & end_mask) | (*end_ptr & ~end_mask));
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
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
|
|
|
{
|
2012-01-25 08:47:44 -05:00
|
|
|
unsigned int tmp = *dp & (0x7f7f >> (7 - dshift));
|
|
|
|
tmp |= v << dshift;
|
|
|
|
*dp = (png_byte)(tmp & 0xff);
|
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
|
|
|
{
|
2012-01-25 08:47:44 -05:00
|
|
|
unsigned int tmp = *dp & (0x3f3f >> (6 - dshift));
|
|
|
|
tmp |= v << dshift;
|
|
|
|
*dp = (png_byte)(tmp & 0xff);
|
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++)
|
|
|
|
{
|
2011-10-27 17:17:24 -04:00
|
|
|
png_byte v = (png_byte)((*sp >> sshift) & 0x0f);
|
2004-11-27 19:22:29 -05:00
|
|
|
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
|
|
|
{
|
2012-01-25 08:47:44 -05:00
|
|
|
unsigned int tmp = *dp & (0xf0f >> (4 - dshift));
|
|
|
|
tmp |= v << dshift;
|
|
|
|
*dp = (png_byte)(tmp & 0xff);
|
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-10-06 23:27:16 -04:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
2011-10-06 23:27:16 -04:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
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-11-03 01:47:55 -04:00
|
|
|
static void
|
|
|
|
png_read_filter_row_sub(png_row_infop row_info, png_bytep row,
|
|
|
|
png_const_bytep prev_row)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
2011-11-03 01:47:55 -04:00
|
|
|
png_size_t i;
|
|
|
|
png_size_t istop = row_info->rowbytes;
|
|
|
|
unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
|
|
|
|
png_bytep rp = row + bpp;
|
|
|
|
|
|
|
|
PNG_UNUSED(prev_row)
|
|
|
|
|
|
|
|
for (i = bpp; i < istop; i++)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
2011-11-07 23:33:49 -05:00
|
|
|
*rp = (png_byte)(((int)(*rp) + (int)(*(rp-bpp))) & 0xff);
|
2011-11-03 01:47:55 -04:00
|
|
|
rp++;
|
|
|
|
}
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-11-03 01:47:55 -04:00
|
|
|
static void
|
|
|
|
png_read_filter_row_up(png_row_infop row_info, png_bytep row,
|
|
|
|
png_const_bytep prev_row)
|
|
|
|
{
|
|
|
|
png_size_t i;
|
|
|
|
png_size_t istop = row_info->rowbytes;
|
|
|
|
png_bytep rp = row;
|
|
|
|
png_const_bytep pp = prev_row;
|
1998-04-21 16:03:57 -04:00
|
|
|
|
2011-11-03 01:47:55 -04:00
|
|
|
for (i = 0; i < istop; i++)
|
|
|
|
{
|
|
|
|
*rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
|
|
|
|
rp++;
|
|
|
|
}
|
|
|
|
}
|
1998-04-21 16:03:57 -04:00
|
|
|
|
2011-11-03 01:47:55 -04:00
|
|
|
static void
|
|
|
|
png_read_filter_row_avg(png_row_infop row_info, png_bytep row,
|
|
|
|
png_const_bytep prev_row)
|
|
|
|
{
|
|
|
|
png_size_t i;
|
|
|
|
png_bytep rp = row;
|
|
|
|
png_const_bytep pp = prev_row;
|
|
|
|
unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
|
|
|
|
png_size_t istop = row_info->rowbytes - bpp;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-11-03 01:47:55 -04:00
|
|
|
for (i = 0; i < bpp; i++)
|
|
|
|
{
|
|
|
|
*rp = (png_byte)(((int)(*rp) +
|
|
|
|
((int)(*pp++) / 2 )) & 0xff);
|
1998-12-29 12:47:59 -05:00
|
|
|
|
2011-11-03 01:47:55 -04:00
|
|
|
rp++;
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-11-03 01:47:55 -04:00
|
|
|
for (i = 0; i < istop; i++)
|
|
|
|
{
|
|
|
|
*rp = (png_byte)(((int)(*rp) +
|
2011-11-07 23:33:49 -05:00
|
|
|
(int)(*pp++ + *(rp-bpp)) / 2 ) & 0xff);
|
1998-04-21 16:03:57 -04:00
|
|
|
|
2011-11-03 01:47:55 -04:00
|
|
|
rp++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2011-11-03 19:31:00 -04:00
|
|
|
png_read_filter_row_paeth_1byte_pixel(png_row_infop row_info, png_bytep row,
|
2011-11-03 01:47:55 -04:00
|
|
|
png_const_bytep prev_row)
|
|
|
|
{
|
2011-11-03 19:31:00 -04:00
|
|
|
png_bytep rp_end = row + row_info->rowbytes;
|
|
|
|
int a, c;
|
2011-11-03 01:47:55 -04:00
|
|
|
|
2011-11-03 19:31:00 -04:00
|
|
|
/* First pixel/byte */
|
|
|
|
c = *prev_row++;
|
|
|
|
a = *row + c;
|
|
|
|
*row++ = (png_byte)a;
|
1998-04-21 16:03:57 -04:00
|
|
|
|
2011-11-03 19:31:00 -04:00
|
|
|
/* Remainder */
|
|
|
|
while (row < rp_end)
|
2011-11-03 01:47:55 -04:00
|
|
|
{
|
2011-11-03 19:31:00 -04:00
|
|
|
int b, pa, pb, pc, p;
|
1998-05-02 13:52:25 -04:00
|
|
|
|
2011-11-03 19:31:00 -04:00
|
|
|
a &= 0xff; /* From previous iteration or start */
|
|
|
|
b = *prev_row++;
|
2011-11-03 01:47:55 -04:00
|
|
|
|
|
|
|
p = b - c;
|
|
|
|
pc = a - c;
|
1998-04-21 16:03:57 -04:00
|
|
|
|
2011-11-03 19:31:00 -04:00
|
|
|
# ifdef PNG_USE_ABS
|
|
|
|
pa = abs(p);
|
|
|
|
pb = abs(pc);
|
|
|
|
pc = abs(p + pc);
|
|
|
|
# else
|
|
|
|
pa = p < 0 ? -p : p;
|
|
|
|
pb = pc < 0 ? -pc : pc;
|
|
|
|
pc = (p + pc) < 0 ? -(p + pc) : p + pc;
|
|
|
|
# endif
|
1998-04-21 16:03:57 -04:00
|
|
|
|
2011-11-03 19:31:00 -04:00
|
|
|
/* Find the best predictor, the least of pa, pb, pc favoring the earlier
|
|
|
|
* ones in the case of a tie.
|
|
|
|
*/
|
|
|
|
if (pb < pa) pa = pb, a = b;
|
|
|
|
if (pc < pa) a = c;
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-11-03 19:31:00 -04:00
|
|
|
/* Calculate the current pixel in a, and move the previous row pixel to c
|
|
|
|
* for the next time round the loop
|
|
|
|
*/
|
|
|
|
c = b;
|
|
|
|
a += *row;
|
|
|
|
*row++ = (png_byte)a;
|
|
|
|
}
|
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-11-03 19:31:00 -04:00
|
|
|
static void
|
|
|
|
png_read_filter_row_paeth_multibyte_pixel(png_row_infop row_info, png_bytep row,
|
|
|
|
png_const_bytep prev_row)
|
|
|
|
{
|
|
|
|
int bpp = (row_info->pixel_depth + 7) >> 3;
|
|
|
|
png_bytep rp_end = row + bpp;
|
1998-04-21 16:03:57 -04:00
|
|
|
|
2011-11-03 19:31:00 -04:00
|
|
|
/* Process the first pixel in the row completely (this is the same as 'up'
|
|
|
|
* because there is only one candidate predictor for the first row).
|
|
|
|
*/
|
|
|
|
while (row < rp_end)
|
|
|
|
{
|
|
|
|
int a = *row + *prev_row++;
|
|
|
|
*row++ = (png_byte)a;
|
|
|
|
}
|
1998-04-21 16:03:57 -04:00
|
|
|
|
2011-11-03 19:31:00 -04:00
|
|
|
/* Remainder */
|
|
|
|
rp_end += row_info->rowbytes - bpp;
|
|
|
|
|
|
|
|
while (row < rp_end)
|
|
|
|
{
|
|
|
|
int a, b, c, pa, pb, pc, p;
|
|
|
|
|
|
|
|
c = *(prev_row - bpp);
|
|
|
|
a = *(row - bpp);
|
|
|
|
b = *prev_row++;
|
|
|
|
|
|
|
|
p = b - c;
|
|
|
|
pc = a - c;
|
|
|
|
|
|
|
|
# ifdef PNG_USE_ABS
|
|
|
|
pa = abs(p);
|
|
|
|
pb = abs(pc);
|
|
|
|
pc = abs(p + pc);
|
|
|
|
# else
|
|
|
|
pa = p < 0 ? -p : p;
|
|
|
|
pb = pc < 0 ? -pc : pc;
|
|
|
|
pc = (p + pc) < 0 ? -(p + pc) : p + pc;
|
|
|
|
# endif
|
|
|
|
|
|
|
|
if (pb < pa) pa = pb, a = b;
|
|
|
|
if (pc < pa) a = c;
|
|
|
|
|
|
|
|
c = b;
|
|
|
|
a += *row;
|
|
|
|
*row++ = (png_byte)a;
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
|
2011-11-03 01:47:55 -04:00
|
|
|
#ifdef PNG_ARM_NEON
|
2011-11-16 14:48:18 -05:00
|
|
|
|
|
|
|
#ifdef __linux__
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <elf.h>
|
|
|
|
#include <asm/hwcap.h>
|
|
|
|
|
|
|
|
static int png_have_hwcap(unsigned cap)
|
|
|
|
{
|
|
|
|
FILE *f = fopen("/proc/self/auxv", "r");
|
|
|
|
Elf32_auxv_t aux;
|
|
|
|
int have_cap = 0;
|
|
|
|
|
|
|
|
if (!f)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
while (fread(&aux, sizeof(aux), 1, f) > 0)
|
|
|
|
{
|
|
|
|
if (aux.a_type == AT_HWCAP &&
|
|
|
|
aux.a_un.a_val & cap)
|
|
|
|
{
|
|
|
|
have_cap = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fclose(f);
|
|
|
|
|
|
|
|
return have_cap;
|
|
|
|
}
|
|
|
|
#endif /* __linux__ */
|
|
|
|
|
2011-11-03 01:47:55 -04:00
|
|
|
static void
|
2011-12-24 10:12:00 -05:00
|
|
|
png_init_filter_functions_neon(png_structrp pp, unsigned int bpp)
|
2011-11-03 01:47:55 -04:00
|
|
|
{
|
2011-11-16 14:48:18 -05:00
|
|
|
#ifdef __linux__
|
|
|
|
if (!png_have_hwcap(HWCAP_NEON))
|
|
|
|
return;
|
|
|
|
#endif
|
|
|
|
|
2011-11-03 01:47:55 -04:00
|
|
|
pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up_neon;
|
|
|
|
|
2011-11-16 14:48:18 -05:00
|
|
|
if (bpp == 3)
|
|
|
|
{
|
2011-11-03 01:47:55 -04:00
|
|
|
pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub3_neon;
|
|
|
|
pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg3_neon;
|
2012-03-02 14:13:15 -05:00
|
|
|
pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
|
2011-11-16 14:48:18 -05:00
|
|
|
png_read_filter_row_paeth3_neon;
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (bpp == 4)
|
|
|
|
{
|
2011-11-03 01:47:55 -04:00
|
|
|
pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub4_neon;
|
|
|
|
pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg4_neon;
|
2011-11-16 14:48:18 -05:00
|
|
|
pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
|
|
|
|
png_read_filter_row_paeth4_neon;
|
2011-11-03 01:47:55 -04:00
|
|
|
}
|
|
|
|
}
|
2011-11-16 14:48:18 -05:00
|
|
|
#endif /* PNG_ARM_NEON */
|
2011-11-03 01:47:55 -04:00
|
|
|
|
|
|
|
static void
|
2011-12-24 10:12:00 -05:00
|
|
|
png_init_filter_functions(png_structrp pp)
|
2011-11-03 01:47:55 -04:00
|
|
|
{
|
2011-11-03 19:31:00 -04:00
|
|
|
unsigned int bpp = (pp->pixel_depth + 7) >> 3;
|
|
|
|
|
2011-11-03 01:47:55 -04:00
|
|
|
pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub;
|
|
|
|
pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up;
|
|
|
|
pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg;
|
2011-11-03 19:31:00 -04:00
|
|
|
if (bpp == 1)
|
|
|
|
pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
|
|
|
|
png_read_filter_row_paeth_1byte_pixel;
|
|
|
|
else
|
|
|
|
pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
|
|
|
|
png_read_filter_row_paeth_multibyte_pixel;
|
2011-11-03 01:47:55 -04:00
|
|
|
|
|
|
|
#ifdef PNG_ARM_NEON
|
2011-11-03 19:31:00 -04:00
|
|
|
png_init_filter_functions_neon(pp, bpp);
|
2011-11-03 01:47:55 -04:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
void /* PRIVATE */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_read_filter_row(png_structrp pp, png_row_infop row_info, png_bytep row,
|
2011-11-03 01:47:55 -04:00
|
|
|
png_const_bytep prev_row, int filter)
|
|
|
|
{
|
|
|
|
if (pp->read_filter[0] == NULL)
|
|
|
|
png_init_filter_functions(pp);
|
|
|
|
if (filter > PNG_FILTER_VALUE_NONE && filter < PNG_FILTER_VALUE_LAST)
|
|
|
|
pp->read_filter[filter-1](row_info, row, prev_row);
|
|
|
|
}
|
|
|
|
|
2009-08-31 09:42:02 -04:00
|
|
|
#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
|
2000-05-06 15:09:57 -04:00
|
|
|
void /* PRIVATE */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_read_finish_row(png_structrp 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
|
|
|
|
2012-03-05 21:57:40 -05:00
|
|
|
/* Here after at the end of the last row of the last pass. */
|
|
|
|
if (!(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED))
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
2012-03-05 21:57:40 -05:00
|
|
|
Byte extra;
|
1995-07-20 03:43:20 -04:00
|
|
|
int ret;
|
|
|
|
|
2012-03-05 21:57:40 -05:00
|
|
|
png_ptr->zstream.next_out = &extra;
|
|
|
|
png_ptr->zstream.avail_out = 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
|
|
|
{
|
2012-03-05 21:57:40 -05:00
|
|
|
while (png_ptr->idat_size == 0)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
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
|
|
|
|
2012-03-05 21:57:40 -05:00
|
|
|
png_ptr->zstream.avail_in = png_ptr->zbuf_size;
|
1997-01-17 02:34:35 -05:00
|
|
|
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)
|
2012-03-05 21:57:40 -05:00
|
|
|
png_ptr->zstream.avail_in = 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
|
|
|
|
2012-03-05 21:57:40 -05:00
|
|
|
ret = inflate(&png_ptr->zstream, Z_NO_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
|
|
|
|
2012-03-05 21:57:40 -05:00
|
|
|
png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
|
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
|
|
|
break;
|
|
|
|
}
|
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
|
|
|
|
2012-03-05 21:57:40 -05:00
|
|
|
png_ptr->flags &= ~PNG_FLAG_ZSTREAM_IN_USE;
|
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 */
|
2011-12-24 10:12:00 -05:00
|
|
|
png_read_start_row(png_structrp 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");
|
2012-03-05 21:57:40 -05:00
|
|
|
|
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;
|
|
|
|
|
2011-11-08 22:35:16 -05:00
|
|
|
/* WARNING: * png_read_transform_info (pngrtran.c) performs a simpliar set of
|
|
|
|
* calculations to calculate the final pixel depth, then
|
|
|
|
* png_do_read_transforms actually does the transforms. This means that the
|
|
|
|
* code which effectively calculates this value is actually repeated in three
|
|
|
|
* separate places. They must all match. Innocent changes to the order of
|
|
|
|
* transformations can and will break libpng in a way that causes memory
|
|
|
|
* overwrites.
|
|
|
|
*
|
|
|
|
* TODO: fix this.
|
|
|
|
*/
|
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
|
|
|
{
|
2011-11-08 22:35:16 -05:00
|
|
|
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
|
|
|
|
2011-11-08 22:35:16 -05:00
|
|
|
else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB ||
|
|
|
|
png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
|
|
|
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-10-17 16:25:03 -04:00
|
|
|
png_free(png_ptr, png_ptr->big_prev_row);
|
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
|
2011-10-17 16:25:03 -04:00
|
|
|
png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes + 48);
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2011-10-17 16:25:03 -04:00
|
|
|
png_ptr->big_prev_row = (png_bytep)png_malloc(png_ptr, row_bytes + 48);
|
2009-11-20 22:15:06 -05:00
|
|
|
|
|
|
|
#ifdef PNG_ALIGNED_MEMORY_SUPPORTED
|
|
|
|
/* Use 16-byte aligned memory for row_buf with at least 16 bytes
|
2011-10-17 16:25:03 -04:00
|
|
|
* of padding before and after row_buf; treat prev_row similarly.
|
2011-10-06 23:27:16 -04:00
|
|
|
* NOTE: the alignment is to the start of the pixels, one beyond the start
|
|
|
|
* of the buffer, because of the filter byte. Prior to libpng 1.5.6 this
|
2011-10-17 16:25:03 -04:00
|
|
|
* was incorrect; the filter byte was aligned, which had the exact
|
|
|
|
* opposite effect of that intended.
|
2009-11-20 22:15:06 -05:00
|
|
|
*/
|
2011-10-06 23:27:16 -04:00
|
|
|
{
|
|
|
|
png_bytep temp = png_ptr->big_row_buf + 32;
|
2011-10-27 17:17:24 -04:00
|
|
|
int extra = (int)((temp - (png_bytep)0) & 0x0f);
|
2011-10-06 23:27:16 -04:00
|
|
|
png_ptr->row_buf = temp - extra - 1/*filter byte*/;
|
2011-10-17 16:25:03 -04:00
|
|
|
|
|
|
|
temp = png_ptr->big_prev_row + 32;
|
2011-10-27 17:17:24 -04:00
|
|
|
extra = (int)((temp - (png_bytep)0) & 0x0f);
|
2011-10-17 16:25:03 -04:00
|
|
|
png_ptr->prev_row = temp - extra - 1/*filter byte*/;
|
2011-10-06 23:27:16 -04:00
|
|
|
}
|
2011-01-07 19:28:47 -05:00
|
|
|
|
2009-11-20 22:15:06 -05:00
|
|
|
#else
|
2011-10-06 23:27:16 -04:00
|
|
|
/* Use 31 bytes of padding before and 17 bytes after row_buf. */
|
|
|
|
png_ptr->row_buf = png_ptr->big_row_buf + 31;
|
2011-10-17 16:25:03 -04:00
|
|
|
png_ptr->prev_row = png_ptr->big_prev_row + 31;
|
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
|
|
|
|
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
|
|
|
|
2012-03-05 21:57:40 -05:00
|
|
|
/* Finally claim the zstream for the inflate of the IDAT data. */
|
|
|
|
png_inflate_claim(png_ptr);
|
|
|
|
|
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 */
|