[libpng16] Imported from libpng-1.6.19rc02.tarv1.6.19rc02

15 files changed, 46 insertions, 34 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index 41726182f..d61480800 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.19rc02 - October 30, 2015
+Libpng 1.6.19rc02 - October 31, 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.
@@ -106,9 +106,14 @@ Version 1.6.19beta04 [October 15, 2015]
 Version 1.6.19rc01 [October 23, 2015]
   No changes.
 
-Version 1.6.19rc02 [October 30, 2015]
+Version 1.6.19rc02 [October 31, 2015]
   Prevent setting or writing over-length PLTE chunk (Cosmin Truta).
   Silently truncate over-length PLTE chunk while reading.
+  Libpng incorrectly calculated the output rowbytes when the application
+    decreased either the number of channels or the bit depth (or both) in
+    a user transform.  This was safe; libpng overallocated buffer space
+   (potentially by quite a lot; up to 4 times the amount required) but,
+   from 1.5.4 on, resulted in a png_error (John Bowler).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index e15f58b92..30bb7dbc2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5391,9 +5391,14 @@ Version 1.6.19beta04 [October 15, 2015]
 Version 1.6.19rc01 [October 23, 2015]
   No changes.
 
-Version 1.6.19rc02 [October 30, 2015]
+Version 1.6.19rc02 [October 31, 2015]
   Prevent setting or writing over-length PLTE chunk (Cosmin Truta).
   Silently truncate over-length PLTE chunk while reading.
+  Libpng incorrectly calculated the output rowbytes when the application
+    decreased either the number of channels or the bit depth (or both) in
+    a user transform.  This was safe; libpng overallocated buffer space
+   (potentially by quite a lot; up to 4 times the amount required) but,
+   from 1.5.4 on, resulted in a png_error (John Bowler).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/LICENSE b/LICENSE
index 77ba6ffb3..f0b3d54a1 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.19rc02, October 29, 2015, are
+libpng versions 1.0.7, July 1, 2000, through 1.6.19rc02, October 31, 2015, are
 Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.0.6
 with the following individuals added to the list of Contributing Authors:
