[libpng15] Imported from libpng-1.5.15beta03.tar

2025-07-10 18:04:09 +02:00 · 2013-02-06 22:48:34 -06:00
47 changed files with 703 additions and 1210 deletions
--- a/80
+++ b/80
@@ -1,5 +1,5 @@

-Libpng 1.5.15rc01 - March 21, 2013
+Libpng 1.5.15beta03 - February 7, 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.15rc01.tar.xz (LZMA-compressed, recommended)
-   1.5.15rc01.tar.gz
-   1.5.15rc01.tar.bz2
+   1.5.15beta03.tar.xz (LZMA-compressed, recommended)
+   1.5.15beta03.tar.gz
+   1.5.15beta03.tar.bz2

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

-   lp1515r01.7z  (LZMA-compressed, recommended)
-   lp1515r01.zip
+   lp1515b03.7z  (LZMA-compressed, recommended)
+   lp1515b03.zip

 Other information:

-   1.5.15rc01-README.txt
-   1.5.15rc01-LICENSE.txt
+   1.5.15beta03-README.txt
+   1.5.15beta03-LICENSE.txt

 Changes since the last public release (1.5.14):

@@ -45,70 +45,6 @@ Version 1.5.15beta03 [February 7, 2013]
  Remove SUN OS cc -E workround - no longer required
  Turn serial tests back on (recently turned off by autotools upgrade).

-Version 1.5.15beta04 [February 15, 2013]
-  Enclosed the new png_get_palette_max in #ifdef PNG_GET_PALETTE_MAX_SUPPORTED
-    block, and revised pnglibconf.h and pnglibconf.h.prebuilt accordingly.
-
-Version 1.5.15beta05 [February 17, 2013]
-  Use approved/supported Android method to check for NEON, use Linux/POSIX
-    1003.1 API to check /proc/self/auxv avoiding buffer allocation and other
-    library calls.
-  Fixed a race condition in the creation of the build 'scripts' directory
-    while building with a parallel make.
-  Use parentheses more consistently in "#if defined(MACRO)" tests.
-
-Version 1.5.15beta06 [February 22, 2013]
-  Fixed PNG_ALIGN(ED)_MEMORY and add ability to turn off ARM_NEON
-    runtime checks
-  Updated the INSTALL document.
-
-Version 1.5.15beta07 [February 27, 2013]
-  Revised INSTALL to recommend using CPPFLAGS instead of INCLUDES.
-  Revised scripts/makefile.freebsd to respect ZLIBLIB and ZLIBINC.
-  Revised scripts/dfn.awk to work with the buggy MSYS awk that has trouble
-    with CRLF line endings.
-
-Version 1.5.15beta08 [March 5, 2013]
-  Avoid a possible memory leak in contrib/gregbook/readpng.c
-  Made the _SUPPORTED macro definitions consistent. The change made in
-    libpng15 to #define *_SUPPORTED 1, to match the use of -D*_SUPPORTED
-    (which means -D*_SUPPORTED=1) and avoid compiler warnings from GCC was made
-    inconsistently and causes problems as a result, also some additions in
-    pnglibconf.h.prebuilt were inconsistent (omitting the 1). This changes 1.5
-    back to the scheme used both before (1.4) and after (1.6). This might cause
-    some build scripts to issue warnings, and might, in the extreme, cause some
-    applications to fail (but they would fail anyway against 1.6).  It seems
-    safer to go for consistency, given the change in 1.6, not correctness here,
-    particularly as 'make check' currently warns anyway on the symbols.dfn check
-    because of the inconsistencies.
-  Corrected Android builds and corrected libpng.vers with symbol
-    prefixing This adds an API to set optimization options externally,
-    providing an alternative and general solution for the non-portable
-    run-time tests used by the ARM Neon code.  It also makes those tests
-    compile and link on Android.
-  The order of settings vs options in pnglibconf.h is reversed to allow
-    settings to depend on options and options can now set (or override) the
-    defaults for settings.
-
-Version 1.5.15beta09 [March 13, 2013]
-  Fixed CMakelists.txt to allow building a single variant of the library
-    (Claudio Bley):
-  Introduced a PNG_LIB_TARGETS variable that lists all activated library
-    targets.  It is an error if this variable ends up empty, ie. you have
-    to build at least one library variant.
-  Made the *_COPY targets only depend on library targets actually being build.
-  Use PNG_LIB_TARGETS to unify a code path.
-  Changed the CREATE_SYMLINK macro to expect the full path to a file as the
-    first argument. When symlinking the filename component of that path is
-    determined and used as the link target.
-  Use copy_if_different in the CREATE_SYMLINK macro.
-  Eliminated two warnings from the Intel C compiler. The warnings are
-    technically valid, although a reasonable treatment of division would
-    show it to be incorrect.
-
-Version 1.5.15rc01 [March 21, 2013]
-  No changes.
-
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
--- a/71
+++ b/71
@@ -3672,8 +3672,7 @@ Version 1.5.6 [November 3, 2011]
  No changes.

 Version 1.5.7beta01 [November 4, 2011]
-  Added support for ARM processor, when decoding all PNG up-filtered rows
-    and any other-filtered rows with 3 or 4 bytes per pixel (Mans Rullgard).
+  Added support for ARM processor (Mans Rullgard)
  Fixed bug in pngvalid on early allocation failure; fixed type cast in
    pngmem.c; pngvalid would attempt to call png_error() if the allocation
    of a png_struct or png_info failed. This would probably have led to a
@@ -4003,69 +4002,11 @@ Version 1.5.15beta03 [February 7, 2013]
  Remove SUN OS cc -E workround - no longer required
  Turn serial tests back on (recently turned off by autotools upgrade).

-Version 1.5.15beta04 [February 15, 2013]
-  Enclosed the new png_get_palette_max in #ifdef PNG_GET_PALETTE_MAX_SUPPORTED
-    block, and revised pnglibconf.h and pnglibconf.h.prebuilt accordingly.
-
-Version 1.5.15beta05 [February 17, 2013]
-  Use approved/supported Android method to check for NEON, use Linux/POSIX
-    1003.1 API to check /proc/self/auxv avoiding buffer allocation and other
-    library calls.
-  Fixed a race condition in the creation of the build 'scripts' directory
-    while building with a parallel make.
-  Use parentheses more consistently in "#if defined(MACRO)" tests.
-
-Version 1.5.15beta06 [February 22, 2013]
-  Fixed PNG_ALIGN(ED)_MEMORY and add ability to turn off ARM_NEON
-    runtime checks
-  Updated the INSTALL document.
-
-Version 1.5.15beta07 [February 27, 2013]
-  Revised INSTALL to recommend using CPPFLAGS instead of INCLUDES.
-  Revised scripts/makefile.freebsd to respect ZLIBLIB and ZLIBINC.
-  Revised scripts/dfn.awk to work with the buggy MSYS awk that has trouble
-    with CRLF line endings.
-
-Version 1.5.15beta08 [March 5, 2013]
-  Avoid a possible memory leak in contrib/gregbook/readpng.c
-  Made the _SUPPORTED macro definitions consistent. The change made in
-    libpng15 to #define *_SUPPORTED 1, to match the use of -D*_SUPPORTED
-    (which means -D*_SUPPORTED=1) and avoid compiler warnings from GCC was made
-    inconsistently and causes problems as a result, also some additions in
-    pnglibconf.h.prebuilt were inconsistent (omitting the 1). This changes 1.5
-    back to the scheme used both before (1.4) and after (1.6). This might cause
-    some build scripts to issue warnings, and might, in the extreme, cause some
-    applications to fail (but they would fail anyway against 1.6).  It seems
-    safer to go for consistency, given the change in 1.6, not correctness here,
-    particularly as 'make check' currently warns anyway on the symbols.dfn check
-    because of the inconsistencies.
-  Corrected Android builds and corrected libpng.vers with symbol
-    prefixing This adds an API to set optimization options externally,
-    providing an alternative and general solution for the non-portable
-    run-time tests used by the ARM Neon code.  It also makes those tests
-    compile and link on Android.
-  The order of settings vs options in pnglibconf.h is reversed to allow
-    settings to depend on options and options can now set (or override) the
-    defaults for settings.
-
-Version 1.5.15beta09 [March 13, 2013]
-  Fixed CMakelists.txt to allow building a single variant of the library
-    (Claudio Bley):
-  Introduced a PNG_LIB_TARGETS variable that lists all activated library
-    targets.  It is an error if this variable ends up empty, ie. you have
-    to build at least one library variant.
-  Made the *_COPY targets only depend on library targets actually being build.
-  Use PNG_LIB_TARGETS to unify a code path.
-  Changed the CREATE_SYMLINK macro to expect the full path to a file as the
-    first argument. When symlinking the filename component of that path is
-    determined and used as the link target.
-  Use copy_if_different in the CREATE_SYMLINK macro.
-  Eliminated two warnings from the Intel C compiler. The warnings are
-    technically valid, although a reasonable treatment of division would
-    show it to be incorrect.
-
-Version 1.5.15rc01 [March 21, 2013]
-  No changes.
+  ===========================================================================
+                       NOTICE November 17, 2012:
+     The location of the git repository at SourceForge has changed.
+               Visit http://libpng.sf.net/ for details.
+  ===========================================================================

 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,11 +138,8 @@ endif()
 # NOW BUILD OUR TARGET
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${ZLIB_INCLUDE_DIR})

-unset(PNG_LIB_TARGETS)
-
 if(PNG_SHARED)
  add_library(${PNG_LIB_NAME} SHARED ${libpng_sources})
-  set(PNG_LIB_TARGETS ${PNG_LIB_NAME})
  if(MSVC)
    # msvc does not append 'lib' - do it here to have consistent name
    set_target_properties(${PNG_LIB_NAME} PROPERTIES PREFIX "lib")
@@ -155,7 +152,6 @@ if(PNG_STATIC)
 # does not work without changing name
  set(PNG_LIB_NAME_STATIC ${PNG_LIB_NAME}_static)
  add_library(${PNG_LIB_NAME_STATIC} STATIC ${libpng_sources})
-  list(APPEND PNG_LIB_TARGETS ${PNG_LIB_NAME_STATIC})
  if(MSVC)
    # msvc does not append 'lib' - do it here to have consistent name
    set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES PREFIX "lib")
@@ -163,12 +159,6 @@ if(PNG_STATIC)
  target_link_libraries(${PNG_LIB_NAME_STATIC} ${ZLIB_LIBRARY} ${M_LIBRARY})
 endif()

-if(NOT PNG_LIB_TARGETS)
-  message(SEND_ERROR
-    "No library variant selected to build. "
-    "Please enable at least one of the following options: PNG_STATIC, PNG_SHARED")
-endif()
-
 if(PNG_SHARED AND WIN32)
  set_target_properties(${PNG_LIB_NAME} PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL)
 endif()
@@ -197,15 +187,14 @@ macro(CREATE_SYMLINK SRC_FILE DEST_FILE)
  if(WIN32 AND NOT CYGWIN AND NOT MSYS)
    ADD_CUSTOM_COMMAND(
        OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE}   ${CMAKE_CURRENT_BINARY_DIR}/${DEST_FILE}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different  "${SRC_FILE}" ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different  "${SRC_FILE}" ${CMAKE_CURRENT_BINARY_DIR}/${DEST_FILE}
-        DEPENDS ${PNG_LIB_TARGETS}
+        COMMAND ${CMAKE_COMMAND} -E copy        ${CMAKE_CURRENT_BINARY_DIR}/${SRC_FILE} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE}
+        COMMAND ${CMAKE_COMMAND} -E copy        ${CMAKE_CURRENT_BINARY_DIR}/${SRC_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${DEST_FILE}
+        DEPENDS ${PNG_LIB_NAME} ${PNG_LIB_NAME_STATIC}
        )
    ADD_CUSTOM_TARGET(${DEST_FILE}_COPY ALL DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE})
  else(WIN32 AND NOT CYGWIN AND NOT MSYS)
-    get_filename_component(LINK_TARGET "${SRC_FILE}" NAME)
-    execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${LINK_TARGET}" ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${LINK_TARGET}" ${DEST_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SRC_FILE} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SRC_FILE} ${DEST_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
  endif(WIN32 AND NOT CYGWIN AND NOT MSYS)
 endmacro()

@@ -236,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.15rc01
+#   VERSION 15.${PNGLIB_RELEASE}.1.5.15beta03
    VERSION 15.${PNGLIB_RELEASE}.0
    SOVERSION 15
    CLEAN_DIRECT_OUTPUT 1)
@@ -263,33 +252,40 @@ endif()

 # INSTALL
 if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
-  install(TARGETS ${PNG_LIB_TARGETS}
-      ${PNG_EXPORT_RULE}
-      RUNTIME DESTINATION bin
-      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
  if(PNG_SHARED)
+    install(TARGETS ${PNG_LIB_NAME}
+        ${PNG_EXPORT_RULE}
+        RUNTIME DESTINATION bin
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
    # Create a symlink for libpng.dll.a => libpng15.dll.a on Cygwin
    if(CYGWIN OR MINGW)
       get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME} LOCATION_${CMAKE_BUILD_TYPE})
-       CREATE_SYMLINK(${BUILD_TARGET_LOCATION} libpng${CMAKE_IMPORT_LIBRARY_SUFFIX})
+       get_filename_component(BUILD_TARGET_FILE ${BUILD_TARGET_LOCATION} NAME)
+       CREATE_SYMLINK(${BUILD_TARGET_FILE} libpng${CMAKE_IMPORT_LIBRARY_SUFFIX})
       install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_IMPORT_LIBRARY_SUFFIX}
         DESTINATION ${CMAKE_INSTALL_LIBDIR})
    endif(CYGWIN OR MINGW)

    if(NOT WIN32)
      get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME} LOCATION_${CMAKE_BUILD_TYPE})
-      CREATE_SYMLINK(${BUILD_TARGET_LOCATION} libpng${CMAKE_SHARED_LIBRARY_SUFFIX})
+      get_filename_component(BUILD_TARGET_FILE ${BUILD_TARGET_LOCATION} NAME)
+      CREATE_SYMLINK(${BUILD_TARGET_FILE} libpng${CMAKE_SHARED_LIBRARY_SUFFIX})
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
         DESTINATION ${CMAKE_INSTALL_LIBDIR})
    endif(NOT WIN32)
  endif(PNG_SHARED)

  if(PNG_STATIC)
