[libpng16] Imported from libpng-1.6.32beta11.tarv1.6.32beta11

15 files changed, 26 insertions, 25 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index 2ebc83a88..7d14ef0b1 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.32beta11 - August 6, 2017
+Libpng 1.6.32beta11 - August 7, 2017
 
 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.
@@ -80,7 +80,7 @@ Version 1.6.32beta10 [August 5, 2017]
   Fix "const" declaration info_ptr argument to png_get_eXIf_1() and the
     num_exif argument to png_get_eXIf_1() (Github Issue 171).
 
-Version 1.6.32beta11 [August 6, 2017]
+Version 1.6.32beta11 [August 7, 2017]
   Added "eXIf" to "chunks_to_ignore[]" in png_set_keep_unknown_chunks().
   Added huge_IDAT.png and empty_ancillary_chunks.png to testpngs/crashers.
   Make pngtest --strict, --relax, --xfail options imply -m (multiple).
diff --git a/CHANGES b/CHANGES
index 1de0dac6d..b3667b2c2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5963,7 +5963,7 @@ Version 1.6.32beta10 [August 5, 2017]
   Fix "const" declaration info_ptr argument to png_get_eXIf_1() and the
     num_exif argument to png_get_eXIf_1() (Github Issue 171).
 
-Version 1.6.32beta11 [August 6, 2017]
+Version 1.6.32beta11 [August 7, 2017]
   Added "eXIf" to "chunks_to_ignore[]" in png_set_keep_unknown_chunks().
   Added huge_IDAT.png and empty_ancillary_chunks.png to testpngs/crashers.
   Make pngtest --strict, --relax, --xfail options imply -m (multiple).
diff --git a/LICENSE b/LICENSE
index 34ab8aee6..640a34139 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.0.7, July 1, 2000 through 1.6.32beta11, August 5, 2017 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.32beta11, August 7, 2017 are
 Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
 derived from libpng-1.0.6, and are distributed according to the same
 disclaimer and license as libpng-1.0.6 with the following individuals
diff --git a/README b/README
index 80c9bb106..b0ad30e29 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.32beta11 - August 5, 2017 (shared library 16.0)
+README for libpng version 1.6.32beta11 - August 7, 2017 (shared library 16.0)
 See the note about version numbers near the top of png.h
 
 See INSTALL for instructions on how to install libpng.
diff --git a/contrib/testpngs/crashers/bad_iccp.png b/contrib/testpngs/crashers/bad_iccp.png
deleted file mode 100644
index 0b7b86379..000000000
--- a/contrib/testpngs/crashers/bad_iccp.png
+++ /dev/null
diff --git a/libpng-manual.txt b/libpng-manual.txt
index a95e687c5..57b38dc88 100644
--- a/libpng-manual.txt
+++ b/libpng-manual.txt
@@ -1,6 +1,6 @@
 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.6.32beta11 - August 5, 2017
+ libpng version 1.6.32beta11 - August 7, 2017
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2017 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.6.32beta11 - August 5, 2017
+ libpng versions 0.97, January 1998, through 1.6.32beta11 - August 7, 2017
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2017 Glenn Randers-Pehrson
 
diff --git a/libpng.3 b/libpng.3
index 64736f4c8..4703e41c1 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "August 5, 2017"
+.TH LIBPNG 3 "August 7, 2017"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.32beta11
 .SH SYNOPSIS
@@ -518,7 +518,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
 .SH LIBPNG.TXT
 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.6.32beta11 - August 5, 2017
+ libpng version 1.6.32beta11 - August 7, 2017
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2017 Glenn Randers-Pehrson
@@ -529,7 +529,7 @@ libpng-manual.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.6.32beta11 - August 5, 2017
+ libpng versions 0.97, January 1998, through 1.6.32beta11 - August 7, 2017
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2017 Glenn Randers-Pehrson
 
@@ -6081,7 +6081,7 @@ possible without all of you.
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.6.32beta11 - August 5, 2017:
+Libpng version 1.6.32beta11 - August 7, 2017:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
 
@@ -6106,7 +6106,7 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.0.7, July 1, 2000 through 1.6.32beta11, August 5, 2017 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.32beta11, August 7, 2017 are
 Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
 derived from libpng-1.0.6, and are distributed according to the same
 disclaimer and license as libpng-1.0.6 with the following individuals
