[libpng15] Imported from libpng-1.5.14beta06.tar

2025-07-10 18:04:09 +02:00 · 2013-01-01 09:10:21 -06:00
33 changed files with 570 additions and 1156 deletions
--- a/39
+++ b/39
@@ -1,5 +1,5 @@

-Libpng 1.5.14rc03 - January 18, 2013
+Libpng 1.5.14beta06 - January 1, 2013

 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.
@@ -9,20 +9,20 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script

-   1.5.14rc03.tar.xz (LZMA-compressed, recommended)
-   1.5.14rc03.tar.gz
-   1.5.14rc03.tar.bz2
+   1.5.14beta06.tar.xz (LZMA-compressed, recommended)
+   1.5.14beta06.tar.gz
+   1.5.14beta06.tar.bz2

 Source files with CRLF line endings (for Windows), without the
 "configure" script

-   lp1514r03.7z  (LZMA-compressed, recommended)
-   lp1514r03.zip
+   lp1514b06.7z  (LZMA-compressed, recommended)
+   lp1514b06.zip

 Other information:

-   1.5.14rc03-README.txt
-   1.5.14rc03-LICENSE.txt
+   1.5.14beta06-README.txt
+   1.5.14beta06-LICENSE.txt

 Changes since the last public release (1.5.13):

@@ -64,29 +64,6 @@ Version 1.5.14beta06 [January 1, 2013]
  Discontinued distributing libpng-1.5.14-1.5.13-diff.txt and similar.
  Fixed 'make distcheck' on SUN OS - libpng.so was not being removed

-Version 1.5.14beta07 [January 6, 2012]
-  Replaced AM_CONFIG_HEADER(config.h) with AC_CONFIG_HEADERS([config.h])
-    in configure.ac
-  De-configured build fixes to make a range of deconfiguration options (such
-    as switching off read or write support) work in more cases.  Also upgraded
-    pngtest and pngvalid to the libpng 1.6 versions (with some modifications)
-    which provide more extensive testing.  Replaced pngtest.png because pngtest
-    writes the ancillary chunks in a different order.
-
-Version 1.5.14beta08 [January 10, 2013]
-  Check validity of "num_unknowns" parameter of png_set_unknown_chunks()
-    (Bug report from yuris).
-
-Version 1.5.14rc01 [January 17, 2013]
-  No changes.
-
-Version 1.5.14rc02 [January 17, 2013]
-  Revised test for validity of "num_unknowns" to eliminate compiler warnings.
-
-Version 1.5.14rc03 [January 18, 2013]
-  Check the validity of the "nentries" parameter of png_set_sPLT() and the
-  "num_text" parameter of png_set_text_2().
-
  ===========================================================================
                       NOTICE November 17, 2012:
     The location of the git repository at SourceForge has changed.
--- a/23
+++ b/23
@@ -3957,29 +3957,6 @@ Version 1.5.14beta06 [January 1, 2013]
  Discontinued distributing libpng-1.5.14-1.5.13-diff.txt and similar.
  Fixed 'make distcheck' on SUN OS - libpng.so was not being removed

-Version 1.5.14beta07 [January 6, 2012]
-  Replaced AM_CONFIG_HEADER(config.h) with AC_CONFIG_HEADERS([config.h])
-    in configure.ac
-  De-configured build fixes to make a range of deconfiguration options (such
-    as switching off read or write support) work in more cases.  Also upgraded
-    pngtest and pngvalid to the libpng 1.6 versions (with some modifications)
-    which provide more extensive testing.  Replaced pngtest.png because pngtest
-    writes the ancillary chunks in a different order.
-
-Version 1.5.14beta08 [January 10, 2013]
-  Check validity of "num_unknowns" parameter of png_set_unknown_chunks()
-    (Bug report from yuris).
-
-Version 1.5.14rc01 [January 17, 2013]
-  No changes.
-
-Version 1.5.14rc02 [January 17, 2013]
-  Revised test for validity of "num_unknowns" to eliminate compiler warnings.
-
-Version 1.5.14rc03 [January 18, 2013]
-  Check the validity of the "nentries" parameter of png_set_sPLT() and the
-  "num_text" parameter of png_set_text_2().
-
  ===========================================================================
                       NOTICE November 17, 2012:
     The location of the git repository at SourceForge has changed.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,7 +225,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW)
 # SET UP LINKS
 if(PNG_SHARED)
  set_target_properties(${PNG_LIB_NAME} PROPERTIES
-#   VERSION 15.${PNGLIB_RELEASE}.1.5.14rc03
+#   VERSION 15.${PNGLIB_RELEASE}.1.5.14beta06
    VERSION 15.${PNGLIB_RELEASE}.0
    SOVERSION 15
    CLEAN_DIRECT_OUTPUT 1)
