[libpng14] Quiet set-but-not-used warnings in pngset.c
diff --git a/ANNOUNCE b/ANNOUNCE
index 104bac7..1bf559d 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.4.13beta06 - January 10, 2014
+Libpng 1.4.13beta06 - January 22, 2014
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.
@@ -55,7 +55,8 @@
Rebuilt the configure scripts with autoconf-2.69 and automake-1.14.1
Removed potentially misleading warning from png_check_IHDR().
-version 1.4.13beta06 [January 10, 2014]
+version 1.4.13beta06 [January 22, 2014]
+ Quiet set-but-not-used warnings in pngset.c
Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 325dfad..cc18187 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2897,7 +2897,8 @@
Rebuilt the configure scripts with autoconf-2.69 and automake-1.14.1
Removed potentially misleading warning from png_check_IHDR().
-version 1.4.13beta06 [January 10, 2014]
+version 1.4.13beta06 [January 22, 2014]
+ Quiet set-but-not-used warnings in pngset.c
Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit
diff --git a/pngset.c b/pngset.c
index 16eaf55..b9cff85 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct
*
- * Last changed in libpng 1.4.13 [January 10, 2014]
+ * Last changed in libpng 1.4.13 [January 22, 2014]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -530,6 +530,7 @@
#endif
#ifdef PNG_cHRM_SUPPORTED
+# ifdef PNG_FIXED_POINT_SUPPORTED
int_white_x = 31270L;
int_white_y = 32900L;
int_red_x = 64000L;
@@ -538,8 +539,12 @@
int_green_y = 60000L;
int_blue_x = 15000L;
int_blue_y = 6000L;
+ png_set_cHRM_fixed(png_ptr, info_ptr,
+ int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
+ int_green_y, int_blue_x, int_blue_y);
+# endif
-#ifdef PNG_FLOATING_POINT_SUPPORTED
+# ifdef PNG_FLOATING_POINT_SUPPORTED
white_x = (float).3127;
white_y = (float).3290;
red_x = (float).64;
@@ -548,17 +553,9 @@
green_y = (float).60;
blue_x = (float).15;
blue_y = (float).06;
-#endif
-
-#ifdef PNG_FIXED_POINT_SUPPORTED
- png_set_cHRM_fixed(png_ptr, info_ptr,
- int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
- int_green_y, int_blue_x, int_blue_y);
-#endif
-#ifdef PNG_FLOATING_POINT_SUPPORTED
png_set_cHRM(png_ptr, info_ptr,
white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);
-#endif
+# endif
#endif /* cHRM */
}
#endif /* sRGB */
