[legacy] Ported bugfix in 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-07 15:36:54 -05:00
parent d13542a3ee
commit 1883ec49dd
3 changed files with 5 additions and 2 deletions

View File

@ -110,6 +110,8 @@ version 1.2.45beta01 [June 7, 2011]
was introduced in libpng-1.2.20beta01. was introduced in libpng-1.2.20beta01.
Check for up->location !PNG_AFTER_IDAT when writing unknown chunks Check for up->location !PNG_AFTER_IDAT when writing unknown chunks
before IDAT. before IDAT.
Ported bugfix in pngrtran.c from 1.5.3: when expanding a paletted image,
always expand to RGBA if transparency is present.
(subscription required; visit (subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement

View File

@ -2711,6 +2711,8 @@ version 1.2.45beta01 [June 7, 2011]
was introduced in libpng-1.2.20beta01. was introduced in libpng-1.2.20beta01.
Check for up->location !PNG_AFTER_IDAT when writing unknown chunks Check for up->location !PNG_AFTER_IDAT when writing unknown chunks
before IDAT. before IDAT.
Ported bugfix in pngrtran.c from 1.5.3: when expanding a paletted image,
always expand to RGBA if transparency is present.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

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