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

[devel] Added "#ifdef PNG_READ_BACKGROUND_SUPPORTED/#endif" in pngrtran.c

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2011-06-15 11:50:23 -05:00
parent 8f4edd07be
commit 903c64dce8
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.5.4beta03 - June 15, 2011 Libpng 1.5.4beta04 - June 15, 2011
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.
@ -9,20 +9,20 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a Source files with LF line endings (for Unix/Linux) and with a
"configure" script "configure" script
1.5.4beta03.tar.xz (LZMA-compressed, recommended) 1.5.4beta04.tar.xz (LZMA-compressed, recommended)
1.5.4beta03.tar.gz 1.5.4beta04.tar.gz
1.5.4beta03.tar.bz2 1.5.4beta04.tar.bz2
Source files with CRLF line endings (for Windows), without the Source files with CRLF line endings (for Windows), without the
"configure" script "configure" script
lp154b03.7z (LZMA-compressed, recommended) lp154b04.7z (LZMA-compressed, recommended)
lp154b03.zip lp154b04.zip
Other information: Other information:
1.5.4beta03-README.txt 1.5.4beta04-README.txt
1.5.4beta03-LICENSE.txt 1.5.4beta04-LICENSE.txt
Changes since the last public release (1.5.2): Changes since the last public release (1.5.2):
@ -213,6 +213,9 @@ Version 1.5.4beta03 [June 15, 2011]
Correction to the expand_16 code; removed extra instance of Correction to the expand_16 code; removed extra instance of
png_set_scale_16_to_8 from pngpriv.h png_set_scale_16_to_8 from pngpriv.h
Version 1.5.4beta04 [June 15, 2011]
Added a missing "#ifdef PNG_READ_BACKGROUND_SUPPORTED/#endif" in pngrtran.c
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
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement

3
CHANGES
View File

@ -3476,6 +3476,9 @@ Version 1.5.4beta03 [June 15, 2011]
Correction to the expand_16 code; removed extra instance of Correction to the expand_16 code; removed extra instance of
png_set_scale_16_to_8 from pngpriv.h png_set_scale_16_to_8 from pngpriv.h
Version 1.5.4beta04 [June 15, 2011]
Added a missing "#ifdef PNG_READ_BACKGROUND_SUPPORTED/#endif" in pngrtran.c
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
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement

6
pngrtran.c
View File

@ -1503,9 +1503,11 @@ png_init_read_transformations(png_structp png_ptr)
|| ((png_ptr->transformations & PNG_COMPOSE) || ((png_ptr->transformations & PNG_COMPOSE)
&& (png_gamma_significant(png_ptr->gamma) && (png_gamma_significant(png_ptr->gamma)
|| png_gamma_significant(png_ptr->screen_gamma) || png_gamma_significant(png_ptr->screen_gamma)
# ifdef PNG_READ_BACKGROUND_SUPPORTED
|| (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE || (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE
&& png_gamma_significant(png_ptr->background_gamma)))) && png_gamma_significant(png_ptr->background_gamma))
|| ((png_ptr->transformations & PNG_ENCODE_ALPHA) # endif
)) || ((png_ptr->transformations & PNG_ENCODE_ALPHA)
&& png_gamma_significant(png_ptr->screen_gamma)) && png_gamma_significant(png_ptr->screen_gamma))
) )
{ {