@@ -6234,7 +6234,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-August 5, 2017
+August 7, 2017
 
 .\" end of man page
 
diff --git a/png.c b/png.c
index d8a35966f..54c2e3333 100644
--- a/png.c
+++ b/png.c
@@ -816,14 +816,14 @@ png_get_copyright(png_const_structrp png_ptr)
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-      "libpng version 1.6.32beta11 - August 5, 2017" PNG_STRING_NEWLINE \
+      "libpng version 1.6.32beta11 - August 7, 2017" PNG_STRING_NEWLINE \
       "Copyright (c) 1998-2002,2004,2006-2017 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.6.32beta11 - August 5, 2017\
+   return "libpng version 1.6.32beta11 - August 7, 2017\
       Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
diff --git a/png.h b/png.h
index bfd7be9c0..930c59996 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.6.32beta11, August 5, 2017
+ * libpng version 1.6.32beta11, August 7, 2017
  *
  * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -12,7 +12,7 @@
  * Authors and maintainers:
  *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
  *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
- *   libpng versions 0.97, January 1998, through 1.6.32beta11, August 5, 2017:
+ *   libpng versions 0.97, January 1998, through 1.6.32beta11, August 7, 2017:
  *     Glenn Randers-Pehrson.
  *   See also "Contributing Authors", below.
  */
@@ -25,7 +25,7 @@
  *
  * This code is released under the libpng license.
  *
- * libpng versions 1.0.7, July 1, 2000 through 1.6.32beta11, August 5, 2017 are
+ * libpng versions 1.0.7, July 1, 2000 through 1.6.32beta11, August 7, 2017 are
  * Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
  * derived from libpng-1.0.6, and are distributed according to the same
  * disclaimer and license as libpng-1.0.6 with the following individuals
@@ -241,7 +241,7 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    August 5, 2017
+ *    August 7, 2017
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
@@ -310,7 +310,7 @@
 
 /* Version information for png.h - this should match the version in png.c */
 #define PNG_LIBPNG_VER_STRING "1.6.32beta11"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.32beta11 - August 5, 2017\n"
+#define PNG_HEADER_VERSION_STRING " libpng version 1.6.32beta11 - August 7, 2017\n"
 
 #define PNG_LIBPNG_VER_SONUM   16
 #define PNG_LIBPNG_VER_DLLNUM  16
diff --git a/pngconf.h b/pngconf.h
index e42d9c8e5..4022aeaf8 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.6.32beta11, August 5, 2017
+ * libpng version 1.6.32beta11, August 7, 2017
  *
  * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngread.c b/pngread.c
index 64fadbce5..c4c123c8d 100644
--- a/pngread.c
+++ b/pngread.c
@@ -539,6 +539,7 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)
       png_error(png_ptr, "Invalid attempt to read row data");
 
    /* Fill the row with IDAT data: */
+   png_ptr->row_buf[0]=255; /* to force error if no data was found */
    png_read_IDAT_data(png_ptr, png_ptr->row_buf, row_info.rowbytes + 1);
 
    if (png_ptr->row_buf[0] > PNG_FILTER_VALUE_NONE)
diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt
index 4a00cc53e..d7b5244d6 100644
--- a/projects/vstudio/README.txt
+++ b/projects/vstudio/README.txt
@@ -1,7 +1,7 @@
 
 VisualStudio instructions
 
-libpng version 1.6.32beta11 - August 5, 2017
+libpng version 1.6.32beta11 - August 7, 2017
 
 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson
 
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index dad524fd4..198409c81 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
 <!--
  * zlib.props - location of zlib source
  *
- * libpng version 1.6.32beta11 - August 5, 2017
+ * libpng version 1.6.32beta11 - August 7, 2017
  *
  * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *
diff --git a/scripts/README.txt b/scripts/README.txt
index c06404839..f432143a8 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
 
-Makefiles for  libpng version 1.6.32beta11 - August 5, 2017
+Makefiles for  libpng version 1.6.32beta11 - August 7, 2017
 
 pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.linux    =>  Linux/ELF makefile
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 37fb17066..8325b096a 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
 
 /* pnglibconf.h - library build configuration */
 
-/* Libpng version 1.6.32beta11 - August 5, 2017 */
+/* Libpng version 1.6.32beta11 - August 7, 2017 */
 
 /* Copyright (c) 1998-2017 Glenn Randers-Pehrson */