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

[libpng17] Removed some duplicated code from png.c and contrib/tools/scale.c

Browse Source 
and changed some png_warning() calls to png_app_error() calls in pngwutil.c
This commit is contained in:
John Bowler
2012-12-15 16:04:28 -06:00
committed by Glenn Randers-Pehrson
parent b4e241559e
commit 0cf9c7d63d
3 changed files with 5 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pngwutil.c
View File

@@ -1427,11 +1427,8 @@ png_write_tRNS(png_structrp png_ptr, png_const_bytep trans_alpha,
{
if (num_trans <= 0 || num_trans > png_ptr->num_palette)
{
/* This is an error which can only be reliably detected late, change to
* a png_app_warning here so that it will fail in debug. It should be
* a png_app_error.
*/
png_app_warning(png_ptr,
/* This is an error which can only be reliably detected late. */
png_app_error(png_ptr,
"Invalid number of transparent colors specified");
return;
}
@@ -1447,7 +1444,7 @@ png_write_tRNS(png_structrp png_ptr, png_const_bytep trans_alpha,
if (tran->gray >= (1 << png_ptr->bit_depth))
{
/* This can no longer happen because it is checked in png_set_tRNS */
png_warning(png_ptr,
png_app_error(png_ptr,
"Ignoring attempt to write tRNS chunk out-of-range for bit_depth");
return;
@@ -1470,7 +1467,7 @@ png_write_tRNS(png_structrp png_ptr, png_const_bytep trans_alpha,
#endif
{
/* Also checked in png_set_tRNS */
png_warning(png_ptr,
png_app_error(png_ptr,
"Ignoring attempt to write 16-bit tRNS chunk when bit_depth is 8");
return;
}
@@ -1481,7 +1478,7 @@ png_write_tRNS(png_structrp png_ptr, png_const_bytep trans_alpha,
else
{
/* Checked in png_set_tRNS */
png_warning(png_ptr, "Can't write tRNS with an alpha channel");
png_app_error(png_ptr, "Can't write tRNS with an alpha channel");
}
}
#endif