diff --git a/ANNOUNCE b/ANNOUNCE index 6604e7ecb..f0ffd3f5a 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -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 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): +Version 1.5.14beta01 [October 24, 2012] 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. + 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: (subscription required; visit diff --git a/CHANGES b/CHANGES index ffdf1dbd2..db9663d8f 100644 --- a/CHANGES +++ b/CHANGES @@ -3919,9 +3919,11 @@ Version 1.5.13rc01 [September 17, 2012] Version 1.5.13 [September 27, 2012] 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 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 diff --git a/pngrtran.c b/pngrtran.c index 1e31c7520..66dc808f4 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -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; 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; 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 + 1) = (png_byte)(v & 0xff); }