cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[devel] Fixed bug in background transformation handling in pngrtran.c

Browse Source 
(it was looking for the flag in png_ptr->transformations instead of in
png_ptr->flags).
This commit is contained in:
Glenn Randers-Pehrson 2010-12-28 21:48:43 -06:00
parent 332594dd06
commit f2e2833f28
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.5.0rc04 - December 28, 2010 Libpng 1.5.0rc04 - December 29, 2010
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -226,7 +226,7 @@ version 1.5.0beta24 [May 7, 2010]
offset of the png_ptr->rowbuf pointer into png_ptr->big_row_buf. offset of the png_ptr->rowbuf pointer into png_ptr->big_row_buf.
Added more blank lines for readability. Added more blank lines for readability.
version 1.5.0beta25 [December 28, 2010] version 1.5.0beta25 [December 29, 2010]
In pngpread.c: png_push_have_row() add check for new_row > height In pngpread.c: png_push_have_row() add check for new_row > height
Removed the now-redundant check for out-of-bounds new_row from example.c Removed the now-redundant check for out-of-bounds new_row from example.c
@ -478,7 +478,7 @@ Version 1.5.0beta58 [December 19, 2010]
Fixed the clean rule in Makefile.am to remove pngtest-log.txt Fixed the clean rule in Makefile.am to remove pngtest-log.txt
Made minor changes to work around warnings in gcc 3.4 Made minor changes to work around warnings in gcc 3.4
Version 1.5.0rc01 [December 28, 2010] Version 1.5.0rc01 [December 29, 2010]
No changes. No changes.
Version 1.5.0rc02 [December 27, 2010] Version 1.5.0rc02 [December 27, 2010]
@ -487,7 +487,10 @@ Version 1.5.0rc02 [December 27, 2010]
Version 1.5.0rc03 [December 28, 2010] Version 1.5.0rc03 [December 28, 2010]
Eliminated scripts/*.def and revised Makefile.am accordingly Eliminated scripts/*.def and revised Makefile.am accordingly
Version 1.5.0rc04 [December 28, 2010] Version 1.5.0rc04 [December 29, 2010]
Fixed bug in background transformation handling in pngrtran.c (it was
looking for the flag in png_ptr->transformations instead of in
png_ptr->flags).
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

5
CHANGES
View File

@ -3125,7 +3125,10 @@ Version 1.5.0rc02 [December 27, 2010]
Version 1.5.0rc03 [December 28, 2010] Version 1.5.0rc03 [December 28, 2010]
Eliminated scripts/*.def and revised Makefile.am accordingly Eliminated scripts/*.def and revised Makefile.am accordingly
Version 1.5.0rc04 [December 28, 2010] Version 1.5.0rc04 [December 29, 2010]
Fixed bug in background transformation handling in pngrtran.c (it was
looking for the flag in png_ptr->transformations instead of in
png_ptr->flags).
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

4
pngrtran.c
View File

@ -1068,7 +1068,7 @@ png_init_read_transformations(png_structp png_ptr)
*/ */
png_ptr->transformations &= ~PNG_BACKGROUND; png_ptr->transformations &= ~PNG_BACKGROUND;
png_ptr->transformations &= ~PNG_GAMMA; png_ptr->transformations &= ~PNG_GAMMA;
png_ptr->transformations |= PNG_STRIP_ALPHA; png_ptr->flags |= PNG_FLAG_STRIP_ALPHA;
} }
/* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */ /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */
@ -1202,7 +1202,7 @@ png_init_read_transformations(png_structp png_ptr)
/* Handled alpha, still need to strip the channel. */ /* Handled alpha, still need to strip the channel. */
png_ptr->transformations &= ~PNG_BACKGROUND; png_ptr->transformations &= ~PNG_BACKGROUND;
png_ptr->transformations |= PNG_STRIP_ALPHA; png_ptr->flags |= PNG_FLAG_STRIP_ALPHA;
} }
#endif /* PNG_READ_BACKGROUND_SUPPORTED */ #endif /* PNG_READ_BACKGROUND_SUPPORTED */