[libpng16] Imported from libpng-1.6.24beta03.tar

66f796e7 · Glenn Randers-Pehrson · a3eac818 · 66f796e7 · 66f796e7 · 66f796e7
18 changed file
--- a/ANNOUNCE
+++ b/ANNOUNCE
-Libpng 1.6.24beta03 - July 3, 2016
+Libpng 1.6.24beta03 - July 4, 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.
@@ -67,7 +67,7 @@ Version 1.6.24beta02 [June 23, 2016]
    structure padding is fixable, but it would be a signficant change (moving
    structure members around).

-Version 1.6.24beta03 [July 3, 2016]
+Version 1.6.24beta03 [July 4, 2016]
  Optimized absolute value calculation in filter selection, similar to
    code in the PAETH decoder in pngrutil.c. Build with PNG_USE_ABS to
    use this.

--- a/CHANGES
+++ b/CHANGES
@@ -5638,7 +5638,7 @@ Version 1.6.24beta02 [June 23, 2016]
    structure padding is fixable, but it would be a signficant change (moving
    structure members around).

-Version 1.6.24beta03 [July 3, 2016]
+Version 1.6.24beta03 [July 4, 2016]
  Optimized absolute value calculation in filter selection, similar to
    code in the PAETH decoder in pngrutil.c. Build with PNG_USE_ABS to
    use this.

--- 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.24beta03, June 23, 2016 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.24beta03, July 4, 2016 are
 Copyright (c) 2000-2002, 2004, 2006-2016 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
@@ -127,4 +127,4 @@ any encryption software.  See the EAR, paragraphs 734.3(b)(3) and

 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-June 23, 2016