--- a/4
+++ b/4
@@ -10,7 +10,7 @@ this sentence.

 This code is released under the libpng license.

-libpng versions 1.2.6, August 15, 2004, through 1.5.14rc03, January 18, 2013, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.14beta06, January 1, 2013, are
 Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.

 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-January 18, 2013
+January 1, 2013
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-README for libpng version 1.5.14rc03 - January 18, 2013 (shared library 15.0)
+README for libpng version 1.5.14beta06 - January 1, 2013 (shared library 15.0)
 See the note about version numbers near the top of png.h

 See INSTALL for instructions on how to install libpng.
--- a/22
+++ b/22
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libpng 1.5.14rc03.
+# Generated by GNU Autoconf 2.69 for libpng 1.5.14beta06.
 #
 # Report bugs to <png-mng-implement@lists.sourceforge.net>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libpng'
 PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.5.14rc03'
-PACKAGE_STRING='libpng 1.5.14rc03'
+PACKAGE_VERSION='1.5.14beta06'
+PACKAGE_STRING='libpng 1.5.14beta06'
 PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
 PACKAGE_URL=''

@@ -1338,7 +1338,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures libpng 1.5.14rc03 to adapt to many kinds of systems.
+\`configure' configures libpng 1.5.14beta06 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1408,7 +1408,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of libpng 1.5.14rc03:";;
+     short | recursive ) echo "Configuration of libpng 1.5.14beta06:";;
   esac
  cat <<\_ACEOF

@@ -1519,7 +1519,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-libpng configure 1.5.14rc03
+libpng configure 1.5.14beta06
 generated by GNU Autoconf 2.69

 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1942,7 +1942,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by libpng $as_me 1.5.14rc03, which was
+It was created by libpng $as_me 1.5.14beta06, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  $ $0 $@
@@ -2757,7 +2757,7 @@ fi

 # Define the identity of the package.
 PACKAGE='libpng'
- VERSION='1.5.14rc03'
+ VERSION='1.5.14beta06'


 cat >>confdefs.h <<_ACEOF
@@ -2821,7 +2821,7 @@ fi



-PNGLIB_VERSION=1.5.14rc03
+PNGLIB_VERSION=1.5.14beta06
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=5
 PNGLIB_RELEASE=14
@@ -13435,7 +13435,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libpng $as_me 1.5.14rc03, which was
+This file was extended by libpng $as_me 1.5.14beta06, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -13501,7 +13501,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libpng config.status 1.5.14rc03
+libpng config.status 1.5.14beta06
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"

--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@ AC_PREREQ(2.59)

 dnl Version number stuff here:

-AC_INIT([libpng], [1.5.14rc03], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.5.14beta06], [png-mng-implement@lists.sourceforge.net])
 AM_INIT_AUTOMAKE
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE

-PNGLIB_VERSION=1.5.14rc03
+PNGLIB_VERSION=1.5.14beta06
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=5
 PNGLIB_RELEASE=14
@@ -31,7 +31,7 @@ PNGLIB_RELEASE=14
 dnl End of version number stuff

 AC_CONFIG_SRCDIR([pngget.c])
-AC_CONFIG_HEADERS([config.h])
+AM_CONFIG_HEADER(config.h)

 # Checks for programs.
 AC_LANG([C])
--- a/contrib/libtests/pngvalid.c
+++ b/contrib/libtests/pngvalid.c
--- 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.5.14rc03 - January 18, 2013
+ libpng version 1.5.14beta06 - January 1, 2013
 Updated and distributed by Glenn Randers-Pehrson
 <glennrp at users.sourceforge.net>
 Copyright (c) 1998-2012 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.5.14rc03 - January 18, 2013
+ libpng versions 0.97, January 1998, through 1.5.14beta06 - January 1, 2013
 Updated and distributed by Glenn Randers-Pehrson
 Copyright (c) 1998-2012 Glenn Randers-Pehrson

@@ -4612,13 +4612,13 @@ Other rules can be inferred by inspecting the libpng source.

 XIV. Y2K Compliance in libpng

-January 18, 2013
+January 1, 2013

 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.

 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.5.14rc03 are Y2K compliant.  It is my belief that earlier
+upward through 1.5.14beta06 are Y2K compliant.  It is my belief that earlier
 versions were also Y2K compliant.

 Libpng only has two year fields.  One is a 2-byte unsigned integer that
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "January 18, 2013"
+.TH LIBPNG 3 "January 1, 2013"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.5.14rc03
+libpng \- Portable Network Graphics (PNG) Reference Library 1.5.14beta06
 .SH SYNOPSIS
 \fB
 #include <png.h>\fP
@@ -492,7 +492,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.5.14rc03 - January 18, 2013
+ libpng version 1.5.14beta06 - January 1, 2013
 Updated and distributed by Glenn Randers-Pehrson
 <glennrp at users.sourceforge.net>
 Copyright (c) 1998-2012 Glenn Randers-Pehrson
@@ -503,7 +503,7 @@ Libpng-manual.txt - A description on how to use and modify libpng

 Based on:

- libpng versions 0.97, January 1998, through 1.5.14rc03 - January 18, 2013
+ libpng versions 0.97, January 1998, through 1.5.14beta06 - January 1, 2013
 Updated and distributed by Glenn Randers-Pehrson
 Copyright (c) 1998-2012 Glenn Randers-Pehrson

@@ -5105,13 +5105,13 @@ Other rules can be inferred by inspecting the libpng source.

 .SH XIV. Y2K Compliance in libpng

-January 18, 2013
+January 1, 2013

 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.

 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.5.14rc03 are Y2K compliant.  It is my belief that earlier
+upward through 1.5.14beta06 are Y2K compliant.  It is my belief that earlier
 versions were also Y2K compliant.

 Libpng only has two year fields.  One is a 2-byte unsigned integer that
@@ -5331,8 +5331,7 @@ the first widely used release:
 1.5.13beta01-02     15    10513  15.so.15.13[.0]
 1.5.13rc01          15    10513  15.so.15.13[.0]
 1.5.13              15    10513  15.so.15.13[.0]
- 1.5.14beta01-08     15    10514  15.so.15.14[.0]
- 1.5.14rc01-03       15    10514  15.so.15.14[.0]
+ 1.5.14beta01-06     15    10514  15.so.15.14[.0]

 Henceforth the source version will match the shared-library minor
 and patch numbers; the shared-library major version number will be
@@ -5389,7 +5388,7 @@ possible without all of you.

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

-Libpng version 1.5.14rc03 - January 18, 2013:
+Libpng version 1.5.14beta06 - January 1, 2013:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).

@@ -5412,7 +5411,7 @@ this sentence.

 This code is released under the libpng license.

-libpng versions 1.2.6, August 15, 2004, through 1.5.14rc03, January 18, 2013, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.14beta06, January 1, 2013, are
 Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
@@ -5511,7 +5510,7 @@ certification mark of the Open Source Initiative.

 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-January 18, 2013
+January 1, 2013

 .\" end of man page

--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "January 18, 2013"
+.TH LIBPNGPF 3 "January 1, 2013"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.5.14rc03
+libpng \- Portable Network Graphics (PNG) Reference Library 1.5.14beta06
 (private functions)
 .SH SYNOPSIS
 \fB#include \fI"pngpriv.h"
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "January 18, 2013"
+.TH PNG 5 "January 1, 2013"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
--- a/png.c
+++ b/png.c
@@ -14,7 +14,7 @@
 #include "pngpriv.h"

 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_5_14rc03 Your_png_h_is_not_version_1_5_14rc03;
+typedef png_libpng_version_1_5_14beta06 Your_png_h_is_not_version_1_5_14beta06;

 /* Tells libpng that we have already handled the first "num_bytes" bytes
 * of the PNG file signature.  If the PNG data is embedded into another
@@ -658,13 +658,13 @@ png_get_copyright(png_const_structp png_ptr)
 #else
 #  ifdef __STDC__
   return PNG_STRING_NEWLINE \
-     "libpng version 1.5.14rc03 - January 18, 2013" PNG_STRING_NEWLINE \
+     "libpng version 1.5.14beta06 - January 1, 2013" PNG_STRING_NEWLINE \
     "Copyright (c) 1998-2013 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.5.14rc03 - January 18, 2013\
+      return "libpng version 1.5.14beta06 - January 1, 2013\
      Copyright (c) 1998-2013 Glenn Randers-Pehrson\
      Copyright (c) 1996-1997 Andreas Dilger\
      Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@@ -1461,7 +1461,7 @@ png_check_fp_string(png_const_charp string, png_size_t size)
 }
 #endif /* pCAL or sCAL */

-#ifdef PNG_sCAL_SUPPORTED
+#ifdef PNG_READ_sCAL_SUPPORTED
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 /* Utility used below - a simple accurate power of ten from an integral
 * exponent.
@@ -2047,8 +2047,7 @@ png_muldiv_warn(png_structp png_ptr, png_fixed_point a, png_int_32 times,
 }
 #endif

-#if (defined PNG_READ_GAMMA_SUPPORTED) || (defined PNG_cHRM_SUPPORTED)
-/* more fixed point functions for gamma and cHRM (xy/XYZ) suport. */
+#ifdef PNG_READ_GAMMA_SUPPORTED /* more fixed point functions for gamma */
 /* Calculate a reciprocal, return 0 on div-by-zero or overflow. */
 png_fixed_point
 png_reciprocal(png_fixed_point a)
@@ -2068,7 +2067,6 @@ png_reciprocal(png_fixed_point a)
   return 0; /* error/overflow */
 }

-#ifdef PNG_READ_GAMMA_SUPPORTED
 /* A local convenience routine. */
 static png_fixed_point
 png_product2(png_fixed_point a, png_fixed_point b)
@@ -2090,7 +2088,6 @@ png_product2(png_fixed_point a, png_fixed_point b)

   return 0; /* overflow */
 }
-#endif /* READ_GAMMA */

 /* The inverse of the above. */
 png_fixed_point
@@ -2118,7 +2115,7 @@ png_reciprocal2(png_fixed_point a, png_fixed_point b)

   return 0; /* overflow */
 }
-#endif /* READ_GAMMA || cHRM */
+#endif /* READ_GAMMA */

 #ifdef PNG_CHECK_cHRM_SUPPORTED
 /* Added at libpng version 1.2.34 (Dec 8, 2008) and 1.4.0 (Jan 2,
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@

 /* png.h - header file for PNG reference library
 *
- * libpng version 1.5.14rc03 - January 18, 2013
+ * libpng version 1.5.14beta06 - January 1, 2013
 * Copyright (c) 1998-2013 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.)
@@ -11,7 +11,7 @@
 * Authors and maintainers:
 *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
 *   libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *   libpng versions 0.97, January 1998, through 1.5.14rc03 - January 18, 2013: Glenn
+ *   libpng versions 0.97, January 1998, through 1.5.14beta06 - January 1, 2013: Glenn
 *   See also "Contributing Authors", below.
 *
 * Note about libpng version numbers:
@@ -181,8 +181,7 @@
 *    1.5.13beta01-02         15    10513  15.so.15.13[.0]
 *    1.5.13rc01              15    10513  15.so.15.13[.0]
 *    1.5.13                  15    10513  15.so.15.13[.0]
- *    1.5.14beta01-08         15    10514  15.so.15.14[.0]
- *    1.5.14rc01-03           15    10514  15.so.15.14[.0]
+ *    1.5.14beta01-06         15    10514  15.so.15.14[.0]
 *
 *   Henceforth the source version will match the shared-library major
 *   and minor numbers; the shared-library major version number will be
@@ -214,7 +213,7 @@
 *
 * This code is released under the libpng license.
 *
- * libpng versions 1.2.6, August 15, 2004, through 1.5.14rc03, January 18, 2013, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.5.14beta06, January 1, 2013, are
 * Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are
 * distributed according to the same disclaimer and license as libpng-1.2.5
 * with the following individual added to the list of Contributing Authors:
@@ -326,13 +325,13 @@
 * Y2K compliance in libpng:
 * =========================
 *
- *    January 18, 2013
+ *    January 1, 2013
 *
 *    Since the PNG Development group is an ad-hoc body, we can't make
 *    an official declaration.
 *
 *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.5.14rc03 are Y2K compliant.  It is my belief that
+ *    upward through 1.5.14beta06 are Y2K compliant.  It is my belief that
 *    earlier versions were also Y2K compliant.
 *
 *    Libpng only has two year fields.  One is a 2-byte unsigned integer
@@ -391,9 +390,9 @@
 */

 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.5.14rc03"
+#define PNG_LIBPNG_VER_STRING "1.5.14beta06"
 #define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.5.14rc03 - January 18, 2013\n"
+     " libpng version 1.5.14beta06 - January 1, 2013\n"

 #define PNG_LIBPNG_VER_SONUM   15
 #define PNG_LIBPNG_VER_DLLNUM  15
@@ -407,7 +406,7 @@
 * PNG_LIBPNG_VER_STRING, omitting any leading zero:
 */

-#define PNG_LIBPNG_VER_BUILD  03
+#define PNG_LIBPNG_VER_BUILD  06

 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -424,7 +423,7 @@
 #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
                                       PNG_LIBPNG_BUILD_PRIVATE */

-#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC
+#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA

 /* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
 * We must not include leading zeros.
@@ -554,7 +553,7 @@ extern "C" {
 /* This triggers a compiler error in png.c, if png.c and png.h
 * do not agree upon the version number.
 */
-typedef char* png_libpng_version_1_5_14rc03;
+typedef char* png_libpng_version_1_5_14beta06;

 /* Three color definitions.  The order of the red, green, and blue, (and the
 * exact size) is not important, although the size of the fields need to
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@

 /* pngconf.h - machine configurable file for libpng
 *
- * libpng version 1.5.14rc03 - January 18, 2013
+ * libpng version 1.5.14beta06 - January 1, 2013
 *
 * Copyright (c) 1998-2013 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@

 /* pngget.c - retrieval of values from info struct
 *
- * Last changed in libpng 1.5.14 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.7 [December 15, 2011]
 * Copyright (c) 1998-2011 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.)
@@ -175,9 +175,6 @@ png_get_pixel_aspect_ratio(png_const_structp png_ptr, png_const_infop info_ptr)
         return ((float)((float)info_ptr->y_pixels_per_unit
             /(float)info_ptr->x_pixels_per_unit));
   }
-#else
-   PNG_UNUSED(png_ptr)
-   PNG_UNUSED(info_ptr)
 #endif

   return ((float)0.0);
@@ -206,9 +203,6 @@ png_get_pixel_aspect_ratio_fixed(png_const_structp png_ptr,
          (png_int_32)info_ptr->x_pixels_per_unit))
         return res;
   }
-#else
-   PNG_UNUSED(png_ptr)
-   PNG_UNUSED(info_ptr)
 #endif

   return 0;
--- a/pnginfo.h
+++ b/pnginfo.h
@@ -242,7 +242,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED)
 #ifdef PNG_sPLT_SUPPORTED
   /* Data on sPLT chunks (there may be more than one). */
   png_sPLT_tp splt_palettes;
-   int splt_palettes_num;
+   png_uint_32 splt_palettes_num;
 #endif

 #ifdef PNG_sCAL_SUPPORTED
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -416,7 +416,7 @@ typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp;
 #if PNG_ALIGN_TYPE == PNG_ALIGN_SIZE
   /* This is used because in some compiler implementations non-aligned
    * structure members are supported, so the offsetof approach below fails.
-    * Set PNG_ALIGN_SIZE=0 for compiler combinations where unaligned access
+    * Set PNG_ALIGN_TO_SIZE=0 for compiler combinations where unaligned access
    * is good for performance.  Do not do this unless you have tested the result
    * and understand it.
    */
@@ -823,8 +823,10 @@ PNG_EXTERN void png_write_IEND PNGARG((png_structp png_ptr));
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 PNG_EXTERN void png_write_gAMA PNGARG((png_structp png_ptr, double file_gamma));
 #  endif
+#  ifdef PNG_FIXED_POINT_SUPPORTED
 PNG_EXTERN void png_write_gAMA_fixed PNGARG((png_structp png_ptr,
    png_fixed_point file_gamma));
+#  endif
 #endif

 #ifdef PNG_WRITE_sBIT_SUPPORTED
@@ -1489,16 +1491,14 @@ PNG_EXTERN void png_formatted_warning(png_structp png_ptr,
 /* ASCII to FP interfaces, currently only implemented if sCAL
 * support is required.
 */
-#ifdef PNG_sCAL_SUPPORTED
+#if defined(PNG_READ_sCAL_SUPPORTED)
 /* MAX_DIGITS is actually the maximum number of characters in an sCAL
 * width or height, derived from the precision (number of significant
 * digits - a build time settable option) and assumpitions about the
 * maximum ridiculous exponent.
 */
 #define PNG_sCAL_MAX_DIGITS (PNG_sCAL_PRECISION+1/*.*/+1/*E*/+10/*exponent*/)
-#endif

-#ifdef PNG_sCAL_SUPPORTED
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 PNG_EXTERN void png_ascii_from_fp PNGARG((png_structp png_ptr, png_charp ascii,
    png_size_t size, double fp, unsigned int precision));
@@ -1629,7 +1629,7 @@ PNG_EXTERN png_fixed_point png_muldiv_warn PNGARG((png_structp png_ptr,
    png_fixed_point a, png_int_32 multiplied_by, png_int_32 divided_by));
 #endif

-#if (defined PNG_READ_GAMMA_SUPPORTED) || (defined PNG_cHRM_SUPPORTED)
+#ifdef PNG_READ_GAMMA_SUPPORTED
 /* Calculate a reciprocal - used for gamma values.  This returns
 * 0 if the argument is 0 in order to maintain an undefined value,
 * there are no warnings.
@@ -1664,62 +1664,6 @@ PNG_EXTERN void png_build_gamma_table PNGARG((png_structp png_ptr,
    int bit_depth));
 #endif

-/* Missing declarations if FIXED_POINT is *not* supported - fixed properly
- * in libpng 1.6
- */
-#ifndef PNG_FIXED_POINT_SUPPORTED
-#ifdef PNG_cHRM_SUPPORTED
-PNG_EXTERN png_uint_32 png_get_cHRM_XYZ_fixed PNGARG(
-    (png_structp png_ptr, png_const_infop info_ptr,
-    png_fixed_point *int_red_X, png_fixed_point *int_red_Y,
-    png_fixed_point *int_red_Z, png_fixed_point *int_green_X,
-    png_fixed_point *int_green_Y, png_fixed_point *int_green_Z,
-    png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,
-    png_fixed_point *int_blue_Z));
-PNG_EXTERN void png_set_cHRM_XYZ_fixed PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_fixed_point int_red_X, png_fixed_point int_red_Y,
-    png_fixed_point int_red_Z, png_fixed_point int_green_X,
-    png_fixed_point int_green_Y, png_fixed_point int_green_Z,
-    png_fixed_point int_blue_X, png_fixed_point int_blue_Y,
-    png_fixed_point int_blue_Z));
-PNG_EXTERN void png_set_cHRM_fixed PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_fixed_point int_white_x,
-    png_fixed_point int_white_y, png_fixed_point int_red_x,
-    png_fixed_point int_red_y, png_fixed_point int_green_x,
-    png_fixed_point int_green_y, png_fixed_point int_blue_x,
-    png_fixed_point int_blue_y));
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-PNG_EXTERN png_uint_32 png_get_gAMA_fixed PNGARG(
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_fixed_point *int_file_gamma));
-PNG_EXTERN void png_set_gAMA_fixed PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_fixed_point int_file_gamma));
-#endif
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-PNG_EXTERN void png_set_background_fixed PNGARG((png_structp png_ptr,
-    png_const_color_16p background_color, int background_gamma_code,
-    int need_expand, png_fixed_point background_gamma));
-#endif
-
-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-PNG_EXTERN void png_set_alpha_mode_fixed PNGARG((png_structp png_ptr,
-    int mode, png_fixed_point output_gamma));
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-PNG_EXTERN void png_set_gamma_fixed PNGARG((png_structp png_ptr,
-    png_fixed_point screen_gamma, png_fixed_point override_file_gamma));
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-PNG_EXTERN void png_set_rgb_to_gray_fixed PNGARG((png_structp png_ptr,
-    int error_action, png_fixed_point red, png_fixed_point green));
-#endif
-#endif /* FIX MISSING !FIXED_POINT DECLARATIONS */
-
 #ifdef PNG_FILTER_OPTIMIZATIONS
 PNG_EXTERN void PNG_FILTER_OPTIMIZATIONS(png_structp png_ptr, unsigned int bpp);
   /* This is the initialization function for hardware specific optimizations,
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@

 /* pngread.c - read a PNG file
 *
- * Last changed in libpng 1.5.14 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.10 [March 8, 2012]
 * Copyright (c) 1998-2012 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.)
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -4746,9 +4746,7 @@ png_do_expand(png_row_infop row_info, png_bytep row,
         {
            if (row_info->bit_depth == 8)
            {
-               /* NOTE: prior to libpng 1.5.14 this cleared out the top bits of
-                * 'gray', however if those are set it is an error.
-                */
+               gray = gray & 0xff;
               sp = row + (png_size_t)row_width - 1;
               dp = row + (png_size_t)(row_width << 1) - 1;

--- a/pngset.c
+++ b/pngset.c
@@ -690,17 +690,6 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr,
   /* Make sure we have enough space in the "text" array in info_struct
    * to hold all of the incoming text_ptr objects.
    */
-
-   if (num_text < 0 ||
-       num_text > INT_MAX - info_ptr->num_text - 8 ||
-       (unsigned int)/*SAFE*/(num_text +/*SAFE*/
-       info_ptr->num_text + 8) >=
-       PNG_SIZE_MAX/png_sizeof(png_text))
-   {
-      png_warning(png_ptr, "too many text chunks");
-      return(0);
-   }
-
   if (info_ptr->num_text + num_text > info_ptr->max_text)
   {
      int old_max_text = info_ptr->max_text;
@@ -980,18 +969,9 @@ png_set_sPLT(png_structp png_ptr,
   if (png_ptr == NULL || info_ptr == NULL)
      return;

-   if (nentries < 0 ||
-       nentries > INT_MAX-info_ptr->splt_palettes_num ||
-       (unsigned int)/*SAFE*/(nentries +/*SAFE*/
-       info_ptr->splt_palettes_num) >=
-       PNG_SIZE_MAX/png_sizeof(png_sPLT_t))
-      np=NULL;
-
-   else
-
-      np = (png_sPLT_tp)png_malloc_warn(png_ptr,
-          (info_ptr->splt_palettes_num + nentries) *
-          (png_size_t)png_sizeof(png_sPLT_t));
+   np = (png_sPLT_tp)png_malloc_warn(png_ptr,
+       (info_ptr->splt_palettes_num + nentries) *
+       (png_size_t)png_sizeof(png_sPLT_t));

   if (np == NULL)
   {
@@ -1059,17 +1039,9 @@ png_set_unknown_chunks(png_structp png_ptr,
   if (png_ptr == NULL || info_ptr == NULL || num_unknowns == 0)
      return;

-   if (num_unknowns < 0 ||
-       num_unknowns > INT_MAX-info_ptr->unknown_chunks_num ||
-       (unsigned int)/*SAFE*/(num_unknowns +/*SAFE*/
-       info_ptr->unknown_chunks_num) >=
-       PNG_SIZE_MAX/png_sizeof(png_unknown_chunk))
-      np=NULL;
-
-   else
-      np = (png_unknown_chunkp)png_malloc_warn(png_ptr,
-          (png_size_t)(info_ptr->unknown_chunks_num + num_unknowns) *
-          png_sizeof(png_unknown_chunk));
+   np = (png_unknown_chunkp)png_malloc_warn(png_ptr,
+       (png_size_t)(info_ptr->unknown_chunks_num + num_unknowns) *
+       png_sizeof(png_unknown_chunk));

   if (np == NULL)
   {
--- a/pngtest.c
+++ b/pngtest.c
--- a/pngtest.png
+++ b/pngtest.png
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@

 VisualStudio instructions

-libpng version 1.5.14rc03 - January 18, 2013
+libpng version 1.5.14beta06 - January 1, 2013

 Copyright (c) 1998-2010 Glenn Randers-Pehrson

--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
 <!--
 * zlib.props - location of zlib source
 *
- * libpng version 1.5.14rc03 - January 18, 2013
+ * libpng version 1.5.14beta06 - January 1, 2013
 *
 * Copyright (c) 1998-2011 Glenn Randers-Pehrson
 *
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,9 +1,9 @@

-Makefiles for  libpng version 1.5.14rc03 - January 18, 2013
+Makefiles for  libpng version 1.5.14beta06 - January 1, 2013

 pnglibconf.h.prebuilt       =>  Stores configuration settings
 makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng15.so.15.1.5.14rc03)
+                       (gcc, creates libpng15.so.15.1.5.14beta06)
 makefile.gcc      =>  Generic makefile (gcc, creates static libpng.a)
 makefile.knr      =>  Archaic UNIX Makefile that converts files with
                       ansi2knr (Requires ansi2knr.c from
@@ -21,7 +21,7 @@ pnglibconf.h.prebuilt       =>  Stores configuration settings
 makefile.dec      =>  DEC Alpha UNIX makefile
 makefile.dj2      =>  DJGPP 2 makefile
 makefile.elf      =>  Linux/ELF makefile symbol versioning,
-                       (gcc, creates libpng15.so.15.1.5.14rc03)
+                       (gcc, creates libpng15.so.15.1.5.14beta06)
 makefile.freebsd  =>  FreeBSD makefile
 makefile.gcc      =>  Generic gcc makefile
 makefile.hpgcc    =>  HPUX makefile using gcc
@@ -36,12 +36,12 @@ pnglibconf.h.prebuilt       =>  Stores configuration settings
 makefile.os2      =>  OS/2 Makefile (gcc and emx, requires libpng.def)
 makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc
 makefile.sggcc    =>  Silicon Graphics (gcc,
-                       creates libpng15.so.15.1.5.14rc03)
+                       creates libpng15.so.15.1.5.14beta06)
 makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
 makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng15.so.15.1.5.14rc03)
+                       creates libpng15.so.15.1.5.14beta06)
 makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng15.so.15.1.5.14rc03)
+                       creates libpng15.so.15.1.5.14beta06)
 makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
 makefile.sunos    =>  Sun makefile
 makefile.32sunu   =>  Sun Ultra 32-bit makefile
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@

 # Modeled after libxml-config.

-version=1.5.14rc03
+version=1.5.14beta06
 prefix=""
 libdir=""
 libs=""
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng15

 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.5.14rc03
+Version: 1.5.14beta06
 Libs: -L${libdir} -lpng15
 Cflags: -I${includedir}
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng15

 LIB=	png15
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.5.14rc03
+SHLIB_MINOR=	1.5.14beta06
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include

 LIB=	png
 SHLIB_MAJOR=	15
-SHLIB_MINOR=	1.5.14rc03
+SHLIB_MINOR=	1.5.14beta06
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -11,7 +11,7 @@ LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat

 SHLIB_MAJOR=	15
-SHLIB_MINOR=	1.5.14rc03
+SHLIB_MINOR=	1.5.14beta06

 LIB=	png
 SRCS=	png.c pngerror.c pngget.c pngmem.c pngpread.c \
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -3,7 +3,7 @@

 /* pnglibconf.h - library build configuration */

-/* Libpng 1.5.14rc03 - January 18, 2013 */
+/* Libpng 1.5.14beta06 - January 1, 2013 */

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

--- a/scripts/symbols.def
+++ b/scripts/symbols.def
@@ -5,7 +5,7 @@
 LIBRARY

 EXPORTS
-;Version 1.5.14rc03
+;Version 1.5.14beta06
 png_access_version_number @1
 png_set_sig_bytes @2
 png_sig_cmp @3