diff --git a/ANNOUNCE b/ANNOUNCE index 4681ed0e6..2dd310a72 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta53 - February 21, 2015 +Libpng 1.7.0beta53 - February 22, 2015 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. @@ -728,7 +728,8 @@ Version 1.7.0beta52 [February 21, 2015] row_pointers with a single height*width*bpp allocated block Rebuilt configure scripts with automake-1.15 and libtool-2.4.6 -Version 1.7.0beta53 [February 21, 2015] +Version 1.7.0beta53 [February 22, 2015] + Restored compiling of png_reciprocal2 with PNG_NO_16BIT. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index d62031eaa..ad0641af4 100644 --- a/CHANGES +++ b/CHANGES @@ -5018,7 +5018,8 @@ Version 1.7.0beta52 [February 21, 2015] to the manual page. Rebuilt configure scripts with automake-1.15 and libtool-2.4.6 -Version 1.7.0beta53 [February 21, 2015] +Version 1.7.0beta53 [February 22, 2015] + Restored compiling of png_reciprocal2 with PNG_NO_16BIT. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/png.c b/png.c index 7c12e34de..e5ba5ab85 100644 --- a/png.c +++ b/png.c @@ -694,13 +694,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta53 - February 21, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta53 - February 22, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE; # else - return "libpng version 1.7.0beta53 - February 21, 2015\ + return "libpng version 1.7.0beta53 - February 22, 2015\ Copyright (c) 1998-2015 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -3319,7 +3319,6 @@ png_gamma_significant(png_fixed_point gamma_val) #endif #ifdef PNG_READ_GAMMA_SUPPORTED -#ifdef PNG_16BIT_SUPPORTED #ifndef PNG_FLOATING_ARITHMETIC_SUPPORTED /* A local convenience routine. */ static png_fixed_point @@ -3334,13 +3333,11 @@ png_product2(png_fixed_point a, png_fixed_point b) return 0; /* overflow */ } #endif /* FLOATING_ARITHMETIC */ -#endif /* 16BIT */ /* The inverse of the above. */ png_fixed_point png_reciprocal2(png_fixed_point a, png_fixed_point b) { -#ifdef PNG_16BIT_SUPPORTED /* The required result is 1/a * 1/b; the following preserves accuracy. */ #ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED if (a != 0 && b != 0) @@ -3363,7 +3360,6 @@ png_reciprocal2(png_fixed_point a, png_fixed_point b) if (res != 0) return png_reciprocal(res); #endif -#endif /* 16BIT */ return 0; /* overflow */ }