+July 4, 2016
--- a/README
+++ b/README
-README for libpng version 1.6.24beta03 - June 23, 2016 (shared library 16.0)
+README for libpng version 1.6.24beta03 - July 4, 2016 (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.

--- a/configure.ac
+++ b/configure.ac
 # configure.ac

 # Copyright (c) 2004-2015 Glenn Randers-Pehrson
-# Last changed in libpng 1.6.22 [(PENDING RELEASE)]
+# Last changed in libpng 1.6.22 [May 26, 2016]

 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer

--- a/contrib/libtests/pngstest.c
+++ b/contrib/libtests/pngstest.c
@@ -3,7 +3,7 @@
 *
 * Copyright (c) 2013-2016 John Cunningham Bowler
 *
- * Last changed in libpng 1.6.22 [May 26, 2016]
+ * Last changed in libpng 1.6.24 [(PENDING RELEASE)]
 *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer

--- a/contrib/libtests/pngvalid.c
+++ b/contrib/libtests/pngvalid.c

 /* pngvalid.c - validate libpng by constructing then reading png files.
 *
- * Last changed in libpng 1.6.23 [June 9, 2016]
+ * Last changed in libpng 1.6.24 [(PENDING RELEASE)]
 * Copyright (c) 2014-2016 Glenn Randers-Pehrson
 * Written by John Cunningham Bowler
 *

--- a/libpng-manual.txt
+++ b/libpng-manual.txt
 libpng-manual.txt - A description on how to use and modify libpng

- libpng version 1.6.24beta03 - June 23, 2016
+ libpng version 1.6.24beta03 - July 4, 2016
 Updated and distributed by Glenn Randers-Pehrson
 <glennrp at users.sourceforge.net>
 Copyright (c) 1998-2016 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.24beta03 - June 23, 2016
+ libpng versions 0.97, January 1998, through 1.6.24beta03 - July 4, 2016
 Updated and distributed by Glenn Randers-Pehrson
 Copyright (c) 1998-2016 Glenn Randers-Pehrson

@@ -2230,7 +2230,8 @@ is exactly the same.  If you are planning on displaying the image
 after each pass, the "rectangle" effect is generally considered the
 better looking one.

-If you only want the "sparkle" effect, just call png_read_rows() as
+If you only want the "sparkle" effect, just call png_read_row() or
+png_read_rows() as
 normal, with the third parameter NULL.  Make sure you make pass over
 the image number_of_passes times, and you don't change the data in the
 rows between calls.  You can change the locations of the data, just
@@ -2239,6 +2240,8 @@ pass, and assumes the data from previous passes is still valid.

    png_read_rows(png_ptr, row_pointers, NULL,
        number_of_rows);
+    or
+    png_read_row(png_ptr, row_pointers, NULL);

 If you only want the first effect (the rectangles), do the same as
 before except pass the row buffer in the third parameter, and leave
@@ -2246,6 +2249,8 @@ the second parameter NULL.

    png_read_rows(png_ptr, NULL, row_pointers,
        number_of_rows);
+    or
+    png_read_row(png_ptr, NULL, row_pointers);

 If you don't want libpng to handle the interlacing details, just call
 png_read_rows() PNG_INTERLACE_ADAM7_PASSES times to read in all the images.

--- a/libpng.3
+++ b/libpng.3
-.TH LIBPNG 3 "June 23, 2016"
+.TH LIBPNG 3 "July 4, 2016"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta03
 .SH SYNOPSIS
@@ -510,7 +510,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.24beta03 - June 23, 2016
+ libpng version 1.6.24beta03 - July 4, 2016
 Updated and distributed by Glenn Randers-Pehrson
 <glennrp at users.sourceforge.net>
 Copyright (c) 1998-2016 Glenn Randers-Pehrson
@@ -521,7 +521,7 @@ libpng-manual.txt - A description on how to use and modify libpng

 Based on:

- libpng versions 0.97, January 1998, through 1.6.24beta03 - June 23, 2016
+ libpng versions 0.97, January 1998, through 1.6.24beta03 - July 4, 2016
 Updated and distributed by Glenn Randers-Pehrson
 Copyright (c) 1998-2016 Glenn Randers-Pehrson

@@ -2740,7 +2740,8 @@ is exactly the same.  If you are planning on displaying the image
 after each pass, the "rectangle" effect is generally considered the
 better looking one.

-If you only want the "sparkle" effect, just call png_read_rows() as
+If you only want the "sparkle" effect, just call png_read_row() or
+png_read_rows() as
 normal, with the third parameter NULL.  Make sure you make pass over
 the image number_of_passes times, and you don't change the data in the
 rows between calls.  You can change the locations of the data, just
@@ -2749,6 +2750,8 @@ pass, and assumes the data from previous passes is still valid.

    png_read_rows(png_ptr, row_pointers, NULL,
        number_of_rows);
+    or
+    png_read_row(png_ptr, row_pointers, NULL);

 If you only want the first effect (the rectangles), do the same as
 before except pass the row buffer in the third parameter, and leave
@@ -2756,6 +2759,8 @@ the second parameter NULL.

    png_read_rows(png_ptr, NULL, row_pointers,
        number_of_rows);
+    or
+    png_read_row(png_ptr, NULL, row_pointers);

 If you don't want libpng to handle the interlacing details, just call
 png_read_rows() PNG_INTERLACE_ADAM7_PASSES times to read in all the images.
@@ -6013,7 +6018,7 @@ possible without all of you.

 Thanks to Frank J. T. Wojcik for helping with the documentation.

-Libpng version 1.6.24beta03 - June 23, 2016:
+Libpng version 1.6.24beta03 - July 4, 2016:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).

@@ -6038,7 +6043,7 @@ this sentence.

 This code is released under the libpng license.

-libpng versions 1.0.7, July 1, 2000 through 1.6.24beta03, June 23, 2016 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.24beta03, July 4, 2016 are
 Copyright (c) 2000-2002, 2004, 2006-2016 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
@@ -6163,7 +6168,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).

 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-June 23, 2016
+July 4, 2016

 .\" end of man page

--- a/libpngpf.3
+++ b/libpngpf.3
-.TH LIBPNGPF 3 "June 23, 2016"
+.TH LIBPNGPF 3 "July 4, 2016"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta03
 (private functions)

--- a/png.5
+++ b/png.5
-.TH PNG 5 "June 23, 2016"
+.TH PNG 5 "July 4, 2016"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION

--- a/png.c
+++ b/png.c
@@ -775,14 +775,14 @@ png_get_copyright(png_const_structrp png_ptr)
 #else
 #  ifdef __STDC__
   return PNG_STRING_NEWLINE \
-      "libpng version 1.6.24beta03 - July 3, 2016" PNG_STRING_NEWLINE \
+      "libpng version 1.6.24beta03 - July 4, 2016" PNG_STRING_NEWLINE \
      "Copyright (c) 1998-2002,2004,2006-2016 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.24beta03 - July 3, 2016\
+   return "libpng version 1.6.24beta03 - July 4, 2016\
      Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson\
      Copyright (c) 1996-1997 Andreas Dilger\
      Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";

--- a/png.h
+++ b/png.h

 /* png.h - header file for PNG reference library
 *
- * libpng version 1.6.24beta03, July 1, 2016
+ * libpng version 1.6.24beta03, July 4, 2016
 *
 * Copyright (c) 1998-2002,2004,2006-2016 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.24beta03, July 1, 2016:
+ *   libpng versions 0.97, January 1998, through 1.6.24beta03, July 4, 2016:
 *     Glenn Randers-Pehrson.
 *   See also "Contributing Authors", below.
 */
@@ -29,7 +29,7 @@
 * files that are distributed with libpng have other copyright owners and
 * are released under other open source licenses.
 *
- * libpng versions 1.0.7, July 1, 2000 through 1.6.24beta03, July 1, 2016 are
+ * libpng versions 1.0.7, July 1, 2000 through 1.6.24beta03, July 4, 2016 are
 * Copyright (c) 2000-2002, 2004, 2006-2016 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
@@ -245,7 +245,7 @@
 * Y2K compliance in libpng:
 * =========================
 *
- *    July 1, 2016
+ *    July 4, 2016
 *
 *    Since the PNG Development group is an ad-hoc body, we can't make
 *    an official declaration.
@@ -315,7 +315,7 @@
 /* Version information for png.h - this should match the version in png.c */
 #define PNG_LIBPNG_VER_STRING "1.6.24beta03"
 #define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.6.24beta03 - July 1, 2016\n"
+     " libpng version 1.6.24beta03 - July 4, 2016\n"

 #define PNG_LIBPNG_VER_SONUM   16
 #define PNG_LIBPNG_VER_DLLNUM  16

--- a/pngconf.h
+++ b/pngconf.h

 /* pngconf.h - machine configurable file for libpng
 *
- * libpng version 1.6.24beta03, June 23, 2016
+ * libpng version 1.6.24beta03, July 4, 2016
 *
 * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

--- a/projects/vstudio/README.txt
+++ b/projects/vstudio/README.txt

 VisualStudio instructions

-libpng version 1.6.24beta03 - June 23, 2016
+libpng version 1.6.24beta03 - July 4, 2016

 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson

@@ -93,3 +93,5 @@ as follows:
    DLL               /MD         /MDd
    Static Library    /MD         /MDd

+Also, be sure to build libpng, zlib, and your project all for the same
+platform (e.g., 32-bit or 64-bit).
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
 <!--
 * zlib.props - location of zlib source
 *
- * libpng version 1.6.24beta03 - June 23, 2016
+ * libpng version 1.6.24beta03 - July 4, 2016
 *
 * Copyright (c) 1998-2011 Glenn Randers-Pehrson
 *

--- a/scripts/README.txt
+++ b/scripts/README.txt

-Makefiles for  libpng version 1.6.24beta03 - June 23, 2016
+Makefiles for  libpng version 1.6.24beta03 - July 4, 2016

 pnglibconf.h.prebuilt       =>  Stores configuration settings
 makefile.linux    =>  Linux/ELF makefile

--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@

 /* pnglibconf.h - library build configuration */

-/* Libpng version 1.6.24beta03 - June 23, 2016 */
+/* Libpng version 1.6.24beta03 - July 4, 2016 */

 /* Copyright (c) 1998-2015 Glenn Randers-Pehrson */