[libpng15] Relocated a misplaced "}" in png_reciprocal2().
diff --git a/ANNOUNCE b/ANNOUNCE
index 4ab1cb3..4083fd5 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.5.22beta04 - February 21, 2015
+Libpng 1.5.22beta04 - February 24, 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.
@@ -46,7 +46,8 @@
Allow user to call png_get_IHDR() with NULL arguments (Reuben Hawkins).
Rebuilt configure scripts with automake-1.15 and libtool-2.4.6
-Version 1.5.22beta04 [February 21, 2015]
+Version 1.5.22beta04 [February 24, 2015]
+ Relocated a misplaced "}" in png_reciprocal2().
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 34108e0..12d326c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4310,7 +4310,8 @@
Allow user to call png_get_IHDR() with NULL arguments (Reuben Hawkins).
Rebuilt configure scripts with automake-1.15 and libtool-2.4.6
-Version 1.5.22beta04 [February 21, 2015]
+Version 1.5.22beta04 [February 24, 2015]
+ Relocated a misplaced "}" in png_reciprocal2().
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/png.c b/png.c
index 9439765..c02267f 100644
--- a/png.c
+++ b/png.c
@@ -661,13 +661,13 @@
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.5.22beta04 - February 21, 2015" PNG_STRING_NEWLINE \
+ "libpng version 1.5.22beta04 - February 24, 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.5.22beta04 - February 21, 2015\
+ return "libpng version 1.5.22beta04 - February 24, 2015\
Copyright (c) 1998-2015 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@@ -2138,18 +2138,18 @@
if (r <= 2147483647. && r >= -2147483648.)
return (png_fixed_point)r;
-#else
- /* This may overflow because the range of png_fixed_point isn't
- * symmetric, but this API is only used for the product of file and
- * screen gamma so it doesn't matter that the smallest number it can
- * produce is 1/21474, not 1/100000
- */
- png_fixed_point res = png_product2(a, b);
-
- if (res != 0)
- return png_reciprocal(res);
-#endif
}
+#else
+ /* This may overflow because the range of png_fixed_point isn't
+ * symmetric, but this API is only used for the product of file and
+ * screen gamma so it doesn't matter that the smallest number it can
+ * produce is 1/21474, not 1/100000
+ */
+ png_fixed_point res = png_product2(a, b);
+
+ if (res != 0)
+ return png_reciprocal(res);
+#endif
return 0; /* overflow */
}
