[master] Port change to pngrtran.c from 1.5.3: when expanding a paletted image,

always expand to RGBA if transparency is present.
This commit is contained in:
Glenn Randers-Pehrson
2011-06-03 21:17:49 -05:00
parent 5a5ad7a5fa
commit d41915dc2a
3 changed files with 5 additions and 2 deletions

View File

@@ -1181,8 +1181,7 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
{
if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
{
if (png_ptr->num_trans &&
(png_ptr->transformations & PNG_EXPAND_tRNS))
if (png_ptr->num_trans)
info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
else
info_ptr->color_type = PNG_COLOR_TYPE_RGB;