+    install(TARGETS ${PNG_LIB_NAME_STATIC}
+        ${PNG_EXPORT_RULE}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
    if(NOT WIN32 OR CYGWIN OR MINGW)
      get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME_STATIC} LOCATION_${CMAKE_BUILD_TYPE})
-      CREATE_SYMLINK(${BUILD_TARGET_LOCATION} libpng${CMAKE_STATIC_LIBRARY_SUFFIX})
+      get_filename_component(BUILD_TARGET_FILE ${BUILD_TARGET_LOCATION} NAME)
+      CREATE_SYMLINK(${BUILD_TARGET_FILE} libpng${CMAKE_STATIC_LIBRARY_SUFFIX})
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
         DESTINATION ${CMAKE_INSTALL_LIBDIR})
    endif(NOT WIN32 OR CYGWIN OR MINGW)
--- a/41
+++ b/41
@@ -9,16 +9,16 @@ On Unix/Linux and similar systems, you can simply type

 and ignore the rest of this document.

-If configure does not work on your system, or if you have a need to
-change configure.ac or Makefile.am, and you have a reasonably
-up-to-date set of tools, running ./autogen.sh in a git clone before
-running ./configure may fix the problem.  To be really sure that you
-aren't using any of the included pre-built scripts, you can do this:
+If configure does not work on your system and you have a reasonably
+up-to-date set of tools, running ./autogen.sh before running ./configure
+may fix the problem.  You can also run the individual commands in
+autogen.sh with the --force option, if supported by your version of
+the tools.  To be really sure that you aren't using any of the included
+pre-built scripts, you can do this:

    ./configure --enable-maintainer-mode
    make maintainer-clean
-    ./autogen.sh --maintainer --clean
-    ./autogen.sh --maintainer
+    ./autogen.sh
    ./configure [--prefix=/path] [other options]
    make
    make install
@@ -41,33 +41,19 @@ is not already on your system.  zlib can usually be found
 wherever you got libpng.  zlib can be placed in another directory,
 at the same level as libpng.

-If your system already has a preinstalled zlib you will still need
-to have access to the zlib.h and zconf.h include files that
-correspond to the version of zlib that's installed.
-
-If you wish to test with a particular zlib that is not first in the
-standard library search path, put ZLIBLIB, ZLIBINC, CPPFLAGS, LDFLAGS,
-and LD_LIBRARY_PATH in your environment before running "make test"
-or "make distcheck":
-
-ZLIBLIB=/path/to/lib export ZLIBLIB
-ZLIBINC=/path/to/include export ZLIBINC
-CPPFLAGS="-I$ZLIBINC" export CPPFLAGS
-LDFLAGS="-L$ZLIBLIB" export LDFLAGS
-LD_LIBRARY_PATH="$ZLIBLIB:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH
-
-If you are using one of the makefile scripts, put ZLIBLIB and ZLIBINC
-in your environment and type "make ZLIBLIB=$ZLIBLIB ZLIBINC=$ZLIBINC test".
-
 If you want to use "cmake" (see www.cmake.org), type

   cmake . -DCMAKE_INSTALL_PREFIX=/path
   make
   make install

+If your system already has a preinstalled zlib you will still need
+to have access to the zlib.h and zconf.h include files that
+correspond to the version of zlib that's installed.
+
 You can rename the directories that you downloaded (they
-might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.7"
-or "zlib127") so that you have directories called "zlib" and "libpng".
+might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.5"
+or "zlib125") so that you have directories called "zlib" and "libpng".

 Your directory structure should look like this:

@@ -85,7 +71,6 @@ Your directory structure should look like this:
             depcomp, install-sh, mkinstalldirs, test-pngtest.sh
          contrib
             gregbook
-             libtests
             pngminim
             pngminus
             pngsuite
--- 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.15rc01, March 21, 2013, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.15beta03, February 7, 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
-March 21, 2013
+February 7, 2013
--- a/Makefile.am
+++ b/Makefile.am
@@ -144,7 +144,7 @@ SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\

 .dfn.out:
 	rm -f $@ $@.c $@.?
-	test -d scripts || mkdir scripts || test -d scripts
+	test -d scripts || mkdir scripts
 	echo '#include "$<"' >$@.c
 	$(DFNCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) @LIBPNG_DEFINES@\
 	    $(CPPFLAGS) $(SYMBOL_CFLAGS) $@.c > $@.1
@@ -174,7 +174,7 @@ scripts/pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h
 	rm -f $@ dfn?.out
 	test -z "$(CPPFLAGS)"
 	echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\
