mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng16] Imported from libpng-1.6.0beta12.tar

Browse Source
This commit is contained in:
Glenn Randers-Pehrson
2012-02-17 16:12:24 -06:00
parent b0606ea043
commit a4badc4b50
4 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pngrtran.c
View File

@@ -2294,6 +2294,34 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
png_do_unpack(row_info, png_ptr->row_buf + 1);
#endif
/* Added at libpng-1.6.0 */
#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
/* To do: Fix does not check sub-8-bit rows that have not been unpacked. */
if (row_info->color_type == PNG_COLOR_TYPE_PALETTE &&
row_info->bit_depth == 8)
if (png_ptr->num_palette < (1 << png_ptr->bit_depth))
{
if ((png_ptr->interlaced && png_ptr->pass == 6) ||
(!png_ptr->interlaced && png_ptr->pass == 0))
{
png_uint_32 i;
png_bytep rp = png_ptr->row_buf+1; /* +1 to skip the filter byte */
for (i = 0; i <= row_info->rowbytes; i++)
{
if (*rp >= png_ptr->num_palette)
{
/* Should this be a benign error instead of a warning? */
png_warning(png_ptr,"Found invalid palette index");
break;
}
rp++;
}
}
}
#endif
#ifdef PNG_READ_BGR_SUPPORTED
if (png_ptr->transformations & PNG_BGR)
png_do_bgr(row_info, png_ptr->row_buf + 1);