1995-07-20 03:43:20 -04: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
|
|
|
*
|
1998-05-02 13:52:25 -04:00
|
|
|
* 1.0.1b
|
1998-01-01 08:13:13 -05:00
|
|
|
* For conditions of distribution and use, see copyright notice in png.h
|
|
|
|
* Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
|
|
|
|
* Copyright (c) 1996, 1997 Andreas Dilger
|
1998-01-07 21:54:20 -05:00
|
|
|
* Copyright (c) 1998, Glenn Randers-Pehrson
|
1998-05-02 13:52:25 -04:00
|
|
|
* May 2, 1998
|
1998-01-01 08:13:13 -05:00
|
|
|
*
|
|
|
|
* This file contains routines which are only called from within
|
|
|
|
* libpng itself during the course of reading an image.
|
|
|
|
*/
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
#define PNG_INTERNAL
|
|
|
|
#include "png.h"
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
#ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
|
|
|
|
/* Grab an unsigned 32-bit integer from a buffer in big endian format. */
|
1995-07-20 03:43:20 -04:00
|
|
|
png_uint_32
|
1995-12-19 04:22:19 -05:00
|
|
|
png_get_uint_32(png_bytep buf)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_uint_32 i = ((png_uint_32)(*buf) << 24) +
|
1995-07-20 03:43:20 -04:00
|
|
|
((png_uint_32)(*(buf + 1)) << 16) +
|
|
|
|
((png_uint_32)(*(buf + 2)) << 8) +
|
|
|
|
(png_uint_32)(*(buf + 3));
|
|
|
|
|
1998-01-31 21:07:59 -05:00
|
|
|
return (i);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
#if defined(PNG_READ_pCAL_SUPPORTED)
|
|
|
|
/* Grab a signed 32-bit integer from a buffer in big endian format. The
|
|
|
|
* data is stored in the PNG file in two's complement format, and it is
|
|
|
|
* assumed that the machine format for signed integers is the same. */
|
|
|
|
png_int_32
|
|
|
|
png_get_int_32(png_bytep buf)
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_int_32 i = ((png_int_32)(*buf) << 24) +
|
1997-05-16 03:46:07 -04:00
|
|
|
((png_int_32)(*(buf + 1)) << 16) +
|
|
|
|
((png_int_32)(*(buf + 2)) << 8) +
|
|
|
|
(png_int_32)(*(buf + 3));
|
|
|
|
|
1998-01-31 21:07:59 -05:00
|
|
|
return (i);
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
|
|
|
#endif /* PNG_READ_pCAL_SUPPORTED */
|
|
|
|
|
|
|
|
/* Grab an unsigned 16-bit integer from a buffer in big endian format. */
|
1995-07-20 03:43:20 -04:00
|
|
|
png_uint_16
|
1995-12-19 04:22:19 -05:00
|
|
|
png_get_uint_16(png_bytep buf)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_uint_16 i = (png_uint_16)(((png_uint_16)(*buf) << 8) +
|
1996-01-26 02:38:47 -05:00
|
|
|
(png_uint_16)(*(buf + 1)));
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1998-01-31 21:07:59 -05:00
|
|
|
return (i);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
#endif /* PNG_READ_BIG_ENDIAN_SUPPORTED */
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
/* Read data, and (optionally) run it through the CRC. */
|
1995-07-20 03:43:20 -04:00
|
|
|
void
|
1997-05-16 03:46:07 -04:00
|
|
|
png_crc_read(png_structp png_ptr, png_bytep buf, png_size_t length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
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
|
|
|
|
are reading a ancillary or critical chunk, and how the program has set
|
1997-05-16 03:46:07 -04:00
|
|
|
things up, we may calculate the CRC on the data and print a message.
|
|
|
|
Returns '1' if there was a CRC error, '0' otherwise. */
|
1997-01-17 02:34:35 -05:00
|
|
|
int
|
|
|
|
png_crc_finish(png_structp png_ptr, png_uint_32 skip)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_size_t i;
|
|
|
|
png_size_t istop = png_ptr->zbuf_size;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1998-04-21 16:03:57 -04: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
|
|
|
}
|
|
|
|
if (i)
|
|
|
|
{
|
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
|
|
|
{
|
|
|
|
if ((png_ptr->chunk_name[0] & 0x20 && /* Ancillary */
|
|
|
|
!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)) ||
|
|
|
|
(!(png_ptr->chunk_name[0] & 0x20) && /* Critical */
|
|
|
|
png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE))
|
|
|
|
{
|
1998-01-03 23:40:55 -05:00
|
|
|
png_chunk_warning(png_ptr, "CRC error");
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
1998-01-03 23:40:55 -05:00
|
|
|
png_chunk_error(png_ptr, "CRC error");
|
1997-01-17 02:34:35 -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
|
1997-01-17 02:34:35 -05:00
|
|
|
the data it has read thus far. */
|
|
|
|
int
|
|
|
|
png_crc_error(png_structp png_ptr)
|
|
|
|
{
|
|
|
|
png_byte crc_bytes[4];
|
|
|
|
png_uint_32 crc;
|
1997-05-16 03:46:07 -04:00
|
|
|
int need_crc = 1;
|
1997-01-17 02:34:35 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
if (png_ptr->chunk_name[0] & 0x20) /* ancillary */
|
|
|
|
{
|
|
|
|
if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
|
|
|
|
(PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
|
|
|
|
need_crc = 0;
|
|
|
|
}
|
|
|
|
else /* critical */
|
|
|
|
{
|
|
|
|
if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
|
|
|
|
need_crc = 0;
|
|
|
|
}
|
1997-01-17 02:34:35 -05:00
|
|
|
|
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
|
|
|
}
|
|
|
|
else
|
1998-01-31 21:07:59 -05:00
|
|
|
return (0);
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
/* read and check the IDHR chunk */
|
|
|
|
void
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
png_byte buf[13];
|
|
|
|
png_uint_32 width, height;
|
|
|
|
int bit_depth, color_type, compression_type, filter_type;
|
|
|
|
int interlace_type;
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1, "in png_handle_IHDR\n");
|
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (png_ptr->mode != PNG_BEFORE_IHDR)
|
|
|
|
png_error(png_ptr, "Out of place IHDR");
|
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
/* check the length */
|
|
|
|
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
|
|
|
|
|
|
|
width = png_get_uint_32(buf);
|
|
|
|
height = png_get_uint_32(buf + 4);
|
|
|
|
bit_depth = buf[8];
|
|
|
|
color_type = buf[9];
|
|
|
|
compression_type = buf[10];
|
|
|
|
filter_type = buf[11];
|
|
|
|
interlace_type = buf[12];
|
|
|
|
|
|
|
|
/* check for width and height valid values */
|
1998-01-01 08:13:13 -05:00
|
|
|
if (width == 0 || width > (png_uint_32)2147483647L || height == 0 ||
|
|
|
|
height > (png_uint_32)2147483647L)
|
1996-06-05 16:50:50 -04:00
|
|
|
png_error(png_ptr, "Invalid image size in IHDR");
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
/* check other values */
|
1997-05-16 03:46:07 -04:00
|
|
|
if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 &&
|
|
|
|
bit_depth != 8 && bit_depth != 16)
|
1996-06-05 16:50:50 -04:00
|
|
|
png_error(png_ptr, "Invalid bit depth in IHDR");
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
if (color_type < 0 || color_type == 1 ||
|
|
|
|
color_type == 5 || color_type > 6)
|
1996-06-05 16:50:50 -04:00
|
|
|
png_error(png_ptr, "Invalid color type in IHDR");
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if ((color_type == PNG_COLOR_TYPE_PALETTE && bit_depth) > 8 ||
|
|
|
|
((color_type == PNG_COLOR_TYPE_RGB ||
|
|
|
|
color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||
|
|
|
|
color_type == PNG_COLOR_TYPE_RGB_ALPHA) && bit_depth < 8))
|
|
|
|
png_error(png_ptr, "Invalid color type/bit depth combination in IHDR");
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1998-01-01 08:13:13 -05:00
|
|
|
if (interlace_type >= PNG_INTERLACE_LAST)
|
1997-01-17 02:34:35 -05:00
|
|
|
png_error(png_ptr, "Unknown interlace method in IHDR");
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
if (compression_type != PNG_COMPRESSION_TYPE_BASE)
|
1997-01-17 02:34:35 -05:00
|
|
|
png_error(png_ptr, "Unknown compression method in IHDR");
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
if (filter_type != PNG_FILTER_TYPE_BASE)
|
1997-01-17 02:34:35 -05:00
|
|
|
png_error(png_ptr, "Unknown filter method in IHDR");
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
/* set internal variables */
|
|
|
|
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;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
/* find number of channels */
|
|
|
|
switch (png_ptr->color_type)
|
|
|
|
{
|
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;
|
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;
|
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;
|
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
|
|
|
|
1995-07-20 03:43:20 -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);
|
1995-07-20 03:43:20 -04:00
|
|
|
png_ptr->rowbytes = ((png_ptr->width *
|
|
|
|
(png_uint_32)png_ptr->pixel_depth + 7) >> 3);
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug1(3,"bit_depth = %d\n", png_ptr->bit_depth);
|
|
|
|
png_debug1(3,"channels = %d\n", png_ptr->channels);
|
|
|
|
png_debug1(3,"rowbytes = %d\n", png_ptr->rowbytes);
|
|
|
|
png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
|
|
|
|
color_type, interlace_type, compression_type, filter_type);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* read and check the palette */
|
|
|
|
void
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1995-12-19 04:22:19 -05:00
|
|
|
png_colorp palette;
|
1997-01-17 02:34:35 -05:00
|
|
|
int num, i;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1, "in png_handle_PLTE\n");
|
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before PLTE");
|
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;
|
|
|
|
}
|
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
|
|
|
|
|
|
|
#if !defined(PNG_READ_OPT_PLTE_SUPPORTED)
|
|
|
|
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
|
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
if (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;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
png_error(png_ptr, "Invalid palette chunk");
|
|
|
|
}
|
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
num = (int)length / 3;
|
1998-01-16 23:06:18 -05:00
|
|
|
palette = (png_colorp)png_zalloc(png_ptr, (uInt)num, sizeof (png_color));
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->flags |= PNG_FLAG_FREE_PALETTE;
|
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);
|
|
|
|
/* don't depend upon png_color being any order */
|
|
|
|
palette[i].red = buf[0];
|
|
|
|
palette[i].green = buf[1];
|
|
|
|
palette[i].blue = buf[2];
|
|
|
|
}
|
1997-01-17 02:34:35 -05:00
|
|
|
|
|
|
|
/* If we actually NEED the PLTE chunk (ie for a paletted image), we do
|
|
|
|
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. */
|
1998-01-30 22:45:12 -05:00
|
|
|
#if !defined(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
|
|
|
}
|
1998-01-30 22:45:12 -05:00
|
|
|
#if !defined(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,
|
|
|
|
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). */
|
|
|
|
if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE))
|
|
|
|
{
|
|
|
|
if (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)
|
|
|
|
{
|
1998-01-03 23:40:55 -05:00
|
|
|
png_chunk_error(png_ptr, "CRC error");
|
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-05-16 03:46:07 -04:00
|
|
|
png_ptr->flags &= ~PNG_FLAG_FREE_PALETTE;
|
1998-01-16 23:06:18 -05:00
|
|
|
png_zfree(png_ptr, palette);
|
1997-01-17 02:34:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
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
|
1995-07-20 03:43:20 -04:00
|
|
|
png_ptr->palette = palette;
|
1996-01-26 02:38:47 -05:00
|
|
|
png_ptr->num_palette = (png_uint_16)num;
|
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
|
|
|
|
|
|
|
#if defined (PNG_READ_tRNS_SUPPORTED)
|
|
|
|
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
|
|
|
|
{
|
|
|
|
if (info_ptr != NULL && info_ptr->valid & PNG_INFO_tRNS)
|
|
|
|
{
|
|
|
|
if (png_ptr->num_trans > png_ptr->num_palette)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Truncating incorrect tRNS chunk length");
|
|
|
|
png_ptr->num_trans = png_ptr->num_palette;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
1996-06-05 16:50:50 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
void
|
|
|
|
png_handle_IEND(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1, "in png_handle_IEND\n");
|
|
|
|
|
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");
|
1998-02-08 21:56:40 -05:00
|
|
|
|
|
|
|
/* to quiet compiler warnings about unused info_ptr */
|
|
|
|
if (info_ptr == NULL)
|
|
|
|
return;
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
png_ptr->mode |= PNG_AFTER_IDAT | PNG_HAVE_IEND;
|
|
|
|
|
|
|
|
if (length != 0)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Incorrect IEND chunk length");
|
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
png_crc_finish(png_ptr, length);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
1995-09-26 06:22:39 -04:00
|
|
|
#if defined(PNG_READ_gAMA_SUPPORTED)
|
1995-07-20 03:43:20 -04:00
|
|
|
void
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_gAMA(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
png_uint_32 igamma;
|
1997-05-16 03:46:07 -04:00
|
|
|
float file_gamma;
|
1995-07-20 03:43:20 -04:00
|
|
|
png_byte buf[4];
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1, "in png_handle_gAMA\n");
|
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before gAMA");
|
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;
|
|
|
|
}
|
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
|
|
|
|
|
|
|
else if (info_ptr != NULL && info_ptr->valid & PNG_INFO_gAMA
|
|
|
|
#if defined(PNG_READ_sRGB_SUPPORTED)
|
|
|
|
&& !(info_ptr->valid & PNG_INFO_sRGB)
|
|
|
|
#endif
|
|
|
|
)
|
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);
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
return;
|
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
igamma = png_get_uint_32(buf);
|
|
|
|
/* check for zero gamma */
|
1997-05-16 03:46:07 -04:00
|
|
|
if (igamma == 0)
|
1996-01-26 02:38:47 -05:00
|
|
|
return;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1998-01-01 08:13:13 -05:00
|
|
|
#if defined(PNG_READ_sRGB_SUPPORTED)
|
1998-01-07 21:54:20 -05:00
|
|
|
if (info_ptr->valid & PNG_INFO_sRGB)
|
1998-01-30 22:45:12 -05:00
|
|
|
if(igamma != (png_uint_32)45000L)
|
1998-01-01 08:13:13 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr,
|
|
|
|
"Ignoring incorrect gAMA value when sRGB is also present");
|
1998-01-07 21:54:20 -05:00
|
|
|
#ifndef PNG_NO_STDIO
|
|
|
|
fprintf(stderr, "igamma = %lu\n", igamma);
|
|
|
|
#endif
|
1998-01-01 08:13:13 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif /* PNG_READ_sRGB_SUPPORTED */
|
|
|
|
|
1998-03-07 20:45:37 -05:00
|
|
|
file_gamma = (float)igamma / (float)100000.0;
|
1998-01-30 22:45:12 -05:00
|
|
|
#ifdef PNG_READ_GAMMA_SUPPORTED
|
1997-05-16 03:46:07 -04:00
|
|
|
png_ptr->gamma = file_gamma;
|
1998-01-30 22:45:12 -05:00
|
|
|
#endif
|
1997-05-16 03:46:07 -04:00
|
|
|
png_set_gAMA(png_ptr, info_ptr, file_gamma);
|
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
|
|
|
|
1995-09-26 06:22:39 -04:00
|
|
|
#if defined(PNG_READ_sBIT_SUPPORTED)
|
1995-07-20 03:43:20 -04:00
|
|
|
void
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_size_t truelen;
|
1996-01-26 02:38:47 -05:00
|
|
|
png_byte buf[4];
|
1996-01-10 03:56:49 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1, "in png_handle_sBIT\n");
|
|
|
|
|
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");
|
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;
|
|
|
|
}
|
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
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
else 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;
|
1995-07-20 03:43:20 -04:00
|
|
|
else
|
1997-05-16 03:46:07 -04:00
|
|
|
truelen = (png_size_t)png_ptr->channels;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (length != truelen)
|
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);
|
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
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
1996-01-26 02:38:47 -05:00
|
|
|
png_ptr->sig_bit.gray = 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
|
|
|
}
|
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
|
|
|
|
1995-09-26 06:22:39 -04:00
|
|
|
#if defined(PNG_READ_cHRM_SUPPORTED)
|
1995-07-20 03:43:20 -04:00
|
|
|
void
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
png_byte buf[4];
|
1997-01-17 02:34:35 -05:00
|
|
|
png_uint_32 val;
|
1995-07-20 03:43:20 -04:00
|
|
|
float white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1, "in png_handle_cHRM\n");
|
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before sBIT");
|
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;
|
|
|
|
}
|
1996-06-05 16:50:50 -04:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_PLTE)
|
|
|
|
/* Should be an error, but we can cope with it */
|
|
|
|
png_warning(png_ptr, "Missing PLTE before cHRM");
|
1998-01-07 21:54:20 -05:00
|
|
|
|
1998-01-01 08:13:13 -05:00
|
|
|
else if (info_ptr != NULL && info_ptr->valid & PNG_INFO_cHRM
|
1998-01-07 21:54:20 -05:00
|
|
|
#if defined(PNG_READ_sRGB_SUPPORTED)
|
|
|
|
&& !(info_ptr->valid & PNG_INFO_sRGB)
|
|
|
|
#endif
|
|
|
|
)
|
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
|
|
|
}
|
|
|
|
|
|
|
|
png_crc_read(png_ptr, buf, 4);
|
1997-01-17 02:34:35 -05:00
|
|
|
val = png_get_uint_32(buf);
|
1998-03-07 20:45:37 -05:00
|
|
|
white_x = (float)val / (float)100000.0;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
png_crc_read(png_ptr, buf, 4);
|
1997-01-17 02:34:35 -05:00
|
|
|
val = png_get_uint_32(buf);
|
1998-03-07 20:45:37 -05:00
|
|
|
white_y = (float)val / (float)100000.0;
|
1997-01-17 02:34:35 -05:00
|
|
|
|
|
|
|
if (white_x < 0 || white_x > 0.8 || white_y < 0 || white_y > 0.8 ||
|
|
|
|
white_x + white_y > 1.0)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid cHRM white point");
|
|
|
|
png_crc_finish(png_ptr, 24);
|
|
|
|
return;
|
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
png_crc_read(png_ptr, buf, 4);
|
1997-01-17 02:34:35 -05:00
|
|
|
val = png_get_uint_32(buf);
|
1998-03-07 20:45:37 -05:00
|
|
|
red_x = (float)val / (float)100000.0;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
png_crc_read(png_ptr, buf, 4);
|
1997-01-17 02:34:35 -05:00
|
|
|
val = png_get_uint_32(buf);
|
1998-03-07 20:45:37 -05:00
|
|
|
red_y = (float)val / (float)100000.0;
|
1997-01-17 02:34:35 -05:00
|
|
|
|
|
|
|
if (red_x < 0 || red_x > 0.8 || red_y < 0 || red_y > 0.8 ||
|
|
|
|
red_x + red_y > 1.0)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid cHRM red point");
|
|
|
|
png_crc_finish(png_ptr, 16);
|
|
|
|
return;
|
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
png_crc_read(png_ptr, buf, 4);
|
1997-01-17 02:34:35 -05:00
|
|
|
val = png_get_uint_32(buf);
|
1998-03-07 20:45:37 -05:00
|
|
|
green_x = (float)val / (float)100000.0;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
png_crc_read(png_ptr, buf, 4);
|
1997-01-17 02:34:35 -05:00
|
|
|
val = png_get_uint_32(buf);
|
1998-03-07 20:45:37 -05:00
|
|
|
green_y = (float)val / (float)100000.0;
|
1997-01-17 02:34:35 -05:00
|
|
|
|
|
|
|
if (green_x < 0 || green_x > 0.8 || green_y < 0 || green_y > 0.8 ||
|
|
|
|
green_x + green_y > 1.0)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid cHRM green point");
|
|
|
|
png_crc_finish(png_ptr, 8);
|
|
|
|
return;
|
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
png_crc_read(png_ptr, buf, 4);
|
1997-01-17 02:34:35 -05:00
|
|
|
val = png_get_uint_32(buf);
|
1998-03-07 20:45:37 -05:00
|
|
|
blue_x = (float)val / (float)100000.0;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
png_crc_read(png_ptr, buf, 4);
|
1997-01-17 02:34:35 -05:00
|
|
|
val = png_get_uint_32(buf);
|
1998-03-07 20:45:37 -05:00
|
|
|
blue_y = (float)val / (float)100000.0;
|
1997-01-17 02:34:35 -05:00
|
|
|
|
1998-01-03 23:40:55 -05:00
|
|
|
if (blue_x < (float)0 || blue_x > (float)0.8 || blue_y < (float)0 ||
|
|
|
|
blue_y > (float)0.8 || blue_x + blue_y > (float)1.0)
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid cHRM blue point");
|
|
|
|
png_crc_finish(png_ptr, 0);
|
|
|
|
return;
|
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
return;
|
|
|
|
|
1998-01-01 08:13:13 -05:00
|
|
|
#if defined(PNG_READ_sRGB_SUPPORTED)
|
1998-01-07 21:54:20 -05:00
|
|
|
if (info_ptr->valid & PNG_INFO_sRGB)
|
1998-01-01 08:13:13 -05:00
|
|
|
{
|
1998-01-03 23:40:55 -05:00
|
|
|
if (fabs(white_x - (float).3127) > (float).001 ||
|
|
|
|
fabs(white_y - (float).3290) > (float).001 ||
|
|
|
|
fabs( red_x - (float).6400) > (float).001 ||
|
|
|
|
fabs( red_y - (float).3300) > (float).001 ||
|
|
|
|
fabs(green_x - (float).3000) > (float).001 ||
|
|
|
|
fabs(green_y - (float).6000) > (float).001 ||
|
|
|
|
fabs( blue_x - (float).1500) > (float).001 ||
|
1998-01-07 21:54:20 -05:00
|
|
|
fabs( blue_y - (float).0600) > (float).001)
|
1998-01-03 23:40:55 -05:00
|
|
|
{
|
1998-01-07 21:54:20 -05:00
|
|
|
|
1998-01-03 23:40:55 -05:00
|
|
|
png_warning(png_ptr,
|
|
|
|
"Ignoring incorrect cHRM value when sRGB is also present");
|
1998-01-07 21:54:20 -05:00
|
|
|
#ifndef PNG_NO_STDIO
|
|
|
|
fprintf(stderr,"wx=%f, wy=%f, rx=%f, ry=%f\n",
|
|
|
|
white_x, white_y, red_x, red_y);
|
|
|
|
fprintf(stderr,"gx=%f, gy=%f, bx=%f, by=%f\n",
|
|
|
|
green_x, green_y, blue_x, blue_y);
|
|
|
|
#endif
|
1998-01-03 23:40:55 -05:00
|
|
|
}
|
1998-01-01 08:13:13 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif /* PNG_READ_sRGB_SUPPORTED */
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_set_cHRM(png_ptr, info_ptr,
|
1996-01-26 02:38:47 -05:00
|
|
|
white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);
|
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
|
|
|
|
1998-01-01 08:13:13 -05:00
|
|
|
#if defined(PNG_READ_sRGB_SUPPORTED)
|
|
|
|
void
|
|
|
|
png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
|
|
|
{
|
1998-01-16 23:06:18 -05:00
|
|
|
int intent;
|
1998-01-01 08:13:13 -05:00
|
|
|
png_byte buf[1];
|
|
|
|
|
|
|
|
png_debug(1, "in png_handle_sRGB\n");
|
|
|
|
|
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before sRGB");
|
|
|
|
else if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid sRGB after IDAT");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
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
|
|
|
|
1998-01-01 08:13:13 -05:00
|
|
|
else if (info_ptr != NULL && info_ptr->valid & PNG_INFO_sRGB)
|
|
|
|
{
|
|
|
|
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);
|
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
return;
|
|
|
|
|
|
|
|
intent = buf[0];
|
|
|
|
/* 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)
|
1998-01-07 21:54:20 -05:00
|
|
|
if ((info_ptr->valid & PNG_INFO_gAMA))
|
1998-03-07 20:45:37 -05:00
|
|
|
if((png_uint_32)(png_ptr->gamma*(float)100000.+.5) != (png_uint_32)45000L)
|
1998-01-07 21:54:20 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr,
|
|
|
|
"Ignoring incorrect gAMA value when sRGB is also present");
|
|
|
|
#ifndef PNG_NO_STDIO
|
|
|
|
fprintf(stderr,"gamma=%f\n",png_ptr->gamma);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
#endif /* PNG_READ_gAMA_SUPPORTED */
|
|
|
|
|
|
|
|
#ifdef PNG_READ_cHRM_SUPPORTED
|
|
|
|
if (info_ptr->valid & PNG_INFO_cHRM)
|
|
|
|
if (fabs(info_ptr->x_white - (float).3127) > (float).001 ||
|
|
|
|
fabs(info_ptr->y_white - (float).3290) > (float).001 ||
|
|
|
|
fabs( info_ptr->x_red - (float).6400) > (float).001 ||
|
|
|
|
fabs( info_ptr->y_red - (float).3300) > (float).001 ||
|
|
|
|
fabs(info_ptr->x_green - (float).3000) > (float).001 ||
|
|
|
|
fabs(info_ptr->y_green - (float).6000) > (float).001 ||
|
|
|
|
fabs( info_ptr->x_blue - (float).1500) > (float).001 ||
|
|
|
|
fabs( info_ptr->y_blue - (float).0600) > (float).001)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr,
|
|
|
|
"Ignoring incorrect cHRM value when sRGB is also present");
|
|
|
|
}
|
|
|
|
#endif /* PNG_READ_cHRM_SUPPORTED */
|
1998-01-01 08:13:13 -05:00
|
|
|
|
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 */
|
|
|
|
|
1995-09-26 06:22:39 -04:00
|
|
|
#if defined(PNG_READ_tRNS_SUPPORTED)
|
1995-07-20 03:43:20 -04:00
|
|
|
void
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1, "in png_handle_tRNS\n");
|
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before tRNS");
|
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;
|
|
|
|
}
|
1997-05-16 03:46:07 -04: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
|
|
|
|
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
|
|
|
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");
|
|
|
|
}
|
|
|
|
else if (length > png_ptr->num_palette)
|
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;
|
|
|
|
}
|
1998-04-21 16:03:57 -04:00
|
|
|
if (length == 0)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Zero length tRNS chunk");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->trans = (png_bytep)png_malloc(png_ptr, length);
|
|
|
|
png_ptr->flags |= PNG_FLAG_FREE_TRANS;
|
1997-05-16 03:46:07 -04:00
|
|
|
png_crc_read(png_ptr, png_ptr->trans, (png_size_t)length);
|
1996-01-26 02:38:47 -05:00
|
|
|
png_ptr->num_trans = (png_uint_16)length;
|
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;
|
|
|
|
}
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_crc_read(png_ptr, buf, (png_size_t)length);
|
1998-01-01 08:13:13 -05:00
|
|
|
png_ptr->num_trans = 1;
|
1995-07-20 03:43:20 -04:00
|
|
|
png_ptr->trans_values.red = png_get_uint_16(buf);
|
|
|
|
png_ptr->trans_values.green = png_get_uint_16(buf + 2);
|
|
|
|
png_ptr->trans_values.blue = png_get_uint_16(buf + 4);
|
|
|
|
}
|
|
|
|
else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
|
|
|
|
{
|
|
|
|
png_byte buf[6];
|
|
|
|
|
|
|
|
if (length != 2)
|
|
|
|
{
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
png_crc_read(png_ptr, buf, 2);
|
|
|
|
png_ptr->num_trans = 1;
|
|
|
|
png_ptr->trans_values.gray = png_get_uint_16(buf);
|
|
|
|
}
|
|
|
|
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))
|
|
|
|
return;
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_set_tRNS(png_ptr, info_ptr, png_ptr->trans, png_ptr->num_trans,
|
1995-07-20 03:43:20 -04:00
|
|
|
&(png_ptr->trans_values));
|
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1995-09-26 06:22:39 -04:00
|
|
|
#if defined(PNG_READ_bKGD_SUPPORTED)
|
1995-07-20 03:43:20 -04:00
|
|
|
void
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_size_t truelen;
|
1995-07-20 03:43:20 -04:00
|
|
|
png_byte buf[6];
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1, "in png_handle_bKGD\n");
|
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before bKGD");
|
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;
|
|
|
|
}
|
1996-06-05 16:50:50 -04:00
|
|
|
else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
|
|
|
|
!(png_ptr->mode & PNG_HAVE_PLTE))
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Missing PLTE before bKGD");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
1997-05-16 03:46:07 -04: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;
|
|
|
|
else if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
|
|
|
|
truelen = 6;
|
|
|
|
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);
|
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
|
1997-01-17 02:34:35 -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
|
|
|
{
|
1995-07-20 03:43:20 -04:00
|
|
|
png_ptr->background.index = buf[0];
|
1996-06-05 16:50:50 -04:00
|
|
|
png_ptr->background.red = (png_uint_16)png_ptr->palette[buf[0]].red;
|
|
|
|
png_ptr->background.green = (png_uint_16)png_ptr->palette[buf[0]].green;
|
|
|
|
png_ptr->background.blue = (png_uint_16)png_ptr->palette[buf[0]].blue;
|
|
|
|
}
|
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
|
|
|
{
|
|
|
|
png_ptr->background.red =
|
|
|
|
png_ptr->background.green =
|
|
|
|
png_ptr->background.blue =
|
1995-07-20 03:43:20 -04:00
|
|
|
png_ptr->background.gray = png_get_uint_16(buf);
|
1996-06-05 16:50:50 -04:00
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
else
|
|
|
|
{
|
|
|
|
png_ptr->background.red = png_get_uint_16(buf);
|
|
|
|
png_ptr->background.green = png_get_uint_16(buf + 2);
|
|
|
|
png_ptr->background.blue = png_get_uint_16(buf + 4);
|
|
|
|
}
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_set_bKGD(png_ptr, info_ptr, &(png_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
|
|
|
|
1995-09-26 06:22:39 -04:00
|
|
|
#if defined(PNG_READ_hIST_SUPPORTED)
|
1995-07-20 03:43:20 -04:00
|
|
|
void
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1996-01-26 02:38:47 -05:00
|
|
|
int num, i;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1, "in png_handle_hIST\n");
|
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before hIST");
|
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;
|
|
|
|
}
|
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;
|
|
|
|
}
|
1997-05-16 03:46:07 -04: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;
|
|
|
|
}
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
if (length != (png_uint_32)(2 * png_ptr->num_palette))
|
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
|
|
|
|
|
|
|
num = (int)length / 2;
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->hist = (png_uint_16p)png_malloc(png_ptr,
|
1998-02-07 11:20:57 -05:00
|
|
|
(png_uint_32)(num * sizeof (png_uint_16)));
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->flags |= PNG_FLAG_FREE_HIST;
|
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);
|
|
|
|
png_ptr->hist[i] = png_get_uint_16(buf);
|
|
|
|
}
|
1997-01-17 02:34:35 -05:00
|
|
|
|
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
return;
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_set_hIST(png_ptr, info_ptr, png_ptr->hist);
|
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
|
|
|
|
1995-09-26 06:22:39 -04:00
|
|
|
#if defined(PNG_READ_pHYs_SUPPORTED)
|
1995-07-20 03:43:20 -04:00
|
|
|
void
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_pHYs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
png_byte buf[9];
|
|
|
|
png_uint_32 res_x, res_y;
|
|
|
|
int unit_type;
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1, "in png_handle_pHYs\n");
|
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before pHYS");
|
1997-01-17 02:34:35 -05:00
|
|
|
else if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid pHYS after IDAT");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
else if (info_ptr != NULL && info_ptr->valid & PNG_INFO_pHYs)
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Duplicate pHYS 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 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);
|
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
|
|
|
|
1995-09-26 06:22:39 -04:00
|
|
|
#if defined(PNG_READ_oFFs_SUPPORTED)
|
1995-07-20 03:43:20 -04:00
|
|
|
void
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_oFFs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
png_byte buf[9];
|
|
|
|
png_uint_32 offset_x, offset_y;
|
|
|
|
int unit_type;
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1, "in png_handle_oFFs\n");
|
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before oFFs");
|
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;
|
|
|
|
}
|
1997-05-16 03:46:07 -04: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);
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
return;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
offset_x = png_get_uint_32(buf);
|
|
|
|
offset_y = png_get_uint_32(buf + 4);
|
|
|
|
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
|
|
|
|
|
|
|
|
#if defined(PNG_READ_pCAL_SUPPORTED)
|
|
|
|
/* read the pCAL chunk (png-scivis-19970203) */
|
|
|
|
void
|
|
|
|
png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
|
|
|
{
|
|
|
|
png_charp purpose;
|
|
|
|
png_int_32 X0, X1;
|
|
|
|
png_byte type, nparams;
|
|
|
|
png_charp buf, units, endptr;
|
|
|
|
png_charpp params;
|
1998-02-08 21:56:40 -05:00
|
|
|
png_size_t slength;
|
1997-05-16 03:46:07 -04:00
|
|
|
int i;
|
|
|
|
|
|
|
|
png_debug(1, "in png_handle_pCAL\n");
|
|
|
|
|
|
|
|
if (!(png_ptr->mode & PNG_HAVE_IHDR))
|
|
|
|
png_error(png_ptr, "Missing IHDR before pCAL");
|
|
|
|
else if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid pCAL after IDAT");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
else if (info_ptr != NULL && info_ptr->valid & PNG_INFO_pCAL)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Duplicate pCAL chunk");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
png_debug1(2, "Allocating and reading pCAL chunk data (%d bytes)\n",
|
|
|
|
length + 1);
|
|
|
|
purpose = (png_charp)png_malloc(png_ptr, length + 1);
|
1998-02-08 21:56:40 -05:00
|
|
|
slength = (png_size_t)length;
|
|
|
|
png_crc_read(png_ptr, (png_bytep)purpose, slength);
|
1997-05-16 03:46:07 -04:00
|
|
|
|
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
{
|
|
|
|
png_free(png_ptr, purpose);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1998-02-08 21:56:40 -05:00
|
|
|
purpose[slength] = 0x00; /* null terminate the last string */
|
1997-05-16 03:46:07 -04:00
|
|
|
|
|
|
|
png_debug(3, "Finding end of pCAL purpose string\n");
|
1998-04-21 16:03:57 -04:00
|
|
|
for (buf = purpose; *buf; buf++)
|
1998-03-13 08:39:39 -05:00
|
|
|
/* empty loop */ ;
|
1997-05-16 03:46:07 -04:00
|
|
|
|
1998-02-08 21:56:40 -05:00
|
|
|
endptr = purpose + slength;
|
1997-05-16 03:46:07 -04:00
|
|
|
|
|
|
|
/* We need to have at least 12 bytes after the purpose string
|
|
|
|
in order to get the parameter information. */
|
|
|
|
if (endptr <= buf + 12)
|
|
|
|
{
|
|
|
|
png_warning(png_ptr, "Invalid pCAL data");
|
|
|
|
png_free(png_ptr, purpose);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
png_debug(3, "Reading pCAL X0, X1, type, nparams, and units\n");
|
|
|
|
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;
|
|
|
|
|
|
|
|
png_debug(3, "Checking pCAL equation type and number of parameters\n");
|
|
|
|
/* Check that we have the right number of parameters for known
|
|
|
|
equation types. */
|
|
|
|
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");
|
|
|
|
png_free(png_ptr, purpose);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
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
|
|
|
|
|
|
|
png_debug(3, "Allocating pCAL parameters array\n");
|
1998-02-07 11:20:57 -05:00
|
|
|
params = (png_charpp)png_malloc(png_ptr, (png_uint_32)(nparams
|
|
|
|
*sizeof(png_charp))) ;
|
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. */
|
|
|
|
|
|
|
|
png_debug1(3, "Reading pCAL parameter %d\n", i);
|
1998-03-13 08:39:39 -05:00
|
|
|
for (params[i] = buf; *buf != 0x00 && buf <= endptr; 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");
|
|
|
|
png_free(png_ptr, purpose);
|
|
|
|
png_free(png_ptr, params);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
png_set_pCAL(png_ptr, info_ptr, purpose, X0, X1, type, nparams,
|
|
|
|
units, params);
|
|
|
|
|
|
|
|
png_free(png_ptr, purpose);
|
|
|
|
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
|
|
|
|
1995-09-26 06:22:39 -04:00
|
|
|
#if defined(PNG_READ_tIME_SUPPORTED)
|
1995-07-20 03:43:20 -04:00
|
|
|
void
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_tIME(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
png_byte buf[7];
|
|
|
|
png_time mod_time;
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1, "in png_handle_tIME\n");
|
|
|
|
|
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");
|
1997-05-16 03:46:07 -04: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);
|
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
|
|
|
|
1995-09-26 06:22:39 -04:00
|
|
|
#if defined(PNG_READ_tEXt_SUPPORTED)
|
1997-05-16 03:46:07 -04:00
|
|
|
/* Note: this does not properly handle chunks that are > 64K under DOS */
|
1995-07-20 03:43:20 -04:00
|
|
|
void
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_textp text_ptr;
|
1996-01-26 02:38:47 -05:00
|
|
|
png_charp key;
|
1995-12-19 04:22:19 -05:00
|
|
|
png_charp text;
|
1997-05-16 03:46:07 -04:00
|
|
|
png_uint_32 skip = 0;
|
1998-02-08 21:56:40 -05:00
|
|
|
png_size_t slength;
|
1997-05-16 03:46:07 -04:00
|
|
|
|
|
|
|
png_debug(1, "in png_handle_tEXt\n");
|
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 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
|
|
|
|
|
|
|
|
key = (png_charp)png_malloc(png_ptr, length + 1);
|
1998-02-08 21:56:40 -05:00
|
|
|
slength = (png_size_t)length;
|
|
|
|
png_crc_read(png_ptr, (png_bytep)key, slength);
|
1997-05-16 03:46:07 -04:00
|
|
|
|
|
|
|
if (png_crc_finish(png_ptr, skip))
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
|
|
|
png_free(png_ptr, key);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1998-02-08 21:56:40 -05:00
|
|
|
key[slength] = 0x00;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
for (text = key; *text; text++)
|
1997-05-16 03:46:07 -04:00
|
|
|
/* empty loop to find end of key */ ;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1998-02-08 21:56:40 -05:00
|
|
|
if (text != key + slength)
|
1995-07-20 03:43:20 -04:00
|
|
|
text++;
|
|
|
|
|
1998-02-07 11:20:57 -05:00
|
|
|
text_ptr = (png_textp)png_malloc(png_ptr, (png_uint_32)sizeof(png_text));
|
1997-05-16 03:46:07 -04:00
|
|
|
text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
|
|
|
|
text_ptr->key = key;
|
|
|
|
text_ptr->text = text;
|
|
|
|
|
|
|
|
png_set_text(png_ptr, info_ptr, text_ptr, 1);
|
|
|
|
|
|
|
|
png_free(png_ptr, text_ptr);
|
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
|
|
|
|
1995-09-26 06:22:39 -04:00
|
|
|
#if defined(PNG_READ_zTXt_SUPPORTED)
|
1997-05-16 03:46:07 -04:00
|
|
|
/* note: this does not correctly handle chunks that are > 64K under DOS */
|
1995-07-20 03:43:20 -04:00
|
|
|
void
|
1997-01-17 02:34:35 -05:00
|
|
|
png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1996-06-05 16:50:50 -04:00
|
|
|
static char msg[] = "Error decoding zTXt chunk";
|
1997-05-16 03:46:07 -04:00
|
|
|
png_textp text_ptr;
|
1995-12-19 04:22:19 -05:00
|
|
|
png_charp key;
|
|
|
|
png_charp text;
|
1997-05-16 03:46:07 -04:00
|
|
|
int comp_type = PNG_TEXT_COMPRESSION_NONE;
|
1998-02-08 21:56:40 -05:00
|
|
|
png_size_t slength;
|
1997-05-16 03:46:07 -04:00
|
|
|
|
|
|
|
png_debug(1, "in png_handle_zTXt\n");
|
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 zTXt");
|
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
png_ptr->mode |= PNG_AFTER_IDAT;
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
#ifdef PNG_MAX_MALLOC_64K
|
|
|
|
/* We will no doubt have problems with chunks even half this size, but
|
|
|
|
there is no hard and fast rule to tell us where to stop. */
|
1998-01-01 08:13:13 -05:00
|
|
|
if (length > (png_uint_32)65535L)
|
1997-05-16 03:46:07 -04:00
|
|
|
{
|
|
|
|
png_warning(png_ptr,"zTXt chunk too large to fit in memory");
|
|
|
|
png_crc_finish(png_ptr, length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
key = (png_charp)png_malloc(png_ptr, length + 1);
|
1998-02-08 21:56:40 -05:00
|
|
|
slength = (png_size_t)length;
|
|
|
|
png_crc_read(png_ptr, (png_bytep)key, slength);
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_crc_finish(png_ptr, 0))
|
|
|
|
{
|
|
|
|
png_free(png_ptr, key);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1998-02-08 21:56:40 -05:00
|
|
|
key[slength] = 0x00;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
for (text = key; *text; text++)
|
|
|
|
/* empty loop */ ;
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
/* zTXt must have some text after the keyword */
|
1998-02-08 21:56:40 -05:00
|
|
|
if (text == key + slength)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1996-01-10 03:56:49 -05:00
|
|
|
png_warning(png_ptr, "Zero length zTXt chunk");
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
else if ((comp_type = *(++text)) == PNG_TEXT_COMPRESSION_zTXt)
|
1996-06-05 16:50:50 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_size_t text_size, key_size;
|
1996-06-05 16:50:50 -04:00
|
|
|
text++;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_ptr->zstream.next_in = (png_bytep)text;
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->zstream.avail_in = (uInt)(length - (text - key));
|
|
|
|
png_ptr->zstream.next_out = png_ptr->zbuf;
|
1998-03-07 07:06:55 -05:00
|
|
|
png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1998-02-08 21:56:40 -05:00
|
|
|
key_size = (png_size_t)(text - key);
|
1996-06-05 16:50:50 -04:00
|
|
|
text_size = 0;
|
|
|
|
text = NULL;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
while (png_ptr->zstream.avail_in)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1996-06-05 16:50:50 -04:00
|
|
|
int ret;
|
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
|
1996-06-05 16:50:50 -04:00
|
|
|
if (ret != Z_OK && ret != Z_STREAM_END)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
if (png_ptr->zstream.msg != NULL)
|
1997-01-17 02:34:35 -05:00
|
|
|
png_warning(png_ptr, png_ptr->zstream.msg);
|
1996-06-05 16:50:50 -04:00
|
|
|
else
|
1997-05-16 03:46:07 -04:00
|
|
|
png_warning(png_ptr, msg);
|
1997-01-17 02:34:35 -05:00
|
|
|
inflateReset(&png_ptr->zstream);
|
|
|
|
png_ptr->zstream.avail_in = 0;
|
1996-06-05 16:50:50 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
if (text == NULL)
|
1996-06-05 16:50:50 -04:00
|
|
|
{
|
|
|
|
text_size = key_size + sizeof(msg) + 1;
|
1998-02-07 11:20:57 -05:00
|
|
|
text = (png_charp)png_malloc(png_ptr, (png_uint_32)text_size);
|
1997-05-16 03:46:07 -04:00
|
|
|
png_memcpy(text, key, key_size);
|
1996-06-05 16:50:50 -04:00
|
|
|
}
|
|
|
|
|
1998-02-08 21:56:40 -05:00
|
|
|
text[text_size - 1] = 0x00;
|
1996-06-05 16:50:50 -04:00
|
|
|
|
|
|
|
/* Copy what we can of the error message into the text chunk */
|
1998-02-08 21:56:40 -05:00
|
|
|
text_size = (png_size_t)(slength - (text - key) - 1);
|
1996-06-05 16:50:50 -04:00
|
|
|
text_size = sizeof(msg) > text_size ? text_size : sizeof(msg);
|
1997-05-16 03:46:07 -04:00
|
|
|
png_memcpy(text + key_size, msg, text_size + 1);
|
1996-06-05 16:50:50 -04:00
|
|
|
break;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1997-01-17 02:34:35 -05:00
|
|
|
if (!png_ptr->zstream.avail_out || ret == Z_STREAM_END)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
if (text == NULL)
|
1996-06-05 16:50:50 -04:00
|
|
|
{
|
1997-01-17 02:34:35 -05:00
|
|
|
text = (png_charp)png_malloc(png_ptr,
|
1998-02-07 11:20:57 -05:00
|
|
|
(png_uint_32)(png_ptr->zbuf_size - png_ptr->zstream.avail_out
|
|
|
|
+ key_size + 1));
|
1997-05-16 03:46:07 -04:00
|
|
|
png_memcpy(text + key_size, png_ptr->zbuf,
|
|
|
|
png_ptr->zbuf_size - png_ptr->zstream.avail_out);
|
|
|
|
png_memcpy(text, key, key_size);
|
|
|
|
text_size = key_size + png_ptr->zbuf_size -
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->zstream.avail_out;
|
1998-02-08 21:56:40 -05:00
|
|
|
*(text + text_size) = 0x00;
|
1996-06-05 16:50:50 -04:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
png_charp tmp;
|
|
|
|
|
|
|
|
tmp = text;
|
1998-02-07 11:20:57 -05:00
|
|
|
text = (png_charp)png_malloc(png_ptr, (png_uint_32)(text_size +
|
|
|
|
png_ptr->zbuf_size - png_ptr->zstream.avail_out + 1));
|
1997-05-16 03:46:07 -04:00
|
|
|
png_memcpy(text, tmp, text_size);
|
1997-01-17 02:34:35 -05:00
|
|
|
png_free(png_ptr, tmp);
|
1997-05-16 03:46:07 -04:00
|
|
|
png_memcpy(text + text_size, png_ptr->zbuf,
|
|
|
|
(png_ptr->zbuf_size - png_ptr->zstream.avail_out));
|
1997-01-17 02:34:35 -05:00
|
|
|
text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
|
1998-02-08 21:56:40 -05:00
|
|
|
*(text + text_size) = 0x00;
|
1996-06-05 16:50:50 -04:00
|
|
|
}
|
|
|
|
if (ret != Z_STREAM_END)
|
|
|
|
{
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->zstream.next_out = png_ptr->zbuf;
|
|
|
|
png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
|
1996-06-05 16:50:50 -04:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
inflateReset(&png_ptr->zstream);
|
|
|
|
png_ptr->zstream.avail_in = 0;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
png_free(png_ptr, key);
|
1996-06-05 16:50:50 -04:00
|
|
|
key = text;
|
1997-05-16 03:46:07 -04:00
|
|
|
text += key_size;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
else /* if (comp_type >= PNG_TEXT_COMPRESSION_LAST) */
|
|
|
|
{
|
|
|
|
png_size_t text_size;
|
1998-01-03 23:40:55 -05:00
|
|
|
#if !defined(PNG_NO_STDIO)
|
1997-05-16 03:46:07 -04:00
|
|
|
char umsg[50];
|
|
|
|
|
|
|
|
sprintf(umsg, "Unknown zTXt compression type %d", comp_type);
|
|
|
|
png_warning(png_ptr, umsg);
|
1998-01-03 23:40:55 -05:00
|
|
|
#else
|
|
|
|
png_warning(png_ptr, "Unknown zTXt compression type");
|
|
|
|
#endif
|
1997-05-16 03:46:07 -04:00
|
|
|
|
|
|
|
/* Copy what we can of the error message into the text chunk */
|
1998-02-08 21:56:40 -05:00
|
|
|
text_size = (png_size_t)(slength - (text - key) - 1);
|
1997-05-16 03:46:07 -04:00
|
|
|
text_size = sizeof(msg) > text_size ? text_size : sizeof(msg);
|
|
|
|
png_memcpy(text, msg, text_size + 1);
|
|
|
|
}
|
|
|
|
|
1998-02-07 11:20:57 -05:00
|
|
|
text_ptr = (png_textp)png_malloc(png_ptr, (png_uint_32)sizeof(png_text));
|
1997-05-16 03:46:07 -04:00
|
|
|
text_ptr->compression = comp_type;
|
|
|
|
text_ptr->key = key;
|
|
|
|
text_ptr->text = text;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_set_text(png_ptr, info_ptr, text_ptr, 1);
|
|
|
|
|
|
|
|
png_free(png_ptr, text_ptr);
|
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
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
/* This function is called when we haven't found a handler for a
|
|
|
|
chunk. If there isn't a problem with the chunk itself (ie bad
|
1997-05-16 03:46:07 -04:00
|
|
|
chunk name, CRC, or a critical chunk), the chunk is silently ignored. */
|
1997-01-17 02:34:35 -05:00
|
|
|
void
|
|
|
|
png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
|
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1, "in png_handle_unknown\n");
|
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
/* In the future we can have code here that calls user-supplied
|
|
|
|
* callback functions for unknown chunks before they are ignored or
|
|
|
|
* cause an error.
|
|
|
|
*/
|
|
|
|
png_check_chunk_name(png_ptr, png_ptr->chunk_name);
|
|
|
|
|
|
|
|
if (!(png_ptr->chunk_name[0] & 0x20))
|
|
|
|
{
|
1998-01-03 23:40:55 -05:00
|
|
|
png_chunk_error(png_ptr, "unknown critical chunk");
|
1998-02-08 21:56:40 -05:00
|
|
|
|
1998-02-28 08:00:24 -05:00
|
|
|
/* to quiet compiler warnings about unused info_ptr */
|
1998-02-08 21:56:40 -05:00
|
|
|
if (info_ptr == NULL)
|
|
|
|
return;
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
if (png_ptr->mode & PNG_HAVE_IDAT)
|
|
|
|
png_ptr->mode |= PNG_AFTER_IDAT;
|
|
|
|
|
|
|
|
png_crc_finish(png_ptr, length);
|
1998-02-08 21:56:40 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
/* This function is called to verify that a chunk name is valid.
|
|
|
|
This function can't have the "critical chunk check" incorporated
|
1997-05-16 03:46:07 -04:00
|
|
|
into it, since in the future we will need to be able to call user
|
1997-01-17 02:34:35 -05:00
|
|
|
functions to handle unknown critical chunks after we check that
|
|
|
|
the chunk name itself is valid. */
|
1997-05-16 03:46:07 -04:00
|
|
|
|
|
|
|
#define isnonalpha(c) ((c) < 41 || (c) > 122 || ((c) > 90 && (c) < 97))
|
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
void
|
|
|
|
png_check_chunk_name(png_structp png_ptr, png_bytep chunk_name)
|
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1, "in png_check_chunk_name\n");
|
|
|
|
if (isnonalpha(chunk_name[0]) || isnonalpha(chunk_name[1]) ||
|
|
|
|
isnonalpha(chunk_name[2]) || isnonalpha(chunk_name[3]))
|
1997-01-17 02:34:35 -05:00
|
|
|
{
|
1998-01-03 23:40:55 -05:00
|
|
|
png_chunk_error(png_ptr, "invalid chunk type");
|
1997-01-17 02:34:35 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
/* Combines the row recently read in with the previous row.
|
|
|
|
This routine takes care of alpha and transparency if requested.
|
|
|
|
This routine also handles the two methods of progressive display
|
|
|
|
of interlaced images, depending on the mask value.
|
|
|
|
The mask value describes which pixels are to be combined with
|
|
|
|
the row. The pattern always repeats every 8 pixels, so just 8
|
|
|
|
bits are needed. A one indicates the pixels is to be combined,
|
|
|
|
a zero indicates the pixel is to be skipped. This is in addition
|
|
|
|
to any alpha or transparency value associated with the pixel. If
|
1997-01-17 02:34:35 -05:00
|
|
|
you want all pixels to be combined, pass 0xff (255) in mask. */
|
1995-07-20 03:43:20 -04:00
|
|
|
void
|
1995-12-19 04:22:19 -05:00
|
|
|
png_combine_row(png_structp png_ptr, png_bytep row,
|
1995-07-20 03:43:20 -04:00
|
|
|
int mask)
|
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1,"in png_combine_row\n");
|
1995-07-20 03:43:20 -04:00
|
|
|
if (mask == 0xff)
|
|
|
|
{
|
1995-09-26 06:22:39 -04:00
|
|
|
png_memcpy(row, png_ptr->row_buf + 1,
|
1995-07-20 03:43:20 -04:00
|
|
|
(png_size_t)((png_ptr->width *
|
|
|
|
png_ptr->row_info.pixel_depth + 7) >> 3));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
switch (png_ptr->row_info.pixel_depth)
|
|
|
|
{
|
|
|
|
case 1:
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_bytep sp = png_ptr->row_buf + 1;
|
|
|
|
png_bytep dp = row;
|
1997-05-16 03:46:07 -04:00
|
|
|
int s_inc, s_start, s_end;
|
1998-05-02 13:52:25 -04:00
|
|
|
int m = 0x80;
|
1995-07-20 03:43:20 -04:00
|
|
|
int shift;
|
1998-05-02 13:52:25 -04:00
|
|
|
png_uint_32 i;
|
|
|
|
png_uint_32 row_width = png_ptr->width;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
#if defined(PNG_READ_PACKSWAP_SUPPORTED)
|
|
|
|
if (png_ptr->transformations & PNG_PACKSWAP)
|
|
|
|
{
|
|
|
|
s_start = 0;
|
|
|
|
s_end = 7;
|
|
|
|
s_inc = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
s_start = 7;
|
|
|
|
s_end = 0;
|
|
|
|
s_inc = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
shift = s_start;
|
|
|
|
|
1998-05-02 13:52:25 -04:00
|
|
|
for (i = 0; i < row_width; i++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
if (m & mask)
|
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
int value;
|
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
value = (*sp >> shift) & 0x1;
|
|
|
|
*dp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
|
1996-01-26 02:38:47 -05:00
|
|
|
*dp |= (png_byte)(value << shift);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
if (shift == s_end)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
shift = s_start;
|
1995-07-20 03:43:20 -04:00
|
|
|
sp++;
|
|
|
|
dp++;
|
|
|
|
}
|
|
|
|
else
|
1997-05-16 03:46:07 -04:00
|
|
|
shift += s_inc;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
if (m == 1)
|
|
|
|
m = 0x80;
|
|
|
|
else
|
|
|
|
m >>= 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case 2:
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_bytep sp = png_ptr->row_buf + 1;
|
|
|
|
png_bytep dp = row;
|
1997-05-16 03:46:07 -04:00
|
|
|
int s_start, s_end, s_inc;
|
1998-05-02 13:52:25 -04:00
|
|
|
int m = 0x80;
|
1995-07-20 03:43:20 -04:00
|
|
|
int shift;
|
1998-05-02 13:52:25 -04:00
|
|
|
png_uint_32 i;
|
|
|
|
png_uint_32 row_width = png_ptr->width;
|
1995-07-20 03:43:20 -04:00
|
|
|
int value;
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
#if defined(PNG_READ_PACKSWAP_SUPPORTED)
|
|
|
|
if (png_ptr->transformations & PNG_PACKSWAP)
|
|
|
|
{
|
|
|
|
s_start = 0;
|
|
|
|
s_end = 6;
|
|
|
|
s_inc = 2;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
s_start = 6;
|
|
|
|
s_end = 0;
|
|
|
|
s_inc = -2;
|
|
|
|
}
|
|
|
|
|
|
|
|
shift = s_start;
|
|
|
|
|
1998-05-02 13:52:25 -04:00
|
|
|
for (i = 0; i < row_width; i++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
if (m & mask)
|
|
|
|
{
|
|
|
|
value = (*sp >> shift) & 0x3;
|
|
|
|
*dp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
|
1996-01-26 02:38:47 -05:00
|
|
|
*dp |= (png_byte)(value << shift);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
if (shift == s_end)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
shift = s_start;
|
1995-07-20 03:43:20 -04:00
|
|
|
sp++;
|
|
|
|
dp++;
|
|
|
|
}
|
|
|
|
else
|
1997-05-16 03:46:07 -04:00
|
|
|
shift += s_inc;
|
1995-07-20 03:43:20 -04:00
|
|
|
if (m == 1)
|
|
|
|
m = 0x80;
|
|
|
|
else
|
|
|
|
m >>= 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case 4:
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_bytep sp = png_ptr->row_buf + 1;
|
|
|
|
png_bytep dp = row;
|
1997-05-16 03:46:07 -04:00
|
|
|
int s_start, s_end, s_inc;
|
1998-05-02 13:52:25 -04:00
|
|
|
int m = 0x80;
|
1995-07-20 03:43:20 -04:00
|
|
|
int shift;
|
1998-05-02 13:52:25 -04:00
|
|
|
png_uint_32 i;
|
|
|
|
png_uint_32 row_width = png_ptr->width;
|
1995-07-20 03:43:20 -04:00
|
|
|
int value;
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
#if defined(PNG_READ_PACKSWAP_SUPPORTED)
|
|
|
|
if (png_ptr->transformations & PNG_PACKSWAP)
|
|
|
|
{
|
|
|
|
s_start = 0;
|
|
|
|
s_end = 4;
|
|
|
|
s_inc = 4;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
s_start = 4;
|
|
|
|
s_end = 0;
|
|
|
|
s_inc = -4;
|
|
|
|
}
|
|
|
|
shift = s_start;
|
|
|
|
|
1998-05-02 13:52:25 -04:00
|
|
|
for (i = 0; i < row_width; i++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
if (m & mask)
|
|
|
|
{
|
|
|
|
value = (*sp >> shift) & 0xf;
|
|
|
|
*dp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
|
1996-01-26 02:38:47 -05:00
|
|
|
*dp |= (png_byte)(value << shift);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
if (shift == s_end)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
shift = s_start;
|
1995-07-20 03:43:20 -04:00
|
|
|
sp++;
|
|
|
|
dp++;
|
|
|
|
}
|
|
|
|
else
|
1997-05-16 03:46:07 -04:00
|
|
|
shift += s_inc;
|
1995-07-20 03:43:20 -04:00
|
|
|
if (m == 1)
|
|
|
|
m = 0x80;
|
|
|
|
else
|
|
|
|
m >>= 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_bytep sp = png_ptr->row_buf + 1;
|
|
|
|
png_bytep dp = row;
|
|
|
|
png_size_t pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
|
|
|
|
png_uint_32 i;
|
|
|
|
png_uint_32 row_width = png_ptr->width;
|
|
|
|
png_byte m = 0x80;
|
|
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < row_width; i++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
if (m & mask)
|
|
|
|
{
|
1995-09-26 06:22:39 -04:00
|
|
|
png_memcpy(dp, sp, pixel_bytes);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
sp += pixel_bytes;
|
|
|
|
dp += pixel_bytes;
|
|
|
|
|
|
|
|
if (m == 1)
|
|
|
|
m = 0x80;
|
|
|
|
else
|
|
|
|
m >>= 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1995-09-26 06:22:39 -04:00
|
|
|
#if defined(PNG_READ_INTERLACING_SUPPORTED)
|
1995-07-20 03:43:20 -04:00
|
|
|
void
|
1997-05-16 03:46:07 -04:00
|
|
|
png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
|
|
|
|
png_uint_32 transformations)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1,"in png_do_read_interlace\n");
|
|
|
|
if (row != NULL && row_info != NULL)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
png_uint_32 final_width;
|
|
|
|
|
|
|
|
final_width = row_info->width * png_pass_inc[pass];
|
|
|
|
|
|
|
|
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);
|
1998-03-07 12:24:03 -05:00
|
|
|
int sshift, dshift;
|
1997-05-16 03:46:07 -04:00
|
|
|
int s_start, s_end, s_inc;
|
1998-05-02 13:52:25 -04:00
|
|
|
int jstop = png_pass_inc[pass];
|
1995-07-20 03:43:20 -04:00
|
|
|
png_byte v;
|
|
|
|
png_uint_32 i;
|
1998-05-02 13:52:25 -04:00
|
|
|
int j;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
#if defined(PNG_READ_PACKSWAP_SUPPORTED)
|
|
|
|
if (transformations & PNG_PACKSWAP)
|
|
|
|
{
|
1998-03-07 12:24:03 -05:00
|
|
|
sshift = (int)((row_info->width + 7) & 7);
|
|
|
|
dshift = (int)((final_width + 7) & 7);
|
1997-05-16 03:46:07 -04:00
|
|
|
s_start = 7;
|
|
|
|
s_end = 0;
|
|
|
|
s_inc = -1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
1998-03-07 12:24:03 -05:00
|
|
|
sshift = 7 - (int)((row_info->width + 7) & 7);
|
|
|
|
dshift = 7 - (int)((final_width + 7) & 7);
|
1997-05-16 03:46:07 -04:00
|
|
|
s_start = 0;
|
|
|
|
s_end = 7;
|
|
|
|
s_inc = 1;
|
|
|
|
}
|
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
for (i = row_info->width; i; i--)
|
|
|
|
{
|
1996-01-26 02:38:47 -05:00
|
|
|
v = (png_byte)((*sp >> sshift) & 0x1);
|
1998-04-21 16:03:57 -04:00
|
|
|
for (j = 0; j < jstop; j++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
*dp &= (png_byte)((0x7f7f >> (7 - dshift)) & 0xff);
|
|
|
|
*dp |= (png_byte)(v << dshift);
|
1997-05-16 03:46:07 -04:00
|
|
|
if (dshift == s_end)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
dshift = s_start;
|
1995-07-20 03:43:20 -04:00
|
|
|
dp--;
|
|
|
|
}
|
|
|
|
else
|
1997-05-16 03:46:07 -04:00
|
|
|
dshift += s_inc;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
if (sshift == s_end)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
sshift = s_start;
|
1995-07-20 03:43:20 -04:00
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
else
|
1997-05-16 03:46:07 -04:00
|
|
|
sshift += s_inc;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case 2:
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_bytep sp = row + (png_uint_32)((row_info->width - 1) >> 2);
|
|
|
|
png_bytep dp = row + (png_uint_32)((final_width - 1) >> 2);
|
1998-03-07 12:24:03 -05:00
|
|
|
int sshift, dshift;
|
1997-05-16 03:46:07 -04:00
|
|
|
int s_start, s_end, s_inc;
|
1998-05-02 13:52:25 -04:00
|
|
|
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
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
#if defined(PNG_READ_PACKSWAP_SUPPORTED)
|
|
|
|
if (transformations & PNG_PACKSWAP)
|
|
|
|
{
|
1998-03-07 12:24:03 -05:00
|
|
|
sshift = (int)(((row_info->width + 3) & 3) << 1);
|
|
|
|
dshift = (int)(((final_width + 3) & 3) << 1);
|
1997-05-16 03:46:07 -04:00
|
|
|
s_start = 6;
|
|
|
|
s_end = 0;
|
|
|
|
s_inc = -2;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
1998-03-07 12:24:03 -05:00
|
|
|
sshift = (int)((3 - ((row_info->width + 3) & 3)) << 1);
|
|
|
|
dshift = (int)((3 - ((final_width + 3) & 3)) << 1);
|
1997-05-16 03:46:07 -04:00
|
|
|
s_start = 0;
|
|
|
|
s_end = 6;
|
|
|
|
s_inc = 2;
|
|
|
|
}
|
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
for (i = row_info->width; i; i--)
|
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_byte v;
|
|
|
|
int j;
|
|
|
|
|
1996-01-26 02:38:47 -05:00
|
|
|
v = (png_byte)((*sp >> sshift) & 0x3);
|
1998-04-21 16:03:57 -04:00
|
|
|
for (j = 0; j < jstop; j++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
*dp &= (png_byte)((0x3f3f >> (6 - dshift)) & 0xff);
|
1996-01-26 02:38:47 -05:00
|
|
|
*dp |= (png_byte)(v << dshift);
|
1997-05-16 03:46:07 -04:00
|
|
|
if (dshift == s_end)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
dshift = s_start;
|
1995-07-20 03:43:20 -04:00
|
|
|
dp--;
|
|
|
|
}
|
|
|
|
else
|
1997-05-16 03:46:07 -04:00
|
|
|
dshift += s_inc;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
if (sshift == s_end)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
sshift = s_start;
|
1995-07-20 03:43:20 -04:00
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
else
|
1997-05-16 03:46:07 -04:00
|
|
|
sshift += s_inc;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
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);
|
1998-03-07 12:24:03 -05:00
|
|
|
int sshift, dshift;
|
1997-05-16 03:46:07 -04:00
|
|
|
int s_start, s_end, s_inc;
|
1995-07-20 03:43:20 -04:00
|
|
|
png_uint_32 i;
|
1998-05-02 13:52:25 -04:00
|
|
|
int jstop = png_pass_inc[pass];
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
#if defined(PNG_READ_PACKSWAP_SUPPORTED)
|
|
|
|
if (transformations & PNG_PACKSWAP)
|
|
|
|
{
|
1998-03-07 12:24:03 -05:00
|
|
|
sshift = (int)(((row_info->width + 1) & 1) << 2);
|
|
|
|
dshift = (int)(((final_width + 1) & 1) << 2);
|
1997-05-16 03:46:07 -04:00
|
|
|
s_start = 4;
|
|
|
|
s_end = 0;
|
|
|
|
s_inc = -4;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
1998-03-07 12:24:03 -05:00
|
|
|
sshift = (int)((1 - ((row_info->width + 1) & 1)) << 2);
|
|
|
|
dshift = (int)((1 - ((final_width + 1) & 1)) << 2);
|
1997-05-16 03:46:07 -04:00
|
|
|
s_start = 0;
|
|
|
|
s_end = 4;
|
|
|
|
s_inc = 4;
|
|
|
|
}
|
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
for (i = row_info->width; i; i--)
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_byte v = (png_byte)((*sp >> sshift) & 0xf);
|
1997-05-16 03:46:07 -04:00
|
|
|
int j;
|
|
|
|
|
1998-04-21 16:03:57 -04:00
|
|
|
for (j = 0; j < jstop; j++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
*dp &= (png_byte)((0xf0f >> (4 - dshift)) & 0xff);
|
1996-01-16 02:51:56 -05:00
|
|
|
*dp |= (png_byte)(v << dshift);
|
1997-05-16 03:46:07 -04:00
|
|
|
if (dshift == s_end)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
dshift = s_start;
|
1995-07-20 03:43:20 -04:00
|
|
|
dp--;
|
|
|
|
}
|
|
|
|
else
|
1997-05-16 03:46:07 -04:00
|
|
|
dshift += s_inc;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
if (sshift == s_end)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
sshift = s_start;
|
1995-07-20 03:43:20 -04:00
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
else
|
1997-05-16 03:46:07 -04:00
|
|
|
sshift += s_inc;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_size_t pixel_bytes = (row_info->pixel_depth >> 3);
|
|
|
|
png_bytep sp = row + (png_size_t)(row_info->width - 1) * pixel_bytes;
|
|
|
|
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
|
|
|
|
|
|
|
for (i = row_info->width; i; i--)
|
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_byte v[8];
|
|
|
|
int j;
|
|
|
|
|
1995-09-26 06:22:39 -04:00
|
|
|
png_memcpy(v, sp, pixel_bytes);
|
1998-04-21 16:03:57 -04:00
|
|
|
for (j = 0; j < jstop; j++)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1995-09-26 06:22:39 -04:00
|
|
|
png_memcpy(dp, v, pixel_bytes);
|
1995-07-20 03:43:20 -04:00
|
|
|
dp -= pixel_bytes;
|
|
|
|
}
|
|
|
|
sp -= pixel_bytes;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
row_info->width = final_width;
|
|
|
|
row_info->rowbytes = ((final_width *
|
|
|
|
(png_uint_32)row_info->pixel_depth + 7) >> 3);
|
|
|
|
}
|
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1998-04-21 16:03:57 -04:00
|
|
|
#ifndef PNG_READ_SLOW_FILTERING
|
|
|
|
void
|
|
|
|
png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,
|
|
|
|
png_bytep prev_row, int filter)
|
|
|
|
{
|
|
|
|
png_debug(1, "in png_read_filter_row\n");
|
|
|
|
png_debug2(2,"row = %d, filter = %d\n", png_ptr->row_number, filter);
|
|
|
|
|
|
|
|
|
|
|
|
switch (filter)
|
|
|
|
{
|
|
|
|
case PNG_FILTER_VALUE_NONE:
|
|
|
|
break;
|
|
|
|
case PNG_FILTER_VALUE_SUB:
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_uint_32 i;
|
|
|
|
png_uint_32 istop = row_info->rowbytes;
|
|
|
|
png_uint_32 bpp = (row_info->pixel_depth + 7) / 8;
|
|
|
|
png_bytep rp = row + bpp;
|
|
|
|
png_bytep lp = row;
|
1998-04-21 16:03:57 -04:00
|
|
|
|
1998-05-02 13:52:25 -04:00
|
|
|
for (i = bpp; i < istop; i++)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
*rp++ = (png_byte)(((int)(*rp) + (int)(*lp++)) & 0xff);
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case PNG_FILTER_VALUE_UP:
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_uint_32 i;
|
|
|
|
png_uint_32 istop = row_info->rowbytes;
|
|
|
|
png_bytep rp = row;
|
|
|
|
png_bytep pp = prev_row;
|
1998-04-21 16:03:57 -04:00
|
|
|
|
1998-05-02 13:52:25 -04:00
|
|
|
for (i = 0; i < istop; i++)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
*rp++ = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case PNG_FILTER_VALUE_AVG:
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_uint_32 i;
|
|
|
|
png_bytep rp = row;
|
|
|
|
png_bytep pp = prev_row;
|
|
|
|
png_bytep lp = row;
|
|
|
|
png_uint_32 bpp = (row_info->pixel_depth + 7) / 8;
|
|
|
|
png_uint_32 istop = row_info->rowbytes;
|
1998-04-21 16:03:57 -04:00
|
|
|
|
1998-05-02 13:52:25 -04:00
|
|
|
for (i = 0; i < bpp; i++)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
*rp++ = (png_byte)(((int)(*rp) +
|
|
|
|
((int)(*pp++) / 2)) & 0xff);
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
|
|
|
|
1998-05-02 13:52:25 -04:00
|
|
|
for (lp = row; i < istop; i++)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
*rp++ = (png_byte)(((int)(*rp) +
|
|
|
|
(int)(*pp++ + *lp++) / 2) & 0xff);
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case PNG_FILTER_VALUE_PAETH:
|
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
png_uint_32 i;
|
|
|
|
png_bytep rp = row;
|
|
|
|
png_bytep pp = prev_row;
|
|
|
|
png_bytep lp = row;
|
|
|
|
png_bytep cp = prev_row;
|
|
|
|
png_uint_32 bpp = (row_info->pixel_depth + 7) / 8;
|
|
|
|
png_uint_32 istop=row_info->rowbytes;
|
|
|
|
|
|
|
|
for (i = 0; i < bpp; i++)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
*rp++ = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
|
|
|
|
1998-05-02 13:52:25 -04:00
|
|
|
for ( ; i < istop; i++) /* use leftover i,rp,pp */
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
|
|
|
int a, b, c, pa, pb, pc, p;
|
|
|
|
|
1998-05-02 13:52:25 -04:00
|
|
|
a = *lp++;
|
|
|
|
b = *pp++;
|
|
|
|
c = *cp++;
|
|
|
|
|
|
|
|
p = b - c;
|
|
|
|
pc = a - c;
|
1998-04-21 16:03:57 -04:00
|
|
|
|
|
|
|
#ifdef PNG_USE_ABS
|
1998-05-02 13:52:25 -04:00
|
|
|
pa = abs(p);
|
|
|
|
pb = abs(pc);
|
|
|
|
pc = abs(p + pc);
|
1998-04-21 16:03:57 -04:00
|
|
|
#else
|
1998-05-02 13:52:25 -04:00
|
|
|
pa = p < 0 ? -p : p;
|
|
|
|
pb = pc < 0 ? -pc : pc;
|
|
|
|
pc = (p + pc) < 0 ? -(p + pc) : p + pc;
|
1998-04-21 16:03:57 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
if (pa <= pb && pa <= pc)
|
|
|
|
p = a;
|
|
|
|
else if (pb <= pc)
|
|
|
|
p = b;
|
|
|
|
else
|
|
|
|
p = c;
|
|
|
|
*/
|
|
|
|
|
|
|
|
p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
|
|
|
|
|
1998-05-02 13:52:25 -04:00
|
|
|
*rp++ = (png_byte)(((int)(*rp) + p) & 0xff);
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
png_error(png_ptr, "Bad adaptive filter type");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#else /* PNG_READ_SLOW_FILTERING */
|
1995-07-20 03:43:20 -04:00
|
|
|
void
|
1996-06-05 16:50:50 -04:00
|
|
|
png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,
|
1995-12-19 04:22:19 -05:00
|
|
|
png_bytep prev_row, int filter)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1, "in png_read_filter_row\n");
|
|
|
|
png_debug2(2,"row = %d, filter = %d\n", png_ptr->row_number, filter);
|
|
|
|
|
1998-02-07 11:20:57 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
switch (filter)
|
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
case PNG_FILTER_VALUE_NONE:
|
1995-07-20 03:43:20 -04:00
|
|
|
break;
|
1997-05-16 03:46:07 -04:00
|
|
|
case PNG_FILTER_VALUE_SUB:
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
png_uint_32 i;
|
1998-05-02 13:52:25 -04:00
|
|
|
int bpp = (row_info->pixel_depth + 7) / 8;
|
1995-12-19 04:22:19 -05:00
|
|
|
png_bytep rp;
|
|
|
|
png_bytep lp;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
for (i = (png_uint_32)bpp, rp = row + bpp, lp = row;
|
|
|
|
i < row_info->rowbytes; i++, rp++, lp++)
|
|
|
|
{
|
|
|
|
*rp = (png_byte)(((int)(*rp) + (int)(*lp)) & 0xff);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
case PNG_FILTER_VALUE_UP:
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
png_uint_32 i;
|
1995-12-19 04:22:19 -05:00
|
|
|
png_bytep rp;
|
|
|
|
png_bytep pp;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
for (i = 0, rp = row, pp = prev_row;
|
|
|
|
i < row_info->rowbytes; i++, rp++, pp++)
|
|
|
|
{
|
|
|
|
*rp = (png_byte)(((int)(*rp) + (int)(*pp)) & 0xff);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
case PNG_FILTER_VALUE_AVG:
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
png_uint_32 i;
|
1998-05-02 13:52:25 -04:00
|
|
|
int bpp = (row_info->pixel_depth + 7) / 8;
|
1995-12-19 04:22:19 -05:00
|
|
|
png_bytep rp;
|
|
|
|
png_bytep pp;
|
|
|
|
png_bytep lp;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
for (i = 0, rp = row, pp = prev_row;
|
|
|
|
i < (png_uint_32)bpp; i++, rp++, pp++)
|
|
|
|
{
|
|
|
|
*rp = (png_byte)(((int)(*rp) +
|
|
|
|
((int)(*pp) / 2)) & 0xff);
|
|
|
|
}
|
|
|
|
for (lp = row; i < row_info->rowbytes; i++, rp++, lp++, pp++)
|
|
|
|
{
|
|
|
|
*rp = (png_byte)(((int)(*rp) +
|
|
|
|
(int)(*pp + *lp) / 2) & 0xff);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
case PNG_FILTER_VALUE_PAETH:
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1998-05-02 13:52:25 -04:00
|
|
|
int bpp = (row_info->pixel_depth + 7) / 8;
|
1995-07-20 03:43:20 -04:00
|
|
|
png_uint_32 i;
|
1995-12-19 04:22:19 -05:00
|
|
|
png_bytep rp;
|
|
|
|
png_bytep pp;
|
|
|
|
png_bytep lp;
|
|
|
|
png_bytep cp;
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
for (i = 0, rp = row, pp = prev_row,
|
|
|
|
lp = row - bpp, cp = prev_row - bpp;
|
|
|
|
i < row_info->rowbytes; i++, rp++, pp++, lp++, cp++)
|
|
|
|
{
|
|
|
|
int a, b, c, pa, pb, pc, p;
|
|
|
|
|
|
|
|
b = *pp;
|
|
|
|
if (i >= (png_uint_32)bpp)
|
|
|
|
{
|
|
|
|
c = *cp;
|
|
|
|
a = *lp;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
a = c = 0;
|
|
|
|
}
|
|
|
|
p = a + b - c;
|
|
|
|
pa = abs(p - a);
|
|
|
|
pb = abs(p - b);
|
|
|
|
pc = abs(p - c);
|
|
|
|
|
|
|
|
if (pa <= pb && pa <= pc)
|
|
|
|
p = a;
|
|
|
|
else if (pb <= pc)
|
|
|
|
p = b;
|
|
|
|
else
|
|
|
|
p = c;
|
|
|
|
|
|
|
|
*rp = (png_byte)(((int)(*rp) + p) & 0xff);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
1996-06-05 16:50:50 -04:00
|
|
|
png_error(png_ptr, "Bad adaptive filter type");
|
1995-07-20 03:43:20 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
1998-04-21 16:03:57 -04:00
|
|
|
#endif /* PNG_READ_SLOW_FILTERING */
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
void
|
1995-12-19 04:22:19 -05:00
|
|
|
png_read_finish_row(png_structp png_ptr)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1, "in png_read_finish_row\n");
|
1995-07-20 03:43:20 -04:00
|
|
|
png_ptr->row_number++;
|
|
|
|
if (png_ptr->row_number < png_ptr->num_rows)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (png_ptr->interlaced)
|
|
|
|
{
|
|
|
|
png_ptr->row_number = 0;
|
1998-02-08 21:56:40 -05:00
|
|
|
png_memset_check(png_ptr, png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
|
1995-07-20 03:43:20 -04:00
|
|
|
do
|
|
|
|
{
|
|
|
|
png_ptr->pass++;
|
|
|
|
if (png_ptr->pass >= 7)
|
|
|
|
break;
|
|
|
|
png_ptr->iwidth = (png_ptr->width +
|
|
|
|
png_pass_inc[png_ptr->pass] - 1 -
|
|
|
|
png_pass_start[png_ptr->pass]) /
|
|
|
|
png_pass_inc[png_ptr->pass];
|
1998-02-07 11:20:57 -05:00
|
|
|
png_ptr->irowbytes = ((png_ptr->iwidth *
|
|
|
|
(png_uint_32)png_ptr->pixel_depth + 7) >> 3) +1;
|
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
if (!(png_ptr->transformations & PNG_INTERLACE))
|
|
|
|
{
|
|
|
|
png_ptr->num_rows = (png_ptr->height +
|
|
|
|
png_pass_yinc[png_ptr->pass] - 1 -
|
|
|
|
png_pass_ystart[png_ptr->pass]) /
|
|
|
|
png_pass_yinc[png_ptr->pass];
|
|
|
|
if (!(png_ptr->num_rows))
|
|
|
|
continue;
|
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
if (png_ptr->transformations & PNG_INTERLACE)
|
|
|
|
break;
|
1995-07-20 03:43:20 -04:00
|
|
|
} while (png_ptr->iwidth == 0);
|
|
|
|
|
|
|
|
if (png_ptr->pass < 7)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
char extra;
|
|
|
|
int ret;
|
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->zstream.next_out = (Byte *)&extra;
|
|
|
|
png_ptr->zstream.avail_out = (uInt)1;
|
1998-03-07 15:33:00 -05:00
|
|
|
for(;;)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1997-01-17 02:34:35 -05:00
|
|
|
if (!(png_ptr->zstream.avail_in))
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
while (!png_ptr->idat_size)
|
|
|
|
{
|
1997-01-17 02:34:35 -05:00
|
|
|
png_byte chunk_length[4];
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
png_crc_finish(png_ptr, 0);
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
png_read_data(png_ptr, chunk_length, 4);
|
|
|
|
png_ptr->idat_size = png_get_uint_32(chunk_length);
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
png_reset_crc(png_ptr);
|
|
|
|
png_crc_read(png_ptr, png_ptr->chunk_name, 4);
|
|
|
|
if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
|
1995-12-19 04:22:19 -05:00
|
|
|
png_error(png_ptr, "Not enough image data");
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
}
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
|
|
|
|
png_ptr->zstream.next_in = png_ptr->zbuf;
|
1995-07-20 03:43:20 -04:00
|
|
|
if (png_ptr->zbuf_size > png_ptr->idat_size)
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
|
|
|
|
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
|
|
|
}
|
1997-01-17 02:34:35 -05:00
|
|
|
ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
|
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 ||
|
1995-07-20 03:43:20 -04:00
|
|
|
png_ptr->idat_size)
|
1995-12-19 04:22:19 -05:00
|
|
|
png_error(png_ptr, "Extra compressed data");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->mode |= PNG_AFTER_IDAT;
|
|
|
|
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
|
1995-07-20 03:43:20 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (ret != Z_OK)
|
1997-01-17 02:34:35 -05:00
|
|
|
png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
|
1996-06-05 16:50:50 -04: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))
|
1995-12-19 04:22:19 -05:00
|
|
|
png_error(png_ptr, "Extra compressed data");
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1998-03-07 15:33:00 -05:00
|
|
|
}
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->zstream.avail_out = 0;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
if (png_ptr->idat_size || png_ptr->zstream.avail_in)
|
1995-12-19 04:22:19 -05:00
|
|
|
png_error(png_ptr, "Extra compression data");
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
inflateReset(&png_ptr->zstream);
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->mode |= PNG_AFTER_IDAT;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1995-12-19 04:22:19 -05:00
|
|
|
png_read_start_row(png_structp png_ptr)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
|
|
|
int max_pixel_depth;
|
|
|
|
png_uint_32 rowbytes;
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(1, "in png_read_start_row\n");
|
1997-01-17 02:34:35 -05:00
|
|
|
png_ptr->zstream.avail_in = 0;
|
1995-07-20 03:43:20 -04:00
|
|
|
png_init_read_transformations(png_ptr);
|
|
|
|
if (png_ptr->interlaced)
|
|
|
|
{
|
|
|
|
if (!(png_ptr->transformations & PNG_INTERLACE))
|
|
|
|
png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
|
|
|
|
png_pass_ystart[0]) / png_pass_yinc[0];
|
|
|
|
else
|
|
|
|
png_ptr->num_rows = png_ptr->height;
|
|
|
|
|
|
|
|
png_ptr->iwidth = (png_ptr->width +
|
|
|
|
png_pass_inc[png_ptr->pass] - 1 -
|
|
|
|
png_pass_start[png_ptr->pass]) /
|
|
|
|
png_pass_inc[png_ptr->pass];
|
1998-02-07 11:20:57 -05:00
|
|
|
|
|
|
|
rowbytes = ((png_ptr->iwidth *
|
|
|
|
(png_uint_32)png_ptr->pixel_depth + 7) >> 3) +1;
|
|
|
|
png_ptr->irowbytes = (png_size_t)rowbytes;
|
|
|
|
if((png_uint_32)png_ptr->irowbytes != rowbytes)
|
|
|
|
png_error(png_ptr, "Rowbytes overflow in png_read_start_row");
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
png_ptr->num_rows = png_ptr->height;
|
|
|
|
png_ptr->iwidth = png_ptr->width;
|
|
|
|
png_ptr->irowbytes = png_ptr->rowbytes + 1;
|
|
|
|
}
|
|
|
|
max_pixel_depth = png_ptr->pixel_depth;
|
|
|
|
|
1995-09-26 06:22:39 -04:00
|
|
|
#if defined(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
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
#if defined(PNG_READ_EXPAND_SUPPORTED)
|
|
|
|
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;
|
|
|
|
else
|
|
|
|
max_pixel_depth = 24;
|
|
|
|
}
|
|
|
|
else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
|
|
|
|
{
|
|
|
|
if (max_pixel_depth < 8)
|
|
|
|
max_pixel_depth = 8;
|
|
|
|
if (png_ptr->num_trans)
|
|
|
|
max_pixel_depth *= 2;
|
|
|
|
}
|
|
|
|
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
|
|
|
|
1995-09-26 06:22:39 -04:00
|
|
|
#if defined(PNG_READ_FILLER_SUPPORTED)
|
|
|
|
if (png_ptr->transformations & (PNG_FILLER))
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1998-04-21 16:03:57 -04:00
|
|
|
if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
|
|
|
|
{
|
|
|
|
if (max_pixel_depth <= 8)
|
|
|
|
max_pixel_depth = 16;
|
|
|
|
else
|
|
|
|
max_pixel_depth = 32;
|
|
|
|
}
|
|
|
|
else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
|
|
|
|
{
|
|
|
|
if (max_pixel_depth <= 32)
|
|
|
|
max_pixel_depth = 32;
|
|
|
|
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
|
|
|
|
1995-09-26 06:22:39 -04:00
|
|
|
#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
|
1995-07-20 03:43:20 -04:00
|
|
|
if (png_ptr->transformations & PNG_GRAY_TO_RGB)
|
|
|
|
{
|
|
|
|
if ((png_ptr->num_trans && (png_ptr->transformations & PNG_EXPAND)) ||
|
|
|
|
png_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
|
|
|
|
{
|
|
|
|
if (max_pixel_depth <= 16)
|
|
|
|
max_pixel_depth = 32;
|
|
|
|
else if (max_pixel_depth <= 32)
|
|
|
|
max_pixel_depth = 64;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (max_pixel_depth <= 8)
|
|
|
|
max_pixel_depth = 24;
|
|
|
|
else if (max_pixel_depth <= 16)
|
|
|
|
max_pixel_depth = 48;
|
|
|
|
}
|
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
/* align the width on the next larger 8 pixels. Mainly used
|
|
|
|
for interlacing */
|
|
|
|
rowbytes = ((png_ptr->width + 7) & ~((png_uint_32)7));
|
|
|
|
/* calculate the maximum bytes needed, adding a byte and a pixel
|
1998-04-21 16:03:57 -04:00
|
|
|
for safety's sake */
|
1995-07-20 03:43:20 -04:00
|
|
|
rowbytes = ((rowbytes * (png_uint_32)max_pixel_depth + 7) >> 3) +
|
|
|
|
1 + ((max_pixel_depth + 7) >> 3);
|
|
|
|
#ifdef PNG_MAX_MALLOC_64K
|
1998-01-01 08:13:13 -05:00
|
|
|
if (rowbytes > (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
|
1997-05-16 03:46:07 -04:00
|
|
|
png_ptr->row_buf = (png_bytep)png_malloc(png_ptr, rowbytes);
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
#ifdef PNG_MAX_MALLOC_64K
|
1998-01-01 08:13:13 -05:00
|
|
|
if ((png_uint_32)png_ptr->rowbytes + 1 > (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
|
1998-02-07 11:20:57 -05:00
|
|
|
png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, (png_uint_32)(
|
|
|
|
png_ptr->rowbytes + 1));
|
1997-05-16 03:46:07 -04:00
|
|
|
|
1998-02-08 21:56:40 -05:00
|
|
|
png_memset_check(png_ptr, png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug1(3, "width = %d,\n", png_ptr->width);
|
|
|
|
png_debug1(3, "height = %d,\n", png_ptr->height);
|
|
|
|
png_debug1(3, "iwidth = %d,\n", png_ptr->iwidth);
|
|
|
|
png_debug1(3, "num_rows = %d\n", png_ptr->num_rows);
|
|
|
|
png_debug1(3, "rowbytes = %d,\n", png_ptr->rowbytes);
|
|
|
|
png_debug1(3, "irowbytes = %d,\n", png_ptr->irowbytes);
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1996-06-05 16:50:50 -04:00
|
|
|
png_ptr->flags |= PNG_FLAG_ROW_INIT;
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|