-	$(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out logunsupported=1\
+	$(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out logunsupported=1
 		version=search ${srcdir}/pngconf.h -\
 		${srcdir}/scripts/pnglibconf.dfa 1>&2
 	$(AWK) -f ${srcdir}/scripts/options.awk out=dfn2.out dfn1.out 1>&2
--- a/Makefile.in
+++ b/Makefile.in
@@ -1496,7 +1496,7 @@ contrib/libtests/pngvalid.o pngtest.o: pnglibconf.h

 .dfn.out:
 	rm -f $@ $@.c $@.?
-	test -d scripts || mkdir scripts || test -d scripts
+	test -d scripts || mkdir scripts
 	echo '#include "$<"' >$@.c
 	$(DFNCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) @LIBPNG_DEFINES@\
 	    $(CPPFLAGS) $(SYMBOL_CFLAGS) $@.c > $@.1
@@ -1526,7 +1526,7 @@ scripts/pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h
 	rm -f $@ dfn?.out
 	test -z "$(CPPFLAGS)"
 	echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\
-	$(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out logunsupported=1\
+	$(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out logunsupported=1
 		version=search ${srcdir}/pngconf.h -\
 		${srcdir}/scripts/pnglibconf.dfa 1>&2
 	$(AWK) -f ${srcdir}/scripts/options.awk out=dfn2.out dfn1.out 1>&2
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-README for libpng version 1.5.15rc01 - March 21, 2013 (shared library 15.0)
+README for libpng version 1.5.15beta03 - February 7, 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/arm/arm_init.c
+++ b/arm/arm_init.c
@@ -3,188 +3,52 @@
 *
 * Copyright (c) 2013 Glenn Randers-Pehrson
 * Written by Mans Rullgard, 2011.
- * Last changed in libpng 1.5.15 [%RDATE%]
+ * Last changed in libpng 1.5.14 [(PENDING RELEASE)]
 *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */
-/* Below, after checking __linux__, various non-C90 POSIX 1003.1 functions are
- * called.
- */
-#define _POSIX_SOURCE 1
-
 #include "../pngpriv.h"

-#ifdef PNG_ARM_NEON_SUPPORTED
-#ifdef PNG_ARM_NEON_CHECK_SUPPORTED /* Do run-time checks */
-#include <signal.h> /* for sig_atomic_t */
-
-#ifdef __ANDROID__
-/* Linux provides access to information about CPU capabilites via
- * /proc/self/auxv, however Android blocks this while still claiming to be
- * Linux.  The Andoid NDK, however, provides appropriate support.
- *
- * Documentation: http://www.kandroid.org/ndk/docs/CPU-ARM-NEON.html
- */
-#include <cpu-features.h>
-
-static int
-png_have_neon(png_structp png_ptr)
-{
-   /* This is a whole lot easier than the mess below, however it is probably
-    * implemented as below, therefore it is better to cache the result (these
-    * function calls may be slow!)
-    */
-   PNG_UNUSED(png_ptr)
-   return android_getCpuFamily() == ANDROID_CPU_FAMILY_ARM &&
-      (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
-}
-#elif defined(__linux__)
-/* The generic __linux__ implementation requires reading /proc/self/auxv and
- * looking at each element for one that records NEON capabilities.
- */
-#include <unistd.h> /* for POSIX 1003.1 */
-#include <errno.h>  /* for EINTR */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
+/* __arm__ is defined by GCC, MSVC defines _M_ARM to the ARM version number */
+#if defined __linux__ && defined __arm__
+#include <stdio.h>
 #include <elf.h>
 #include <asm/hwcap.h>

-/* A read call may be interrupted, in which case it returns -1 and sets errno to
- * EINTR if nothing was done, otherwise (if something was done) a partial read
- * may result.
- */
-static size_t
-safe_read(png_structp png_ptr, int fd, void *buffer_in, size_t nbytes)
+static int png_have_hwcap(unsigned cap)
 {
-   size_t ntotal = 0;
-   char *buffer = png_voidcast(char*, buffer_in);
-
-   while (nbytes > 0)
-   {
-      unsigned int nread;
-      int iread;
-
-      /* Passing nread > INT_MAX to read is implementation defined in POSIX
-       * 1003.1, therefore despite the unsigned argument portable code must
-       * limit the value to INT_MAX!
-       */
-      if (nbytes > INT_MAX)
-         nread = INT_MAX;
-
-      else
-         nread = (unsigned int)/*SAFE*/nbytes;
-
-      iread = read(fd, buffer, nread);
-
-      if (iread == -1)
-      {
-         /* This is the devil in the details, a read can terminate early with 0
-          * bytes read because of EINTR, yet it still returns -1 otherwise end
-          * of file cannot be distinguished.
-          */
-         if (errno != EINTR)
-         {
-            png_warning(png_ptr, "/proc read failed");
-            return 0; /* I.e. a permanent failure */
-         }
-      }
-
-      else if (iread < 0)
-      {
-         /* Not a valid 'read' result: */
-         png_warning(png_ptr, "OS /proc read bug");
-         return 0;
-      }
-
-      else if (iread > 0)
-      {
-         /* Continue reading until a permanent failure, or EOF */
-         buffer += iread;
-         nbytes -= (unsigned int)/*SAFE*/iread;
-         ntotal += (unsigned int)/*SAFE*/iread;
-      }
-
-      else
-         return ntotal;
-   }
-
-   return ntotal; /* nbytes == 0 */
-}
-
-static int
-png_have_neon(png_structp png_ptr)
-{
-   int fd = open("/proc/self/auxv", O_RDONLY);
+   FILE *f = fopen("/proc/self/auxv", "r");
   Elf32_auxv_t aux;
+   int have_cap = 0;

-   /* Failsafe: failure to open means no NEON */
-   if (fd == -1)
-   {
-      png_warning(png_ptr, "/proc/self/auxv open failed");
+   if (!f)
      return 0;
-   }

-   while (safe_read(png_ptr, fd, &aux, sizeof aux) == sizeof aux)
+   while (fread(&aux, sizeof(aux), 1, f) > 0)
   {
-      if (aux.a_type == AT_HWCAP && (aux.a_un.a_val & HWCAP_NEON) != 0)
+      if (aux.a_type == AT_HWCAP &&
+          aux.a_un.a_val & cap)
      {
-         close(fd);
-         return 1;
+         have_cap = 1;
+         break;
      }
   }

-   close(fd);
-   return 0;
-}
-#else
-   /* We don't know how to do a run-time check on this system */
-#  error "no support for run-time ARM NEON checks"
-#endif /* OS checks */
-#endif /* PNG_ARM_NEON_CHECK_SUPPORTED */
+   fclose(f);

-#ifndef PNG_ALIGNED_MEMORY_SUPPORTED
-#  error "ALIGNED_MEMORY is required; set: -DPNG_ALIGNED_MEMORY_SUPPORTED"
-#endif
+   return have_cap;
+}
+#endif /* __linux__ && __arm__ */

 void
 png_init_filter_functions_neon(png_structp pp, unsigned int bpp)
 {
-#ifdef PNG_ARM_NEON_API_SUPPORTED
-   switch ((pp->options >> PNG_ARM_NEON) & 3)
-   {
-      case PNG_OPTION_UNSET:
-         /* Allow the run-time check to execute if it has been enabled -
-          * thus both API and CHECK can be turned on.  If it isn't supported
-          * this case will fall through to the 'default' below, which just
-          * returns.
-          */
-#endif /* PNG_ARM_NEON_API_SUPPORTED */
-#ifdef PNG_ARM_NEON_CHECK_SUPPORTED
-         {
-            static volatile sig_atomic_t no_neon = -1; /* not checked */
-
-            if (no_neon < 0)
-               no_neon = !png_have_neon(pp);
-
-            if (no_neon)
-               return;
-         }
-#ifdef PNG_ARM_NEON_API_SUPPORTED
-         break;
-#endif
-#endif /* PNG_ARM_NEON_CHECK_SUPPORTED */
-#ifdef PNG_ARM_NEON_API_SUPPORTED
-      case PNG_OPTION_ON:
-         /* Option turned on */
-         break;
-
-      default: /* OFF or INVALID */
-         return;
-   }
+#ifdef __arm__
+#ifdef __linux__
+   if (!png_have_hwcap(HWCAP_NEON))
+      return;
 #endif

   /* IMPORTANT: any new external functions used here must be declared using
@@ -215,5 +79,8 @@ png_init_filter_functions_neon(png_structp pp, unsigned int bpp)
      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
          png_read_filter_row_paeth4_neon;
   }
+#else
+   PNG_UNUSED(pp)
+   PNG_UNUSED(bpp)
+#endif
 }
-#endif /* FILTER_OPTIMIZATIONS && __arm__ && __ARM_NEON__ */
--- a/arm/filter_neon.S
+++ b/arm/filter_neon.S
@@ -10,14 +10,11 @@
 * and license in png.h
 */

-/* This is required to get the symbol renames, which are #defines, and also
- * includes the value of PNG_FILTER_OPTIMIZATIONS.
- */
+/* This is required to get the symbol renames, which are #defines */
 #define PNG_VERSION_INFO_ONLY
 #include "../pngpriv.h"

-#if defined(PNG_FILTER_OPTIMIZATIONS) && defined(__arm__) && \
-   defined(__ARM_NEON__)
+#ifdef __arm__
 #if defined(__linux__) && defined(__ELF__)
 .section .note.GNU-stack,"",%progbits /* mark stack as non-executable */
 #endif
@@ -232,4 +229,4 @@ func    png_read_filter_row_paeth3_neon, export=1

        pop             {r4,pc}
 endfunc
-#endif /* FILTER_OPTIMIZATIONS && __arm__ && __ARM_NEON__ */
+#endif
--- a/config.h.in
+++ b/config.h.in
@@ -73,17 +73,11 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION

-/* Turn on ARM Neon optimizations at run-time */
-#undef PNG_ARM_NEON_API_SUPPORTED
+/* Align row buffers */
+#undef PNG_ALIGNED_MEMORY_SUPPORTED

-/* Check for ARM Neon support at run-time */
-#undef PNG_ARM_NEON_CHECK_SUPPORTED
-
-/* Enable ARM Neon optimizations */
-#undef PNG_ARM_NEON_SUPPORTED
-
-/* Disable ARM Neon optimizations */
-#undef PNG_NO_ARM_NEON
+/* ARM NEON filter initialization function */
+#undef PNG_FILTER_OPTIMIZATIONS

 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
--- a/55
+++ b/55
@@ -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.15rc01.
+# Generated by GNU Autoconf 2.69 for libpng 1.5.15beta03.
 #
 # 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.15rc01'
-PACKAGE_STRING='libpng 1.5.15rc01'
+PACKAGE_VERSION='1.5.15beta03'
+PACKAGE_STRING='libpng 1.5.15beta03'
 PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
 PACKAGE_URL=''

@@ -1343,7 +1343,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.15rc01 to adapt to many kinds of systems.
+\`configure' configures libpng 1.5.15beta03 to adapt to many kinds of systems.

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

@@ -1413,7 +1413,7 @@ fi

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

@@ -1435,13 +1435,7 @@ Optional Features:
  --enable-fast-install[=PKGS]
                          optimize for fast installation [default=yes]
  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-arm-neon     Enable ARM NEON optimizations: =off, check, api, on:
-                          off: disable the optimizations; check: use internal
-                          checking code (deprecated and poorly supported);
-                          api: disable by default, enable by a call to
-                          png_set_option; on: turn on unconditionally. The
-                          default is 'on' if __ARM_NEON__ is defined,
-                          otherwise 'off'.
+  --enable-arm-neon       Enable ARM NEON optimizations

 Optional Packages:
  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1535,7 +1529,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-libpng configure 1.5.15rc01
+libpng configure 1.5.15beta03
 generated by GNU Autoconf 2.69

 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1958,7 +1952,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.15rc01, which was
+It was created by libpng $as_me 1.5.15beta03, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  $ $0 $@
@@ -2821,7 +2815,7 @@ fi

 # Define the identity of the package.
 PACKAGE='libpng'
- VERSION='1.5.15rc01'
+ VERSION='1.5.15beta03'


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



-PNGLIB_VERSION=1.5.15rc01
+PNGLIB_VERSION=1.5.15beta03
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=5
 PNGLIB_RELEASE=15
@@ -12817,29 +12811,17 @@ AM_CCASFLAGS=-Wa,--noexecstack

 # Check whether --enable-arm-neon was given.
 if test "${enable_arm_neon+set}" = set; then :
-  enableval=$enable_arm_neon; case "$enableval" in
-      off)
+  enableval=$enable_arm_neon; if test "${enableval}" = yes; then

-$as_echo "#define PNG_NO_ARM_NEON /**/" >>confdefs.h
-;;
-      check)
+$as_echo "#define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_neon" >>confdefs.h

-$as_echo "#define PNG_ARM_NEON_CHECK_SUPPORTED /**/" >>confdefs.h
-;;
-      api)

-$as_echo "#define PNG_ARM_NEON_API_SUPPORTED /**/" >>confdefs.h
-;;
-      on)
+$as_echo "#define PNG_ALIGNED_MEMORY_SUPPORTED 1" >>confdefs.h

-$as_echo "#define PNG_ARM_NEON_SUPPORTED /**/" >>confdefs.h
-;;
-      *)
-         as_fn_error $? "arm-neon: option value required (off/check/api/on)" "$LINENO" 5;;
-   esac
+	fi
 fi

- if test "${enable_arm_neon:-no}" != "no"; then
+ if test "${enable_arm_neon:-no}" = yes; then
  PNG_ARM_NEON_TRUE=
  PNG_ARM_NEON_FALSE='#'
 else
@@ -12848,9 +12830,6 @@ else
 fi


- { $as_echo "$as_me:${as_lineno-$LINENO}: Extra options for compiler: $PNG_COPTS" >&5
-$as_echo "$as_me: Extra options for compiler: $PNG_COPTS" >&6;}
-
 # Config files, substituting as above
 ac_config_files="$ac_config_files Makefile libpng.pc:libpng.pc.in"

@@ -13407,7 +13386,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.15rc01, which was
+This file was extended by libpng $as_me 1.5.15beta03, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -13473,7 +13452,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.15rc01
+libpng config.status 1.5.15beta03
 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.15rc01], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.5.15beta03], [png-mng-implement@lists.sourceforge.net])
 AM_INIT_AUTOMAKE([serial-tests])
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE

-PNGLIB_VERSION=1.5.15rc01
+PNGLIB_VERSION=1.5.15beta03
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=5
 PNGLIB_RELEASE=15
@@ -172,31 +172,15 @@ AC_SUBST([binconfigs])
 AC_SUBST([AM_CCASFLAGS], [-Wa,--noexecstack])

 AC_ARG_ENABLE([arm-neon],
-   AS_HELP_STRING([[[--enable-arm-neon]]],
-      [Enable ARM NEON optimizations: =off, check, api, on:]
-      [off: disable the optimizations; check: use internal checking code]
-      [(deprecated and poorly supported); api: disable by default, enable by]
-      [a call to png_set_option; on: turn on unconditionally.  The]
-      [default is 'on' if __ARM_NEON__ is defined, otherwise 'off'.]),
-   [case "$enableval" in
-      off)
-         AC_DEFINE([PNG_NO_ARM_NEON], [],
-                   [Disable ARM Neon optimizations]);;
-      check)
-         AC_DEFINE([PNG_ARM_NEON_CHECK_SUPPORTED], [],
-                   [Check for ARM Neon support at run-time]);;
-      api)
-         AC_DEFINE([PNG_ARM_NEON_API_SUPPORTED], [],
-                   [Turn on ARM Neon optimizations at run-time]);;
-      on)
-         AC_DEFINE([PNG_ARM_NEON_SUPPORTED], [],
-                   [Enable ARM Neon optimizations]);;
-      *)
-         AC_MSG_ERROR([arm-neon: option value required (off/check/api/on)]);;
-   esac])
-AM_CONDITIONAL([PNG_ARM_NEON], [test "${enable_arm_neon:-no}" != "no"])
- 
- AC_MSG_NOTICE([[Extra options for compiler: $PNG_COPTS]])
+	AC_HELP_STRING([--enable-arm-neon], [Enable ARM NEON optimizations]),
+	[if test "${enableval}" = yes; then
+		AC_DEFINE([PNG_FILTER_OPTIMIZATIONS],
+                          [png_init_filter_functions_neon],
+                          [ARM NEON filter initialization function])
+		AC_DEFINE([PNG_ALIGNED_MEMORY_SUPPORTED], [1],
+                          [Align row buffers])
+	fi])
+AM_CONDITIONAL([PNG_ARM_NEON], [test "${enable_arm_neon:-no}" = yes])

 # Config files, substituting as above
 AC_CONFIG_FILES([Makefile libpng.pc:libpng.pc.in])
--- a/contrib/gregbook/readpng.c
+++ b/contrib/gregbook/readpng.c
@@ -215,10 +215,6 @@ uch *readpng_get_image(double display_exponent, int *pChannels, ulg *pRowbytes)
     * libpng function */

    if (setjmp(png_jmpbuf(png_ptr))) {
-        free(image_data);
-        image_data = NULL;
-        free(row_pointers);
-        row_pointers = NULL;
        png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
        return NULL;
    }
--- a/contrib/libtests/pngvalid.c
+++ b/contrib/libtests/pngvalid.c
@@ -26,7 +26,7 @@
 #include <signal.h>
 #include <stdio.h>

-#if defined(HAVE_CONFIG_H) && !defined(PNG_NO_CONFIG_H)
+#if (defined HAVE_CONFIG_H) && !(defined PNG_NO_CONFIG_H)
 #  include <config.h>
 #endif

@@ -1999,8 +1999,8 @@ static double digitize(PNG_CONST png_modifier *pm, double value,
 }
 #endif

-#if defined(PNG_READ_GAMMA_SUPPORTED) ||\
-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+#if (defined PNG_READ_GAMMA_SUPPORTED) ||\
+   (defined PNG_READ_RGB_TO_GRAY_SUPPORTED)
 static double abserr(PNG_CONST png_modifier *pm, int in_depth, int out_depth)
 {
   /* Absolute error permitted in linear values - affected by the bit depth of
@@ -3357,7 +3357,7 @@ make_transform_image(png_store* PNG_CONST ps, png_byte PNG_CONST colour_type,
         PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);

 #ifdef PNG_TEXT_SUPPORTED
-#  if defined (NG_READ_zTXt_SUPPORTED) && defined(PNG_WRITE_zTXt_SUPPORTED)
+#  if (defined PNG_READ_zTXt_SUPPORTED) && (defined PNG_WRITE_zTXt_SUPPORTED)
 #     define TEXT_COMPRESSION PNG_TEXT_COMPRESSION_zTXt
 #  else
 #     define TEXT_COMPRESSION PNG_TEXT_COMPRESSION_NONE
@@ -8902,8 +8902,8 @@ static void perform_gamma_scale16_tests(png_modifier *pm)
 }
 #endif /* 16 to 8 bit conversion */

-#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)
+#if defined PNG_READ_BACKGROUND_SUPPORTED ||\
+   defined PNG_READ_ALPHA_MODE_SUPPORTED
 static void gamma_composition_test(png_modifier *pm,
   PNG_CONST png_byte colour_type, PNG_CONST png_byte bit_depth,
   PNG_CONST int palette_number,
--- a/libpng-manual.txt
+++ b/libpng-manual.txt
@@ -1,9 +1,9 @@
 Libpng-manual.txt - A description on how to use and modify libpng

- libpng version 1.5.15rc01 - March 21, 2013
+ libpng version 1.5.15beta03 - February 7, 2013
 Updated and distributed by Glenn Randers-Pehrson
 <glennrp at users.sourceforge.net>
- Copyright (c) 1998-2013 Glenn Randers-Pehrson
+ Copyright (c) 1998-2012 Glenn Randers-Pehrson

 This document is released under the libpng license.
 For conditions of distribution and use, see the disclaimer
@@ -11,9 +11,9 @@ Libpng-manual.txt - A description on how to use and modify libpng

 Based on:

- libpng versions 0.97, January 1998, through 1.5.15rc01 - March 21, 2013
+ libpng versions 0.97, January 1998, through 1.5.15beta03 - February 7, 2013
 Updated and distributed by Glenn Randers-Pehrson
- Copyright (c) 1998-2013 Glenn Randers-Pehrson
+ Copyright (c) 1998-2012 Glenn Randers-Pehrson

 libpng 1.0 beta 6  version 0.96 May 28, 1997
 Updated and distributed by Andreas Dilger
@@ -509,7 +509,8 @@ you can retrieve with

 If you call the png_set_read_user_chunk_fn() function, then all unknown
 chunks will be saved when read, in case your callback function will need
-one or more of them.
+one or more of them.  This behavior can be changed with the
+png_set_keep_unknown_chunks() function, described below.

 At this point, you can set up a callback function that will be
 called after each row has been read, which you can use to control
@@ -603,18 +604,14 @@ callback function:

    #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
      /* ignore all unknown chunks: */
-    #  if PNG_LIBPNG_VER < 10700
-      png_set_keep_unknown_chunks(read_ptr, 2, NULL, 0);
-    #  else
      png_set_keep_unknown_chunks(read_ptr, 1, NULL, 0);
-    #  endif

      /* except for vpAg: */
      png_set_keep_unknown_chunks(read_ptr, 2, vpAg, 1);

      /* also ignore unused known chunks: */
      png_set_keep_unknown_chunks(read_ptr, 1, unused_chunks,
-         (int)png_sizeof(unused_chunks)/5);
+         (int)sizeof(unused_chunks)/5);
    #endif

 User limits
@@ -4165,16 +4162,12 @@ This is enabled by default but can be disabled in each png_ptr with
                 1: enable

 Retrieving the maximum palette index found was added at libpng-1.5.15.
-This statement must appear after png_read_png() or png_read_image() while
-reading, and after png_write_png() or png_write_image() while writing.
+This statement must appear after png_read_png() or png_read_image().

   int max_palette = png_get_palette_max(png_ptr, info_ptr);

-This will return the maximum palette index found in the image, or "-1" if
-the palette was not checked, or "0" if no palette was found.  Note that this
-does not account for any palette index used by ancillary chunks such as the
-bKGD chunk; you must check those separately to determine the maximum
-palette index actually used.
+This will return the maximum palette index found, or "-1" if the palette
+was not checked, or "0" if no palette was found.

 A. Changes that affect users of libpng

@@ -4611,8 +4604,7 @@ left parenthesis that follows it:
       y[i] = a(x) + (int)b;

 We prefer #ifdef and #ifndef to #if defined() and #if !defined()
-when there is only one macro being tested.  We always use parentheses
-with "defined".
+when there is only one macro being tested.

 We prefer to express integers that are used as bit masks in hex format,
 with an even number of lower-case hex digits (e.g., 0x00, 0xff, 0x0100).
@@ -4625,13 +4617,13 @@ Other rules can be inferred by inspecting the libpng source.

 XIV. Y2K Compliance in libpng

-March 21, 2013
+February 7, 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.15rc01 are Y2K compliant.  It is my belief that earlier
+upward through 1.5.15beta03 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 "March 21, 2013"
+.TH LIBPNG 3 "February 7, 2013"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.5.15rc01
+libpng \- Portable Network Graphics (PNG) Reference Library 1.5.15beta03
 .SH SYNOPSIS
 \fB
 #include <png.h>\fP
@@ -277,7 +277,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.5.15rc01

 \fBvoid png_set_bKGD (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_color_16p \fIbackground\fP\fB);\fP

-\fBvoid png_set_check_for_invalid_index(png_structp \fP\fIpng_ptr\fP\fB, int \fIallowed\fP\fB);\fP
+\fBvoid png_set_check_for_invalid_index(png_structrp \fP\fIpng_ptr\fP\fB, int \fIallowed\fP\fB);\fP

 \fBvoid png_set_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fP\fIwhite_x\fP\fB, double \fP\fIwhite_y\fP\fB, double \fP\fIred_x\fP\fB, double \fP\fIred_y\fP\fB, double \fP\fIgreen_x\fP\fB, double \fP\fIgreen_y\fP\fB, double \fP\fIblue_x\fP\fB, double \fIblue_y\fP\fB);\fP

@@ -492,10 +492,10 @@ 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.15rc01 - March 21, 2013
+ libpng version 1.5.15beta03 - February 7, 2013
 Updated and distributed by Glenn Randers-Pehrson
 <glennrp at users.sourceforge.net>
- Copyright (c) 1998-2013 Glenn Randers-Pehrson
+ Copyright (c) 1998-2012 Glenn Randers-Pehrson

 This document is released under the libpng license.
 For conditions of distribution and use, see the disclaimer
@@ -503,9 +503,9 @@ Libpng-manual.txt - A description on how to use and modify libpng

 Based on:

- libpng versions 0.97, January 1998, through 1.5.15rc01 - March 21, 2013
+ libpng versions 0.97, January 1998, through 1.5.15beta03 - February 7, 2013
 Updated and distributed by Glenn Randers-Pehrson
- Copyright (c) 1998-2013 Glenn Randers-Pehrson
+ Copyright (c) 1998-2012 Glenn Randers-Pehrson

 libpng 1.0 beta 6  version 0.96 May 28, 1997
 Updated and distributed by Andreas Dilger
@@ -1001,7 +1001,8 @@ you can retrieve with

 If you call the png_set_read_user_chunk_fn() function, then all unknown
 chunks will be saved when read, in case your callback function will need
-one or more of them.
+one or more of them.  This behavior can be changed with the
+png_set_keep_unknown_chunks() function, described below.

 At this point, you can set up a callback function that will be
 called after each row has been read, which you can use to control
@@ -1095,18 +1096,14 @@ callback function:

    #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
      /* ignore all unknown chunks: */
-    #  if PNG_LIBPNG_VER < 10700
-      png_set_keep_unknown_chunks(read_ptr, 2, NULL, 0);
-    #  else
      png_set_keep_unknown_chunks(read_ptr, 1, NULL, 0);
-    #  endif

      /* except for vpAg: */
      png_set_keep_unknown_chunks(read_ptr, 2, vpAg, 1);

      /* also ignore unused known chunks: */
      png_set_keep_unknown_chunks(read_ptr, 1, unused_chunks,
-         (int)png_sizeof(unused_chunks)/5);
+         (int)sizeof(unused_chunks)/5);
    #endif

 .SS User limits
@@ -4658,16 +4655,12 @@ This is enabled by default but can be disabled in each png_ptr with
                 1: enable

 Retrieving the maximum palette index found was added at libpng-1.5.15.
-This statement must appear after png_read_png() or png_read_image() while
-reading, and after png_write_png() or png_write_image() while writing.
+This statement must appear after png_read_png() or png_read_image().

   int max_palette = png_get_palette_max(png_ptr, info_ptr);

-This will return the maximum palette index found in the image, or "-1" if
-the palette was not checked, or "0" if no palette was found.  Note that this
-does not account for any palette index used by ancillary chunks such as the
-bKGD chunk; you must check those separately to determine the maximum
-palette index actually used.
+This will return the maximum palette index found, or "-1" if the palette
+was not checked, or "0" if no palette was found.

 A. Changes that affect users of libpng

@@ -5104,8 +5097,7 @@ left parenthesis that follows it:
       y[i] = a(x) + (int)b;

 We prefer #ifdef and #ifndef to #if defined() and #if !defined()
-when there is only one macro being tested.  We always use parentheses
-with "defined".
+when there is only one macro being tested.

 We prefer to express integers that are used as bit masks in hex format,
 with an even number of lower-case hex digits (e.g., 0x00, 0xff, 0x0100).
@@ -5118,13 +5110,13 @@ Other rules can be inferred by inspecting the libpng source.

 .SH XIV. Y2K Compliance in libpng

-March 21, 2013
+February 7, 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.15rc01 are Y2K compliant.  It is my belief that earlier
+upward through 1.5.15beta03 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
@@ -5347,7 +5339,7 @@ the first widely used release:
 1.5.14beta01-08     15    10514  15.so.15.14[.0]
 1.5.14rc01-03       15    10514  15.so.15.14[.0]
 1.5.14              15    10514  15.so.15.14[.0]
- 1.5.15rc01          15    10515  15.so.15.15[.0]
+ 1.5.15beta01-03     15    10515  15.so.15.15[.0]

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

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

-Libpng version 1.5.15rc01 - March 21, 2013:
+Libpng version 1.5.15beta03 - February 7, 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).

@@ -5427,7 +5419,7 @@ this sentence.

 This code is released under the libpng license.

-libpng versions 1.2.6, August 15, 2004, through 1.5.15rc01, March 21, 2013, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.15beta03, February 7, 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
@@ -5526,7 +5518,7 @@ certification mark of the Open Source Initiative.

 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-March 21, 2013
+February 7, 2013

 .\" end of man page

--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "March 21, 2013"
+.TH LIBPNGPF 3 "February 7, 2013"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.5.15rc01
+libpng \- Portable Network Graphics (PNG) Reference Library 1.5.15beta03
 (private functions)
 .SH SYNOPSIS
 \fB#include \fI"pngpriv.h"
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "March 21, 2013"
+.TH PNG 5 "February 7, 2013"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@

 /* png.c - location for general purpose libpng functions
 *
- * Last changed in libpng 1.5.15 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.14 [January 24, 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.)
@@ -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_15rc01 Your_png_h_is_not_version_1_5_15rc01;
+typedef png_libpng_version_1_5_15beta03 Your_png_h_is_not_version_1_5_15beta03;

 /* 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.15rc01 - March 21, 2013" PNG_STRING_NEWLINE \
+     "libpng version 1.5.15beta03 - February 7, 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.15rc01 - March 21, 2013\
+      return "libpng version 1.5.15beta03 - February 7, 2013\
      Copyright (c) 1998-2013 Glenn Randers-Pehrson\
      Copyright (c) 1996-1997 Andreas Dilger\
      Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@@ -1907,7 +1907,7 @@ png_fixed(png_structp png_ptr, double fp, png_const_charp text)
 #endif

 #if defined(PNG_READ_GAMMA_SUPPORTED) || \
-    defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED)
+    defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG__READ_pHYs_SUPPORTED)
 /* muldiv functions */
 /* This API takes signed arguments and rounds the result to the nearest
 * integer (or, for a fixed point number - the standard argument - to
@@ -2047,7 +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)
+#if (defined PNG_READ_GAMMA_SUPPORTED) || (defined PNG_cHRM_SUPPORTED)
 /* more fixed point functions for gamma and cHRM (xy/XYZ) suport. */
 /* Calculate a reciprocal, return 0 on div-by-zero or overflow. */
 png_fixed_point
@@ -2878,24 +2878,3 @@ png_build_gamma_table(png_structp png_ptr, int bit_depth)
 }
 #endif /* READ_GAMMA */
 #endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
-
-/* HARDWARE OPTION SUPPORT */
-#ifdef PNG_SET_OPTION_SUPPORTED
-int PNGAPI
-png_set_option(png_structp png_ptr, int option, int onoff)
-{
-   if (png_ptr != NULL && option >= 0 && option < PNG_OPTION_NEXT &&
-      (option & 1) == 0)
-   {
-      int mask = 3 << option;
-      int setting = (2 + (onoff != 0)) << option;
-      int current = png_ptr->options;
-
-      png_ptr->options = (png_byte)((current & ~mask) | setting);
-
-      return (current & mask) >> option;
-   }
-
-   return PNG_OPTION_INVALID;
-}
-#endif
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@

 /* png.h - header file for PNG reference library
 *
- * libpng version 1.5.15rc01 - March 21, 2013
+ * libpng version 1.5.15beta03 - February 7, 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.15rc01 - March 21, 2013: Glenn
+ *   libpng versions 0.97, January 1998, through 1.5.15beta03 - February 7, 2013: Glenn
 *   See also "Contributing Authors", below.
 *
 * Note about libpng version numbers:
@@ -184,8 +184,7 @@
 *    1.5.14beta01-08         15    10514  15.so.15.14[.0]
 *    1.5.14rc01-03           15    10514  15.so.15.14[.0]
 *    1.5.14                  15    10514  15.so.15.14[.0]
- *    1.5.15beta01-10         15    10515  15.so.15.15[.0]
- *    1.5.15rc01              15    10515  15.so.15.15[.0]
+ *    1.5.15beta01-03         15    10515  15.so.15.15[.0]
 *
 *   Henceforth the source version will match the shared-library major
 *   and minor numbers; the shared-library major version number will be
@@ -217,7 +216,7 @@
 *
 * This code is released under the libpng license.
 *
- * libpng versions 1.2.6, August 15, 2004, through 1.5.15rc01, March 21, 2013, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.5.15beta03, February 7, 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:
@@ -329,13 +328,13 @@
 * Y2K compliance in libpng:
 * =========================
 *
- *    March 21, 2013
+ *    February 7, 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.15rc01 are Y2K compliant.  It is my belief that
+ *    upward through 1.5.15beta03 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
@@ -394,9 +393,9 @@
 */

 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.5.15rc01"
+#define PNG_LIBPNG_VER_STRING "1.5.15beta03"
 #define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.5.15rc01 - March 21, 2013\n"
+     " libpng version 1.5.15beta03 - February 7, 2013\n"

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

-#define PNG_LIBPNG_VER_BUILD  01
+#define PNG_LIBPNG_VER_BUILD  03

 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -427,7 +426,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.
@@ -557,7 +556,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_15rc01;
+typedef char* png_libpng_version_1_5_15beta03;

 /* 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
@@ -2652,55 +2651,13 @@ PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
      : (png_int_32)png_get_uint_32(buf)))
 #endif

-#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
+#if defined(PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \
+    defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)
 PNG_EXPORT(234, void, png_set_check_for_invalid_index, (png_structp png_ptr,
    int allowed));
-#  ifdef PNG_GET_PALETTE_MAX_SUPPORTED
 PNG_EXPORT(235, int, png_get_palette_max, (png_const_structp png_ptr,
    png_const_infop info_ptr));
-#  endif
-#endif /* CHECK_FOR_INVALID_INDEX */
-
-/*******************************************************************************
- *  IMPLEMENTATION OPTIONS
- *******************************************************************************
- *
- * Support for arbitrary implementation-specific optimizations.  The API allows
- * particular options to be turned on or off.  'Option' is the number of the
- * option and 'onoff' is 0 (off) or non-0 (on).  The value returned is given
- * by the PNG_OPTION_ defines below.
- *
- * HARDWARE: normally hardware capabilites, such as the Intel SSE instructions,
- *           are detected at run time, however sometimes it may be impossible
- *           to do this in user mode, in which case it is necessary to discover
- *           the capabilities in an OS specific way.  Such capabilities are
- *           listed here when libpng has support for them and must be turned
- *           ON by the application if present.
- *
- * SOFTWARE: sometimes software optimizations actually result in performance
- *           decrease on some architectures or systems, or with some sets of
- *           PNG images.  'Software' options allow such optimizations to be
- *           selected at run time.
- */
-#ifdef PNG_SET_OPTION_SUPPORTED
-#ifdef PNG_ARM_NEON_API_SUPPORTED
-#  define PNG_ARM_NEON   0 /* HARDWARE: ARM Neon SIMD instructions supported */
 #endif
-#define PNG_OPTION_NEXT  2 /* Next option - numbers must be even */
-
-/* Return values: NOTE: there are four values and 'off' is *not* zero */
-#define PNG_OPTION_UNSET   0 /* Unset - defaults to off */
-#define PNG_OPTION_INVALID 1 /* Option number out of range */
-#define PNG_OPTION_OFF     2
-#define PNG_OPTION_ON      3
-
-PNG_EXPORT(236, int, png_set_option, (png_structp png_ptr, int option,
-   int onoff));
-#endif
-
-/*******************************************************************************
- *  END OF HARDWARE OPTIONS
- ******************************************************************************/

 /* Maintainer: Put new public prototypes here ^, in libpng.3, and project
 * defs
@@ -2711,7 +2668,7 @@ PNG_EXPORT(236, int, png_set_option, (png_structp png_ptr, int option,
 * scripts/symbols.def as well.
 */
 #ifdef PNG_EXPORT_LAST_ORDINAL
-  PNG_EXPORT_LAST_ORDINAL(236);
+  PNG_EXPORT_LAST_ORDINAL(235);
 #endif

 #ifdef __cplusplus
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@

 /* pngconf.h - machine configurable file for libpng
 *
- * libpng version 1.5.15rc01 - March 21, 2013
+ * libpng version 1.5.15beta03 - February 7, 2013
 *
 * Copyright (c) 1998-2013 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -197,7 +197,7 @@
 #    define PNGCAPI __watcall
 #  endif

-#  if defined(__GNUC__) || (defined(_MSC_VER) && (_MSC_VER >= 800))
+#  if defined(__GNUC__) || (defined (_MSC_VER) && (_MSC_VER >= 800))
 #    define PNGCAPI __cdecl
 #    if PNG_API_RULE == 1
       /* If this line results in an error __stdcall is not understood and
--- a/pngget.c
+++ b/pngget.c
@@ -1128,7 +1128,6 @@ png_get_io_chunk_name (png_structp png_ptr)
 #endif /* ?PNG_IO_STATE_SUPPORTED */

 #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#  ifdef PNG_GET_PALETTE_MAX_SUPPORTED
 int PNGAPI
 png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr)
 {
@@ -1137,7 +1136,6 @@ png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr)

   return (-1);
 }
-#  endif
 #endif

 #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -2,11 +2,11 @@
 /* pngpriv.h - private declarations for use inside libpng
 *
 * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2013 Glenn Randers-Pehrson
+ * 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.)
 *
- * Last changed in libpng 1.5.15 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.10 [March 29, 2012]
 *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
@@ -238,7 +238,7 @@
   /* Modern compilers support restrict, but assume not for anything not
    * recognized here:
    */
-#  if defined(__GNUC__) || defined(_MSC_VER) || defined(__WATCOMC__)
+#  if defined __GNUC__ || defined _MSC_VER || defined __WATCOMC__
 #     define PNG_RESTRICT restrict
 #  else
 #     define PNG_RESTRICT
@@ -1637,7 +1637,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)
+#if (defined PNG_READ_GAMMA_SUPPORTED) || (defined PNG_cHRM_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.
--- 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.5.15 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.14 [January 24, 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.)
@@ -2198,8 +2198,8 @@ png_do_read_transformations(png_structp png_ptr, png_row_infop row_info)
      png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1);
 #endif

-#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)
+#if (defined PNG_READ_BACKGROUND_SUPPORTED) ||\
+   (defined PNG_READ_ALPHA_MODE_SUPPORTED)
   if (png_ptr->transformations & PNG_COMPOSE)
      png_do_compose(row_info, png_ptr->row_buf + 1, png_ptr);
 #endif
@@ -2210,8 +2210,8 @@ png_do_read_transformations(png_structp png_ptr, png_row_infop row_info)
      /* Because RGB_TO_GRAY does the gamma transform. */
      !(png_ptr->transformations & PNG_RGB_TO_GRAY) &&
 #endif
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)
+#if (defined PNG_READ_BACKGROUND_SUPPORTED) ||\
+   (defined PNG_READ_ALPHA_MODE_SUPPORTED)
      /* Because PNG_COMPOSE does the gamma transform if there is something to
       * do (if there is an alpha channel or transparency.)
       */
@@ -3477,8 +3477,8 @@ png_build_grayscale_palette(int bit_depth, png_colorp palette)


 #ifdef PNG_READ_TRANSFORMS_SUPPORTED
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)
+#if (defined PNG_READ_BACKGROUND_SUPPORTED) ||\
+   (defined PNG_READ_ALPHA_MODE_SUPPORTED)
 /* Replace any alpha or transparency with the supplied background color.
 * "background" is already in the screen gamma, while "background_1" is
 * at a gamma of 1.0.  Paletted files have already been taken care of.
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@

 /* pngrutil.c - utilities to read a PNG file
 *
- * Last changed in libpng 1.5.15 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.14 [January 24, 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.)
@@ -3161,7 +3161,7 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display)
                  {
                     png_uint_32p dp32 = (png_uint_32p)dp;
                     png_const_uint_32p sp32 = (png_const_uint_32p)sp;
-                     size_t skip = (bytes_to_jump-bytes_to_copy) /
+                     unsigned int skip = (bytes_to_jump-bytes_to_copy) /
                        sizeof (png_uint_32);

                     do
@@ -3202,7 +3202,7 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display)
                  {
                     png_uint_16p dp16 = (png_uint_16p)dp;
                     png_const_uint_16p sp16 = (png_const_uint_16p)sp;
-                     size_t skip = (bytes_to_jump-bytes_to_copy) /
+                     unsigned int skip = (bytes_to_jump-bytes_to_copy) /
                        sizeof (png_uint_16);

                     do
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@

 /* pngset.c - storage of image information into info struct
 *
- * Last changed in libpng 1.5.14 [January 24, 2013]
+ * Last changed in libpng 1.5.15 [(PENDING RELEASE)]
 * 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.)
--- a/pngstruct.h
+++ b/pngstruct.h
@@ -1,11 +1,11 @@

 /* pngstruct.h - header file for PNG reference library
 *
- * Copyright (c) 1998-2013 Glenn Randers-Pehrson
+ * 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.)
 *
- * Last changed in libpng 1.5.15 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.9 [February 18, 2012]
 *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
@@ -352,13 +352,7 @@ struct png_struct_def
 /* New member added in libpng-1.5.6 */
   png_bytep big_prev_row;

-/* New member added in libpng-1.5.7 */
   void (*read_filter[PNG_FILTER_VALUE_LAST-1])(png_row_infop row_info,
      png_bytep row, png_const_bytep prev_row);
-
-   /* Options */
-#ifdef PNG_SET_OPTION_SUPPORTED
-   png_byte options;           /* On/off state (up to 4 options) */
-#endif
 };
 #endif /* PNGSTRUCT_H */
--- a/pngtest.c
+++ b/pngtest.c
@@ -1469,8 +1469,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)

   /* When the unknown vpAg/sTER chunks are written by pngtest the only way to
    * do it is to write them *before* calling png_write_end.  When unknown
-    * chunks are written by libpng, however, they are written just before IEND.
-    * There seems to be no way round this, however vpAg/sTER are not expected
+    * chunks are written by libpng, however, they are written just before IEND.     * There seems to be no way round this, however vpAg/sTER are not expected
    * after IDAT.
    */
   write_chunks(write_ptr, after_IDAT);
@@ -1949,4 +1948,4 @@ main(void)
 #endif

 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_5_15rc01 Your_png_h_is_not_version_1_5_15rc01;
+typedef png_libpng_version_1_5_15beta03 Your_png_h_is_not_version_1_5_15beta03;
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@

 /* pngwrite.c - general routines to write a PNG file
 *
- * Last changed in libpng 1.5.15 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.14 [January 24, 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.)
@@ -456,9 +456,7 @@ png_create_write_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
 }

 /* Alternate initialize png_ptr structure, and allocate any memory needed */
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
 static void png_reset_filter_heuristics(png_structp png_ptr); /* forward decl */
-#endif

 PNG_FUNCTION(png_structp,PNGAPI
 png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@

 VisualStudio instructions

-libpng version 1.5.15rc01 - March 21, 2013
+libpng version 1.5.15beta03 - February 7, 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.15rc01 - March 21, 2013
+ * libpng version 1.5.15beta03 - February 7, 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.15rc01 - March 21, 2013
+Makefiles for  libpng version 1.5.15beta03 - February 7, 2013

 pnglibconf.h.prebuilt       =>  Stores configuration settings
 makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng15.so.15.1.5.15rc01)
+                       (gcc, creates libpng15.so.15.1.5.15beta03)
 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.15rc01)
+                       (gcc, creates libpng15.so.15.1.5.15beta03)
 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.15rc01)
+                       creates libpng15.so.15.1.5.15beta03)
 makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
 makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng15.so.15.1.5.15rc01)
+                       creates libpng15.so.15.1.5.15beta03)
 makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng15.so.15.1.5.15rc01)
+                       creates libpng15.so.15.1.5.15beta03)
 makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
 makefile.sunos    =>  Sun makefile
 makefile.32sunu   =>  Sun Ultra 32-bit makefile
--- a/scripts/checksym.awk
+++ b/scripts/checksym.awk
@@ -5,9 +5,8 @@
 # awk -f checksym.awk official-def list-to-check
 #
 # Output is a file in the current directory called 'symbols.new',
-# the value of the awk variable "of" (which can be changed on the
-# command line if required.)  stdout holds error messages.  Error
-# code indicates success or failure.
+# stdout holds error messages.  Error code indicates success or
+# failure.
 #
 # NOTE: this is a pure, old fashioned, awk script.  It will
 # work with any awk
@@ -22,7 +21,6 @@ BEGIN{
   mastero = 0      # highest ordinal in master file
   symbolo = 0      # highest ordinal in png.h
   missing = "error"# log an error on missing symbols
-   of="symbols.new" # default to a fixed name
 }

 # Read existing definitions from the master file (the first
@@ -113,16 +111,6 @@ END{
      err = 1
   }
   unexported=0
-   # Add a standard header to symbols.new:
-   print ";Version INSERT-VERSION-HERE" >of
-   print ";--------------------------------------------------------------" >of
-   print "; LIBPNG symbol list as a Win32 DEF file" >of
-   print "; Contains all the symbols that can be exported from libpng" >of
-   print ";--------------------------------------------------------------" >of
-   print "LIBRARY" >of
-   print "" >of
-   print "EXPORTS" >of
-
   for (o=1; o<=lasto; ++o) {
      if (symbol[o] == "" && removed[o] == "") {
         if (unexported == 0) unexported = o
@@ -163,11 +151,11 @@ END{

      # Finally generate symbols.new
      if (symbol[o] != "")
-         print " " symbol[o], "@" o > of
+         print " " symbol[o], "@" o > "symbols.new"
   }

   if (err != 0) {
-      print "*** A new list is in", of, "***"
+      print "*** A new list is in symbols.new ***"
      exit 1
   }
 }
--- a/scripts/dfn.awk
+++ b/scripts/dfn.awk
@@ -31,11 +31,11 @@ NR==1 && out == "/dev/null" {

 # Output can be sorted; two lines are recognized
 $1 == "PNG_DFN_START_SORT"{
-   sort=0+$2
+   sort=$2
   next
 }

-$1 ~ /^PNG_DFN_END_SORT/{
+$1 == "PNG_DFN_END_SORT"{
   # Do a very simple, slow, sort; notice that blank lines won't be
   # output by this
   for (entry in array) {
@@ -61,143 +61,75 @@ $1 ~ /^PNG_DFN_END_SORT/{
 }

 /^[^"]*PNG_DFN *".*"[^"]*$/{
-   # A definition line, apparently correctly formated, extract the
-   # definition then replace any doubled "" that remain with a single
-   # double quote.  Notice that the original doubled double quotes
-   # may have been split by tokenization
-   #
-   # Sometimes GCC splits the PNG_DFN lines, we know this has happened
-   # if the quotes aren't closed and must read another line.  In this
-   # case it is essential to reject lines that start '#' because those
-   # are introduced #line directives.
-   orig=$0
-   line=$0
-   lineno=FNR
-   if (lineno == "") lineno=NR
+    # A definition line, apparently correctly formated, extract the
+    # definition then replace any doubled "" that remain with a single
+    # double quote.  Notice that the original doubled double quotes
+    # may have been split by tokenization
+    orig=$0

-   if (sub(/^[^"]*PNG_DFN *"/,"",line) != 1) {
-	print "line", lineno ": processing failed:"
+    if (gsub(/^[^"]*PNG_DFN *"/,"") != 1 || gsub(/"[^"]*$/, "") != 1) {
+	print "line", NR, "processing failed:"
 	print orig
+	print $0
 	err=1
-       next
-   } else {
+    } else {
 	++out_count
-   }
+    }

-   # Now examine quotes within the value:
-   #
-   #   @" - delete this and any following spaces
-   #   "@ - delete this and any preceding spaces
-   #   @' - replace this by a double quote
-   #
-   # This allows macro substitution by the C compiler thus:
-   #
-   #   #define first_name John
-   #   #define last_name Smith
-   #
-   #	PNG_DFN"#define name @'@" first_name "@ @" last_name "@@'"
-   #
-   # Might get C preprocessed to:
-   #
-   #   PNG_DFN "#define foo @'@" John "@ @" Smith "@@'"
-   #
-   # Which this script reduces to:
-   #
-   #	#define name "John Smith"
-   #
-   while (1) {
-      # While there is an @" remove it and the next "@
-      if (line ~ /@"/) {
-         if (line ~ /@".*"@/) {
-            # Do this special case first to avoid swallowing extra spaces
-            # before or after the @ stuff:
-            if (!sub(/@" *"@/, "", line)) {
-               # Ok, do it in pieces - there has to be a non-space between the
-               # two.  NOTE: really weird things happen if a leading @" is
-               # lost - the code will error out below (I believe).
-               if (!sub(/@" */, "", line) || !sub(/ *"@/, "", line)) {
-                  print "line", lineno, ": internal error:", orig
-                  exit 1
-               }
-            }
-         }
+    # Now examine quotes within the value:
+    #
+    #   @" - delete this and any following spaces
+    #   "@ - delete this and any original spaces
+    #   @' - replace this by a double quote
+    #
+    # This allows macro substitution by the C compiler thus:
+    #
+    #   #define first_name John
+    #   #define last_name Smith
+    #
+    #	PNG_DFN"#define name @'@" first_name "@ @" last_name "@@'"
+    #
+    # Might get C preprocessed to:
+    #
+    #   PNG_DFN "#define foo @'@" John "@ @" Smith "@@'"
+    #
+    # Which this script reduces to:
+    #
+    #	#define name "John Smith"
+    #
+    while (sub(/@" */, "")) {
+	if (!sub(/ *"@/, "")) {
+	    print "unbalanced @\" ... \"@ pair"
+	    err=1
+	    break
+	}
+    }

-         # There is no matching "@.  Assume a split line
-         else while (1) {
-            if (getline nextline) {
-               # If the line starts with '#' it is a preprocesor line directive
-               # from cc -E, skip it:
-               if (nextline !~ /^#/) {
-                  line = line " " nextline
-                  break
-               }
-            } else {
-               # This is end-of-input - probably a missig "@ on the first line:
-               print "line", lineno ": unbalanced @\" ... \"@ pair"
-               err=1
-               next
-            }
-         }
+    # Put any needed double quotes in
+    gsub(/@'/,"\"")

-         # Keep going until all the @" have gone
-         continue
-      }
+    # Remove any trailing spaces (not really required, but for
+    # editorial consistency
+    sub(/ *$/, "")

-      # Attempt to remove a trailing " (not preceded by '@') - if this can
-      # be done stop now, if not assume a split line again
-      if (sub(/"[^"]*$/, "", line))
-         break
+    if (sort)
+       array[$(sort)] = $0

-      # Read another line
-      while (1) {
-         if (getline nextline) {
-            if (nextline !~ /^#/) {
-               line = line " " nextline
-               # Go back to stripping @" "@ pairs
-               break
-            }
-         } else {
-            print "line", lineno ": unterminated PNG_DFN string"
-            err=1
-            next
-         }
-      }
-   }
-
-   # Put any needed double quotes in (at the end, because these would otherwise
-   # interfere with the processing above.)
-   gsub(/@'/,"\"", line)
-
-   # Remove any trailing spaces (not really required, but for
-   # editorial consistency
-   sub(/ *$/, "", line)
-
-   # Remove trailing CR
-   sub(/
-$/, "", line)
-
-   if (sort) {
-      if (split(line, parts) < sort) {
-         print "line", lineno ": missing sort field:", line
-         err=1
-      } else
-         array[parts[sort]] = line
-   }
-
-   else
-      print line >out
+    else
+       print $0 >out
+    next
 }

 /PNG_DFN/{
-/PNG_DFN/{
-   print "line", NR, "incorrectly formated PNG_DFN line:"
-   print $0
+    print "line", NR, "incorrectly formated PNG_DFN line:"
+    print $0
+    err = 1
 }

 END{
-END{
+    if (out_count > 0 || err > 0)
 	exit err

-
-   print "no definition lines found"
+    print "no definition lines found"
+    exit 1
 }
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@

 # Modeled after libxml-config.

-version=1.5.15rc01
+version=1.5.15beta03
 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.15rc01
+Version: 1.5.15beta03
 Libs: -L${libdir} -lpng15
 Cflags: -I${includedir}
--- a/scripts/makefile.freebsd
+++ b/scripts/makefile.freebsd
@@ -26,24 +26,19 @@ SYMLINKS=       libpng/png.h ${INCSDIR}/../png.h \
 		libpng/pngconf.h ${INCSDIR}/../pngconf.h \
 		libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h

-# where make install finds libz.a and zlib.h
-ZLIBLIB=	/usr/lib
-ZLIBINC=	/usr/include
-
-LDADD+=        -lm -lz
-#LDADD+=       -lm -lz -lssp_nonshared   # for OSVERSION < 800000 ?
+LDADD+=         -lm -lz
+#LDADD+=         -lm -lz -lssp_nonshared   # for OSVERSION >= 800000 ?

 DPADD+=         ${LIBM} ${LIBZ}

-CFLAGS+= -I. -I${ZLIBINC}
+CFLAGS+= -I.

 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

 pngtest: pngtest.o libpng.a
-	${CC} ${CFLAGS} -L. -static -o pngtest pngtest.o -L${ZLIBLIB} \
-	-lpng ${LDADD}
+	${CC} ${CFLAGS} -L. -static -o pngtest pngtest.o -lpng -lz -lm

 CLEANFILES= pngtest pngtest.o pngout.png

--- 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.15rc01
+SHLIB_MINOR=	1.5.15beta03
 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.15rc01
+SHLIB_MINOR=	1.5.15beta03
 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.15rc01
+SHLIB_MINOR=	1.5.15beta03

 LIB=	png
 SRCS=	png.c pngerror.c pngget.c pngmem.c pngpread.c \
--- a/scripts/options.awk
+++ b/scripts/options.awk
@@ -53,7 +53,7 @@ BEGIN{
   comment=start "/*"           # Comment start
   cend="*/" end                # Comment end
   def=start "#define PNG_"     # Arbitrary define
-   sup="_SUPPORTED" end         # end supported option
+   sup="_SUPPORTED 1" end       # end supported option
   und=comment "#undef PNG_"    # Unsupported option
   une="_SUPPORTED" cend        # end unsupported option
   error=start "ERROR:"         # error message, terminate with 'end'
@@ -64,15 +64,11 @@ BEGIN{
   logunsupported=0             # write unsupported options too

   # Precreate arrays
-   # for each option:
   option[""] = ""    # list of all options: default enabled/disabled
   done[""] = 1       # marks option as having been output
   requires[""] = ""  # requires by option
   iffs[""] = ""      # if by option
   enabledby[""] = "" # options that enable it by option
-   sets[""] = ""      # settings set by each option
-   setval[""] = ""    # value to set (indexed: 'option sets[option]')
-   # for each setting:
   setting[""] = ""   # requires by setting
   defaults[""] = ""  # used for a defaulted value
   doneset[""] = 1    # marks setting as having been output
@@ -204,7 +200,7 @@ $1 == "com"{
   if (NF > 1) {
      # sub(/^[ 	]*com[ 	]*/, "")
      $1 = ""
-      print comment $0, cend >out
+      print comment, $0, cend >out
   } else
      print start end >out
   next
@@ -241,9 +237,7 @@ $1 == "file" && NF >= 2{
   next
 }

-# option NAME ( (requires|enables|if) NAME* | on | off | disabled |
-#                sets SETTING VALUE+ )*
-#     
+# option NAME ( (requires|enables|if) NAME* | on | off | disabled )*
 #   Declares an option 'NAME' and describes its default setting (disabled)
 #   and its relationship to other options.  The option is disabled
 #   unless *all* the options listed after 'requires' are set and at
@@ -258,152 +252,95 @@ $1 == "file" && NF >= 2{
 #   be later) entry may turn an option on or off explicitly.

 $1 == "option" && NF >= 2{
-   opt = $2
-   sub(/,$/,"",opt)
-   onoff = option[opt]  # records current (and the default is "", enabled)
+   onoff = option[$2]  # records current (and the default is "", enabled)
   key = ""
-   istart = 3
-   do {
-      if (istart == 1) {     # continuation line
-         val = getline
-
-         if (val != 1) { # error reading it
-            if (val == 0)
-               print "option", opt ": ERROR: missing contination line"
-            else
-               print "option", opt ": ERROR: error reading continuation line"
-
-            # This is a hard error
-            err = 1 # prevent END{} running
-            exit 1
-         }
-      }
-
-      for (i=istart; i<=NF; ++i) {
-         val=$(i)
-         sub(/,$/,"",val)
-         if (val == "on" || val == "off" || val == "disabled") {
-            key = ""
-            if (onoff != val) {
-               # on or off can zap disabled or enabled:
-               if (onoff == "" || (onoff == "disabled" || onoff == "enabled") &&
-                   (val == "on" || val == "off")) {
-                  # It's easy to mis-spell the option when turning it
-                  # on or off, so warn about it here:
-                  if (onoff == "" && (val == "on" || val == "off")) {
-                     print "option", opt ": ERROR: turning unrecognized option", val
-                     # For the moment error out - it is safer
-                     err = 1 # prevent END{} running
-                     exit 1
-                  }
-                  onoff = val
-               } else {
-                  # Print a message, otherwise the error
-                  # below is incomprehensible
-                  print "option", opt ": currently", onoff ": attempt to turn", val
-                  break
+   for (i=3; i<=NF; ++i) {
+      if ($(i) == "on" || $(i) == "off" || $(i) == "disabled") {
+         key = ""
+         if (onoff != $(i)) {
+            # on or off can zap disabled or enabled:
+            if (onoff == "" || (onoff == "disabled" || onoff == "enabled") && ($(i) == "on" || $(i) == "off")) {
+               # It's easy to mis-spell the option when turning it
+               # on or off, so warn about it here:
+               if (onoff == "" && ($(i) == "on" || $(i) == "off")) {
+                  print $2 ": ERROR: turning unrecognized option", $(i)
+                  # For the moment error out - it is safer
+                  err = 1 # prevent END{} running
+                  exit 1
               }
+               onoff = $(i)
+            } else {
+               # Print a message, otherwise the error
+               # below is incomprehensible
+               print $2 ": currently", onoff ": attempt to turn", $(i)
+               break
            }
-         } else if (val == "requires" || val == "if" || val == "enables" || val =="sets") {
-            key = val
-         } else if (key == "requires") {
-            requires[opt] = requires[opt] " " val
-         } else if (key == "if") {
-            iffs[opt] = iffs[opt] " " val
-         } else if (key == "enables") {
-            enabledby[val] = enabledby[val] " " opt
-         } else if (key == "sets") {
-            sets[opt] = sets[opt] " " val
-            key = "setval"
-            set = val
-         } else if (key == "setval") {
-            setval[opt " " set] = setval[opt " " set] " " val
-         } else
-            break # bad line format
-      }
-
-      istart = 1
-   } while (i > NF && $0 ~ /,$/)
+         }
+      } else if ($(i) == "requires" || $(i) == "if" || $(i) == "enables") {
+         key = $(i)
+      } else if (key == "requires") {
+         requires[$2] = requires[$2] " " $(i)
+      } else if (key == "if") {
+         iffs[$2] = iffs[$2] " " $(i)
+      } else if (key == "enables") {
+         enabledby[$(i)] = enabledby[$(i)] " " $2
+      } else
+         break # bad line format
+   }

   if (i > NF) {
      # Set the option, defaulting to 'enabled'
      if (onoff == "") onoff = "enabled"
-      option[opt] = onoff
+      option[$2] = onoff
      next
   }
   # Else fall through to the error handler
 }

-# chunk NAME [requires OPT] [enables LIST] [on|off|disabled]
+# chunk NAME [requires OPT] [on|off|disabled]
 #   Expands to the 'option' settings appropriate to the reading and
 #   writing of an ancilliary PNG chunk 'NAME':
 #
 #   option READ_NAME requires READ_ANCILLARY_CHUNKS [READ_OPT]
-#   option READ_NAME enables NAME LIST
+#   option READ_NAME enables NAME
 #   [option READ_NAME off]
 #   option WRITE_NAME requires WRITE_ANCILLARY_CHUNKS [WRITE_OPT]
-#   option WRITE_NAME enables NAME LIST
+#   option WRITE_NAME enables NAME
 #   [option WRITE_NAME off]

 pre != 0 && $1 == "chunk" && NF >= 2{
   # 'chunk' is handled on the first pass by writing appropriate
   # 'option' lines into the intermediate file.
-   opt = $2
-   sub(/,$/,"",opt)
   onoff = ""
   reqread = ""
   reqwrite = ""
-   enables = ""
-   req = 0
-   istart = 3
-   do {
-      if (istart == 1) {     # continuation line
-         val = getline
-
-         if (val != 1) { # error reading it
-            if (val == 0)
-               print "chunk", opt ": ERROR: missing contination line"
-            else
-               print "chunk", opt ": ERROR: error reading continuation line"
-
-            # This is a hard error
-            err = 1 # prevent END{} running
-            exit 1
-         }
-      }
-
+   i = 3 # indicates format error
+   if (NF > 2) {
      # read the keywords/additional OPTS
-      for (i=istart; i<=NF; ++i) {
-         val = $(i)
-         sub(/,$/,"",val)
-         if (val == "on" || val == "off" || val == "disabled") {
-            if (onoff != val) {
+      req = 0
+      for (i=3; i<=NF; ++i) {
+         if ($(i) == "on" || $(i) == "off" || $(i) == "disabled") {
+            if (onoff != $(i)) {
               if (onoff == "")
-                  onoff = val
+                  onoff = $(i)
               else
                  break # on/off conflict
            }
-            req = 0
-         } else if (val == "requires")
+         } else if ($(i) == "requires")
            req = 1
-         else if (val == "enables")
-            req = 2
-         else if (req == 1){
-            reqread = reqread " READ_" val
-            reqwrite = reqwrite " WRITE_" val
-         } else if (req == 2)
-            enables = enables " " val
-         else
+         else if (req != 1)
            break # bad line: handled below
+         else {
+            reqread = reqread " READ_" $(i)
+            reqwrite = reqwrite " WRITE_" $(i)
+         }
      }
-
-      istart = 1
-   } while (i > NF && $0 ~ /,$/)
+   }

   if (i > NF) {
      # Output new 'option' lines to the intermediate file (out)
-      print "option READ_" opt, "requires READ_ANCILLARY_CHUNKS" reqread, "enables", opt enables , onoff >out
-      print "option WRITE_" opt, "requires WRITE_ANCILLARY_CHUNKS" reqwrite, "enables", opt enables, onoff >out
+      print "option READ_" $2, "requires READ_ANCILLARY_CHUNKS" reqread, "enables", $2, onoff >out
+      print "option WRITE_" $2, "requires WRITE_ANCILLARY_CHUNKS" reqwrite, "enables", $2, onoff >out
      next
   }
   # Else hit the error handler below - bad line format!
@@ -534,7 +471,83 @@ END{
      exit 0
   }

-   # Do the options first (allowing options to set settings).  The dependency
+   # Do the 'setting' values first, the algorithm the standard
+   # tree walk (O(1)) done in an O(2) while/for loop; interations
+   # settings x depth, outputing the deepest required macros
+   # first.
+   print "" >out
+   print "/* SETTINGS */" >out
+   print comment, "settings", cend >out
+   # Sort (in dfn.awk) on field 2, the setting name
+   print "PNG_DFN_START_SORT 2" >out
+   finished = 0
+   while (!finished) {
+      finished = 1
+      movement = 0 # done nothing
+      for (i in setting) if (!doneset[i]) {
+         nreqs = split(setting[i], r)
+         if (nreqs > 0) {
+            for (j=1; j<=nreqs; ++j) if (!doneset[r[j]]) {
+               break
+            }
+            if (j<=nreqs) {
+               finished = 0
+               continue # try a different setting
+            }
+         }
+
+         # All the requirements have been processed, output
+         # this setting.
+         if (deb) print "setting", i
+         deflt = defaults[i]
+         # A leading @ means leave it unquoted so the preprocessor
+         # can substitute the build time value
+         if (deflt ~ /^ @/)
+            deflt = " " subs substr(deflt, 3) sube
+         # Remove any spurious trailing spaces
+         sub(/ *$/,"",deflt)
+         print "" >out
+         print "/* setting: ", i >out
+         print " *   requires:" setting[i] >out
+         print " *   default: ", defaults[i] defltinfo, "*/" >out
+         if (defaults[i] == "") { # no default, only check if defined
+            print "#ifdef PNG_" i >out
+         }
+         for (j=1; j<=nreqs; ++j) {
+            print "# ifndef PNG_" r[j] >out
+            print error, i, "requires", r[j] end >out
+            print "# endif" >out
+         }
+         if (defaults[i] != "") { # default handling
+            print "#ifdef PNG_" i >out
+         }
+         # PNG_<i> is defined, so substitute the value:
+         print def i, subs "PNG_" i sube end >out
+         if (defaults[i] != "") {
+            print "#else /*default*/" >out
+            # And add the default definition for the benefit
+            # of later settings an options test:
+            print "# define PNG_" i deflt >out
+            print def i deflt end >out
+         }
+         print "#endif" >out
+
+         doneset[i] = 1
+         ++movement
+      }
+
+      if (!finished && !movement) {
+         print "setting: loop or missing setting in 'requires', cannot process:"
+         for (i in setting) if (!doneset[i]) {
+            print "  setting", i, "requires" setting[i]
+         }
+         exit 1
+      }
+   }
+   print "PNG_DFN_END_SORT" >out
+   print comment, "end of settings", cend >out
+
+   # Now do the options - somewhat more complex.  The dependency
   # tree is thus:
   #
   #   name     >     name
@@ -626,7 +639,7 @@ END{
   }
   if (err) exit 1

-   # Sort options:
+   # Sort options too
   print "PNG_DFN_START_SORT 2" >out

   # option[i] is now the complete list of all the tokens we may
@@ -666,9 +679,8 @@ END{
         print "" >out
         print "/* option:", i, option[i] >out
         print " *   requires:  " requires[i] >out
-         print " *   if:        " iffs[i] >out
-         print " *   enabled-by:" enabledby[i] >out
-         print " *   sets:      " sets[i], "*/" >out
+         print " *   if:      " iffs[i] >out
+         print " *   enabled-by:" enabledby[i], "*/" >out
         print "#undef PNG_on" >out
         print "#define PNG_on 1" >out

@@ -751,21 +763,6 @@ END{
            print error, i, "is on: enabled by:" iffs[i] enabledby[i] ", requires" requires[i] end >out
         } else if (i !~ /^ok_/) {
            print def i sup >out
-            # Supported option, set required settings
-            nreqs = split(sets[i], r)
-            for (j=1; j<=nreqs; ++j) {
-               print "#    ifdef PNG_set_" r[j] >out
-               # Some other option has already set a value:
-               print error, i, "sets", r[j] ": duplicate setting" end >out
-               print error, "   previous value: " end "PNG_set_" r[j] >out
-               print "#    else" >out
-               # Else set the default: note that this won't accept arbitrary
-               # values, the setval string must be acceptable to all the C
-               # compilers we use.  That means it must be VERY simple; a number,
-               # a name or a string.
-               print "#     define PNG_set_" r[j], setval[i " " r[j]] >out
-               print "#    endif" >out
-            }
         }
         print "#   endif /* definition */" >out
         print "#endif /*requires, if*/" >out
@@ -799,93 +796,6 @@ END{
   print "PNG_DFN_END_SORT" >out
   print comment, "end of options", cend >out

-   # Do the 'setting' values second, the algorithm the standard
-   # tree walk (O(1)) done in an O(2) while/for loop; interations
-   # settings x depth, outputing the deepest required macros
-   # first.
-   print "" >out
-   print "/* SETTINGS */" >out
-   print comment, "settings", cend >out
-   # Sort (in dfn.awk) on field 2, the setting name
-   print "PNG_DFN_START_SORT 2" >out
-   finished = 0
-   while (!finished) {
-      finished = 1
-      movement = 0 # done nothing
-      for (i in setting) if (!doneset[i]) {
-         nreqs = split(setting[i], r)
-         if (nreqs > 0) {
-            # By default assume the requires values are options, but if there
-            # is no option with that name check for a setting
-            for (j=1; j<=nreqs; ++j) if (option[r[j]] == "" && !doneset[r[j]]) {
-               break
-            }
-            if (j<=nreqs) {
-               finished = 0
-               continue # try a different setting
-            }
-         }
-
-         # All the requirements have been processed, output
-         # this setting.
-         if (deb) print "setting", i
-         deflt = defaults[i]
-         # Remove any spurious trailing spaces
-         sub(/ *$/,"",deflt)
-         # A leading @ means leave it unquoted so the preprocessor
-         # can substitute the build time value
-         if (deflt ~ /^ @/)
-            deflt = " " subs substr(deflt, 3) sube
-         print "" >out
-         print "/* setting: ", i >out
-         print " *   requires:" setting[i] >out
-         print " *   default: ", defaults[i] deflt, "*/" >out
-         for (j=1; j<=nreqs; ++j) {
-            if (option[r[j]] != "")
-               print "#ifndef PNG_" r[j] "_SUPPORTED" >out
-            else
-               print "#ifndef PNG_" r[j] >out
-            print error, i, "requires", r[j] end >out
-            print "# endif" >out
-         }
-         # The precedence is:
-         #
-         #  1) External definition; trumps:
-         #  2) Option 'sets' value; trumps:
-         #  3) Setting 'default'
-         #
-         print "#ifdef PNG_" i >out
-         # PNG_<i> is defined, so substitute the value:
-         print def i, subs "PNG_" i sube end >out
-         print "#else /* use default */" >out
-         print "# ifdef PNG_set_" i >out
-         # Value from an option 'sets' argument
-         print def i, subs "PNG_set_" i sube end >out
-         # This is so that subsequent tests on the setting work:
-         print "#  define PNG_" i, "1" >out
-         if (defaults[i] != "") {
-            print "# else /*default*/" >out
-            print def i deflt end >out
-            print "#  define PNG_" i, "1" >out
-         }
-         print "# endif /* defaults */" >out
-         print "#endif /* setting", i, "*/" >out
-
-         doneset[i] = 1
-         ++movement
-      }
-
-      if (!finished && !movement) {
-         print "setting: loop or missing setting in 'requires', cannot process:"
-         for (i in setting) if (!doneset[i]) {
-            print "  setting", i, "requires" setting[i]
-         }
-         exit 1
-      }
-   }
-   print "PNG_DFN_END_SORT" >out
-   print comment, "end of settings", cend >out
-
   # Regular end - everything looks ok
   if (protect != "") {
      print start "#endif", "/*", protect, "*/" end >out
--- a/scripts/pnglibconf.dfa
+++ b/scripts/pnglibconf.dfa
@@ -27,7 +27,7 @@ file pnglibconf.h scripts/pnglibconf.dfa PNGLCONF_H
 # The syntax is detailed in scripts/options.awk, this is a summary
 # only:
 #
-# setting <name> [requires ...] [default]
+# setting <name> [default]
 #    #define PNG_<name> <value>  /* value comes from current setting */
 # option <name> [requires ...] [if ...] [enables ...] [disabled]
 #    #define PNG_<name>_SUPPORTED if the requirements are met and
@@ -127,12 +127,6 @@ logunsupported = 1
 # - PNG_USER_VERSIONINFO_COMPANYNAME
 # - PNG_USER_VERSIONINFO_LEGALTRADEMARKS

-# It is necessary to include configures definitions here so that AC_DEFINE
-# in configure.ac works in a comprehensible way
-@#if defined(HAVE_CONFIG_H) && !defined(PNG_NO_CONFIG_H)
-@#  include "config.h"
-@#endif
-
@#ifdef PNG_USER_CONFIG
@#  include "pngusr.h"
@#endif
@@ -185,29 +179,6 @@ option READ_INT_FUNCTIONS requires READ
 option WRITE_INT_FUNCTIONS disabled
 option WRITE enables WRITE_INT_FUNCTIONS

-# This setting allows a hardware or configuration specific filter optimization
-# function to be specified, the argument is the name of the filter initializaion
-# function to use.
-
-setting FILTER_OPTIMIZATIONS
-
-# Implementation specific control of the optimizations, enabled by those
-# hardware or software options that need it (typically when run-time choices
-# must be made by the user)
-option SET_OPTION disabled
- 
-# These options are specific to the ARM NEON hardware optimizations:
-#
-# ARM_NEON: the optimization itself
-# ARM_NEON_API: allow the optimization to be switched on with png_set_hardware
-# ARM_NEON_CHECK: compile a run-time check to see if Neon extensions are
-#                 supported, this is poorly supported and deprectated - use the
-#                 png_set_hardware API.
-option ARM_NEON disabled,
-   sets FILTER_OPTIMIZATIONS png_init_filter_functions_neon
-option ARM_NEON_API disabled enables SET_OPTION ARM_NEON
-option ARM_NEON_CHECK disabled enables ARM_NEON
- 
 # Generic options - affect both read and write.

 option WARNINGS
@@ -380,12 +351,6 @@ option INCH_CONVERSIONS

 option BUILD_GRAYSCALE_PALETTE

-# This changes the default for the ARM NEON optimizations according to
-# __ARM_NEON__
-@#ifdef __ARM_NEON__
-@#  define PNG_ARM_NEON_SUPPORTED
-@#endif
-
 # IN DEVELOPMENT
 # These are currently experimental features; define them if you want

@@ -481,7 +446,7 @@ option CHECK_cHRM requires cHRM
 # but can help (in theory) on some architectures.  Only affects
 # internal structures.  Added at libpng 1.4.0

-option ALIGNED_MEMORY
+option ALIGN_MEMORY

 # Buggy compilers (e.g., gcc 2.7.2.2) need PNG_NO_POINTER_INDEXING
 # See png[wr]util.c, normally this should always be *on*
@@ -623,8 +588,3 @@ option CHECK_FOR_INVALID_INDEX enables WRITE_CHECK_FOR_INVALID_INDEX
 option READ_CHECK_FOR_INVALID_INDEX requires READ CHECK_FOR_INVALID_INDEX
 option WRITE_CHECK_FOR_INVALID_INDEX requires WRITE CHECK_FOR_INVALID_INDEX

-# added at libpng-1.5.15
-option GET_PALETTE_MAX enables READ_GET_PALETTE_MAX WRITE_GET_PALETTE_MAX
-option READ_GET_PALETTE_MAX requires READ_CHECK_FOR_INVALID_INDEX disabled
-option WRITE_GET_PALETTE_MAX requires WRITE_CHECK_FOR_INVALID_INDEX disabled
-
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -1,176 +1,25 @@
-/* 1.5.15rc01 STANDARD API DEFINITION */
+
+/* libpng STANDARD API DEFINITION */
+
 /* pnglibconf.h - library build configuration */

-/* libpng version 1.5.15rc01 - March 21, 2013 */
+/* Libpng 1.5.15beta03 - February 7, 2013 */

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

 /* This code is released under the libpng license. */
 /* For conditions of distribution and use, see the disclaimer */
 /* and license in png.h */

 /* pnglibconf.h */
-/* Machine generated file: DO NOT EDIT */
 /* Derived from: scripts/pnglibconf.dfa */
+/* If you edit this file by hand you must obey the rules expressed in */
+/* pnglibconf.dfa with respect to the dependencies between the following */
+/* symbols.  It is much better to generate a new file using */
+/* scripts/libpngconf.mak */
+
 #ifndef PNGLCONF_H
 #define PNGLCONF_H
-/* options */
-#define PNG_16BIT_SUPPORTED
-#define PNG_ALIGNED_MEMORY_SUPPORTED
-/*#undef PNG_ARM_NEON_API_SUPPORTED*/
-/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
-/*#undef PNG_ARM_NEON_SUPPORTED*/
-#define PNG_BENIGN_ERRORS_SUPPORTED
-#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
-#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_CHECK_cHRM_SUPPORTED
-#define PNG_CONSOLE_IO_SUPPORTED
-#define PNG_CONVERT_tIME_SUPPORTED
-#define PNG_EASY_ACCESS_SUPPORTED
-/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
-#define PNG_ERROR_TEXT_SUPPORTED
-#define PNG_FIXED_POINT_SUPPORTED
-#define PNG_FLOATING_ARITHMETIC_SUPPORTED
-#define PNG_FLOATING_POINT_SUPPORTED
-#define PNG_GET_PALETTE_MAX_SUPPORTED
-#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-#define PNG_INCH_CONVERSIONS_SUPPORTED
-#define PNG_INFO_IMAGE_SUPPORTED
-#define PNG_IO_STATE_SUPPORTED
-#define PNG_MNG_FEATURES_SUPPORTED
-#define PNG_POINTER_INDEXING_SUPPORTED
-#define PNG_PROGRESSIVE_READ_SUPPORTED
-#define PNG_READ_16BIT_SUPPORTED
-#define PNG_READ_ALPHA_MODE_SUPPORTED
-#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_READ_BACKGROUND_SUPPORTED
-#define PNG_READ_BGR_SUPPORTED
-#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
-#define PNG_READ_COMPRESSED_TEXT_SUPPORTED
-#define PNG_READ_EXPAND_16_SUPPORTED
-#define PNG_READ_EXPAND_SUPPORTED
-#define PNG_READ_FILLER_SUPPORTED
-#define PNG_READ_GAMMA_SUPPORTED
-#define PNG_READ_GET_PALETTE_MAX_SUPPORTED
-#define PNG_READ_GRAY_TO_RGB_SUPPORTED
-#define PNG_READ_INTERLACING_SUPPORTED
-#define PNG_READ_INT_FUNCTIONS_SUPPORTED
-#define PNG_READ_INVERT_ALPHA_SUPPORTED
-#define PNG_READ_INVERT_SUPPORTED
-#define PNG_READ_OPT_PLTE_SUPPORTED
-#define PNG_READ_PACKSWAP_SUPPORTED
-#define PNG_READ_PACK_SUPPORTED
-#define PNG_READ_QUANTIZE_SUPPORTED
-#define PNG_READ_RGB_TO_GRAY_SUPPORTED
-#define PNG_READ_SCALE_16_TO_8_SUPPORTED
-#define PNG_READ_SHIFT_SUPPORTED
-#define PNG_READ_STRIP_16_TO_8_SUPPORTED
-#define PNG_READ_STRIP_ALPHA_SUPPORTED
-#define PNG_READ_SUPPORTED
-#define PNG_READ_SWAP_ALPHA_SUPPORTED
-#define PNG_READ_SWAP_SUPPORTED
-#define PNG_READ_TEXT_SUPPORTED
-#define PNG_READ_TRANSFORMS_SUPPORTED
-#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_READ_USER_CHUNKS_SUPPORTED
-#define PNG_READ_USER_TRANSFORM_SUPPORTED
-#define PNG_READ_bKGD_SUPPORTED
-#define PNG_READ_cHRM_SUPPORTED
-#define PNG_READ_gAMA_SUPPORTED
-#define PNG_READ_hIST_SUPPORTED
-#define PNG_READ_iCCP_SUPPORTED
-#define PNG_READ_iTXt_SUPPORTED
-#define PNG_READ_oFFs_SUPPORTED
-#define PNG_READ_pCAL_SUPPORTED
-#define PNG_READ_pHYs_SUPPORTED
-#define PNG_READ_sBIT_SUPPORTED
-#define PNG_READ_sCAL_SUPPORTED
-#define PNG_READ_sPLT_SUPPORTED
-#define PNG_READ_sRGB_SUPPORTED
-#define PNG_READ_tEXt_SUPPORTED
-#define PNG_READ_tIME_SUPPORTED
-#define PNG_READ_tRNS_SUPPORTED
-#define PNG_READ_zTXt_SUPPORTED
-/*#undef PNG_SAFE_LIMITS_SUPPORTED*/
-#define PNG_SAVE_INT_32_SUPPORTED
-#define PNG_SEQUENTIAL_READ_SUPPORTED
-#define PNG_SETJMP_SUPPORTED
-#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED
-#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
-/*#undef PNG_SET_OPTION_SUPPORTED*/
-#define PNG_SET_USER_LIMITS_SUPPORTED
-#define PNG_STDIO_SUPPORTED
-#define PNG_TEXT_SUPPORTED
-#define PNG_TIME_RFC1123_SUPPORTED
-#define PNG_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_USER_CHUNKS_SUPPORTED
-#define PNG_USER_LIMITS_SUPPORTED
-#define PNG_USER_MEM_SUPPORTED
-#define PNG_USER_TRANSFORM_INFO_SUPPORTED
-#define PNG_USER_TRANSFORM_PTR_SUPPORTED
-#define PNG_WARNINGS_SUPPORTED
-#define PNG_WRITE_16BIT_SUPPORTED
-#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_WRITE_BGR_SUPPORTED
-#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-#define PNG_WRITE_FILLER_SUPPORTED
-#define PNG_WRITE_FILTER_SUPPORTED
-#define PNG_WRITE_FLUSH_SUPPORTED
-#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED
-#define PNG_WRITE_INTERLACING_SUPPORTED
-#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
-#define PNG_WRITE_INVERT_SUPPORTED
-#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-#define PNG_WRITE_PACKSWAP_SUPPORTED
-#define PNG_WRITE_PACK_SUPPORTED
-#define PNG_WRITE_SHIFT_SUPPORTED
-#define PNG_WRITE_SUPPORTED
-#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
-#define PNG_WRITE_SWAP_SUPPORTED
-#define PNG_WRITE_TEXT_SUPPORTED
-#define PNG_WRITE_TRANSFORMS_SUPPORTED
-#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
-#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-#define PNG_WRITE_bKGD_SUPPORTED
-#define PNG_WRITE_cHRM_SUPPORTED
-#define PNG_WRITE_gAMA_SUPPORTED
-#define PNG_WRITE_hIST_SUPPORTED
-#define PNG_WRITE_iCCP_SUPPORTED
-#define PNG_WRITE_iTXt_SUPPORTED
-#define PNG_WRITE_oFFs_SUPPORTED
-#define PNG_WRITE_pCAL_SUPPORTED
-#define PNG_WRITE_pHYs_SUPPORTED
-#define PNG_WRITE_sBIT_SUPPORTED
-#define PNG_WRITE_sCAL_SUPPORTED
-#define PNG_WRITE_sPLT_SUPPORTED
-#define PNG_WRITE_sRGB_SUPPORTED
-#define PNG_WRITE_tEXt_SUPPORTED
-#define PNG_WRITE_tIME_SUPPORTED
-#define PNG_WRITE_tRNS_SUPPORTED
-#define PNG_WRITE_zTXt_SUPPORTED
-#define PNG_bKGD_SUPPORTED
-#define PNG_cHRM_SUPPORTED
-#define PNG_gAMA_SUPPORTED
-#define PNG_hIST_SUPPORTED
-#define PNG_iCCP_SUPPORTED
-#define PNG_iTXt_SUPPORTED
-#define PNG_oFFs_SUPPORTED
-#define PNG_pCAL_SUPPORTED
-#define PNG_pHYs_SUPPORTED
-#define PNG_sBIT_SUPPORTED
-#define PNG_sCAL_SUPPORTED
-#define PNG_sPLT_SUPPORTED
-#define PNG_sRGB_SUPPORTED
-#define PNG_tEXt_SUPPORTED
-#define PNG_tIME_SUPPORTED
-#define PNG_tRNS_SUPPORTED
-#define PNG_zTXt_SUPPORTED
-/* end of options */
 /* settings */
 #define PNG_API_RULE 0
 #define PNG_CALLOC_SUPPORTED
@@ -185,4 +34,154 @@
 #define PNG_ZBUF_SIZE 8192
 #define PNG_sCAL_PRECISION 5
 /* end of settings */
+/* options */
+#define PNG_16BIT_SUPPORTED 1
+#define PNG_ALIGN_MEMORY_SUPPORTED 1
+#define PNG_BENIGN_ERRORS_SUPPORTED 1
+#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED 1
+#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED 1
+#define PNG_CHECK_cHRM_SUPPORTED 1
+#define PNG_CONSOLE_IO_SUPPORTED 1
+#define PNG_CONVERT_tIME_SUPPORTED 1
+#define PNG_EASY_ACCESS_SUPPORTED 1
+/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
+#define PNG_ERROR_TEXT_SUPPORTED 1
+#define PNG_FIXED_POINT_SUPPORTED 1
+#define PNG_FLOATING_ARITHMETIC_SUPPORTED 1
+#define PNG_FLOATING_POINT_SUPPORTED 1
+#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED 1
+#define PNG_INCH_CONVERSIONS_SUPPORTED 1
+#define PNG_INFO_IMAGE_SUPPORTED 1
+#define PNG_IO_STATE_SUPPORTED 1
+#define PNG_MNG_FEATURES_SUPPORTED 1
+#define PNG_POINTER_INDEXING_SUPPORTED 1
+#define PNG_PROGRESSIVE_READ_SUPPORTED 1
+#define PNG_READ_16BIT_SUPPORTED 1
+#define PNG_READ_ALPHA_MODE_SUPPORTED 1
+#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED 1
+#define PNG_READ_BACKGROUND_SUPPORTED 1
+#define PNG_READ_BGR_SUPPORTED 1
+#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED 1
+#define PNG_READ_COMPOSITE_NODIV_SUPPORTED 1
+#define PNG_READ_COMPRESSED_TEXT_SUPPORTED 1
+#define PNG_READ_EXPAND_16_SUPPORTED 1
+#define PNG_READ_EXPAND_SUPPORTED 1
+#define PNG_READ_FILLER_SUPPORTED 1
+#define PNG_READ_GAMMA_SUPPORTED 1
+#define PNG_READ_GRAY_TO_RGB_SUPPORTED 1
+#define PNG_READ_INTERLACING_SUPPORTED 1
+#define PNG_READ_INT_FUNCTIONS_SUPPORTED 1
+#define PNG_READ_INVERT_ALPHA_SUPPORTED 1
+#define PNG_READ_INVERT_SUPPORTED 1
+#define PNG_READ_OPT_PLTE_SUPPORTED 1
+#define PNG_READ_PACKSWAP_SUPPORTED 1
+#define PNG_READ_PACK_SUPPORTED 1
+#define PNG_READ_QUANTIZE_SUPPORTED 1
+#define PNG_READ_RGB_TO_GRAY_SUPPORTED 1
+#define PNG_READ_SCALE_16_TO_8_SUPPORTED 1
+#define PNG_READ_SHIFT_SUPPORTED 1
+#define PNG_READ_STRIP_16_TO_8_SUPPORTED 1
+#define PNG_READ_STRIP_ALPHA_SUPPORTED 1
+#define PNG_READ_SUPPORTED 1
+#define PNG_READ_SWAP_ALPHA_SUPPORTED 1
+#define PNG_READ_SWAP_SUPPORTED 1
+#define PNG_READ_TEXT_SUPPORTED 1
+#define PNG_READ_TRANSFORMS_SUPPORTED 1
+#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED 1
+#define PNG_READ_USER_CHUNKS_SUPPORTED 1
+#define PNG_READ_USER_TRANSFORM_SUPPORTED 1
+#define PNG_READ_bKGD_SUPPORTED 1
+#define PNG_READ_cHRM_SUPPORTED 1
+#define PNG_READ_gAMA_SUPPORTED 1
+#define PNG_READ_hIST_SUPPORTED 1
+#define PNG_READ_iCCP_SUPPORTED 1
+#define PNG_READ_iTXt_SUPPORTED 1
+#define PNG_READ_oFFs_SUPPORTED 1
+#define PNG_READ_pCAL_SUPPORTED 1
+#define PNG_READ_pHYs_SUPPORTED 1
+#define PNG_READ_sBIT_SUPPORTED 1
+#define PNG_READ_sCAL_SUPPORTED 1
+#define PNG_READ_sPLT_SUPPORTED 1
+#define PNG_READ_sRGB_SUPPORTED 1
+#define PNG_READ_tEXt_SUPPORTED 1
+#define PNG_READ_tIME_SUPPORTED 1
+#define PNG_READ_tRNS_SUPPORTED 1
+#define PNG_READ_zTXt_SUPPORTED 1
+/*#undef PNG_SAFE_LIMITS_SUPPORTED*/
+#define PNG_SAVE_INT_32_SUPPORTED 1
+#define PNG_SEQUENTIAL_READ_SUPPORTED 1
+#define PNG_SETJMP_SUPPORTED 1
+#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED 1
+#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED 1
+#define PNG_SET_USER_LIMITS_SUPPORTED 1
+#define PNG_STDIO_SUPPORTED 1
+#define PNG_TEXT_SUPPORTED 1
+#define PNG_TIME_RFC1123_SUPPORTED 1
+#define PNG_UNKNOWN_CHUNKS_SUPPORTED 1
+#define PNG_USER_CHUNKS_SUPPORTED 1
+#define PNG_USER_LIMITS_SUPPORTED 1
+#define PNG_USER_MEM_SUPPORTED 1
+#define PNG_USER_TRANSFORM_INFO_SUPPORTED 1
+#define PNG_USER_TRANSFORM_PTR_SUPPORTED 1
+#define PNG_WARNINGS_SUPPORTED 1
+#define PNG_WRITE_16BIT_SUPPORTED 1
+#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED 1
+#define PNG_WRITE_BGR_SUPPORTED 1
+#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED 1
+#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED 1
+#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED 1
+#define PNG_WRITE_FILLER_SUPPORTED 1
+#define PNG_WRITE_FILTER_SUPPORTED 1
+#define PNG_WRITE_FLUSH_SUPPORTED 1
+#define PNG_WRITE_INTERLACING_SUPPORTED 1
+#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED 1
+#define PNG_WRITE_INVERT_ALPHA_SUPPORTED 1
+#define PNG_WRITE_INVERT_SUPPORTED 1
+#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED 1
+#define PNG_WRITE_PACKSWAP_SUPPORTED 1
+#define PNG_WRITE_PACK_SUPPORTED 1
+#define PNG_WRITE_SHIFT_SUPPORTED 1
+#define PNG_WRITE_SUPPORTED 1
+#define PNG_WRITE_SWAP_ALPHA_SUPPORTED 1
+#define PNG_WRITE_SWAP_SUPPORTED 1
+#define PNG_WRITE_TEXT_SUPPORTED 1
+#define PNG_WRITE_TRANSFORMS_SUPPORTED 1
+#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED 1
+#define PNG_WRITE_USER_TRANSFORM_SUPPORTED 1
+#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED 1
+#define PNG_WRITE_bKGD_SUPPORTED 1
+#define PNG_WRITE_cHRM_SUPPORTED 1
+#define PNG_WRITE_gAMA_SUPPORTED 1
+#define PNG_WRITE_hIST_SUPPORTED 1
+#define PNG_WRITE_iCCP_SUPPORTED 1
+#define PNG_WRITE_iTXt_SUPPORTED 1
+#define PNG_WRITE_oFFs_SUPPORTED 1
+#define PNG_WRITE_pCAL_SUPPORTED 1
+#define PNG_WRITE_pHYs_SUPPORTED 1
+#define PNG_WRITE_sBIT_SUPPORTED 1
+#define PNG_WRITE_sCAL_SUPPORTED 1
+#define PNG_WRITE_sPLT_SUPPORTED 1
+#define PNG_WRITE_sRGB_SUPPORTED 1
+#define PNG_WRITE_tEXt_SUPPORTED 1
+#define PNG_WRITE_tIME_SUPPORTED 1
+#define PNG_WRITE_tRNS_SUPPORTED 1
+#define PNG_WRITE_zTXt_SUPPORTED 1
+#define PNG_bKGD_SUPPORTED 1
+#define PNG_cHRM_SUPPORTED 1
+#define PNG_gAMA_SUPPORTED 1
+#define PNG_hIST_SUPPORTED 1
+#define PNG_iCCP_SUPPORTED 1
+#define PNG_iTXt_SUPPORTED 1
+#define PNG_oFFs_SUPPORTED 1
+#define PNG_pCAL_SUPPORTED 1
+#define PNG_pHYs_SUPPORTED 1
+#define PNG_sBIT_SUPPORTED 1
+#define PNG_sCAL_SUPPORTED 1
+#define PNG_sPLT_SUPPORTED 1
+#define PNG_sRGB_SUPPORTED 1
+#define PNG_tEXt_SUPPORTED 1
+#define PNG_tIME_SUPPORTED 1
+#define PNG_tRNS_SUPPORTED 1
+#define PNG_zTXt_SUPPORTED 1
+/* end of options */
 #endif /* PNGLCONF_H */
--- a/scripts/symbols.def
+++ b/scripts/symbols.def
@@ -1,4 +1,3 @@
-;Version 1.5.15rc01
 ;--------------------------------------------------------------
 ; LIBPNG symbol list as a Win32 DEF file
 ; Contains all the symbols that can be exported from libpng
@@ -6,6 +5,7 @@
 LIBRARY

 EXPORTS
+;Version 1.5.15beta03
 png_access_version_number @1
 png_set_sig_bytes @2
 png_sig_cmp @3
@@ -241,4 +241,3 @@ EXPORTS
 png_set_cHRM_XYZ_fixed @233
 png_set_check_for_invalid_index @234
 png_get_palette_max @235
- png_set_option @236
--- a/scripts/symbols.dfn
+++ b/scripts/symbols.dfn
@@ -35,14 +35,13 @@
 * defaulted to 'off' in scripts/pnglibconf.dfa
 *
 * Maintenance: if scripts/pnglibconf.dfa options are changed
- * from, or to, 'disabled' this needs updating!
+ * from, or to, 'off' this needs updating!
 */
 #define PNG_BENIGN_ERRORS_SUPPORTED
 #define PNG_ERROR_NUMBERS_SUPPORTED
 #define PNG_READ_BIG_ENDIAN_SUPPORTED  /* should do nothing! */
 #define PNG_INCH_CONVERSIONS_SUPPORTED
 #define PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
-#define PNG_SET_OPTION_SUPPORTED

 #undef PNG_H
 #include "../png.h"
--- a/127
+++ b/127
@@ -0,0 +1,127 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=2012-06-27.10; # UTC
+
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+              [--expect-failure={yes|no}] [--color-tests={yes|no}]
+              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+END
+}
+
+# TODO: better error handling in option parsing (in particular, ensure
+# TODO: $log_file, $trs_file and $test_name are defined).
+test_name= # Used for reporting.
+log_file=  # Where to save the output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "test-driver $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) enable_hard_errors=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+  esac
+  shift
+done
+
+if test $color_tests = yes; then
+  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+  red='[0;31m' # Red.
+  grn='[0;32m' # Green.
+  lgn='[1;32m' # Light green.
+  blu='[1;34m' # Blue.
+  mgn='[0;35m' # Magenta.
+  std='[m'     # No color.
+else
+  red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here.
+"$@" >$log_file 2>&1
+estatus=$?
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  estatus=1
+fi
+
+case $estatus:$expect_failure in
+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End: