From 9295264b6f53dc2bfb441f8dec4e43bea052f141 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Mon, 7 Mar 2016 07:17:28 -0600
Subject: [PATCH] [libpng16] Update CHANGES and ANNOUNCE

---
 ANNOUNCE | 5 +++--
 CHANGES  | 6 ++++--
 pngget.c | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 36b801bb2..96c60e487 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.22beta03 - February 27, 2016
+Libpng 1.6.22beta03 - March 7, 2016
 
 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.
@@ -54,7 +54,7 @@ Version 1.6.22beta02 [February 8, 2016]
     extend the png_set_alpha_mode range as HDR imaging systems are starting
     to emerge.
 
-Version 1.6.22beta03 [February 27, 2016]
+Version 1.6.22beta03 [March 7, 2016]
   Added a common-law trademark notice and export control information
     to the LICENSE file, png.h, and the man page.
   Restored "& 0xff" in png_save_uint_16() and png_save_uint_32() that
@@ -75,6 +75,7 @@ Version 1.6.22beta03 [February 27, 2016]
     that case, to apply any of the supported transforms.  This makes for
     more realistic testing; the decoded data actually gets used in a
     meaningful fashion (John Bowler).
+  Fixed some misleading indentation (Krishnaraj Bhat).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index a6044d8f6..6142ded49 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5063,7 +5063,8 @@ Version 1.6.15beta04 [November 4, 2014]
 Version 1.6.15beta05 [November 5, 2014]
   Use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING in
     example.c, pngtest.c, and applications in the contrib directory.
-  Avoid out-of-bounds memory access in png_user_version_check().
+  Fixed an out-of-range read in png_user_version_check() (Bug report from
+    Qixue Xiao, CVE-2015-8540).
   Simplified and future-proofed png_user_version_check().
   Fixed GCC unsigned int->float warnings. Various versions of GCC
     seem to generate warnings when an unsigned value is implicitly
@@ -5513,7 +5514,7 @@ Version 1.6.22beta02 [February 8, 2016]
     extend the png_set_alpha_mode range as HDR imaging systems are starting
     to emerge.
 
-Version 1.6.22beta03 [February 27, 2016]
+Version 1.6.22beta03 [March 7, 2016]
   Added a common-law trademark notice and export control information
     to the LICENSE file, png.h, and the man page.
   Restored "& 0xff" in png_save_uint_16() and png_save_uint_32() that
@@ -5534,6 +5535,7 @@ Version 1.6.22beta03 [February 27, 2016]
     that case, to apply any of the supported transforms.  This makes for
     more realistic testing; the decoded data actually gets used in a
     meaningful fashion (John Bowler).
+  Fixed some misleading indentation (Krishnaraj Bhat).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngget.c b/pngget.c
index aafcd96c9..14fc7be52 100644
--- a/pngget.c
+++ b/pngget.c
@@ -456,11 +456,11 @@ png_get_pHYs_dpi(png_const_structrp png_ptr, png_const_inforp info_ptr,
    return (retval);
 }
 #endif /* pHYs */
-#endif  /* INCH_CONVERSIONS */
+#endif /* INCH_CONVERSIONS */
 
 /* png_get_channels really belongs in here, too, but it's been around longer */
 
-#endif  /* EASY_ACCESS */
+#endif /* EASY_ACCESS */
 
 
 png_byte PNGAPI