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

[libpng15] Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose()

Browse Source 
in pngrtran.c (Domani Hannes).
This commit is contained in:
Glenn Randers-Pehrson 2012-10-24 11:10:49 -05:00
parent 33b90debc5
commit 7c699f27fc
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.5.14beta01 - September 29, 2012 Libpng 1.5.14beta01 - October 24, 2012
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.
@ -26,8 +26,20 @@ Other information:
Changes since the last public release (1.5.13): Changes since the last public release (1.5.13):
Version 1.5.14beta01 [October 24, 2012]
Added -DZ_SOLO to contrib/pngminim/*/makefile to work with zlib-1.2.7 Added -DZ_SOLO to contrib/pngminim/*/makefile to work with zlib-1.2.7
Warn about the incorrect runtime library setting for VS2010 debug DLL builds. Warn about the incorrect runtime library setting for VS2010 debug DLL builds.
Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose() in
pngrtran.c (Domani Hannes).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
to subscribe)
or to glennrp at users.sourceforge.net
Glenn R-P
#endif
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
CHANGES
View File

@ -3919,9 +3919,11 @@ Version 1.5.13rc01 [September 17, 2012]
Version 1.5.13 [September 27, 2012] Version 1.5.13 [September 27, 2012]
No changes. No changes.
Version 1.5.14beta01 [September 29, 2012] Version 1.5.14beta01 [October 24, 2012]
Added -DZ_SOLO to contrib/pngminim/*/makefile to work with zlib-1.2.7 Added -DZ_SOLO to contrib/pngminim/*/makefile to work with zlib-1.2.7
Warn about the incorrect runtime library setting for VS2010 debug DLL builds. Warn about the incorrect runtime library setting for VS2010 debug DLL builds.
Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose() in
pngrtran.c (Domani Hannes).
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

@ -3920,7 +3920,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structp png_ptr)
*sp = (png_byte)png_ptr->background.gray; *sp = (png_byte)png_ptr->background.gray;
else if (a < 0xff) else if (a < 0xff)
png_composite(*sp, *sp, a, png_ptr->background_1.gray); png_composite(*sp, *sp, a, png_ptr->background.gray);
} }
} }
} }
@ -3989,7 +3989,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structp png_ptr)
png_uint_16 g, v; png_uint_16 g, v;
g = (png_uint_16)(((*sp) << 8) + *(sp + 1)); g = (png_uint_16)(((*sp) << 8) + *(sp + 1));
png_composite_16(v, g, a, png_ptr->background_1.gray); png_composite_16(v, g, a, png_ptr->background.gray);
*sp = (png_byte)((v >> 8) & 0xff); *sp = (png_byte)((v >> 8) & 0xff);
*(sp + 1) = (png_byte)(v & 0xff); *(sp + 1) = (png_byte)(v & 0xff);
} }