@@ -104,4 +104,4 @@ the additional disclaimers inserted at version 1.0.7.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-October 29, 2015
+October 31, 2015
diff --git a/README b/README
index 9129c51d4..7db23e8d3 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.19rc02 - October 29, 2015 (shared library 16.0)
+README for libpng version 1.6.19rc02 - October 31, 2015 (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/libpng-manual.txt b/libpng-manual.txt
index 6b4fef82a..0b8369d53 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.19rc02 - October 30, 2015
+ libpng version 1.6.19rc02 - October 31, 2015
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2015 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.19rc02 - October 30, 2015
+ libpng versions 0.97, January 1998, through 1.6.19rc02 - October 31, 2015
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2015 Glenn Randers-Pehrson
 
@@ -5144,7 +5144,8 @@ PNG_LIBPNG_BUILD_BASE_TYPE definition which is not directly user controllable.
 
 Starting with libpng-1.6.19, attempting to set an over-length PLTE chunk
 is an error. Previously this requirement of the PNG specification was not
-enforced, and the palette was always limited to 256 entries.
+enforced, and the palette was always limited to 256 entries. An over-length
+PLTE chunk found in an input PNG is silently truncated.
 
 XIII.  Detecting libpng
 
@@ -5318,7 +5319,7 @@ Other rules can be inferred by inspecting the libpng source.
 
 XVI. Y2K Compliance in libpng
 
-October 30, 2015
+October 31, 2015
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
diff --git a/libpng.3 b/libpng.3
index 1f7c75ce3..4f60e4bc4 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "October 30, 2015"
+.TH LIBPNG 3 "October 31, 2015"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.19rc02
 .SH SYNOPSIS
@@ -508,7 +508,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.19rc02 - October 30, 2015
+ libpng version 1.6.19rc02 - October 31, 2015
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -519,7 +519,7 @@ libpng-manual.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.6.19rc02 - October 30, 2015
+ libpng versions 0.97, January 1998, through 1.6.19rc02 - October 31, 2015
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2015 Glenn Randers-Pehrson
 
@@ -5652,7 +5652,8 @@ PNG_LIBPNG_BUILD_BASE_TYPE definition which is not directly user controllable.
 
 Starting with libpng-1.6.19, attempting to set an over-length PLTE chunk
 is an error. Previously this requirement of the PNG specification was not
-enforced, and the palette was always limited to 256 entries.
+enforced, and the palette was always limited to 256 entries. An over-length
+PLTE chunk found in an input PNG is silently truncated.
 
 .SH XIII.  Detecting libpng
 
@@ -5826,7 +5827,7 @@ Other rules can be inferred by inspecting the libpng source.
 
 .SH XVI. Y2K Compliance in libpng
 
-October 30, 2015
+October 31, 2015
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
@@ -6091,7 +6092,7 @@ the first widely used release:
  1.6.18rc01-03       16    10618  16.so.16.18[.0]
  1.6.18              16    10618  16.so.16.18[.0]
  1.6.19beta01-04     16    10619  16.so.16.19[.0]
- 1.6.19rc01          16    10619  16.so.16.19[.0]
+ 1.6.19rc01-02       16    10619  16.so.16.19[.0]
 
 Henceforth the source version will match the shared-library minor
 and patch numbers; the shared-library major version number will be
@@ -6148,7 +6149,7 @@ possible without all of you.
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.6.19rc02 - October 30, 2015:
+Libpng version 1.6.19rc02 - October 31, 2015:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
 
@@ -6171,7 +6172,7 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.0.7, July 1, 2000, through 1.6.19rc02, October 30, 2015, are
+libpng versions 1.0.7, July 1, 2000, through 1.6.19rc02, October 31, 2015, are
 Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.0.6
 with the following individuals added to the list of Contributing Authors:
@@ -6265,7 +6266,7 @@ the additional disclaimers inserted at version 1.0.7.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-October 30, 2015
+October 31, 2015
 
 .\" end of man page
 
diff --git a/libpngpf.3 b/libpngpf.3
index cfae7f4d4..9468a44c5 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "October 29, 2015"
+.TH LIBPNGPF 3 "October 31, 2015"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.19rc02
 (private functions)
diff --git a/png.5 b/png.5
index 0e42f8e58..f6c19d617 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "October 29, 2015"
+.TH PNG 5 "October 31, 2015"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
diff --git a/png.c b/png.c
index fa73b990e..693a2fb24 100644
--- a/png.c
+++ b/png.c
@@ -775,13 +775,13 @@ png_get_copyright(png_const_structrp png_ptr)
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-      "libpng version 1.6.19rc02 - October 29, 2015" PNG_STRING_NEWLINE \
+      "libpng version 1.6.19rc02 - October 31, 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.6.19rc02 - October 29, 2015\
+   return "libpng version 1.6.19rc02 - October 31, 2015\
       Copyright (c) 1998-2015 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 097a0060e..eca1abed5 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.6.19rc02, October 29, 2015
+ * libpng version 1.6.19rc02, October 31, 2015
  *
  * Copyright (c) 1998-2015 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.19rc02, October 29, 2015: Glenn
+ *   libpng versions 0.97, January 1998, through 1.6.19rc02, October 31, 2015: Glenn
  *   See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -220,7 +220,7 @@
  *    1.6.18rc01-03           16    10618  16.so.16.18[.0]
  *    1.6.18                  16    10618  16.so.16.18[.0]
  *    1.6.19beta01-04         16    10619  16.so.16.19[.0]
- *    1.6.19rc01              16    10619  16.so.16.19[.0]
+ *    1.6.19rc01-02           16    10619  16.so.16.19[.0]
  *
  *   Henceforth the source version will match the shared-library major
  *   and minor numbers; the shared-library major version number will be
@@ -252,7 +252,7 @@
  *
  * This code is released under the libpng license.
  *
- * libpng versions 1.0.7, July 1, 2000, through 1.6.19rc02, October 29, 2015, are
+ * libpng versions 1.0.7, July 1, 2000, through 1.6.19rc02, October 31, 2015, are
  * Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are
  * distributed according to the same disclaimer and license as libpng-1.0.6
  * with the following individuals added to the list of Contributing Authors:
@@ -361,7 +361,7 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    October 29, 2015
+ *    October 31, 2015
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
@@ -431,7 +431,7 @@
 /* Version information for png.h - this should match the version in png.c */
 #define PNG_LIBPNG_VER_STRING "1.6.19rc02"
 #define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.6.19rc02 - October 29, 2015\n"
+     " libpng version 1.6.19rc02 - October 31, 2015\n"
 
 #define PNG_LIBPNG_VER_SONUM   16
 #define PNG_LIBPNG_VER_DLLNUM  16
diff --git a/pngrtran.c b/pngrtran.c
index 0d37a726b..156b025ea 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1,7 +1,7 @@
 
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
- * Last changed in libpng 1.6.18 [July 23, 2015]
+ * Last changed in libpng 1.6.19 [(PENDING RELEASE)]
  * Copyright (c) 1998-2015 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.)
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index 74113d9d0..06c5fc445 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
 
 VisualStudio instructions
 
-libpng version 1.6.19rc02 - October 29, 2015
+libpng version 1.6.19rc02 - October 31, 2015
 
 Copyright (c) 1998-2010 Glenn Randers-Pehrson
 
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 07cbb1870..64a638399 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.19rc02 - October 29, 2015
+ * libpng version 1.6.19rc02 - October 31, 2015
  *
  * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *
diff --git a/scripts/README.txt b/scripts/README.txt
index e4b9d5ac6..07bd288ac 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
 
-Makefiles for  libpng version 1.6.19rc02 - October 29, 2015
+Makefiles for  libpng version 1.6.19rc02 - October 31, 2015
 
 pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.linux    =>  Linux/ELF makefile
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index d2fb65fa7..0735bb6f0 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
 
 /* pnglibconf.h - library build configuration */
 
-/* Libpng version 1.6.19rc02 - October 29, 2015 */
+/* Libpng version 1.6.19rc02 - October 31, 2015 */
 
 /* Copyright (c) 1998-2014 Glenn Randers-Pehrson */