[libpng10] Imported from libpng-1.0.21.tar

[libpng10] Imported from libpng-1.0.21rc2.tar
[libpng10] Imported from libpng-1.0.21rc1.tar
2025-07-10 18:04:09 +02:00 · 2011-09-03 12:23:41 -05:00 · 2011-09-03 12:23:38 -05:00 · 2011-09-03 12:23:36 -05:00 · 2011-09-03 12:23:33 -05:00 · 2011-09-03 12:23:31 -05:00
229 changed files with 60313 additions and 79033 deletions
--- a/61
+++ b/61
@@ -1,5 +1,5 @@
-Libpng 1.5.20 - November 20, 2014
+Libpng 1.0.21 - November 15, 2006
 This is a public release of libpng, intended for use in production codes.
@@ -8,42 +8,49 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
-   libpng-1.5.20.tar.xz (LZMA-compressed, recommended)
+   libpng-1.0.21.tar.gz
-   libpng-1.5.20.tar.gz
+   libpng-1.0.21.tar.bz2
-   libpng-1.5.20.tar.bz2
+
 Source files with LF line endings (for Unix/Linux) without the
 "configure" script
   libpng-1.0.21-no-config.tar.gz
   libpng-1.0.21-no-config.tar.bz2
 Source files with CRLF line endings (for Windows), without the
 "configure" script
-   lpng1520.7z  (LZMA-compressed, recommended)
+   lpng1021.zip
-   lpng1520.zip
+   lpng1021.tar.bz2
 Project files
   libpng-1.0.21-project-netware.zip
   libpng-1.0.21-project-wince.zip
 Other information:
-   libpng-1.5.20-README.txt
+   libpng-1.0.21-README.txt
-   libpng-1.5.20-LICENSE.txt
+   libpng-1.0.21-KNOWNBUGS.txt
-   libpng-1.5.20-*.asc (armored detached GPG signatures)
+   libpng-1.0.21-LICENSE.txt
   libpng-1.0.21-Y2K-compliance.txt
-Changes since the last public release (1.5.19):
+Changes since the last public release (1.0.20):
-  Removed "option WRITE_COMPRESSED_TEXT enables WRITE_TEXT" from pnglibconf.dfa
+
-  Only mark text chunks as written after successfully writing them.
+version 1.0.21 [November 15, 2006]
-  Avoid out-of-bounds memory access in png_user_version_check().
+
-  Simplified and future-proofed png_user_version_check().
+version 1.0.21 and 1.2.13 [November 15, 2006]
-  Quieted three "comparison is always false due to limited range" compiler
+  Removed AC_FUNC_MALLOC from configure.ac
-    warnings in pngset.c
+  Work around Intel-Mac compiler bug by setting PNG_NO_MMX_CODE in pngconf.h
-  The macros passed in the command line to Borland make were ignored if
+  Change "logical" to "bitwise" throughout documentation.
-    similarly-named macros were already defined in makefiles. This behavior
+  Fix Makefile.am to not try to link to noexistent files.
-    is different from POSIX make and other make programs.  Surround the
+  Detect and fix attempt to write wrong iCCP profile length.
-    macro definitions with ifndef guards (Cosmin).
+  Fix potential buffer overflow in sPLT chunk handler.
-  Use memcpy instead of CopyMemory in the definition of png_memcpy.
+  Check all exported functions for NULL png_ptr.
    The Borland C++ build breaks otherwise (Cosmin).
  Added "-D_CRT_SECURE_NO_WARNINGS" to CFLAGS in scripts/makefile.vcwin32
  Removed the obsolete $ARCH variable from scripts/makefile.darwin.
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
-(subscription required; visit
+(subscription required; visit 
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
-to subscribe)
+to subscribe) or to glennrp at users.sourceforge.net
 or to glennrp at users.sourceforge.net
 Glenn R-P
--- a/3450
+++ b/3450
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,331 +0,0 @@
 # CMakeLists.txt
 # Copyright (C) 2007-2014 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
 cmake_minimum_required(VERSION 2.4.4)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 set(CMAKE_CONFIGURATION_TYPES "Release;Debug;MinSizeRel;RelWithDebInfo")
 project(libpng C)
 enable_testing()
 set(PNGLIB_MAJOR 1)
 set(PNGLIB_MINOR 5)
 set(PNGLIB_RELEASE 20)
 set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
 set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
 # needed packages
 find_package(ZLIB REQUIRED)
 include_directories(${ZLIB_INCLUDE_DIR})
 if(NOT WIN32)
  find_library(M_LIBRARY
    NAMES m
    PATHS /usr/lib /usr/local/lib
  )
  if(NOT M_LIBRARY)
    message(STATUS
      "math library 'libm' not found - floating point support disabled")
  endif()
 else()
  # not needed on windows
  set(M_LIBRARY "")
 endif()
 # COMMAND LINE OPTIONS
 if(DEFINED PNG_SHARED)
  option(PNG_SHARED "Build shared lib" ${PNG_SHARED})
 else()
  option(PNG_SHARED "Build shared lib" ON)
 endif()
 if(DEFINED PNG_STATIC)
  option(PNG_STATIC "Build static lib" ${PNG_STATIC})
 else()
  option(PNG_STATIC "Build static lib" ON)
 endif()
 option(PNG_TESTS  "Build libpng tests" YES)
 # Many more configuration options could be added here
 option(PNG_DEBUG         "Build with debug output" NO)
 option(PNGARG            "Disable ANSI-C prototypes" NO)
 # SET LIBNAME
 set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
 # to distinguish between debug and release lib
 set(CMAKE_DEBUG_POSTFIX "d")
 # Use the prebuilt pnglibconf.h file from the scripts folder
 # TODO: fix this by building with awk; without this no cmake build can be
 # configured directly (to do so indirectly use your local awk to build a
 # pnglibconf.h in the build directory.)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt
               ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 # OUR SOURCES
 set(libpng_public_hdrs
  png.h
  pngconf.h
  ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h
 )
 set(libpng_sources
  ${libpng_public_hdrs}
  pngdebug.h
  pnginfo.h
  pngpriv.h
  pngstruct.h
  png.c
  pngerror.c
  pngget.c
  pngmem.c
  pngpread.c
  pngread.c
  pngrio.c
  pngrtran.c
  pngrutil.c
  pngset.c
  pngtrans.c
  pngwio.c
  pngwrite.c
  pngwtran.c
  pngwutil.c
 )
 set(pngtest_sources
  pngtest.c
 )
 set(pngvalid_sources
  contrib/libtests/pngvalid.c
 )
 # SOME NEEDED DEFINITIONS
 add_definitions(-DPNG_CONFIGURE_LIBPNG)
 if(MSVC)
  add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
 endif(MSVC)
 if(PNG_DEBUG)
  add_definitions(-DPNG_DEBUG)
 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")
    set_target_properties(${PNG_LIB_NAME} PROPERTIES IMPORT_PREFIX "lib")
  endif()
  target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY})
 endif()
 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")
  endif()
  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()
 if(PNG_TESTS AND PNG_SHARED)
  # does not work with msvc due to png_lib_ver issue
  add_executable(pngtest ${pngtest_sources})
  target_link_libraries(pngtest ${PNG_LIB_NAME})
  add_test(pngtest ./pngtest ${CMAKE_CURRENT_SOURCE_DIR}/pngtest.png)
  #
  add_executable(pngvalid ${pngvalid_sources})
  target_link_libraries(pngvalid ${PNG_LIB_NAME})
  add_test(pngvalid ./pngvalid)
 endif()
 # Ensure the CMAKE_LIBRARY_OUTPUT_DIRECTORY is set
 IF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
  SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "lib")
 ENDIF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
 # Set a variable with CMake code which:
 # Creates a symlink from src to dest (if possible) or alternatively
 # copies if different.
 macro(CREATE_SYMLINK SRC_FILE DEST_FILE)
  FILE(REMOVE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${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}
        )
    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 make_directory ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
    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}" ${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})
  endif(WIN32 AND NOT CYGWIN AND NOT MSYS)
 endmacro()
 # libpng is a library so default to 'lib'
 if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
  set(CMAKE_INSTALL_LIBDIR lib)
 endif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
 # CREATE PKGCONFIG FILES
 # we use the same files like ./configure, so we have to set its vars
 # Only do this on Windows for Cygwin - the files don't make much sense outside
 # a UNIX look alike
 if(NOT WIN32 OR CYGWIN OR MINGW) 
  set(prefix      ${CMAKE_INSTALL_PREFIX})
  set(exec_prefix ${CMAKE_INSTALL_PREFIX})
  set(libdir      ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
  set(includedir  ${CMAKE_INSTALL_PREFIX}/include)
  set(LIBS        "-lz -lm")
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in
    ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY)
  CREATE_SYMLINK(${PNGLIB_NAME}.pc libpng.pc)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in
    ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY)
  CREATE_SYMLINK(${PNGLIB_NAME}-config libpng-config)
 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.20
    VERSION 15.${PNGLIB_RELEASE}.0
    SOVERSION 15
    CLEAN_DIRECT_OUTPUT 1)
 endif()
 if(PNG_STATIC)
  # MSVC doesn't use a different file extension for shared vs. static
  # libs.  We are able to change OUTPUT_NAME to remove the _static
  # for all other platforms.
  if(NOT MSVC)
    set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES
      OUTPUT_NAME ${PNG_LIB_NAME}
      CLEAN_DIRECT_OUTPUT 1)
  endif()
 endif()
 # If CMake > 2.4.x, we set a variable used below to export
 # targets to an export file.
 # TODO: Use VERSION_GREATER after our cmake_minimum_required >= 2.6.2
 if(CMAKE_MAJOR_VERSION GREATER 1 AND CMAKE_MINOR_VERSION GREATER 4)
  set(PNG_EXPORT_RULE EXPORT libpng)
 elseif(CMAKE_MAJOR_VERSION GREATER 2) # future proof
  set(PNG_EXPORT_RULE EXPORT libpng)
 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)
    # 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})
       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})
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
         DESTINATION ${CMAKE_INSTALL_LIBDIR})
    endif(NOT WIN32)
  endif(PNG_SHARED)
  if(PNG_STATIC)
    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})
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
         DESTINATION ${CMAKE_INSTALL_LIBDIR})
    endif(NOT WIN32 OR CYGWIN OR MINGW)
 endif()
 endif()
 if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
  install(FILES ${libpng_public_hdrs}   DESTINATION include)
  install(FILES ${libpng_public_hdrs}   DESTINATION include/${PNGLIB_NAME})
 endif()
 if(NOT SKIP_INSTALL_EXECUTABLES AND NOT SKIP_INSTALL_ALL )
  if(NOT WIN32 OR CYGWIN OR MINGW)
    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config DESTINATION bin)
    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config
            DESTINATION bin)
  endif(NOT WIN32 OR CYGWIN OR MINGW)
 endif()
 if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
  # Install man pages
  if(NOT PNG_MAN_DIR)
    set(PNG_MAN_DIR "share/man")
  endif()
  install(FILES libpng.3 libpngpf.3      DESTINATION ${PNG_MAN_DIR}/man3)
  install(FILES png.5                    DESTINATION ${PNG_MAN_DIR}/man5)
  # Install pkg-config files
  if(NOT WIN32 OR CYGWIN OR MINGW)
    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc
            DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config
            DESTINATION bin)
    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc
            DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config
            DESTINATION bin)
  endif(NOT WIN32 OR CYGWIN OR MINGW)
 endif()
 # On versions of CMake that support it, create an export file CMake
 # users can include() to import our targets
 if(PNG_EXPORT_RULE AND NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL )
  install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake)
 endif()
 # what's with libpng-manual.txt and all the extra files?
 # UNINSTALL
 # do we need this?
 # DIST
 # do we need this?
 # to create msvc import lib for mingw compiled shared lib
 # pexports libpng.dll > libpng.def
 # lib /def:libpng.def /machine:x86
--- a/419
+++ b/419
@@ -1,114 +1,44 @@
-Installing libpng
+Installing libpng version 1.0.21 - November 15, 2006
 Contents
   I. Simple installation
  II. Rebuilding the configure scripts
 III. Using scripts/makefile*
  IV. Using cmake
   V. Directory structure
  VI. Building with project files
 VII. Building with makefiles
 VIII. Configuring libpng for 16-bit platforms
  IX. Configuring for DOS
   X. Configuring for Medium Model
  XI. Omitted
 XII. Configuring for compiler xxx:
 XIII. Removing unwanted object code
 XIV. Changes to the build and configuration of libpng in libpng-1.5.x
  XV. Configuring libpng for multiprocessing
 XVI. Other sources of information about libpng
 I. Simple installation
 On Unix/Linux and similar systems, you can simply type
-    ./configure [--prefix=/path]
+    ./configure [--prefix=$HOME]
    make check
    make install
-and ignore the rest of this document.  "/path" is the path to the directory
+and ignore the rest of this document.
 where you want to install the libpng "lib", "include", and "bin"
 subdirectories.
-Note that "configure" is only included in the "*.tar" distributions and not
+If configure does not work on your system and you have a reasonably
-in the "*.zip" or "*.7z" distributions. If you downloaded one of those
+up-to-date set of tools, running ./autogen.sh before running ./configure
-distributions, see "Building with project files" or "Building with makefiles",
+may fix the problem.  You can also run the individual commands in
-below.
+autogen.sh with the --force option, if supported by your version of
-
+the tools.  If you run 'libtoolize --force', though, this will replace
-II. Rebuilding the configure scripts
+the distributed, patched, version of ltmain.sh with an unpatched version
-
+and your shared library builds may fail to produce libraries with the
-If configure does not work on your system, or if you have a need to
+correct version numbers.
 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:
    ./configure --enable-maintainer-mode
    make maintainer-clean
    ./autogen.sh --maintainer --clean
    ./autogen.sh --maintainer
    ./configure [--prefix=/path] [other options]
    make
    make install
    make check
 III. Using scripts/makefile*
 Instead, you can use one of the custom-built makefiles in the
 "scripts" directory
    cp scripts/pnglibconf.h.prebuilt pnglibconf.h
    cp scripts/makefile.system makefile
    make test
    make install
 The files that are presently available in the scripts directory
 are listed and described in scripts/README.txt.
 Or you can use one of the "projects" in the "projects" directory.
 Before installing libpng, you must first install zlib, if it
 is not already on your system.  zlib can usually be found
-wherever you got libpng; otherwise go to http://zlib.net.  You can place
+wherever you got libpng.  zlib can be placed in another directory,
-zlib in in the same directory as libpng or 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".
 IV. Using cmake
 If you want to use "cmake" (see www.cmake.org), type
   cmake . -DCMAKE_INSTALL_PREFIX=/path
   make
   make install
 As when using the simple configure method described above, "/path" points to
 the installation directory where you want to put the libpng "lib", "include",
 and "bin" subdirectories.
 V. Directory structure
 You can rename the directories that you downloaded (they
-might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.8"
+might be called "libpng-1.0.21" or "lpng109" and "zlib-1.2.1"
-or "zlib128") so that you have directories called "zlib" and "libpng".
+or "zlib121") so that you have directories called "zlib" and "libpng".
 Your directory structure should look like this:
@@ -116,54 +46,122 @@ Your directory structure should look like this:
      libpng  (this directory)
          INSTALL (this file)
          README
-          *.h, *.c  => libpng source files
+          *.h
-          CMakeLists.txt    =>  "cmake" script
+          *.c
          configuration files:
             configure.ac, configure, Makefile.am, Makefile.in,
             autogen.sh, config.guess, ltmain.sh, missing, libpng.pc.in,
             libpng-config.in, aclocal.m4, config.h.in, config.sub,
             depcomp, install-sh, mkinstalldirs, test-pngtest.sh
          contrib
-             gregbook, libtests, pngminim, pngminus, pngsuite, visupng
+             gregbook
             pngminus
             pngsuite
             visupng
          projects
-             cbuilder5, owatcom, visualc71, vstudio, xcode
+             beos
             c5builder (Borland)
             visualc6 (msvc)
             netware.txt
             wince.txt
          scripts
             makefile.*
             *.def (module definition files)
             etc.
          pngtest.png
          etc.
      zlib
-          README, *.h, *.c contrib, etc.
+          README
          *.h
          *.c
          contrib
          etc.
 If the line endings in the files look funny, you may wish to get the other
 distribution of libpng.  It is available in both tar.gz (UNIX style line
 endings) and zip (DOS style line endings) formats.
 VI. Building with project files
 If you are building libpng with MSVC, you can enter the
-libpng projects\visualc71 or vstudio directory and follow the instructions
+libpng projects\visualc6 directory and follow the instructions in
-in README.txt.
+projects\visualc6\README.txt.
-Otherwise enter the zlib directory and follow the instructions in zlib/README,
+You can build libpng for WindowsCE by downloading and installing
 the projects\wince directory as instructed in the projects\wince.txt file, and
 then following the instructions in the README* files.  Similarly, you can
 build libpng for Netware or Beos as instructed in projects\netware.txt
 or projects\beos.
 Else enter the zlib directory and follow the instructions in zlib/README,
 then come back here and run "configure" or choose the appropriate
 makefile.sys in the scripts directory.
-VII. Building with makefiles
+The files that are presently available in the scripts directory
 include
 makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
 makefile.elf      =>  Linux/ELF makefile symbol versioning,
                       gcc, creates libpng10.so.0.1.0.21)
 makefile.linux    =>  Linux/ELF makefile
                       (gcc, creates libpng10.so.0.1.0.21)
 makefile.gcmmx    =>  Linux/ELF makefile
                       (gcc, creates libpng10.so.0.1.0.21,
                       uses assembler code tuned for Intel MMX platform)
 makefile.gcc      =>  Generic makefile (gcc, creates static libpng.a)
 makefile.knr      =>  Archaic UNIX Makefile that converts files with
                       ansi2knr (Requires ansi2knr.c from
                       ftp://ftp.cs.wisc.edu/ghost)
 makefile.aix      =>  AIX/gcc makefile
 makefile.cygwin   =>  Cygwin/gcc makefile
 makefile.darwin   =>  Darwin makefile, can use on MacosX
 makefile.dec      =>  DEC Alpha UNIX makefile
 makefile.freebsd  =>  FreeBSD makefile
 makefile.hpgcc    =>  HPUX makefile using gcc
 makefile.hpux     =>  HPUX (10.20 and 11.00) makefile
 makefile.hp64     =>  HPUX (10.20 and 11.00) makefile, 64-bit
 makefile.ibmc     =>  IBM C/C++ version 3.x for Win32 and OS/2 (static)
 makefile.intel    =>  Intel C/C++ version 4.0 and later
 libpng.icc        =>  Project file for IBM VisualAge/C++ version 4.0 or later
 makefile.netbsd   =>  NetBSD/cc makefile, uses PNGGCCRD, makes libpng.so.
 makefile.ne10bsd  =>  NetBSD/cc makefile, uses PNGGCCRD,
                       makes libpng10.so
 makefile.openbsd  =>  OpenBSD makefile
 makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
 makefile.sggcc    =>  Silicon Graphics (gcc,
                       creates libpng10.so.0.1.0.21)
 makefile.sunos    =>  Sun makefile
 makefile.solaris  =>  Solaris 2.X makefile (gcc,
                       creates libpng10.so.0.1.0.21)
 makefile.so9      =>  Solaris 9 makefile (gcc,
                       creates libpng10.so.0.1.0.21)
 makefile.32sunu   =>  Sun Ultra 32-bit makefile
 makefile.64sunu   =>  Sun Ultra 64-bit makefile
 makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc
 makefile.mips     =>  MIPS makefile
 makefile.acorn    =>  Acorn makefile
 makefile.amiga    =>  Amiga makefile
 smakefile.ppc     =>  AMIGA smakefile for SAS C V6.58/7.00 PPC compiler
                       (Requires SCOPTIONS, copied from scripts/SCOPTIONS.ppc)
 makefile.atari    =>  Atari makefile
 makefile.beos     =>  BEOS makefile for X86
 makefile.bor      =>  Borland makefile (uses bcc)
 makefile.bc32     =>  32-bit Borland C++ (all modules compiled in C mode)
 makefile.tc3      =>  Turbo C 3.0 makefile
 makefile.dj2      =>  DJGPP 2 makefile
 makefile.msc      =>  Microsoft C makefile
 makefile.vcawin32 =>  makefile for Microsoft Visual C++ 5.0 and later (uses
                       assembler code tuned for Intel MMX platform)
 makefile.vcwin32  =>  makefile for Microsoft Visual C++ 4.0 and later (does
                       not use assembler code)
 makefile.os2      =>  OS/2 Makefile (gcc and emx, requires pngos2.def)
 pngos2.def        =>  OS/2 module definition file used by makefile.os2
 makefile.watcom   =>  Watcom 10a+ Makefile, 32-bit flat memory model
 makevms.com       =>  VMS build script
 descrip.mms       =>  VMS makefile for MMS or MMK
 SCOPTIONS.ppc     =>  Used with smakefile.ppc
 Copy the file (or files) that you need from the
 scripts directory into this directory, for example
   MSDOS example: copy scripts\makefile.msc makefile
-                  copy scripts\pnglibconf.h.prebuilt pnglibconf.h
+   UNIX example:    cp scripts/makefile.std makefile
   UNIX example:  cp scripts/makefile.std makefile
                  cp scripts/pnglibconf.h.prebuilt pnglibconf.h
 Read the makefile to see if you need to change any source or
 target directories to match your preferences.
-Then read pnglibconf.dfa to see if you want to make any configuration
+Then read pngconf.h to see if you want to make any configuration
 changes.
 Then just run "make" which will create the libpng library in
@@ -181,208 +179,37 @@ do that, run "make install" in the zlib directory first if necessary).
 Some also allow you to run "make test-installed" after you have
 run "make install".
-VIII. Configuring libpng for 16-bit platforms
+If you encounter a compiler error message complaining about the
 lines
      __png.h__ already includes setjmp.h;
      __dont__ include it again.;
 This means you have compiled another module that includes setjmp.h,
 which is hazardous because the two modules might not include exactly
 the same setjmp.h.  If you are sure that you know what you are doing
 and that they are exactly the same, then you can comment out or
 delete the two lines.  Better yet, use the cexcept interface
 instead, as demonstrated in contrib/visupng of the libpng distribution.
-You will want to look into zconf.h to tell zlib (and thus libpng) that
+Further information can be found in the README and libpng.txt
 it cannot allocate more then 64K at a time.  Even if you can, the memory
 won't be accessible.  So limit zlib and libpng to 64K by defining MAXSEG_64K.
 IX. Configuring for DOS
 For DOS users who only have access to the lower 640K, you will
 have to limit zlib's memory usage via a png_set_compression_mem_level()
 call.  See zlib.h or zconf.h in the zlib library for more information.
 X. Configuring for Medium Model
 Libpng's support for medium model has been tested on most of the popular
 compilers.  Make sure MAXSEG_64K gets defined, USE_FAR_KEYWORD gets
 defined, and FAR gets defined to far in pngconf.h, and you should be
 all set.  Everything in the library (except for zlib's structure) is
 expecting far data.  You must use the typedefs with the p or pp on
 the end for pointers (or at least look at them and be careful).  Make
 note that the rows of data are defined as png_bytepp, which is
 an "unsigned char far * far *".
 XI. Omitted
 XII. Configuring for compiler xxx:
 All includes for libpng are in pngconf.h.  If you need to add, change
 or delete an include, this is the place to do it.
 The includes that are not needed outside libpng are placed in pngpriv.h,
 which is only used by the routines inside libpng itself.
 The files in libpng proper only include pngpriv.h and png.h, which
 in turn includes pngconf.h and, as of libpng-1.5.0, pnglibconf.h.
 As of libpng-1.5.0, pngpriv.h also includes three other private header
 files, pngstruct.h, pnginfo.h, and pngdebug.h, which contain material
 that previously appeared in the public headers.
 XIII. Removing unwanted object code
 There are a bunch of #define's in pngconf.h that control what parts of
 libpng are compiled.  All the defines end in _SUPPORTED.  If you are
 never going to use a capability, you can change the #define to #undef
 before recompiling libpng and save yourself code and data space, or
 you can turn off individual capabilities with defines that begin with
 PNG_NO_.
 In libpng-1.5.0 and later, the #define's are in pnglibconf.h instead.
 You can also turn all of the transforms and ancillary chunk capabilities
 off en masse with compiler directives that define
 PNG_NO_READ[or WRITE]_TRANSFORMS, or PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS,
 or all four, along with directives to turn on any of the capabilities that
 you do want.  The PNG_NO_READ[or WRITE]_TRANSFORMS directives disable the
 extra transformations but still leave the library fully capable of reading
 and writing PNG files with all known public chunks. Use of the
 PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS directive produces a library
 that is incapable of reading or writing ancillary chunks.  If you are
 not using the progressive reading capability, you can turn that off
 with PNG_NO_PROGRESSIVE_READ (don't confuse this with the INTERLACING
 capability, which you'll still have).
 All the reading and writing specific code are in separate files, so the
 linker should only grab the files it needs.  However, if you want to
 make sure, or if you are building a stand alone library, all the
 reading files start with "pngr" and all the writing files start with "pngw".
 The files that don't match either (like png.c, pngtrans.c, etc.)
 are used for both reading and writing, and always need to be included.
 The progressive reader is in pngpread.c
 If you are creating or distributing a dynamically linked library (a .so
 or DLL file), you should not remove or disable any parts of the library,
 as this will cause applications linked with different versions of the
 library to fail if they call functions not available in your library.
 The size of the library itself should not be an issue, because only
 those sections that are actually used will be loaded into memory.
 XIV. Changes to the build and configuration of libpng in libpng-1.5.x
 Details of internal changes to the library code can be found in the CHANGES
 file and in the GIT repository logs.  These will be of no concern to the vast
 majority of library users or builders; however, the few who configure libpng
 to a non-default feature set may need to change how this is done.
 There should be no need for library builders to alter build scripts if
 these use the distributed build support - configure or the makefiles -
 however, users of the makefiles may care to update their build scripts
 to build pnglibconf.h where the corresponding makefile does not do so.
 Building libpng with a non-default configuration has changed completely.
 The old method using pngusr.h should still work correctly even though the
 way pngusr.h is used in the build has been changed; however, library
 builders will probably want to examine the changes to take advantage of
 new capabilities and to simplify their build system.
 A. Specific changes to library configuration capabilities
 The exact mechanism used to control attributes of API functions has
 changed.  A single set of operating system independent macro definitions
 is used and operating system specific directives are defined in
 pnglibconf.h
 As part of this the mechanism used to choose procedure call standards on
 those systems that allow a choice has been changed.  At present this only
 affects certain Microsoft (DOS, Windows) and IBM (OS/2) operating systems
 running on Intel processors.  As before, PNGAPI is defined where required
 to control the exported API functions; however, two new macros, PNGCBAPI
 and PNGCAPI, are used instead for callback functions (PNGCBAPI) and
 (PNGCAPI) for functions that must match a C library prototype (currently
 only png_longjmp_ptr, which must match the C longjmp function.)  The new
 approach is documented in pngconf.h
 Despite these changes, libpng 1.5.0 only supports the native C function
 calling standard on those platforms tested so far (__cdecl on Microsoft
 Windows).  This is because the support requirements for alternative
 calling conventions seem to no longer exist.  Developers who find it
 necessary to set PNG_API_RULE to 1 should advise the mailing list
 (png-mng-implement) of this and library builders who use Openwatcom and
 therefore set PNG_API_RULE to 2 should also contact the mailing list.
 B. Changes to the configuration mechanism
 Prior to libpng-1.5.0 library builders who needed to configure libpng
 had either to modify the exported pngconf.h header file to add system
 specific configuration or had to write feature selection macros into
 pngusr.h and cause this to be included into pngconf.h by defining
 PNG_USER_CONFIG. The latter mechanism had the disadvantage that an
 application built without PNG_USER_CONFIG defined would see the
 unmodified, default, libpng API and thus would probably fail to link.
 These mechanisms still work in the configure build and in any makefile
 build that builds pnglibconf.h, although the feature selection macros
 have changed somewhat as described above.  In 1.5.0, however, pngusr.h is
 processed only once, at the time the exported header file pnglibconf.h is
 built.  pngconf.h no longer includes pngusr.h; therefore, pngusr.h is ignored
 after the build of pnglibconf.h and it is never included in an application
 build.
 The formerly used alternative of adding a list of feature macros to the
 CPPFLAGS setting in the build also still works; however, the macros will be
 copied to pnglibconf.h and this may produce macro redefinition warnings
 when the individual C files are compiled.
 All configuration now only works if pnglibconf.h is built from
 scripts/pnglibconf.dfa.  This requires the program awk.  Brian Kernighan
 (the original author of awk) maintains C source code of that awk and this
 and all known later implementations (often called by subtly different
 names - nawk and gawk for example) are adequate to build pnglibconf.h.
 The Sun Microsystems (now Oracle) program 'awk' is an earlier version
 and does not work; this may also apply to other systems that have a
 functioning awk called 'nawk'.
 Configuration options are now documented in scripts/pnglibconf.dfa.  This
 file also includes dependency information that ensures a configuration is
 consistent; that is, if a feature is switched off, dependent features are
 also switched off.  As a recommended alternative to using feature macros in
 pngusr.h a system builder may also define equivalent options in pngusr.dfa
 (or, indeed, any file) and add that to the configuration by setting
 DFA_XTRA to the file name.  The makefiles in contrib/pngminim illustrate
 how to do this, and also illustrate a case where pngusr.h is still required.
 After you have built libpng, the definitions that were recorded in
 pnglibconf.h are available to your application (pnglibconf.h is included
 in png.h and gets installed alongside png.h and pngconf.h in your
 $PREFIX/include directory).  Do not edit pnglibconf.h after you have built
 libpng, because than the settings would not accurately reflect the settings
 that were used to build libpng.
 XV. Configuring libpng for multiprocessing
 Libpng uses setjmp()/longjmp() for error handling.  Unfortunately setjmp()
 is known to be not thread-safe on some platforms and we don't know of
 any platform where it is guaranteed to be thread-safe.  Therefore, if
 your application is going to be using multiple threads, you should
 configure libpng with PNG_NO_SETJMP in your pngusr.dfa file, with
 -DPNG_NO_SETJMP on your compile line, or with
  #undef PNG_SETJMP_SUPPORTED
 in your pnglibconf.h or pngusr.h.
 XVI. Other sources of information about libpng:
 Further information can be found in the README and libpng-manual.txt
 files, in the individual makefiles, in png.h, and the manual pages
 libpng.3 and png.5.
 Using the ./configure script -- 16 December 2002.
 =================================================
 The ./configure script should work compatibly with what scripts/makefile.*
-did, however there are some options you might need to add to configure
+did, however there are some options you need to add to configure explicitly,
-explicitly, which previously was done semi-automatically (if you didn't edit
+which previously was done semi-automatically (if you didn't edit
 scripts/makefile.* yourself, that is)
-CFLAGS="-Wall -O -funroll-loops \
+
 CFLAGS="-Wall -O3 -funroll-loops \
 -malign-loops=2 -malign-functions=2" ./configure --prefix=/usr/include \
 --with-pkgconfigdir=/usr/lib/pkgconfig --includedir=/usr/include
 You can alternatively specify --includedir=/usr/include, /usr/local/include,
-/usr/include/libpng15, or whatever.
+/usr/include/png12, or whatever.
 If you find that the configure script is out-of-date or is not supporting
 your platform properly, try running autogen.sh to regenerate "configure",
 "Makefile.in", and the other configuration files. Then try configure again.
--- a/23
+++ b/23
@@ -0,0 +1,23 @@
 Known bugs in libpng version 1.0.21
 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when
   reading interlaced PNG files, when assembler code is enabled but running
   on a non-MMX i386 platform.
   STATUS: Under investigation.  The change to pnggccrd.c in libpng-1.2.1
   fixed a problem under FreeBSD but not the problem with NetBSD, which
   still fails as of libpng-1.2.2rc1.
 2. February 23, 2006: The custom makefiles don't build libpng with -lz.
   STATUS: This is a subject of debate. The change will probably be made
   as a part of a major overhaul of the makefiles in libpng version 1.3.0.
 3. February 24, 2006: The Makefile generated by the "configure" script
   fails to install symbolic links
   libpng12.so => libpng12.so.0.1.2.9betaN
   that are generated by the custom makefiles.
   STATUS: For now, system library builders should use the custom makefiles.
--- a/8
+++ b/8
@@ -8,10 +8,8 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
 If you modify libpng you may insert additional notices immediately following
 this sentence.
-This code is released under the libpng license.
+libpng versions 1.2.6, August 15, 2004, through 1.0.21, November 15, 2006, are
-
+Copyright (c) 2004, 2006 Glenn Randers-Pehrson, and are
 libpng versions 1.2.6, August 15, 2004, through 1.5.20, November 20, 2014, are
 Copyright (c) 2004, 2006-2014 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 +106,4 @@ certification mark of the Open Source Initiative.
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-November 20, 2014
+November 15, 2006
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,109 +1,92 @@
 # Makefile.am:
 #   Source file for Makefile.in (and hence Makefile)
 #
 # Makefile.am need only be changed on a major version number
 # change (e.g. libpng12 --> libpng13).  In that case seach
 # this file for every instance of the old base name (libpng12)
 # and change to the new one (libpng13), then change the
 # -version-number settings below so that the new values have
 # the correct major part (first field).
-PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
+PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@
 # libpng does not follow GNU file name conventions
 # "color-tests" requires automake 1.11.1 or later.  Enable it if you like,
 # to get red "FAIL" and green "PASS" notations during tests.
 # AUTOMAKE_OPTIONS = foreign color-tests
 AUTOMAKE_OPTIONS = foreign
 # test programs - run on make check, make distcheck
 TESTS_ENVIRONMENT= srcdir=$(srcdir)
 check_PROGRAMS= pngtest
 pngtest_SOURCES = pngtest.c
-pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
+pngtest_LDADD = libpng10.la
 TESTS = test-pngtest.sh
-
+TESTS_ENVIRONMENT= srcdir=$(srcdir) 
 # Only do the following if the contrib directory is present.
 check_PROGRAMS+= pngvalid
 pngvalid_SOURCES = contrib/libtests/pngvalid.c
 pngvalid_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
 TESTS += test-pngvalid-simple.sh test-pngvalid-full.sh
 # man pages
 dist_man_MANS= libpng.3 libpngpf.3 png.5
 # generate the -config scripts if required
-binconfigs= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config
+binconfigs= libpng10-config 
-EXTRA_SCRIPTS= libpng-config libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config
+EXTRA_SCRIPTS= libpng-config libpng10-config
 bin_SCRIPTS= @binconfigs@
 # rules to build libpng, only build the old library on request
-lib_LTLIBRARIES=libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
+lib_LTLIBRARIES=libpng10.la @compatlib@
-# EXTRA_LTLIBRARIES= libpng.la
+EXTRA_LTLIBRARIES= libpng.la
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngerror.c\
+libpng10_la_SOURCES = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
-	pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c pngrutil.c\
+	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
-	pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c\
+	pngwtran.c pngmem.c pngerror.c pngpread.c pnggccrd.c \
-	png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h pngusr.dfa
+	png.h pngconf.h
 libpng_la_SOURCES = $(libpng10_la_SOURCES)
-if PNG_ARM_NEON
+libpng_la_CPPFLAGS = @LIBPNG_DEFINES@
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += arm/arm_init.c\
+libpng10_la_CPPFLAGS = @LIBPNG_DEFINES@
 	arm/filter_neon.S
 endif
-nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h
+# MAJOR UPGRADE: the version-number settings below must be changed.
-
+libpng10_la_LDFLAGS = -no-undefined -export-dynamic \
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_CPPFLAGS = @LIBPNG_DEFINES@
+	-version-number 0:@PNGLIB_MINOR@:0
-
+# -rpath is needed as automake doesn't know the directory
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined -export-dynamic \
+libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-	-version-number @PNGLIB_MAJOR@@PNGLIB_MINOR@:@PNGLIB_RELEASE@:0
+	-version-number 2:@PNGLIB_MINOR@:0
 if HAVE_LD_VERSION_SCRIPT
-#   Versioned symbols and restricted exports
+  # Versioned symbols and restricted exports
-if HAVE_SOLARIS_LD
+  libpng10_la_LDFLAGS += -Wl,--version-script=libpng.vers
-  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -Wl,-M -Wl,libpng.vers
+  libpng10_la_DEPENDENCIES = libpng.vers
 else
-  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -Wl,--version-script=libpng.vers
+  # Only restricted exports when possible
-endif
+  libpng10_la_LDFLAGS += -export-symbols libpng.sym
-
+  libpng10_la_DEPENDENCIES = libpng.sym
  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.vers
 else
 #   Only restricted exports when possible
  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -export-symbols libpng.sym
  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.sym
 endif
 libpng_la_DEPENDENCIES = $(libpng10_la_DEPENDENCIES)
 #distribute headers in /usr/include/libpng/*
 pkgincludedir= $(includedir)/$(PNGLIB_BASENAME)
 pkginclude_HEADERS= png.h pngconf.h
 nodist_pkginclude_HEADERS= pnglibconf.h
 # pkg-config stuff, note that libpng.pc is always required in order
 # to get the correct library
 pkgconfigdir = @pkgconfigdir@
-pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc
+pkgconfig_DATA = libpng10.pc
 #extra source distribution files.
 EXTRA_DIST= \
-	ANNOUNCE CHANGES INSTALL LICENSE README TODO \
+	ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO \
 	pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
-	${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \
+	${srcdir}/projects/cbuilder5/* \
 	${srcdir}/projects/beos/* \
 	${srcdir}/projects/visualc6/* \
 	${srcdir}/projects/visualc71/* \
 	${srcdir}/projects/wince.txt \
 	${srcdir}/projects/netware.txt \
 	${srcdir}/scripts/* \
 	${srcdir}/contrib/gregbook/* \
 	${srcdir}/contrib/pngminus/* \
 	${srcdir}/contrib/pngsuite/* \
 	${srcdir}/contrib/visupng/* \
 	$(TESTS) \
-	CMakeLists.txt example.c libpng-manual.txt
+	example.c libpng.txt pngvcrd.c 
-SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.dfn
+CLEANFILES= pngout.png libpng10.pc libpng10-config libpng.vers \
-
+libpng.sym
 CLEANFILES= dfn.c dfn?.out *.out.? scripts/*.out.? pngout.png \
 	libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc \
 	libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers libpng.sym \
 	check.new pnglibconf.* symbols.new pngtest-log.txt \
 	$(SCRIPT_CLEANFILES)
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
 config.sub configure depcomp install-sh ltmain.sh missing
 # DFNCPP is normally just CPP - the C preprocessor - but on Solaris and maybe
 # other operating systems (NeXT?) the C preprocessor selected by configure
 # checks input tokens for validity - effectively it performs part of the ANSI-C
 # parsing - and therefore fails with the .df files.  configure.ac has special
 # checks for this and sets DFNCPP appropriately.
 DFNCPP = @DFNCPP@
 SUFFIXES = .chk .dfn .out
 $(PNGLIB_BASENAME).pc: libpng.pc
 	cp libpng.pc $@
@@ -111,158 +94,50 @@ $(PNGLIB_BASENAME).pc: libpng.pc
 $(PNGLIB_BASENAME)-config: libpng-config
 	cp libpng-config $@
-scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h
+libpng.sym: png.h pngconf.h
-scripts/symbols.out: png.h pngconf.h $(srcdir)/scripts/pnglibconf.h.prebuilt
+	rm -f $@ $@.new
 	$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS png.h | \
 		$(SED) -n -e 's|^.*PNG_FUNCTION_EXPORT[ 	]*\([a-zA-Z0-9_]*\).*$$|\1|p' \
 			-e 's|^.*PNG_DATA_EXPORT[ 	]*\([a-zA-Z0-9_]*\).*$$|\1|p' \
 			>$@.new
 	mv $@.new $@
-libpng.sym: scripts/sym.out
+libpng.vers: libpng.sym
-	rm -f $@
+	rm -f $@ $@.new
-	cp $? $@
+	$(ECHO) PNG@PNGLIB_MAJOR@_0 '{global:' > $@.new
-libpng.vers: scripts/vers.out
+	$(SED) s/$$/\;/ libpng.sym >> $@.new
-	rm -f $@
+	$(ECHO) 'local: *; };' >> $@.new
-	cp $? $@
+	mv $@.new $@
 pnglibconf.h: pnglibconf.out
 	rm -f $@
 	cp $? $@
 $(srcdir)/scripts/pnglibconf.h.prebuilt:
 	@echo "Attempting to build $@" >&2
 	@echo "This is a machine generated file, but if you want to make" >&2
 	@echo "a new one simply make 'scripts/pnglibconf.out' and copy that" >&2
 	@exit 1
-# The following is necessary to ensure that the local pnglibconf.h is used, not
+# install the .../include headers as links to the new ones
-# an installed one (this can happen immediately after on a clean system if
+install-data-hook:
-# 'make test' is the first thing the user does.)
+	cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h
-contrib/libtests/pngvalid.o pngtest.o: pnglibconf.h
+	cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/png.h png.h
 	cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pngconf.h pngconf.h
 	cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc
 	cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
-# We must use -DPNG_NO_USE_READ_MACROS here even when the library may actually
+# do evil things to libpng to cause libpng10 to be used
-# be built with PNG_USE_READ_MACROS; this prevents the read macros from
+install-exec-hook:
-# interfering with the symbol file format.
+	cd $(DESTDIR)$(bindir); rm -f libpng-config
-SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\
+	cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
-		-DPNGLIB_VERSION='@PNGLIB_VERSION@'\
+	@set -x;\
-		-DSYMBOL_PREFIX='$(SYMBOL_PREFIX)'\
+	cd $(DESTDIR)$(libdir);\
-		-DPNG_NO_USE_READ_MACROS -DPNG_BUILDING_SYMBOL_TABLE
+	for ext in a la so; do\
-
+		rm -f libpng.$$ext;\
-.dfn.out:
+                if test -f $(PNGLIB_BASENAME).$$ext; then\
-	rm -f $@ $@.c $@.?
+                       $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
-	test -d scripts || mkdir scripts || test -d scripts
+                fi;\
 	echo '#include "$<"' >$@.c
 	$(DFNCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) @LIBPNG_DEFINES@\
 	    $(CPPFLAGS) $(SYMBOL_CFLAGS) $@.c > $@.1
 	$(AWK) -f "${srcdir}/scripts/dfn.awk" out="$@.2" $@.1 1>&2
 	mv $@.2 $@
 # The .dfn file for pnglibconf.h is machine generated
 pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA)
 	rm -f $@ pnglibconf.pre $@.?
 	$(AWK) -f ${srcdir}/scripts/options.awk out="pnglibconf.pre"\
 	    version=search ${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
 	    ${srcdir}/pngusr.dfa $(DFA_XTRA) 1>&2
 	$(AWK) -f ${srcdir}/scripts/options.awk out="$@.1" pnglibconf.pre 1>&2
 	mv $@.1 $@
 # Symbol checks (.def and .out files should match)
 scripts/symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/symbols.out
 .out.chk:
 	rm -f $@ symbols.new
 	$(AWK) -f ${srcdir}/scripts/checksym.awk ${srcdir}/scripts/${*F}.def\
 	    $< >&2
 	mv symbols.new $@
 # used on demand to regenerate the standard header, CPPFLAGS should
 # be empty - no non-standard defines
 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\
 		version=search ${srcdir}/pngconf.h -\
 		${srcdir}/scripts/pnglibconf.dfa 1>&2
 	$(AWK) -f ${srcdir}/scripts/options.awk out=dfn2.out dfn1.out 1>&2
 	rm dfn1.out
 	mv dfn2.out $@
 $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS): png.h pngconf.h \
 	pnglibconf.h pngpriv.h pngdebug.h pnginfo.h pngstruct.h
 test: check-am
 # Extra checks
 check: scripts/symbols.chk
 # Don't distribute the generated script files
 dist-hook:
 	cd '$(top_distdir)'; rm -f $(SCRIPT_CLEANFILES)
 # Make links between installed files with release-specific names and the generic
 # file names.  If this install rule is run the generic names will be deleted and
 # recreated - this has obvious issues for systems with multiple installations.
 install-header-links:
 	@set -ex; cd '$(DESTDIR)$(includedir)'; for f in $(HEADERS); do \
 	   rm -f "$$f"; $(LN_S) "$(PNGLIB_BASENAME)/$$f" "$$f"; done
 uninstall-header-links:
 	cd '$(DESTDIR)$(includedir)'; rm -f $(HEADERS)
 install-libpng-pc:
 	@set -ex; cd '$(DESTDIR)$(pkgconfigdir)'; rm -f libpng.pc; \
 	   $(LN_S) '$(PNGLIB_BASENAME).pc' libpng.pc
 uninstall-libpng-pc:
 	rm -f '$(DESTDIR)$(pkgconfigdir)/libpng.pc'
 # EXT_LIST is a list of the possibly library directory extensions, this exists
 # because we can't find a good way of discovering the file extensions that are
 # actually installed on a given system, so instead we check for every extension
 # we have seen.
 EXT_LIST = a dll.a so so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@ la sl dylib
 install-library-links:
 	@set -x; cd '$(DESTDIR)$(libdir)';\
 	for ext in $(EXT_LIST); do\
 	   rm -f "libpng.$$ext";\
           if test -f "$(PNGLIB_BASENAME).$$ext"; then\
              $(LN_S) "$(PNGLIB_BASENAME).$$ext" "libpng.$$ext" || exit 1;\
           fi;\
 	done
-uninstall-library-links:
+uninstall-hook:
-	@set -x; cd '$(DESTDIR)$(libdir)'; for ext in $(EXT_LIST); do\
+	cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h
-	   rm -f "libpng.$$ext"; done
+	rm -f $(DESTDIR)$(pkgconfigdir)/libpng.pc
-
+	rm -f $(DESTDIR)$(bindir)/libpng-config
-install-libpng-config:
+	@if test -n "@compatlib@"; then\
-	@set -ex; cd '$(DESTDIR)$(bindir)'; rm -f libpng-config; \
+		set -x;\
-	   $(LN_S) '$(PNGLIB_BASENAME)-config' libpng-config
+		cd $(DESTDIR)$(libdir);\
-
+		for ext in a la so; do\
-uninstall-libpng-config:
+			rm -f libpng.$$ext;\
-	rm -f '$(DESTDIR)$(bindir)/libpng-config'
+		done;\
-
+	fi
 if DO_INSTALL_LINKS
 # If --enable-unversioned-links is specified the header and lib file links
 # will be automatically made on a 'make install':
 install-data-hook: install-header-links
 uninstall-hook: uninstall-header-links
 install-exec-hook: install-library-links
 uninstall-hook: uninstall-library-links
 endif
 if DO_INSTALL_LIBPNG_PC
 # Likewise, --install-pc causes libpng.pc to be constructed:
 install-data-hook: install-libpng-pc
 uninstall-hook: uninstall-libpng-pc
 endif
 if DO_INSTALL_LIBPNG_CONFIG
 # And --install-config:
 install-exec-hook: install-libpng-config
 uninstall-hook: uninstall-libpng-config
 endif
 # The following addition ensures that 'make all' always builds the test programs
 # too.  It used to, but some change either in libpng or configure stopped this
 # working.
 all-am: $(check_PROGRAMS)
--- a/Makefile.in
+++ b/Makefile.in
--- a/176
+++ b/176
@@ -1,11 +1,11 @@
-README for libpng version 1.5.20 - November 20, 2014 (shared library 15.0)
+README for libpng version 1.0.21 - November 15, 2006 (shared library 10.0)
 See the note about version numbers near the top of png.h
 See INSTALL for instructions on how to install libpng.
-Libpng comes in several distribution formats.  Get libpng-*.tar.gz or
+Libpng comes in several distribution formats.  Get libpng-*.tar.gz
-libpng-*.tar.xz or if you want UNIX-style line endings in the text files,
+or libpng-*.tar.bz2 if you want UNIX-style line endings in the text
-or lpng*.7z or lpng*.zip if you want DOS-style line endings.
+files, or lpng*.zip if you want DOS-style line endings.
 Version 0.89 was the first official release of libpng.  Don't let the
 fact that it's the first release fool you.  The libpng library has been in
@@ -23,25 +23,18 @@ earlier versions if you are using a shared library.  The type of the
 png_uint_32, which will affect shared-library applications that use
 this function.
-To avoid problems with changes to the internals of the png info_struct,
+To avoid problems with changes to the internals of png_info_struct,
 new APIs have been made available in 0.95 to avoid direct application
 access to info_ptr.  These functions are the png_set_<chunk> and
 png_get_<chunk> functions.  These functions should be used when
 accessing/storing the info_struct data, rather than manipulating it
 directly, to avoid such problems in the future.
-It is important to note that the APIs did not make current programs
+It is important to note that the APIs do not make current programs
 that access the info struct directly incompatible with the new
-library, through libpng-1.2.x.  In libpng-1.4.x, which was meant to
+library.  However, it is strongly suggested that new programs use
-be a transitional release, members of the png_struct and the
+the new APIs (as shown in example.c and pngtest.c), and older programs
-info_struct can still be accessed, but the compiler will issue a
+be converted to the new format, to facilitate upgrades in the future.
 warning about deprecated usage.  Since libpng-1.5.0, direct access
 to these structs is not allowed, and the definitions of the structs
 reside in private pngstruct.h and pnginfo.h header files that are not
 accessible to applications.  It is strongly suggested that new
 programs use the new APIs (as shown in example.c and pngtest.c), and
 older programs be converted to the new format, to facilitate upgrades
 in the future.
 ****
 Additions since 0.90 include the ability to compile libpng as a
@@ -61,11 +54,11 @@ to set different actions based on whether the CRC error occurred in a
 critical or an ancillary chunk.
 The changes made to the library, and bugs fixed are based on discussions
-on the PNG-implement mailing list and not on material submitted
+on the PNG-implement mailing list
-privately to Guy, Andreas, or Glenn.  They will forward any good
+and not on material submitted privately to Guy, Andreas, or Glenn.  They will
-suggestions to the list.
+forward any good suggestions to the list.
-For a detailed description on using libpng, read libpng-manual.txt.  For
+For a detailed description on using libpng, read libpng.txt.  For
 examples of libpng in a program, see example.c and pngtest.c.  For usage
 information and restrictions (what little they are) on libpng, see
 png.h.  For a description on using zlib (the compression library used by
@@ -84,21 +77,17 @@ compression library that is useful for more things than just PNG files.
 You can use zlib as a drop-in replacement for fread() and fwrite() if
 you are so inclined.
-zlib should be available at the same place that libpng is, or at zlib.net.
+zlib should be available at the same place that libpng is, or at.
 ftp://ftp.info-zip.org/pub/infozip/zlib
 You may also want a copy of the PNG specification.  It is available
 as an RFC, a W3C Recommendation, and an ISO/IEC Standard.  You can find
 these at http://www.libpng.org/pub/png/documents/
 This code is currently being archived at libpng.sf.net in the
-[DOWNLOAD] area, and at ftp://ftp.simplesystems.org.  If you can't find it
+[DOWNLOAD] area, and on CompuServe, Lib 20 (PNG SUPPORT)
-in any of those places, e-mail me, and I'll help you find it.
+at GO GRAPHSUP.  If you can't find it in any of those places,
-
+e-mail me, and I'll help you find it.
 I am not a lawyer, but I believe that the Export Control Classification
 Number (ECCN) for libpng is EAR99, which means not subject to export
 controls or International Traffic in Arms Regulations (ITAR) because it
 is open source, publicly available software, that does not contain any
 encryption software.  See the EAR, paragraphs 734.3(b)(3) and 734.7(b).
 If you have any code changes, requests, problems, etc., please e-mail
 them to me.  Also, I'd appreciate any make files or project files,
@@ -112,29 +101,31 @@ Finally, if you get any warning messages when compiling libpng
 fix.  Please mention "libpng" somewhere in the subject line.  Thanks.
 This release was created and will be supported by myself (of course
-based in a large way on Guy's and Andreas' earlier work), and the PNG
+based in a large way on Guy's and Andreas' earlier work), and the PNG group.
 development group.
-Send comments/corrections/commendations to png-mng-implement at
+Send comments/corrections/commendations to png-mng-implement at lists.sf.net
-lists.sourceforge.net (subscription required; visit
+(subscription required; visit 
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
 to subscribe) or to glennrp at users.sourceforge.net
 You can't reach Guy, the original libpng author, at the addresses
-given in previous versions of this document.  He and Andreas will
+given in previous versions of this document.  He and Andreas will read mail
-read mail addressed to the png-implement list, however.
+addressed to the png-implement list, however.
 Please do not send general questions about PNG.  Send them to
-png-mng-misc at lists.sf.net (subscription required; visit
+the (png-list at ccrc.wustl.edu, subscription required, write to
-https://lists.sourceforge.net/lists/listinfo/png-mng-misc to
+majordomo at ccrc.wustl.edu with "subscribe png-list" in your message).
-subscribe).  If you have a question about something
+On the other hand,
 please do not send libpng questions to that address, send them to me
 or to the png-implement list.  I'll
 get them in the end anyway.  If you have a question about something
 in the PNG specification that is related to using libpng, send it
 to me.  Send me any questions that start with "I was using libpng,
 and ...".  If in doubt, send questions to me.  I'll bounce them
 to others, if necessary.
 Please do not send suggestions on how to change PNG.  We have
-been discussing PNG for nineteen years now, and it is official and
+been discussing PNG for nine years now, and it is official and
 finished.  If you have suggestions for libpng, however, I'll
 gladly listen.  Even if your suggestion is not used immediately,
 it may be used later.
@@ -149,17 +140,14 @@ Files in this distribution:
      TODO          =>  Things not implemented in the current library
      Y2KINFO       =>  Statement of Y2K compliance
      example.c     =>  Example code for using libpng functions
-      libpng.3      =>  manual page for libpng (includes libpng-manual.txt)
+      libpng.3      =>  manual page for libpng (includes libpng.txt)
-      libpng-manual.txt  =>  Description of libpng and its functions
+      libpng.txt    =>  Description of libpng and its functions
      libpngpf.3    =>  manual page for libpng's private functions
      png.5         =>  manual page for the PNG format
      png.c         =>  Basic interface functions common to library
-      png.h         =>  Library function and interface declarations (public)
+      png.h         =>  Library function and interface declarations
-      pngpriv.h     =>  Library function and interface declarations (private)
+      pngconf.h     =>  System specific library configuration
-      pngconf.h     =>  System specific library configuration (public)
+      pngasmrd.h    =>  Header file for assembler-coded functions
      pngstruct.h   =>  png_struct declaration (private)
      pnginfo.h     =>  png_info struct declaration (private)
      pngdebug.h    =>  debugging macros (private)
      pngerror.c    =>  Error/warning message I/O functions
      pngget.c      =>  Functions for retrieving info from struct
      pngmem.c      =>  Memory handling functions
@@ -178,30 +166,92 @@ Files in this distribution:
      pngwrite.c    =>  High-level write functions
      pngwtran.c    =>  Write data transformations
      pngwutil.c    =>  Write utility functions
      arm           =>  Contains optimized code for the ARM platform
      contrib       =>  Contributions
       gregbook         =>  source code for PNG reading and writing, from
                            Greg Roelofs' "PNG: The Definitive Guide",
                            O'Reilly, 1999
-       libtests         =>  Test programs
+       msvctest     =>  Builds and runs pngtest using a MSVC workspace
-       pngminim         =>  Minimal decoder, encoder, and progressive decoder
+       pngminus     =>  Simple pnm2png and png2pnm programs
-                            programs demonstrating use of pngusr.dfa
+       pngsuite     =>  Test images
-       pngminus         =>  Simple pnm2png and png2pnm programs
+       visupng      =>  Contains a MSVC workspace for VisualPng
-       pngsuite         =>  Test images
+      projects      =>  Contains project files and workspaces for building DLL
-       visupng          =>  Contains a MSVC workspace for VisualPng
+       beos             =>  Contains a Beos workspace for building libpng
-      projects      =>  Contains project files and workspaces for
+       c5builder        =>  Contains a Borland workspace for building libpng
-                        building a DLL
+                            and zlib
-       owatcom          =>  Contains a WATCOM project for building libpng
+       visualc6         =>  Contains a Microsoft Visual C++ (MSVC) workspace
-       visualc71        =>  Contains a Microsoft Visual C++ (MSVC)
+                            for building libpng and zlib
-                            workspace for building libpng and zlib
+       netware.txt      =>  Contains instructions for downloading a set of
-       vstudio          =>  Contains a Microsoft Visual C++ (MSVC)
+                            project files for building libpng and zlib on
-                            workspace for building libpng and zlib
+                            Netware.
       wince.txt        =>  Contains instructions for downloading a Microsoft
                            Visual C++ (Windows CD Toolkit) workspace for
                            building libpng and zlib on WindowsCE
      scripts       =>  Directory containing scripts for building libpng:
-                            (see scripts/README.txt for the list of scripts)
+       descrip.mms      =>  VMS makefile for MMS or MMK
       makefile.std     =>  Generic UNIX makefile (cc, creates static libpng.a)
       makefile.elf     =>  Linux/ELF makefile symbol versioning,
                            gcc, creates libpng10.so.0.1.0.21)
       makefile.linux   =>  Linux/ELF makefile
                            (gcc, creates libpng10.so.0.1.0.21)
       makefile.gcmmx   =>  Linux/ELF makefile
                            (gcc, creates libpng10.so.0.1.0.21,
                            uses assembler code tuned for Intel MMX platform)
       makefile.gcc     =>  Generic makefile (gcc, creates static libpng.a)
       makefile.knr     =>  Archaic UNIX Makefile that converts files with
                            ansi2knr (Requires ansi2knr.c from
                            ftp://ftp.cs.wisc.edu/ghost)
       makefile.aix     =>  AIX makefile
       makefile.cygwin  =>  Cygwin/gcc makefile
       makefile.darwin  =>  Darwin makefile
       makefile.dec     =>  DEC Alpha UNIX makefile
       makefile.freebsd =>  FreeBSD makefile
       makefile.hpgcc   =>  HPUX makefile using gcc
       makefile.hpux    =>  HPUX (10.20 and 11.00) makefile
       makefile.hp64    =>  HPUX (10.20 and 11.00) makefile, 64 bit
       makefile.ibmc    =>  IBM C/C++ version 3.x for Win32 and OS/2 (static)
       makefile.intel   =>  Intel C/C++ version 4.0 and later
       libpng.icc       =>  Project file, IBM VisualAge/C++ 4.0 or later
       makefile.netbsd  =>  NetBSD/cc makefile, PNGGCCRD, makes libpng.so.
       makefile.ne10bsd  =>  NetBSD/cc makefile, PNGGCCRD, makes libpng10.so
       makefile.openbsd =>  OpenBSD makefile
       makefile.sgi     =>  Silicon Graphics IRIX (cc, creates static lib)
       makefile.sggcc   =>  Silicon Graphics
                            (gcc, creates libpng10.so.0.1.0.21)
       makefile.sunos   =>  Sun makefile
       makefile.solaris =>  Solaris 2.X makefile
                            (gcc, creates libpng10.so.0.1.0.21)
       makefile.so9     =>  Solaris 9 makefile
                            (gcc, creates libpng10.so.0.1.0.21)
       makefile.32sunu  =>  Sun Ultra 32-bit makefile
       makefile.64sunu  =>  Sun Ultra 64-bit makefile
       makefile.sco     =>  For SCO OSr5  ELF and Unixware 7 with Native cc
       makefile.mips    =>  MIPS makefile
       makefile.acorn   =>  Acorn makefile
       makefile.amiga   =>  Amiga makefile
       smakefile.ppc    =>  AMIGA smakefile for SAS C V6.58/7.00 PPC
                            compiler (Requires SCOPTIONS, copied from
                            scripts/SCOPTIONS.ppc)
       makefile.atari   =>  Atari makefile
       makefile.beos    =>  BEOS makefile for X86
       makefile.bor     =>  Borland makefile (uses bcc)
       makefile.bc32    =>  32-bit Borland C++ (all modules compiled in C mode)
       makefile.tc3     =>  Turbo C 3.0 makefile
       makefile.dj2     =>  DJGPP 2 makefile
       makefile.msc     =>  Microsoft C makefile
       makefile.vcawin32=>  makefile for Microsoft Visual C++ 5.0 and
                            later (uses assembler code tuned for Intel MMX
                            platform)
       makefile.vcwin32 =>  makefile for Microsoft Visual C++ 4.0 and
                            later (does not use assembler code)
       makefile.os2     =>  OS/2 Makefile (gcc and emx, requires pngos2.def)
       pngos2.def       =>  OS/2 module definition file used by makefile.os2
       makefile.watcom  =>  Watcom 10a+ Makefile, 32-bit flat memory model
       makevms.com      =>  VMS build script
       SCOPTIONS.ppc    =>  Used with smakefile.ppc
 Good luck, and happy coding.
-Glenn Randers-Pehrson (current maintainer, since 1998)
+-Glenn Randers-Pehrson (current maintainer)
 Internet: glennrp at users.sourceforge.net
 -Andreas Eric Dilger (former maintainer, 1996-1997)
--- a/14
+++ b/14
@@ -1,12 +1,12 @@
 /*
 TODO - list of things to do for libpng:
 Final bug fixes.
 Improve API by hiding the png_struct and png_info structs.
 Finish work on the no-floating-point version (including gamma compensation)
 Better C++ wrapper/full C++ implementation?
 Fix problem with C++ and EXTERN "C".
 cHRM transformation.
-Remove setjmp/longjmp usage in favor of returning error codes.
+Improve setjmp/longjmp usage or remove it in favor of returning error codes.
 Palette creation.
 Add "grayscale->palette" transformation and "palette->grayscale" detection.
 Improved dithering.
 Multi-lingual error and warning message support.
@@ -17,12 +17,8 @@ Better filter selection
   (counting huffman bits/precompression?  filter inertia?  filter costs?).
 Histogram creation.
 Text conversion between different code pages (Latin-1 -> Mac and DOS).
-Avoid building gamma tables whenever possible.
+Should we always malloc 2^bit_depth PLTE/tRNS/hIST entries for safety?
 Build gamma tables using fixed point (and do away with floating point entirely).
 Use greater precision when changing to linear gamma for compositing against
  background and doing rgb-to-gray transformation.
 Investigate pre-incremented loop counters and other loop constructions.
 Add interpolated method of handling interlacing.
 Switch to the simpler zlib (zlib/libpng) license if legally possible.
 Extend pngvalid.c to validate more of the libpng transformations.
 */
--- a/55
+++ b/55
@@ -0,0 +1,55 @@
   Y2K compliance in libpng:
   =========================
      November 15, 2006
      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.0.21 are Y2K compliant.  It is my belief that earlier
      versions were also Y2K compliant.
      Libpng only has three year fields.  One is a 2-byte unsigned integer
      that will hold years up to 65535.  The other two hold the date in text
      format, and will hold years up to 9999.
      The integer is
          "png_uint_16 year" in png_time_struct.
      The strings are
          "png_charp time_buffer" in png_struct and
          "near_time_buffer", which is a local character string in png.c.
      There are seven time-related functions:
          png_convert_to_rfc_1123() in png.c
            (formerly png_convert_to_rfc_1152() in error)
          png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
          png_convert_from_time_t() in pngwrite.c
          png_get_tIME() in pngget.c
          png_handle_tIME() in pngrutil.c, called in pngread.c
          png_set_tIME() in pngset.c
          png_write_tIME() in pngwutil.c, called in pngwrite.c
      All appear to handle dates properly in a Y2K environment.  The
      png_convert_from_time_t() function calls gmtime() to convert from system
      clock time, which returns (year - 1900), which we properly convert to
      the full 4-digit year.  There is a possibility that applications using
      libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
      function, or that they are incorrectly passing only a 2-digit year
      instead of "year - 1900" into the png_convert_from_struct_tm() function,
      but this is not under our control.  The libpng documentation has always
      stated that it works with 4-digit years, and the APIs have been
      documented as such.
      The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned
      integer to hold the year, and can hold years as large as 65535.
      zlib, upon which libpng depends, is also Y2K compliant.  It contains
      no date-related code.
         Glenn Randers-Pehrson
         libpng maintainer
         PNG Development Group
--- a/aclocal.m4
+++ b/aclocal.m4
--- a/arm/arm_init.c
+++ b/arm/arm_init.c
@@ -1,232 +0,0 @@
 /* arm_init.c - NEON optimised filter functions
 *
 * Copyright (c) 2013 Glenn Randers-Pehrson
 * Written by Mans Rullgard, 2011.
 * Last changed in libpng 1.6.8 [December 19, 2013]
 *
 * 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_READ_SUPPORTED
 #if PNG_ARM_NEON_OPT > 0
 #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>
 #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)
 {
   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);
   Elf32_auxv_t aux;
   /* Failsafe: failure to open means no NEON */
   if (fd == -1)
   {
      png_warning(png_ptr, "/proc/self/auxv open failed");
      return 0;
   }
   while (safe_read(png_ptr, fd, &aux, sizeof aux) == sizeof aux)
   {
      if (aux.a_type == AT_HWCAP && (aux.a_un.a_val & HWCAP_NEON) != 0)
      {
         close(fd);
         return 1;
      }
   }
   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 */
 #ifndef PNG_ALIGNED_MEMORY_SUPPORTED
 #  error "ALIGNED_MEMORY is required; set: -DPNG_ALIGNED_MEMORY_SUPPORTED"
 #endif
 void
 png_init_filter_functions_neon(png_structp pp, unsigned int bpp)
 {
   /* The switch statement is compiled in for ARM_NEON_API, the call to
    * png_have_neon is compiled in for ARM_NEON_CHECK.  If both are defined
    * the check is only performed if the API has not set the NEON option on
    * or off explicitly.  In this case the check controls what happens.
    *
    * If the CHECK is not compiled in and the option is UNSET the behavior prior
    * to 1.6.7 was to use the NEON code - this was a bug caused by having the
    * wrong order of the 'ON' and 'default' cases.  UNSET now defaults to OFF,
    * as documented in png.h
    */
 #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
      default: /* OFF or INVALID */
         return;
      case PNG_OPTION_ON:
         /* Option turned on */
         break;
   }
 #endif
   /* IMPORTANT: any new external functions used here must be declared using
    * PNG_INTERNAL_FUNCTION in ../pngpriv.h.  This is required so that the
    * 'prefix' option to configure works:
    *
    *    ./configure --with-libpng-prefix=foobar_
    *
    * Verify you have got this right by running the above command, doing a build
    * and examining pngprefix.h; it must contain a #define for every external
    * function you add.  (Notice that this happens automatically for the
    * initialization function.)
    */
   pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up_neon;
   if (bpp == 3)
   {
      pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub3_neon;
      pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg3_neon;
      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
         png_read_filter_row_paeth3_neon;
   }
   else if (bpp == 4)
   {
      pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub4_neon;
      pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg4_neon;
      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
          png_read_filter_row_paeth4_neon;
   }
 }
 #endif /* PNG_ARM_NEON_OPT > 0 */
 #endif /* PNG_READ_SUPPORTED */
--- a/arm/filter_neon.S
+++ b/arm/filter_neon.S
@@ -1,235 +0,0 @@
 /* filter_neon.S - NEON optimised filter functions
 *
 * Copyright (c) 2013 Glenn Randers-Pehrson
 * Written by Mans Rullgard, 2011.
 * Last changed in libpng 1.5.17 [June 27, 2013]
 *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */
 /* This is required to get the symbol renames, which are #defines, and also
 * includes the definition (or not) of PNG_ARM_NEON_OPT.
 */
 #define PNG_VERSION_INFO_ONLY
 #include "../pngpriv.h"
 #if defined(__linux__) && defined(__ELF__)
 .section .note.GNU-stack,"",%progbits /* mark stack as non-executable */
 #endif
 #if PNG_ARM_NEON_OPT > 0
 #ifdef __ELF__
 #   define ELF
 #else
 #   define ELF @
 #endif
        .arch armv7-a
        .fpu  neon
 .macro  func    name, export=0
    .macro endfunc
 ELF     .size   \name, . - \name
        .endfunc
        .purgem endfunc
    .endm
        .text
    .if \export
        .global \name
    .endif
 ELF     .type   \name, STT_FUNC
        .func   \name
 \name:
 .endm
 func    png_read_filter_row_sub4_neon, export=1
        ldr             r3,  [r0, #4]           @ rowbytes
        vmov.i8         d3,  #0
 1:
        vld4.32         {d4[],d5[],d6[],d7[]},    [r1,:128]
        vadd.u8         d0,  d3,  d4
        vadd.u8         d1,  d0,  d5
        vadd.u8         d2,  d1,  d6
        vadd.u8         d3,  d2,  d7
        vst4.32         {d0[0],d1[0],d2[0],d3[0]},[r1,:128]!
        subs            r3,  r3,  #16
        bgt             1b
        bx              lr
 endfunc
 func    png_read_filter_row_sub3_neon, export=1
        ldr             r3,  [r0, #4]           @ rowbytes
        vmov.i8         d3,  #0
        mov             r0,  r1
        mov             r2,  #3
        mov             r12, #12
        vld1.8          {q11},    [r0], r12
 1:
        vext.8          d5,  d22, d23, #3
        vadd.u8         d0,  d3,  d22
        vext.8          d6,  d22, d23, #6
        vadd.u8         d1,  d0,  d5
        vext.8          d7,  d23, d23, #1
        vld1.8          {q11},    [r0], r12
        vst1.32         {d0[0]},  [r1,:32], r2
        vadd.u8         d2,  d1,  d6
        vst1.32         {d1[0]},  [r1], r2
        vadd.u8         d3,  d2,  d7
        vst1.32         {d2[0]},  [r1], r2
        vst1.32         {d3[0]},  [r1], r2
        subs            r3,  r3,  #12
        bgt             1b
        bx              lr
 endfunc
 func    png_read_filter_row_up_neon, export=1
        ldr             r3,  [r0, #4]           @ rowbytes
 1:
        vld1.8          {q0}, [r1,:128]
        vld1.8          {q1}, [r2,:128]!
        vadd.u8         q0,  q0,  q1
        vst1.8          {q0}, [r1,:128]!
        subs            r3,  r3,  #16
        bgt             1b
        bx              lr
 endfunc
 func    png_read_filter_row_avg4_neon, export=1
        ldr             r12, [r0, #4]           @ rowbytes
        vmov.i8         d3,  #0
 1:
        vld4.32         {d4[],d5[],d6[],d7[]},    [r1,:128]
        vld4.32         {d16[],d17[],d18[],d19[]},[r2,:128]!
        vhadd.u8        d0,  d3,  d16
        vadd.u8         d0,  d0,  d4
        vhadd.u8        d1,  d0,  d17
        vadd.u8         d1,  d1,  d5
        vhadd.u8        d2,  d1,  d18
        vadd.u8         d2,  d2,  d6
        vhadd.u8        d3,  d2,  d19
        vadd.u8         d3,  d3,  d7
        vst4.32         {d0[0],d1[0],d2[0],d3[0]},[r1,:128]!
        subs            r12, r12, #16
        bgt             1b
        bx              lr
 endfunc
 func    png_read_filter_row_avg3_neon, export=1
        push            {r4,lr}
        ldr             r12, [r0, #4]           @ rowbytes
        vmov.i8         d3,  #0
        mov             r0,  r1
        mov             r4,  #3
        mov             lr,  #12
        vld1.8          {q11},    [r0], lr
 1:
        vld1.8          {q10},    [r2], lr
        vext.8          d5,  d22, d23, #3
        vhadd.u8        d0,  d3,  d20
        vext.8          d17, d20, d21, #3
        vadd.u8         d0,  d0,  d22
        vext.8          d6,  d22, d23, #6
        vhadd.u8        d1,  d0,  d17
        vext.8          d18, d20, d21, #6
        vadd.u8         d1,  d1,  d5
        vext.8          d7,  d23, d23, #1
        vld1.8          {q11},    [r0], lr
        vst1.32         {d0[0]},  [r1,:32], r4
        vhadd.u8        d2,  d1,  d18
        vst1.32         {d1[0]},  [r1], r4
        vext.8          d19, d21, d21, #1
        vadd.u8         d2,  d2,  d6
        vhadd.u8        d3,  d2,  d19
        vst1.32         {d2[0]},  [r1], r4
        vadd.u8         d3,  d3,  d7
        vst1.32         {d3[0]},  [r1], r4
        subs            r12, r12, #12
        bgt             1b
        pop             {r4,pc}
 endfunc
 .macro  paeth           rx,  ra,  rb,  rc
        vaddl.u8        q12, \ra, \rb           @ a + b
        vaddl.u8        q15, \rc, \rc           @ 2*c
        vabdl.u8        q13, \rb, \rc           @ pa
        vabdl.u8        q14, \ra, \rc           @ pb
        vabd.u16        q15, q12, q15           @ pc
        vcle.u16        q12, q13, q14           @ pa <= pb
        vcle.u16        q13, q13, q15           @ pa <= pc
        vcle.u16        q14, q14, q15           @ pb <= pc
        vand            q12, q12, q13           @ pa <= pb && pa <= pc
        vmovn.u16       d28, q14
        vmovn.u16       \rx, q12
        vbsl            d28, \rb, \rc
        vbsl            \rx, \ra, d28
 .endm
 func    png_read_filter_row_paeth4_neon, export=1
        ldr             r12, [r0, #4]           @ rowbytes
        vmov.i8         d3,  #0
        vmov.i8         d20, #0
 1:
        vld4.32         {d4[],d5[],d6[],d7[]},    [r1,:128]
        vld4.32         {d16[],d17[],d18[],d19[]},[r2,:128]!
        paeth           d0,  d3,  d16, d20
        vadd.u8         d0,  d0,  d4
        paeth           d1,  d0,  d17, d16
        vadd.u8         d1,  d1,  d5
        paeth           d2,  d1,  d18, d17
        vadd.u8         d2,  d2,  d6
        paeth           d3,  d2,  d19, d18
        vmov            d20, d19
        vadd.u8         d3,  d3,  d7
        vst4.32         {d0[0],d1[0],d2[0],d3[0]},[r1,:128]!
        subs            r12, r12, #16
        bgt             1b
        bx              lr
 endfunc
 func    png_read_filter_row_paeth3_neon, export=1
        push            {r4,lr}
        ldr             r12, [r0, #4]           @ rowbytes
        vmov.i8         d3,  #0
        vmov.i8         d4,  #0
        mov             r0,  r1
        mov             r4,  #3
        mov             lr,  #12
        vld1.8          {q11},    [r0], lr
 1:
        vld1.8          {q10},    [r2], lr
        paeth           d0,  d3,  d20, d4
        vext.8          d5,  d22, d23, #3
        vadd.u8         d0,  d0,  d22
        vext.8          d17, d20, d21, #3
        paeth           d1,  d0,  d17, d20
        vst1.32         {d0[0]},  [r1,:32], r4
        vext.8          d6,  d22, d23, #6
        vadd.u8         d1,  d1,  d5
        vext.8          d18, d20, d21, #6
        paeth           d2,  d1,  d18, d17
        vext.8          d7,  d23, d23, #1
        vld1.8          {q11},    [r0], lr
        vst1.32         {d1[0]},  [r1], r4
        vadd.u8         d2,  d2,  d6
        vext.8          d19, d21, d21, #1
        paeth           d3,  d2,  d19, d18
        vst1.32         {d2[0]},  [r1], r4
        vmov            d4,  d19
        vadd.u8         d3,  d3,  d7
        vst1.32         {d3[0]},  [r1], r4
        subs            r12, r12, #12
        bgt             1b
        pop             {r4,pc}
 endfunc
 #endif /* PNG_ARM_NEON_OPT > 0 */
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,31 +4,22 @@
 #
 # WARNING: if you run this you will change the versions
 # of the tools which are used and, maybe, required!
-
+        touch Makefile.am configure.ac
 # You can define your own replacements in your environment.
 # $AUTOCONF,  $AUTOMAKE, $AUTOHEADER, $AUTOPOINT, $ACLOCAL and $LIBTOOLIZE
 touch Makefile.am configure.ac
 {
-   LT=${LIBTOOLIZE-libtoolize}
+	echo "running libtoolize" >&2
-   echo "running $LT" >&2
+	libtoolize --copy --automake
   $LT --force --copy --automake
 } && {
-   AL=${ACLOCAL-aclocal}
+	echo "running aclocal" >&2
-   echo "running $AL" >&2
+	aclocal
   $AL
 } && {
-   AH=${AUTOHEADER-autoheader}
+	echo "running autoheader [ignore the warnings]" >&2
-   echo "running $AH [ignore the warnings]" >&2
+	autoheader
   $AH
 } && {
-   AM=${AUTOMAKE-automake}
+	echo "running automake" >&2
-   echo "running $AM" >&2
+	automake --foreign -a -c
   $AM --force-missing --foreign -a -c
 } && {
-   AC=${AUTOCONF-autoconf}
+	echo "running autoconf" >&2
-   echo "running $AC" >&2
+	autoconf
   $AC
 } &&
-   echo "autogen complete" >&2 ||
+	echo "autogen complete" >&2 ||
-   echo "ERROR: autogen.sh failed, autogen is incomplete" >&2
+	echo "ERROR: autogen.sh failed, autogen is incomplete" >&2
--- a/347
+++ b/347
@@ -1,347 +0,0 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 scriptversion=2012-10-14.11; # UTC
 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # 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>.
 nl='
 '
 # We need space, tab and new line, in precisely that order.  Quoting is
 # there to prevent tools from complaining about whitespace usage.
 IFS=" ""	$nl"
 file_conv=
 # func_file_conv build_file lazy
 # Convert a $build file to $host form and store it in $file
 # Currently only supports Windows hosts. If the determined conversion
 # type is listed in (the comma separated) LAZY, no conversion will
 # take place.
 func_file_conv ()
 {
  file=$1
  case $file in
    / | /[!/]*) # absolute file, and not a UNC file
      if test -z "$file_conv"; then
 	# lazily determine how to convert abs files
 	case `uname -s` in
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
 	  CYGWIN*)
 	    file_conv=cygwin
 	    ;;
 	  *)
 	    file_conv=wine
 	    ;;
 	esac
      fi
      case $file_conv/,$2, in
 	*,$file_conv,*)
 	  ;;
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
 	cygwin/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
 	  file=`winepath -w "$file" || echo "$file"`
 	  ;;
      esac
      ;;
  esac
 }
 # func_cl_dashL linkdir
 # Make cl look for libraries in LINKDIR
 func_cl_dashL ()
 {
  func_file_conv "$1"
  if test -z "$lib_path"; then
    lib_path=$file
  else
    lib_path="$lib_path;$file"
  fi
  linker_opts="$linker_opts -LIBPATH:$file"
 }
 # func_cl_dashl library
 # Do a library search-path lookup for cl
 func_cl_dashl ()
 {
  lib=$1
  found=no
  save_IFS=$IFS
  IFS=';'
  for dir in $lib_path $LIB
  do
    IFS=$save_IFS
    if $shared && test -f "$dir/$lib.dll.lib"; then
      found=yes
      lib=$dir/$lib.dll.lib
      break
    fi
    if test -f "$dir/$lib.lib"; then
      found=yes
      lib=$dir/$lib.lib
      break
    fi
    if test -f "$dir/lib$lib.a"; then
      found=yes
      lib=$dir/lib$lib.a
      break
    fi
  done
  IFS=$save_IFS
  if test "$found" != yes; then
    lib=$lib.lib
  fi
 }
 # func_cl_wrapper cl arg...
 # Adjust compile command to suit cl
 func_cl_wrapper ()
 {
  # Assume a capable shell
  lib_path=
  shared=:
  linker_opts=
  for arg
  do
    if test -n "$eat"; then
      eat=
    else
      case $1 in
 	-o)
 	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
 	  eat=1
 	  case $2 in
 	    *.o | *.[oO][bB][jJ])
 	      func_file_conv "$2"
 	      set x "$@" -Fo"$file"
 	      shift
 	      ;;
 	    *)
 	      func_file_conv "$2"
 	      set x "$@" -Fe"$file"
 	      shift
 	      ;;
 	  esac
 	  ;;
 	-I)
 	  eat=1
 	  func_file_conv "$2" mingw
 	  set x "$@" -I"$file"
 	  shift
 	  ;;
 	-I*)
 	  func_file_conv "${1#-I}" mingw
 	  set x "$@" -I"$file"
 	  shift
 	  ;;
 	-l)
 	  eat=1
 	  func_cl_dashl "$2"
 	  set x "$@" "$lib"
 	  shift
 	  ;;
 	-l*)
 	  func_cl_dashl "${1#-l}"
 	  set x "$@" "$lib"
 	  shift
 	  ;;
 	-L)
 	  eat=1
 	  func_cl_dashL "$2"
 	  ;;
 	-L*)
 	  func_cl_dashL "${1#-L}"
 	  ;;
 	-static)
 	  shared=false
 	  ;;
 	-Wl,*)
 	  arg=${1#-Wl,}
 	  save_ifs="$IFS"; IFS=','
 	  for flag in $arg; do
 	    IFS="$save_ifs"
 	    linker_opts="$linker_opts $flag"
 	  done
 	  IFS="$save_ifs"
 	  ;;
 	-Xlinker)
 	  eat=1
 	  linker_opts="$linker_opts $2"
 	  ;;
 	-*)
 	  set x "$@" "$1"
 	  shift
 	  ;;
 	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
 	  func_file_conv "$1"
 	  set x "$@" -Tp"$file"
 	  shift
 	  ;;
 	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
 	  func_file_conv "$1" mingw
 	  set x "$@" "$file"
 	  shift
 	  ;;
 	*)
 	  set x "$@" "$1"
 	  shift
 	  ;;
      esac
    fi
    shift
  done
  if test -n "$linker_opts"; then
    linker_opts="-link$linker_opts"
  fi
  exec "$@" $linker_opts
  exit 1
 }
 eat=
 case $1 in
  '')
     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
     exit 1;
     ;;
  -h | --h*)
    cat <<\EOF
 Usage: compile [--help] [--version] PROGRAM [ARGS]
 Wrapper for compilers which do not understand '-c -o'.
 Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
 arguments, and rename the output as expected.
 If you are trying to build a whole package this is not the
 right script to run: please start by reading the file 'INSTALL'.
 Report bugs to <bug-automake@gnu.org>.
 EOF
    exit $?
    ;;
  -v | --v*)
    echo "compile $scriptversion"
    exit $?
    ;;
  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
    func_cl_wrapper "$@"      # Doesn't return...
    ;;
 esac
 ofile=
 cfile=
 for arg
 do
  if test -n "$eat"; then
    eat=
  else
    case $1 in
      -o)
 	# configure might choose to run compile as 'compile cc -o foo foo.c'.
 	# So we strip '-o arg' only if arg is an object.
 	eat=1
 	case $2 in
 	  *.o | *.obj)
 	    ofile=$2
 	    ;;
 	  *)
 	    set x "$@" -o "$2"
 	    shift
 	    ;;
 	esac
 	;;
      *.c)
 	cfile=$1
 	set x "$@" "$1"
 	shift
 	;;
      *)
 	set x "$@" "$1"
 	shift
 	;;
    esac
  fi
  shift
 done
 if test -z "$ofile" || test -z "$cfile"; then
  # If no '-o' option was seen then we might have been invoked from a
  # pattern rule where we don't need one.  That is ok -- this is a
  # normal compilation that the losing compiler can handle.  If no
  # '.c' file was seen then we are probably linking.  That is also
  # ok.
  exec "$@"
 fi
 # Name of file we expect compiler to create.
 cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
 # Create the lock directory.
 # Note: use '[/\\:.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
 lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
 while true; do
  if mkdir "$lockdir" >/dev/null 2>&1; then
    break
  fi
  sleep 1
 done
 # FIXME: race condition here if user kills between mkdir and trap.
 trap "rmdir '$lockdir'; exit 1" 1 2 15
 # Run the compile.
 "$@"
 ret=$?
 if test -f "$cofile"; then
  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
 elif test -f "${cofile}bj"; then
  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
 fi
 rmdir "$lockdir"
 exit $ret
 # 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:
--- a/config.guess
+++ b/config.guess
@@ -1,12 +1,13 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2013-11-29'
+timestamp='2005-12-23'
 # This file 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 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -15,23 +16,27 @@ timestamp='2013-11-29'
 # 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/>.
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
 # 02110-1301, USA.
 #
 # 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
+# the same distribution terms that you use for the rest of that program.
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
 # Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 #
 # Please send patches with a ChangeLog entry to config-patches@gnu.org.
 # Originally written by Per Bothner <per@bothner.com>.
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
 # The plan is that this can be called by configure scripts if you
 # don't specify an explicit build system type.
 me=`echo "$0" | sed -e 's,.*/,,'`
 usage="\
@@ -50,7 +55,8 @@ version="\
 GNU config.guess ($timestamp)
 Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -100,7 +106,7 @@ set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -132,33 +138,29 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-case "${UNAME_SYSTEM}" in
+if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
 Linux|GNU|GNU/*)
 	# If the system lacks a compiler, then just pick glibc.
 	# We could probably try harder.
 	LIBC=gnu
 	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
+	cat << EOF > $dummy.c
 	#include <features.h>
-	#if defined(__UCLIBC__)
+	#ifdef __UCLIBC__
 	# ifdef __UCLIBC_CONFIG_VERSION__
 	LIBC=uclibc __UCLIBC_CONFIG_VERSION__
 	# else
 	LIBC=uclibc
-	#elif defined(__dietlibc__)
+	# endif
 	LIBC=dietlibc
 	#else
 	LIBC=gnu
 	#endif
-	EOF
+EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
-	;;
+fi
 esac
 # Note: order is significant - the case branches are not exclusive.
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -175,7 +177,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -184,7 +185,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
+			| grep __ELF__ >/dev/null
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -194,7 +195,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-		os=netbsd
+	        os=netbsd
 		;;
 	esac
 	# The OS release
@@ -215,10 +216,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
    *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
 	exit ;;
    *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -226,11 +223,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
    *:SolidBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 	exit ;;
    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
    *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -241,7 +235,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -287,10 +281,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exit ;;
 	exitcode=$?
 	trap '' 0
 	exit $exitcode ;;
    Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -316,12 +307,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
    *:OS400:*:*)
-	echo powerpc-ibm-os400
+        echo powerpc-ibm-os400
 	exit ;;
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm*:riscos:*:*|arm*:RISCOS:*:*)
+    arm:riscos:*:*|arm:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -345,33 +336,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
    s390x:SunOS:*:*)
 	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
    sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+    i86pc:SunOS:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
 	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
 		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
 		SUN_ARCH="x86_64"
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
    sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -415,23 +387,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    # MiNT.  But MiNT is downward compatible to TOS, so this should
    # be no problem.
    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+        exit ;;
    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
+        echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
+        exit ;;
    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
+        echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
+        exit ;;
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
+        echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
+        exit ;;
    m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -501,8 +473,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
    AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
+        # DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -515,7 +487,7 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
-	exit ;;
+ 	exit ;;
    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -572,7 +544,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[4567])
+    *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -615,52 +587,52 @@ EOF
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
+                    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
+                      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
+                        case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
+                          32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-			esac ;;
+                        esac ;;
-		    esac
+                    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
+		    sed 's/^              //' << EOF >$dummy.c
-		#define _HPUX_SOURCE
+              #define _HPUX_SOURCE
-		#include <stdlib.h>
+              #include <stdlib.h>
-		#include <unistd.h>
+              #include <unistd.h>
-		int main ()
+              int main ()
-		{
+              {
-		#if defined(_SC_KERNEL_BITS)
+              #if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
+                  long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
+              #endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
+                  long cpu  = sysconf (_SC_CPU_VERSION);
-		    switch (cpu)
+                  switch (cpu)
-			{
+              	{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
+              	case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
+              #if defined(_SC_KERNEL_BITS)
-			    switch (bits)
+              	    switch (bits)
-				{
+              		{
-				case 64: puts ("hppa2.0w"); break;
+              		case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
+              		case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
+              		default: puts ("hppa2.0"); break;
-				} break;
+              		} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
+              #else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
+              	    puts ("hppa2.0"); break;
-		#endif
+              #endif
-			default: puts ("hppa1.0"); break;
+              	default: puts ("hppa1.0"); break;
-			}
+              	}
-		    exit (0);
+                  exit (0);
-		}
+              }
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -680,7 +652,7 @@ EOF
 	    # => hppa64-hp-hpux11.23
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
+		grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -751,22 +723,22 @@ EOF
 	exit ;;
    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-	exit ;;
+        exit ;;
    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit ;;
+        exit ;;
    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-	exit ;;
+        exit ;;
    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-	exit ;;
+        exit ;;
    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-	exit ;;
+        exit ;;
    CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -790,14 +762,14 @@ EOF
 	exit ;;
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+        exit ;;
    5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -809,51 +781,32 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
    *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_MACHINE} in
-	case ${UNAME_PROCESSOR} in
+	    pc98)
-	    amd64)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
    i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    *:MINGW64*:*)
+    i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw64
 	exit ;;
    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
    i*:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
+    	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
+    	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
    i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:*)
+    x86:Interix*:[345]*)
-	case ${UNAME_MACHINE} in
+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	    x86)
+	exit ;;
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
 	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
 		echo ia64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	esac ;;
    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
    8664:Windows_NT:*)
 	echo x86_64-pc-mks
 	exit ;;
    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -874,72 +827,26 @@ EOF
 	exit ;;
    *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
    *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 	exit ;;
    i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
    aarch64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
    aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
    alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
 	  EV56)  UNAME_MACHINE=alphaev56 ;;
 	  PCA56) UNAME_MACHINE=alphapca56 ;;
 	  PCA57) UNAME_MACHINE=alphapca56 ;;
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
    arc:Linux:*:* | arceb:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
    arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
 		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
 		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
    avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
    cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	echo cris-axis-linux-${LIBC}
 	exit ;;
    crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	echo crisv32-axis-linux-${LIBC}
 	exit ;;
    frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    	echo frv-unknown-linux-${LIBC}
 	exit ;;
    hexagon:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
    i*86:Linux:*:*)
 	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
    ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -950,37 +857,67 @@ EOF
    m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
+    mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef ${UNAME_MACHINE}
+	#undef mips
-	#undef ${UNAME_MACHINE}el
+	#undef mipsel
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
+	CPU=mipsel
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
+	CPU=mips
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
    mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
 	#undef mips64
 	#undef mips64el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 	CPU=mips64el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 	CPU=mips64
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
 	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
    or1k:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
    or32:Linux:*:*)
 	echo or32-unknown-linux-${LIBC}
 	exit ;;
    ppc:Linux:*:*)
 	echo powerpc-unknown-linux-${LIBC}
 	exit ;;
    ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
    alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
 	  EV56)  UNAME_MACHINE=alphaev56 ;;
 	  PCA56) UNAME_MACHINE=alphapca56 ;;
 	  PCA57) UNAME_MACHINE=alphapca56 ;;
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
        esac
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
    padre:Linux:*:*)
 	echo sparc-unknown-linux-${LIBC}
 	exit ;;
    parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
    parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -989,20 +926,11 @@ EOF
 	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
-    ppc64:Linux:*:*)
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
    ppc:Linux:*:*)
 	echo powerpc-unknown-linux-${LIBC}
 	exit ;;
    ppc64le:Linux:*:*)
 	echo powerpc64le-unknown-linux-${LIBC}
 	exit ;;
    ppcle:Linux:*:*)
 	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
    sh64*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1013,18 +941,73 @@ EOF
    sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
    tile*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
    vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
    x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo x86_64-unknown-linux-${LIBC}
 	exit ;;
    xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
    i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
 	# problems with other programs or directories called `ld' in the path.
 	# Set LC_ALL=C to ensure ld outputs messages in English.
 	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
 			 | sed -ne '/supported targets:/!d
 				    s/[ 	][ 	]*/ /g
 				    s/.*supported targets: *//
 				    s/ .*//
 				    p'`
        case "$ld_supported_targets" in
 	  elf32-i386)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
 		exit ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
 		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
 		exit ;;
 	esac
 	# This should get integrated into the C code below, but now we hack
 	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#include <features.h>
 	#ifdef __ELF__
 	# ifdef __GLIBC__
 	#  if __GLIBC__ >= 2
 	LIBC=gnu
 	#  else
 	LIBC=gnulibc1
 	#  endif
 	# else
 	LIBC=gnulibc1
 	# endif
 	#else
 	#if defined(__INTEL_COMPILER) || defined(__PGI)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
 	#endif
 	#endif
 	#ifdef __dietlibc__
 	LIBC=dietlibc
 	#endif
 EOF
 	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
 	}
 	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 	;;
    i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1032,11 +1015,11 @@ EOF
 	echo i386-sequent-sysv4
 	exit ;;
    i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
+        # Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
+        # number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
+        # I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
+        # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
    i*86:OS/2:*:*)
@@ -1053,7 +1036,7 @@ EOF
    i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
    i*86:*DOS:*:*)
@@ -1068,7 +1051,7 @@ EOF
 	fi
 	exit ;;
    i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1096,13 +1079,10 @@ EOF
 	exit ;;
    pc:*:*:*)
 	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
+        # the processor, so we play safe by assuming i386.
-	# Note: whatever this is, it MUST be the same as what config.sub
+	echo i386-pc-msdosdjgpp
-	# prints for the "djgpp" host, or else GDB configury will decide that
+        exit ;;
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;
    Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1137,18 +1117,8 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
 	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
 	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1161,7 +1131,7 @@ EOF
    rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
    SM[BE]S:UNIX_SV:*:*)
@@ -1181,10 +1151,10 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <Richard.M.Bartel@ccMail.Census.GOV>
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
+        echo i586-unisys-sysv4
-	exit ;;
+        exit ;;
    *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1210,11 +1180,11 @@ EOF
 	exit ;;
    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
+	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
+	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-	exit ;;
+        exit ;;
    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1224,12 +1194,6 @@ EOF
    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
    x86_64:Haiku:*:*)
 	echo x86_64-unknown-haiku
 	exit ;;
    SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1239,15 +1203,6 @@ EOF
    SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
    SX-7:SUPER-UX:*:*)
 	echo sx7-nec-superux${UNAME_RELEASE}
 	exit ;;
    SX-8:SUPER-UX:*:*)
 	echo sx8-nec-superux${UNAME_RELEASE}
 	exit ;;
    SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
    Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1256,31 +1211,9 @@ EOF
 	exit ;;
    *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval $set_cc_for_build
+	case $UNAME_PROCESSOR in
-	if test "$UNAME_PROCESSOR" = unknown ; then
+	    unknown) UNAME_PROCESSOR=powerpc ;;
-	    UNAME_PROCESSOR=powerpc
+	esac
 	fi
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
 	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
 		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 		    grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
 			i386) UNAME_PROCESSOR=x86_64 ;;
 			powerpc) UNAME_PROCESSOR=powerpc64 ;;
 		    esac
 		fi
 	    fi
 	elif test "$UNAME_PROCESSOR" = i386 ; then
 	    # Avoid executing cc on OS X 10.9, as it ships with a stub
 	    # that puts up a graphical alert prompting to install
 	    # developer tools.  Any system running Mac OS X 10.7 or
 	    # later (Darwin 11 and later) is required to have a 64-bit
 	    # processor. This is not true of the ARM version of Darwin
 	    # that Apple uses in portable devices.
 	    UNAME_PROCESSOR=x86_64
 	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
    *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1294,10 +1227,7 @@ EOF
    *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
+    NSE-?:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
    NSR-?:NONSTOP_KERNEL:*:*)
@@ -1342,13 +1272,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
    SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
+        echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
    *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
    *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1363,14 +1293,11 @@ EOF
    i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
    i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
    x86_64:VMkernel:*:*)
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
 esac
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
@@ -1388,11 +1315,11 @@ main ()
 #include <sys/param.h>
  printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-	"4"
+          "4"
 #else
-	""
+	  ""
 #endif
-	); exit (0);
+         ); exit (0);
 #endif
 #endif
@@ -1526,9 +1453,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
--- a/config.h.in
+++ b/config.h.in
@@ -3,9 +3,6 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 /* Define to 1 if you have the `feenableexcept' function. */
 #undef HAVE_FEENABLEEXCEPT
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
@@ -15,6 +12,10 @@
 /* Define to 1 if you have the `z' library (-lz). */
 #undef HAVE_LIBZ
 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
   to 0 otherwise. */
 #undef HAVE_MALLOC
 /* Define to 1 if you have the <malloc.h> header file. */
 #undef HAVE_MALLOC_H
@@ -48,10 +49,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
   */
 #undef LT_OBJDIR
 /* Name of package */
 #undef PACKAGE
@@ -67,21 +64,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 /* Define to the home page for this package. */
 #undef PACKAGE_URL
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 /* Turn on ARM Neon optimizations at run-time */
 #undef PNG_ARM_NEON_API_SUPPORTED
 /* Check for ARM Neon support at run-time */
 #undef PNG_ARM_NEON_CHECK_SUPPORTED
 /* Enable ARM Neon optimizations */
 #undef PNG_ARM_NEON_OPT
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
@@ -94,19 +79,8 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
-/* Define to the equivalent of the C99 'restrict' keyword, or to
+/* Define to rpl_malloc if the replacement function should be used. */
-   nothing if this is not supported.  Do not define if restrict is
+#undef malloc
   supported directly.  */
 #undef restrict
 /* Work around a bug in Sun C++: it does not support _Restrict or
   __restrict__, even though the corresponding Sun C compiler ends up with
   "#define restrict _Restrict" or "#define restrict __restrict__" in the
   previous line.  Perhaps some future version of Sun C++ will work with
   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
 #if defined __SUNPRO_CC && !defined __RESTRICT
 # define _Restrict
 # define __restrict__
 #endif
-/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
--- a/config.sub
+++ b/config.sub
@@ -1,40 +1,43 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2013-10-01'
+timestamp='2005-12-23'
-# This file is free software; you can redistribute it and/or modify it
+# This file is (in principle) common to ALL GNU software.
-# under the terms of the GNU General Public License as published by
+# The presence of a machine in this file suggests that SOME GNU software
-# the Free Software Foundation; either version 3 of the License, or
+# can handle that machine.  It does not imply ALL GNU software can.
 #
 # This file 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 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
+# This program is distributed in the hope that it will be useful,
-# WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# General Public License for more details.
+# 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/>.
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
 # 02110-1301, USA.
 #
 # 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
+# the same distribution terms that you use for the rest of that program.
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -68,7 +71,8 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -115,18 +119,12 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
  knetbsd*-gnu* | netbsd*-gnu* | \
  kopensolaris*-gnu* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
  android-linux)
    os=-linux-android
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
    ;;
  *)
    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
    if [ $basic_machine != $1 ]
@@ -149,13 +147,10 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
 	-bluegene*)
 		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -170,10 +165,10 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
-	-chorusrdb)
+ 	-chorusrdb)
-		os=-chorusrdb
+ 		os=-chorusrdb
 		basic_machine=$1
-		;;
+ 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -218,12 +213,6 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-lynx*178)
 		os=-lynxos178
 		;;
 	-lynx*5)
 		os=-lynxos5
 		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -248,35 +237,23 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
 	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arceb \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
 	| be32 | be64 \
 	| bfin \
-	| c4x | c8051 | clipper \
+	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
+	| d10v | d30v | dlx | dsp16xx | dvp \
-	| epiphany \
+	| fr30 | frv \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| k1om \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
 	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
 	| mips64r5900 | mips64r5900el \
 	| mips64vr | mips64vrel \
 	| mips64orion | mips64orionel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@@ -287,45 +264,32 @@ case $basic_machine in
 	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
+	| or32 \
 	| or1k | or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| rl78 | rx \
+	| sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| sparcv8 | sparcv9 | sparcv9b \
-	| spu \
+	| strongarm \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| tahoe | thumb | tic4x | tic80 | tron \
-	| ubicom32 \
+	| v850 | v850e \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k | z80)
+	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	c54x)
+	m32c)
-		basic_machine=tic54x-unknown
+		basic_machine=$basic_machine-unknown
 		;;
-	c55x)
+	m6811 | m68hc11 | m6812 | m68hc12)
-		basic_machine=tic55x-unknown
+		# Motorola 68HC11/12.
 		;;
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -334,21 +298,10 @@ case $basic_machine in
 	ms1)
 		basic_machine=mt-unknown
 		;;
-
+	nios2 | nios2-* | nios2 | nios2-*)
-	strongarm | thumb | xscale)
+		basic_machine=nios2-altera
 		basic_machine=arm-unknown
 		;;
 	xgate)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
 	xscaleeb)
 		basic_machine=armeb-unknown
 		;;
 	xscaleel)
 		basic_machine=armel-unknown
 		;;
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -364,38 +317,29 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
+	| avr-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| k1om-* \
+	| m32r-* | m32rle-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
 	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
 	| mips64r5900-* | mips64r5900el-* \
 	| mips64vr-* | mips64vrel-* \
 	| mips64orion-* | mips64orionel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
@@ -406,41 +350,32 @@ case $basic_machine in
 	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
+	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* \
+	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile*-* \
 	| tron-* \
-	| ubicom32-* \
+	| v850-* | v850e-* | vax-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
-	| z8k-* | z80-*)
+	| z8k-*)
 		;;
-	# Recognize the basic CPU types without company name, with glob match.
+	m32c-*)
 	xtensa*)
 		basic_machine=$basic_machine-unknown
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -458,7 +393,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-	abacus)
+    	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -504,10 +439,6 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
 	aros)
 		basic_machine=i386-pc
 		os=-aros
 		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -516,35 +447,10 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
 	blackfin)
 		basic_machine=bfin-unknown
 		os=-linux
 		;;
 	blackfin-*)
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	bluegene*)
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
 	c54x-*)
 		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	c55x-*)
 		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	c6x-*)
 		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
 	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -573,8 +479,8 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16 | cr16-*)
+	cr16c)
-		basic_machine=cr16-unknown
+		basic_machine=cr16c-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -612,10 +518,6 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
 	dicos)
 		basic_machine=i686-pc
 		os=-dicos
 		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -731,6 +633,7 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -769,14 +672,6 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
 		;;
 	m68knommu-*)
 		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -788,21 +683,10 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
 	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw64)
 		basic_machine=x86_64-pc
 		os=-mingw64
 		;;
 	mingw32)
-		basic_machine=i686-pc
+		basic_machine=i386-pc
 		os=-mingw32
 		;;
 	mingw32ce)
 		basic_machine=arm-unknown
 		os=-mingw32ce
 		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -810,6 +694,24 @@ case $basic_machine in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
 	mipsEE* | ee | ps2)
 		basic_machine=mips64r5900el-scei
 		case $os in
 		    -linux*)
 			;;
 		    *)
 			os=-elf
 			;;
 		esac
 		;;
 	iop)
 		basic_machine=mipsel-scei
 		os=-irx
 		;;
 	dvp)
 		basic_machine=dvp-scei
 		os=-elf
 		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -831,18 +733,10 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
 		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
 	nacl)
 		basic_machine=le32-unknown
 		os=-nacl
 		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -907,12 +801,6 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
 	neo-tandem)
 		basic_machine=neo-tandem
 		;;
 	nse-tandem)
 		basic_machine=nse-tandem
 		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -943,14 +831,6 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
 	parisc)
 		basic_machine=hppa-unknown
 		os=-linux
 		;;
 	parisc-*)
 		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -995,10 +875,9 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
+	ppc)	basic_machine=powerpc-unknown
 		;;
-	ppc-* | ppcbe-*)
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -1023,11 +902,7 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos | rdos64)
+	rdos)
 		basic_machine=x86_64-pc
 		os=-rdos
 		;;
 	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1057,10 +932,6 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
 	sde)
 		basic_machine=mipsisa32-sde
 		os=-elf
 		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -1072,9 +943,6 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
 	sh5el)
 		basic_machine=sh5le-unknown
 		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1096,9 +964,6 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
 	strongarm-* | thumb-*)
 		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1155,9 +1020,17 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tile*)
+	tic54x | c54x*)
-		basic_machine=$basic_machine-unknown
+		basic_machine=tic54x-unknown
-		os=-linux-gnu
+		os=-coff
 		;;
 	tic55x | c55x*)
 		basic_machine=tic55x-unknown
 		os=-coff
 		;;
 	tic6x | c6x*)
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
 	tx39)
 		basic_machine=mipstx39-unknown
@@ -1226,9 +1099,6 @@ case $basic_machine in
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
 	xscale-* | xscalee[bl]-*)
 		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
 		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1237,10 +1107,6 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
 	z80-*-coff)
 		basic_machine=z80-unknown
 		os=-sim
 		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1279,10 +1145,10 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1326,12 +1192,9 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-	# First match some system type aliases
+        # First match some system type aliases
-	# that might get confused with valid system types.
+        # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
 	-auroraux)
 		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1352,23 +1215,20 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
+	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
 	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1376,7 +1236,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -irx*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1415,7 +1275,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-	-os400*)
+        -os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1464,7 +1324,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-	-tpf*)
+        -tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1500,14 +1360,12 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
 	-kaos*)
 		os=-kaos
 		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
 	-dicos*)
 		os=-dicos
 		;;
 	-nacl*)
 		;;
 	-none)
 		;;
 	*)
@@ -1530,12 +1388,6 @@ else
 # system, and we'll never get to this point.
 case $basic_machine in
 	score-*)
 		os=-elf
 		;;
 	spu-*)
 		os=-elf
 		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1545,24 +1397,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-	c4x-* | tic4x-*)
+    c4x-* | tic4x-*)
-		os=-coff
+        os=-coff
-		;;
+        ;;
 	c8051-*)
 		os=-elf
 		;;
 	hexagon-*)
 		os=-elf
 		;;
 	tic54x-*)
 		os=-coff
 		;;
 	tic55x-*)
 		os=-coff
 		;;
 	tic6x-*)
 		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1581,22 +1418,19 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
 		# This also exists in the configure program, but was not the
 		# default.
 		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
 	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
 		os=-elf
 		;;
 	mips*-*)
 		os=-elf
 		;;
 	or1k-*)
 		os=-elf
 		;;
 	or32-*)
 		os=-coff
 		;;
@@ -1615,7 +1449,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-	*-knuth)
+    	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
@@ -1720,7 +1554,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-cnk*|-aix*)
+			-aix*)
 				vendor=ibm
 				;;
 			-beos*)
--- a/27291
+++ b/27291
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl Minor upgrades (compatible ABI): increment the package version
-dnl (third field in two places below) and set the PNGLIB_RELEASE
+dnl (third field in two places below) and set the PNGLIB_MINOR
 dnl variable.
 dnl
 dnl Major upgrades (incompatible ABI): increment the package major
@@ -18,33 +18,29 @@ AC_PREREQ(2.59)
 dnl Version number stuff here:
-AC_INIT([libpng], [1.5.20], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.0.21], [png-mng-implement@lists.sourceforge.net])
-AM_INIT_AUTOMAKE([1.13 serial-tests subdir-objects])
+AM_INIT_AUTOMAKE
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.5.20
+PNGLIB_VERSION=1.0.21
-PNGLIB_MAJOR=1
+PNGLIB_MAJOR=10
-PNGLIB_MINOR=5
+PNGLIB_MINOR=21
 PNGLIB_RELEASE=20
 dnl End of version number stuff
 AC_CONFIG_SRCDIR([pngget.c])
-AC_CONFIG_HEADERS([config.h])
+AM_CONFIG_HEADER(config.h)
 # Checks for programs.
 AC_LANG([C])
 AC_PROG_CC
 AM_PROG_AS
 AC_PROG_LD
 AC_PROG_CPP
-AC_PROG_SED
+AC_CHECK_TOOL(SED, sed, :)
 AC_PROG_AWK
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-LT_INIT([win32-dll])
+AC_PROG_LIBTOOL
 # Checks for header files.
 AC_HEADER_STDC
@@ -54,64 +50,29 @@ AC_CHECK_HEADERS([malloc.h stdlib.h string.h strings.h])
 AC_C_CONST
 AC_TYPE_SIZE_T
 AC_STRUCT_TM
 AC_C_RESTRICT
 # This is a remnant of the old cc -E validation, where it may have been
 # necessary to use a different preprocessor for .dfn files
 DFNCPP="$CPP"
 AC_SUBST(DFNCPP)
 # Checks for library functions.
 AC_FUNC_STRTOD
 AC_CHECK_FUNCS([memset], , AC_ERROR([memset not found in libc]))
 AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_ERROR([cannot find pow])) )
-AC_ARG_WITH(zlib-prefix,
+AC_CHECK_LIB(z, zlibVersion, , AC_ERROR([zlib not installed]))
   AC_HELP_STRING([--with-zlib-prefix],
                  [prefix that may have been used in installed zlib]),
                  [ZPREFIX=${withval}],
                  [ZPREFIX='z_'])
 AC_CHECK_LIB(z, zlibVersion, ,
    AC_CHECK_LIB(z, ${ZPREFIX}zlibVersion, ,
                 AC_ERROR([zlib not installed])))
-# The following is for pngvalid, to ensure it catches FP errors even on
+AC_MSG_CHECKING([if assembler code in pnggccrd.c can be compiled])
-# platforms that don't enable FP exceptions, the function appears in the math
+AC_TRY_COMPILE(
-# library (typically), it's not an error if it is not found.
+  [#include "pnggccrd.c"],
-AC_CHECK_LIB([m], [feenableexcept])
+  [return 0;],
-AC_CHECK_FUNCS([feenableexcept])
+  LIBPNG_DEFINES=,
-
+  LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG\ -DPNG_NO_ASSEMBLER_CODE)
-LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
+if test "$LIBPNG_DEFINES"; then
-LIBPNG_DEFINES=$LIBPNG_DEFINES
+    AC_MSG_RESULT(no)
 else
    AC_MSG_RESULT(yes)
    LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
 fi
 AC_SUBST(LIBPNG_DEFINES)
 AC_MSG_CHECKING([if using Solaris linker])
 SLD=`$LD --version 2>&1 | grep Solaris`
 if test "$SLD"; then
    have_solaris_ld=yes
    AC_MSG_RESULT(yes)
 else
    have_solaris_ld=no
    AC_MSG_RESULT(no)
 fi
 AM_CONDITIONAL(HAVE_SOLARIS_LD, test "$have_solaris_ld" = "yes")
 AC_MSG_CHECKING([if libraries can be versioned])
-# Special case for PE/COFF platforms: ld reports
+GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
 # support for version-script, but doesn't actually
 # DO anything with it.
 case $host in
 *cygwin* | *mingw32* | *interix* )
    have_ld_version_script=no
    AC_MSG_RESULT(no)
 ;;
 * )
 if test "$have_solaris_ld" = "yes"; then
    GLD=`$LD --help < /dev/null 2>&1 | grep 'M mapfile'`
 else
    GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
 fi
 if test "$GLD"; then
    have_ld_version_script=yes
    AC_MSG_RESULT(yes)
@@ -120,26 +81,12 @@ else
    AC_MSG_RESULT(no)
    AC_MSG_WARN(*** You have not enabled versioned symbols.)
 fi
 ;;
 esac
 AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
 if test "$have_ld_version_script" = "yes"; then
    AC_MSG_CHECKING([for symbol prefix])
    SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \
                  | ${DFNCPP-${CC-gcc} -E} - 2>&1 \
                  | ${EGREP-grep} "^PREFIX=" \
                  | ${SED-sed} -e "s:^PREFIX=::" -e "s:__USER_LABEL_PREFIX__::"`
    AC_SUBST(SYMBOL_PREFIX)
    AC_MSG_RESULT($SYMBOL_PREFIX)
 fi
 # Substitutions for .in files
 AC_SUBST(PNGLIB_VERSION)
 AC_SUBST(PNGLIB_MAJOR)
 AC_SUBST(PNGLIB_MINOR)
 AC_SUBST(PNGLIB_RELEASE)
 # Additional arguments (and substitutions)
 # Allow the pkg-config directory to be set
@@ -166,99 +113,23 @@ AC_ARG_WITH(binconfigs,
 	[binconfigs='${binconfigs}'])
 AC_SUBST([binconfigs])
-# Control over what links are made for installed files.  Versioned files are
+# Allow the old version number library, libpng.so, to be removed from
-# always installed, when the following options are turned on corresponding
+# the build
-# unversioned links are also created (normally as symbolic links):
+AC_ARG_WITH(libpng-compat,
-AC_ARG_ENABLE([unversioned-links],
+	AC_HELP_STRING([--with-libpng-compat],
-   AS_HELP_STRING([[[--enable-unversioned-links]]],
+		[Generate the obsolete libpng.so library @<:@default=yes@:>@]),
-      [Installed libpng header files are placed in a versioned subdirectory]
+	[if test "${withval}" = no; then
-      [and installed libpng library (including DLL) files are versioned.]
+		compatlib=
-      [If this option is enabled unversioned links will be created pointing to]
+		AC_MSG_NOTICE([libpng.so will not be built])
-      [the corresponding installed files.  If you use libpng.pc or]
+	else
-      [libpng-config for all builds you do not need these links, but if you]
+		compatlib=libpng.la
-      [compile programs directly they will typically #include <png.h> and]
+	fi],
-      [link with -lpng; in that case you need the links.]
+	[compatlib=libpng.la])
-      [The links can be installed manually using 'make install-header-links']
+AC_SUBST([compatlib])
      [and 'make install-library-links' and can be removed using the]
      [corresponding uninstall- targets.  If you do enable this option every]
      [libpng 'make install' will recreate the links to point to the just]
      [installed version of libpng.  The default is to create the links;]
      [use --disable-unversioned-links to change this]))
 # The AM_CONDITIONAL test is written so that the default is enabled;
 # --disable-unversioned-links must be given to turn the option off.
 AM_CONDITIONAL([DO_INSTALL_LINKS],[test "$enable_unversioned_links" != "no"])
 AC_ARG_ENABLE([unversioned-libpng-pc],
   AS_HELP_STRING([[[--enable-unversioned-libpng-pc]]],
      [Install the configuration file 'libpng.pc' as a link to the versioned]
      [version.  This is done by default - use --disable-unversioned-libpng-pc]
      [to change this.]))
 AM_CONDITIONAL([DO_INSTALL_LIBPNG_PC],
   [test "$enable_unversioned_libpng_pc" != "no"])
 AC_ARG_ENABLE([unversioned-libpng-config],
   AS_HELP_STRING([[[--enable-unversioned-libpng-config]]],
      [Install the configuration file 'libpng-config' as a link to the]
      [versioned version.  This is done by default - use]
      [--disable-unversioned-libpng-config to change this.]))
 AM_CONDITIONAL([DO_INSTALL_LIBPNG_CONFIG],
   [test "$enable_unversioned_libpng_config" != "no"])
 # HOST SPECIFIC OPTIONS
 # =====================
 #
 # ARM
 # ===
 #
 # ARM NEON (SIMD) support.
 AC_ARG_ENABLE([arm-neon],
   AS_HELP_STRING([[[--enable-arm-neon]]],
      [Enable ARM NEON optimizations: =no/off, check, api, yes/on:]
      [no/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; yes/on: turn on unconditionally.]
      [If not specified: determined by the compiler.]),
   [case "$enableval" in
      no|off)
         # disable the default enabling on __ARM_NEON__ systems:
         AC_DEFINE([PNG_ARM_NEON_OPT], [0],
                   [Disable ARM Neon optimizations])
         # Prevent inclusion of the assembler files below:
         enable_arm_neon=no;;
      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]);;
      yes|on)
         AC_DEFINE([PNG_ARM_NEON_OPT], [2],
                   [Enable ARM Neon optimizations])
         AC_MSG_WARN([--enable-arm-neon: please specify 'check' or 'api', if]
            [you want the optimizations unconditionally pass -mfpu=neon]
            [to the compiler.]);;
      *)
         AC_MSG_ERROR([--enable-arm-neon=${enable_arm_neon}: invalid value])
   esac])
 # Add ARM specific files to all builds where the host_cpu is arm ('arm*') or
 # where ARM optimizations were explicitly requested (this allows a fallback if a
 # future host CPU does not match 'arm*')
 AM_CONDITIONAL([PNG_ARM_NEON],
   [test "$enable_arm_neon" != 'no' &&
    case "$host_cpu" in
      arm*) :;;
      *)    test "$enable_arm_neon" != '';;
    esac])
 AC_MSG_NOTICE([[Extra options for compiler: $PNG_COPTS]])
 # Config files, substituting as above
-AC_CONFIG_FILES([Makefile libpng.pc:libpng.pc.in])
+AC_CONFIG_FILES([Makefile libpng.pc:scripts/libpng.pc.in])
-AC_CONFIG_FILES([libpng-config:libpng-config.in],
+AC_CONFIG_FILES([libpng-config:scripts/libpng-config.in],
 		[chmod +x libpng-config])
 AC_OUTPUT
--- a/contrib/README.txt
+++ b/contrib/README.txt
@@ -1,4 +0,0 @@
 This "contrib" directory contains contributions which are not necessarily under
 the libpng license, although all are open source.  They are not part of
 libpng proper and are not used for building the library.
--- a/contrib/gregbook/COPYING
+++ b/contrib/gregbook/COPYING
@@ -1,340 +0,0 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991
 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
                            Preamble
  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
 License is intended to guarantee your freedom to share and change free
 software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
 the GNU Library General Public License instead.)  You can apply it to
 your programs, too.
  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 this service if you wish), that you receive source code or can get it
 if you want it, that you can change the software or use pieces of it
 in new free programs; and that you know you can do these things.
  To protect your rights, we need to make restrictions that forbid
 anyone to deny you these rights or to ask you to surrender the rights.
 These restrictions translate to certain responsibilities for you if you
 distribute copies of the software, or if you modify it.
  For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must give the recipients all the rights that
 you have.  You must make sure that they, too, receive or can get the
 source code.  And you must show them these terms so they know their
 rights.
  We protect your rights with two steps: (1) copyright the software, and
 (2) offer you this license which gives you legal permission to copy,
 distribute and/or modify the software.
  Also, for each author's protection and ours, we want to make certain
 that everyone understands that there is no warranty for this free
 software.  If the software is modified by someone else and passed on, we
 want its recipients to know that what they have is not the original, so
 that any problems introduced by others will not reflect on the original
 authors' reputations.
  Finally, any free program is threatened constantly by software
 patents.  We wish to avoid the danger that redistributors of a free
 program will individually obtain patent licenses, in effect making the
 program proprietary.  To prevent this, we have made it clear that any
 patent must be licensed for everyone's free use or not licensed at all.
  The precise terms and conditions for copying, distribution and
 modification follow.
                    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
  0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
 means either the Program or any derivative work under copyright law:
 that is to say, a work containing the Program or a portion of it,
 either verbatim or with modifications and/or translated into another
 language.  (Hereinafter, translation is included without limitation in
 the term "modification".)  Each licensee is addressed as "you".
 Activities other than copying, distribution and modification are not
 covered by this License; they are outside its scope.  The act of
 running the Program is not restricted, and the output from the Program
 is covered only if its contents constitute a work based on the
 Program (independent of having been made by running the Program).
 Whether that is true depends on what the Program does.
  1. You may copy and distribute verbatim copies of the Program's
 source code as you receive it, in any medium, provided that you
 conspicuously and appropriately publish on each copy an appropriate
 copyright notice and disclaimer of warranty; keep intact all the
 notices that refer to this License and to the absence of any warranty;
 and give any other recipients of the Program a copy of this License
 along with the Program.
 You may charge a fee for the physical act of transferring a copy, and
 you may at your option offer warranty protection in exchange for a fee.
  2. You may modify your copy or copies of the Program or any portion
 of it, thus forming a work based on the Program, and copy and
 distribute such modifications or work under the terms of Section 1
 above, provided that you also meet all of these conditions:
    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.
    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.
    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
 themselves, then this License, and its terms, do not apply to those
 sections when you distribute them as separate works.  But when you
 distribute the same sections as part of a whole which is a work based
 on the Program, the distribution of the whole must be on the terms of
 this License, whose permissions for other licensees extend to the
 entire whole, and thus to each and every part regardless of who wrote it.
 Thus, it is not the intent of this section to claim rights or contest
 your rights to work written entirely by you; rather, the intent is to
 exercise the right to control the distribution of derivative or
 collective works based on the Program.
 In addition, mere aggregation of another work not based on the Program
 with the Program (or with a work based on the Program) on a volume of
 a storage or distribution medium does not bring the other work under
 the scope of this License.
  3. You may copy and distribute the Program (or a work based on it,
 under Section 2) in object code or executable form under the terms of
 Sections 1 and 2 above provided that you also do one of the following:
    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,
    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,
    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
 code means all the source code for all modules it contains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
 anything that is normally distributed (in either source or binary
 form) with the major components (compiler, kernel, and so on) of the
 operating system on which the executable runs, unless that component
 itself accompanies the executable.
 If distribution of executable or object code is made by offering
 access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
 void, and will automatically terminate your rights under this License.
 However, parties who have received copies, or rights, from you under
 this License will not have their licenses terminated so long as such
 parties remain in full compliance.
  5. You are not required to accept this License, since you have not
 signed it.  However, nothing else grants you permission to modify or
 distribute the Program or its derivative works.  These actions are
 prohibited by law if you do not accept this License.  Therefore, by
 modifying or distributing the Program (or any work based on the
 Program), you indicate your acceptance of this License to do so, and
 all its terms and conditions for copying, distributing or modifying
 the Program or works based on it.
  6. Each time you redistribute the Program (or any work based on the
 Program), the recipient automatically receives a license from the
 original licensor to copy, distribute or modify the Program subject to
 these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties to
 this License.
  7. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot
 distribute so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you
 may not distribute the Program at all.  For example, if a patent
 license would not permit royalty-free redistribution of the Program by
 all those who receive copies directly or indirectly through you, then
 the only way you could satisfy both it and this License would be to
 refrain entirely from distribution of the Program.
 If any portion of this section is held invalid or unenforceable under
 any particular circumstance, the balance of the section is intended to
 apply and the section as a whole is intended to apply in other
 circumstances.
 It is not the purpose of this section to induce you to infringe any
 patents or other property right claims or to contest validity of any
 such claims; this section has the sole purpose of protecting the
 integrity of the free software distribution system, which is
 implemented by public license practices.  Many people have made
 generous contributions to the wide range of software distributed
 through that system in reliance on consistent application of that
 system; it is up to the author/donor to decide if he or she is willing
 to distribute software through any other system and a licensee cannot
 impose that choice.
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
 may add an explicit geographical distribution limitation excluding
 those countries, so that distribution is permitted only in or among
 countries not thus excluded.  In such case, this License incorporates
 the limitation as if written in the body of this License.
  9. The Free Software Foundation may publish revised and/or new versions
 of the General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 Each version is given a distinguishing version number.  If the Program
 specifies a version number of this License which applies to it and "any
 later version", you have the option of following the terms and conditions
 either of that version or of any later version published by the Free
 Software Foundation.  If the Program does not specify a version number of
 this License, you may choose any version ever published by the Free Software
 Foundation.
  10. If you wish to incorporate parts of the Program into other free
 programs whose distribution conditions are different, write to the author
 to ask for permission.  For software which is copyrighted by the Free
 Software Foundation, write to the Free Software Foundation; we sometimes
 make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
                            NO WARRANTY
  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
 PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
 OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
 TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
 REPAIR OR CORRECTION.
  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
 OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
 TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
                     END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>
    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 of the License, 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, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Also add information on how to contact you by electronic and paper mail.
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
    Gnomovision version 69, Copyright (C) year  name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, the commands you use may
 be called something other than `show w' and `show c'; they could even be
 mouse-clicks or menu items--whatever suits your program.
 You should also get your employer (if you work as a programmer) or your
 school, if any, to sign a "copyright disclaimer" for the program, if
 necessary.  Here is a sample; alter the names:
  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.
  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
--- a/contrib/gregbook/LICENSE
+++ b/contrib/gregbook/LICENSE
@@ -1,19 +1,12 @@
  ---------------------------------------------------------------------------
-      Copyright (c) 1998-2008 Greg Roelofs.  All rights reserved.
+      Copyright (c) 1998-2001 Greg Roelofs.  All rights reserved.
      This software is provided "as is," without warranty of any kind,
      express or implied.  In no event shall the author or contributors
      be held liable for any damages arising in any way from the use of
      this software.
      The contents of this file are DUAL-LICENSED.  You may modify and/or
      redistribute this software according to the terms of one of the
      following two licenses (at your option):
      LICENSE 1 ("BSD-like with advertising clause"):
      Permission is granted to anyone to use this software for any purpose,
      including commercial applications, and to alter it and redistribute
      it freely, subject to the following restrictions:
@@ -30,21 +23,4 @@
            and contributors for the book, "PNG: The Definitive Guide,"
            published by O'Reilly and Associates.
      LICENSE 2 (GNU GPL v2 or later):
      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 of the License, 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, write to the Free Software Foundation,
      Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ---------------------------------------------------------------------------
--- a/contrib/gregbook/Makefile.mingw32
+++ b/contrib/gregbook/Makefile.mingw32
@@ -1,131 +0,0 @@
 # Sample makefile for rpng-win / rpng2-win / wpng using mingw32-gcc and make.
 # Greg Roelofs
 # Last modified:  2 June 2007
 #
 #	The programs built by this makefile are described in the book,
 #	"PNG:  The Definitive Guide," by Greg Roelofs (O'Reilly and
 #	Associates, 1999).  Go buy a copy, eh?  Well, OK, it's not
 #	generally for sale anymore, but it's the thought that counts,
 #	right?  (Hint:  http://www.libpng.org/pub/png/book/ )
 #
 # Invoke this makefile from a DOS-prompt window via:
 #
 #	make -f Makefile.mingw32
 #
 # This makefile assumes libpng and zlib have already been built or downloaded
 # and are in subdirectories at the same level as the current subdirectory
 # (as indicated by the PNGDIR and ZDIR macros below).  It makes no assumptions
 # at all about the mingw32 installation tree (W32DIR).  Edit as appropriate.
 #
 # Note that the names of the dynamic and static libpng and zlib libraries
 # used below may change in later releases of the libraries.  This makefile
 # builds both statically and dynamically linked executables by default.
 # (You need only one set, but for testing it can be handy to have both.)
 # macros --------------------------------------------------------------------
 #PNGDIR = ../..#		for libpng-x.y.z/contrib/gregbook builds
 PNGDIR = ../libpng-win32
 PNGINC = -I$(PNGDIR)
 PNGLIBd = $(PNGDIR)/libpng.dll.a	# dynamically linked
 PNGLIBs = $(PNGDIR)/libpng.a		# statically linked, local libpng
 #ZDIR = ../../../zlib-win32#	for libpng-x.y.z/contrib/gregbook builds
 ZDIR = ../zlib-win32
 ZINC = -I$(ZDIR)
 ZLIBd = $(ZDIR)/libzdll.a
 ZLIBs = $(ZDIR)/libz.a
 # change this to be the path where mingw32 installs its stuff:
 W32DIR =
 #W32DIR = /usr/local/cross-tools/i386-mingw32msvc
 W32INC = -I$(W32DIR)/include
 W32LIB = $(W32DIR)/lib/libuser32.a $(W32DIR)/lib/libgdi32.a
 CC = gcc
 #CC = i386-mingw32msvc-gcc #	e.g., Linux -> Win32 cross-compilation
 LD = $(CC)
 RM = rm -f
 CPPFLAGS = $(INCS)
 CFLAGS = -O -Wall $(MINGW_CCFLAGS)
 # [note that -Wall is a gcc-specific compilation flag ("most warnings on")]
 # [-ansi, -pedantic and -W can also be used]
 LDFLAGS = $(MINGW_LDFLAGS)
 O = .o
 E = .exe
 INCS = $(PNGINC) $(ZINC) $(W32INC)
 RLIBSd = $(PNGLIBd) $(ZLIBd) $(W32LIB) -lm
 RLIBSs = $(PNGLIBs) $(ZLIBs) $(W32LIB) -lm
 WLIBSd = $(PNGLIBd) $(ZLIBd)
 WLIBSs = $(PNGLIBs) $(ZLIBs)
 RPNG   = rpng-win
 RPNG2  = rpng2-win
 WPNG   = wpng
 ROBJSd  = $(RPNG)$(O) readpng.pic$(O)
 ROBJS2d = $(RPNG2)$(O) readpng2.pic$(O)
 WOBJSd  = $(WPNG)$(O) writepng.pic$(O)
 RPNGs  = $(RPNG)-static
 RPNG2s = $(RPNG2)-static
 WPNGs  = $(WPNG)-static
 ROBJSs  = $(RPNG)$(O) readpng$(O)
 ROBJS2s = $(RPNG2)$(O) readpng2$(O)
 WOBJSs  = $(WPNG)$(O) writepng$(O)
 STATIC_EXES  = $(RPNGs)$(E) $(RPNG2s)$(E) $(WPNGs)$(E)
 DYNAMIC_EXES = $(RPNG)$(E) $(RPNG2)$(E) $(WPNG)$(E)
 EXES = $(STATIC_EXES) $(DYNAMIC_EXES)
 # implicit make rules -------------------------------------------------------
 .c$(O):
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
 %.pic$(O): %.c
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
 # dependencies --------------------------------------------------------------
 all:  $(EXES)
 $(RPNGs)$(E): $(ROBJSs)
 	$(LD) $(LDFLAGS) -o $@ $(ROBJSs) $(RLIBSs)
 $(RPNG)$(E): $(ROBJSd)
 	$(LD) $(LDFLAGS) -o $@ $(ROBJSd) $(RLIBSd)
 $(RPNG2s)$(E): $(ROBJS2s)
 	$(LD) $(LDFLAGS) -o $@ $(ROBJS2s) $(RLIBSs)
 $(RPNG2)$(E): $(ROBJS2d)
 	$(LD) $(LDFLAGS) -o $@ $(ROBJS2d) $(RLIBSd)
 $(WPNGs)$(E): $(WOBJSs)
 	$(LD) $(LDFLAGS) -o $@ $(WOBJSs) $(WLIBSs)
 $(WPNG)$(E): $(WOBJSd)
 	$(LD) $(LDFLAGS) -o $@ $(WOBJSd) $(WLIBSd)
 $(RPNG)$(O):	$(RPNG).c readpng.h
 $(RPNG2)$(O):	$(RPNG2).c readpng2.h
 $(WPNG)$(O):	$(WPNG).c writepng.h
 readpng$(O) readpng.pic$(O):	readpng.c readpng.h
 readpng2$(O) readpng2.pic$(O):	readpng2.c readpng2.h
 writepng$(O) writepng.pic$(O):	writepng.c writepng.h
 # maintenance ---------------------------------------------------------------
 clean:
 	$(RM) $(EXES)
 	$(RM) $(ROBJSs) $(ROBJS2s) $(WOBJSs)
 	$(RM) $(ROBJSd) $(ROBJS2d) $(WOBJSd)
--- a/contrib/gregbook/Makefile.sgi
+++ b/contrib/gregbook/Makefile.sgi
@@ -23,9 +23,9 @@
 # macros --------------------------------------------------------------------
-PNGINC = -I/usr/local/include/libpng15
+PNGINC = -I/usr/local/include/libpng12
-PNGLIB = -L/usr/local/lib -lpng15	  # dynamically linked against libpng
+PNGLIB = -L/usr/local/lib -lpng12	  # dynamically linked against libpng
-#PNGLIB = /usr/local/lib/libpng15.a # statically linked against libpng
+#PNGLIB = /usr/local/lib/libpng12.a # statically linked against libpng
 # or:
 #PNGINC = -I../..
 #PNGLIB = -L../.. -lpng
@@ -53,8 +53,7 @@ CC = cc
 LD = cc
 RM = rm -f
 # ABI must be the same as that used to build libpng.
-ABI =
+ABI=
 CPPFLAGS =
 CFLAGS = $(ABI) -O -fullwarn $(INCS)
 LDFLAGS = $(ABI)
 O = .o
@@ -74,7 +73,7 @@ EXES = $(RPNG)$(E) $(RPNG2)$(E) $(WPNG)$(E)
 # implicit make rules -------------------------------------------------------
 .c$(O):
-	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
+	$(CC) -c $(CFLAGS) $<
 # dependencies --------------------------------------------------------------
--- a/contrib/gregbook/Makefile.unx
+++ b/contrib/gregbook/Makefile.unx
@@ -1,122 +1,93 @@
 # Sample makefile for rpng-x / rpng2-x / wpng using gcc and make.
 # Greg Roelofs
-# Last modified:  2 June 2007
+# Last modified:  7 March 2002
 #
 #	The programs built by this makefile are described in the book,
 #	"PNG:  The Definitive Guide," by Greg Roelofs (O'Reilly and
-#	Associates, 1999).  Go buy a copy, eh?  Well, OK, it's not
+#	Associates, 1999).  Go buy a copy, eh?  Buy some for friends
-#	generally for sale anymore, but it's the thought that counts,
+#	and family, too.  (Not that this is a blatant plug or anything.)
 #	right?  (Hint:  http://www.libpng.org/pub/png/book/ )
 #
 # Invoke this makefile from a shell prompt in the usual way; for example:
 #
 #	make -f Makefile.unx
 #
 # This makefile assumes libpng and zlib have already been built or downloaded
-# and are installed in /usr/local/{include,lib} or as otherwise indicated by
+# and are both installed in /usr/local/{include,lib} (as indicated by the
-# the PNG* and Z* macros below.  Edit as appropriate--choose only ONE each of
+# PNG* and Z* macros below).  Edit as appropriate--choose only ONE each of
-# the PNGINC, PNGLIBd, PNGLIBs, ZINC, ZLIBd and ZLIBs lines.
+# the PNGINC, PNGLIB, ZINC and ZLIB lines.
 #
-# This makefile builds both dynamically and statically linked executables
+# This makefile builds statically linked executables (against libpng and zlib,
-# (against libpng and zlib, that is), but that can be changed by modifying
+# that is), but that can be changed by uncommenting the appropriate PNGLIB and
-# the "EXES =" line.  (You need only one set, but for testing it can be handy
+# ZLIB lines.
 # to have both.)
 # macros --------------------------------------------------------------------
-#PNGDIR = /usr/local/lib
+PNGINC = -I/usr/local/include/libpng12
-#PNGINC = -I/usr/local/include/libpng15
+#PNGLIB = -L/usr/local/lib -lpng12 # dynamically linked against libpng
-#PNGLIBd = -L$(PNGDIR) -lpng15 # dynamically linked, installed libpng
+PNGLIB = /usr/local/lib/libpng12.a # statically linked against libpng
 #PNGLIBs = $(PNGDIR)/libpng15.a # statically linked, installed libpng
 # or:
-PNGDIR = ../..#	this one is for libpng-x.y.z/contrib/gregbook builds
+#PNGINC = -I../libpng
-#PNGDIR = ../libpng
+#PNGLIB = -L../libpng -lpng
-PNGINC = -I$(PNGDIR)
+#PNGLIB = ../libpng/libpng.a
 PNGLIBd = -Wl,-rpath,$(PNGDIR) -L$(PNGDIR) -lpng15	# dynamically linked
 PNGLIBs = $(PNGDIR)/libpng.a		# statically linked, local libpng
 ZDIR = /usr/local/lib
 #ZDIR = /usr/lib64
 ZINC = -I/usr/local/include
-ZLIBd = -L$(ZDIR) -lz			# dynamically linked against zlib
+#ZLIB = -L/usr/local/lib -lz		# dynamically linked against zlib
-ZLIBs = $(ZDIR)/libz.a			# statically linked against zlib
+ZLIB = /usr/local/lib/libz.a		# statically linked against zlib
-# or:
+#ZINC = -I../zlib
-#ZDIR = ../zlib
+#ZLIB = -L../zlib -lz
-#ZINC = -I$(ZDIR)
+#ZLIB = ../zlib/libz.a
 #ZLIBd = -Wl,-rpath,$(ZDIR) -L$(ZDIR) -lz  # -rpath allows in-place testing
 #ZLIBs = $(ZDIR)/libz.a
 #XINC = -I/usr/include			# old-style, stock X distributions
-#XLIB = -L/usr/lib/X11 -lX11		#  (including SGI IRIX)
+#XLIB = -L/usr/lib/X11 -lX11
 #XINC = -I/usr/openwin/include		# Sun workstations (OpenWindows)
 #XLIB = -L/usr/openwin/lib -lX11
-XINC = -I/usr/X11R6/include		# new X distributions (X.org, etc.)
+XINC = -I/usr/X11R6/include		# new X distributions (XFree86, etc.)
 XLIB = -L/usr/X11R6/lib -lX11
 #XLIB = -L/usr/X11R6/lib64 -lX11	# e.g., Red Hat on AMD64
 INCS = $(PNGINC) $(ZINC) $(XINC)
-RLIBSd = $(PNGLIBd) $(ZLIBd) $(XLIB) -lm
+RLIBS = $(PNGLIB) $(ZLIB) $(XLIB) -lm
-RLIBSs = $(PNGLIBs) $(ZLIBs) $(XLIB) -lm
+WLIBS = $(PNGLIB) $(ZLIB)
 WLIBSd = $(PNGLIBd) $(ZLIBd) -lm
 WLIBSs = $(PNGLIBs) $(ZLIBs)
 CC = gcc
 LD = gcc
 RM = rm -f
-CPPFLAGS = $(INCS) -DFEATURE_LOOP
+CFLAGS = -O -Wall $(INCS)
 CFLAGS = -O -Wall
 # [note that -Wall is a gcc-specific compilation flag ("most warnings on")]
 # [-ansi, -pedantic and -W can also be used]
 LDFLAGS =
 O = .o
 E =
-RPNG   = rpng-x
+RPNG  = rpng-x
-RPNG2  = rpng2-x
+RPNG2 = rpng2-x
-WPNG   = wpng
+WPNG  = wpng
 RPNGs  = $(RPNG)-static
 RPNG2s = $(RPNG2)-static
 WPNGs  = $(WPNG)-static
 ROBJS  = $(RPNG)$(O) readpng$(O)
 ROBJS2 = $(RPNG2)$(O) readpng2$(O)
 WOBJS  = $(WPNG)$(O) writepng$(O)
-STATIC_EXES  = $(RPNGs)$(E) $(RPNG2s)$(E) $(WPNGs)$(E)
+EXES = $(RPNG)$(E) $(RPNG2)$(E) $(WPNG)$(E)
 DYNAMIC_EXES = $(RPNG)$(E) $(RPNG2)$(E) $(WPNG)$(E)
 EXES = $(STATIC_EXES) $(DYNAMIC_EXES)
 # implicit make rules -------------------------------------------------------
 .c$(O):
-	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
+	$(CC) -c $(CFLAGS) $<
 # dependencies --------------------------------------------------------------
 all:  $(EXES)
 $(RPNGs)$(E): $(ROBJS)
 	$(LD) $(LDFLAGS) -o $@ $(ROBJS) $(RLIBSs)
 $(RPNG)$(E): $(ROBJS)
-	$(LD) $(LDFLAGS) -o $@ $(ROBJS) $(RLIBSd)
+	$(LD) $(LDFLAGS) -o $@ $(ROBJS) $(RLIBS)
 $(RPNG2s)$(E): $(ROBJS2)
 	$(LD) $(LDFLAGS) -o $@ $(ROBJS2) $(RLIBSs)
 $(RPNG2)$(E): $(ROBJS2)
-	$(LD) $(LDFLAGS) -o $@ $(ROBJS2) $(RLIBSd)
+	$(LD) $(LDFLAGS) -o $@ $(ROBJS2) $(RLIBS)
 $(WPNGs)$(E): $(WOBJS)
 	$(LD) $(LDFLAGS) -o $@ $(WOBJS) $(WLIBSs)
 $(WPNG)$(E): $(WOBJS)
-	$(LD) $(LDFLAGS) -o $@ $(WOBJS) $(WLIBSd)
+	$(LD) $(LDFLAGS) -o $@ $(WOBJS) $(WLIBS)
 $(RPNG)$(O):	$(RPNG).c readpng.h
 $(RPNG2)$(O):	$(RPNG2).c readpng2.h
--- a/contrib/gregbook/Makefile.w32
+++ b/contrib/gregbook/Makefile.w32
@@ -1,12 +1,11 @@
 # Sample makefile for rpng-win / rpng2-win / wpng using MSVC and NMAKE.
 # Greg Roelofs
-# Last modified:  2 June 2007
+# Last modified:  16 February 1999
 #
 #	The programs built by this makefile are described in the book,
 #	"PNG:  The Definitive Guide," by Greg Roelofs (O'Reilly and
-#	Associates, 1999).  Go buy a copy, eh?  Well, OK, it's not
+#	Associates, 1999).  Go buy a copy, eh?  Buy some for friends
-#	generally for sale anymore, but it's the thought that counts,
+#	and family, too.  (Not that this is a blatant plug or anything.)
 #	right?  (Hint:  http://www.libpng.org/pub/png/book/ )
 #
 # Invoke this makefile from a DOS prompt window via:
 #
@@ -18,7 +17,7 @@
 # "c:\windows\command.com /e:4096" as the program command line and set the
 # working directory to this directory.  Then double-click to open the new
 # DOS-prompt window with a bigger environment and retry the commands above.
-#
+# 
 # This makefile assumes libpng and zlib have already been built or downloaded
 # and are in subdirectories at the same level as the current subdirectory
 # (as indicated by the PNGPATH and ZPATH macros below).  Edit as appropriate.
@@ -53,9 +52,8 @@ WLIBS = $(PNGLIB) $(ZLIB)
 CC = cl
 LD = link
 RM = del
-CPPFLAGS = $(INCS)
+CFLAGS = -nologo -O -W3 $(INCS) $(cvars)
-CFLAGS = -nologo -O -W3 $(cvars)
+# [note that -Wall is an MSVC-specific compilation flag ("all warnings on")]
 # [note that -W3 is an MSVC-specific compilation flag ("all warnings on")]
 # [see %devstudio%\vc\include\win32.mak for cvars macro definition]
 O = .obj
 E = .exe
@@ -77,7 +75,7 @@ EXES = $(RPNG)$(E) $(RPNG2)$(E) $(WPNG)$(E)
 # implicit make rules -------------------------------------------------------
 .c$(O):
-	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
+	$(CC) -c $(CFLAGS) $<
 # dependencies --------------------------------------------------------------
--- a/contrib/gregbook/README
+++ b/contrib/gregbook/README
@@ -22,8 +22,7 @@ below.
 Files:
   README             this file
-   LICENSE            terms of distribution and reuse (BSD-like or GNU GPL)
+   LICENSE            terms of distribution and reuse (BSD-like)
   COPYING            GNU General Public License (GPL)
   Makefile.unx       Unix makefile
   Makefile.w32       Windows (MSVC) makefile
@@ -55,17 +54,17 @@ mation and links to the latest version of the source code, and Chapters
 13-15 of the book for detailed discussion of the three programs.
 Greg Roelofs
-http://pobox.com/~newt/greg_contact.html
+newt@pobox.com
-16 March 2008
+30 June 2001
 BUILD INSTRUCTIONS
 - Prerequisites (in order of compilation):
-      - zlib            http://zlib.net/
+      - zlib		http://www.gzip.org/zlib/
-      - libpng          http://www.libpng.org/pub/png/libpng.html
+      - libpng		http://www.libpng.org/pub/png/libpng.html
-      - pngbook         http://www.libpng.org/pub/png/book/sources.html
+      - pngbook		http://www.libpng.org/pub/png/book/sources.html
     The pngbook demo programs are explicitly designed to demonstrate proper
     coding techniques for using the libpng reference library.  As a result,
@@ -104,7 +103,7 @@ BUILD INSTRUCTIONS
     unpacked the source code.
     For MSVC, set up the necessary environment variables by invoking
-
+ 
        %devstudio%\vc\bin\vcvars32.bat
     where where %devstudio% is the installation directory for MSVC /
@@ -151,9 +150,9 @@ BUILD INSTRUCTIONS
     To run the programs, they probably first need to be set up as "foreign
     symbols," with "disk" and "dir" set appropriately:
-     $ rpng  == "$disk:[dir]rpng-x.exe"
+     $ rpng == "$disk:[dir]rpng-x.exe"
     $ rpng2 == "$disk:[dir]rpng2-x.exe"
-     $ wpng  == "$disk:[dir]wpng.exe"
+     $ wpng == "$disk:[dir]wpng.exe"
     All three will print a basic usage screen when run without any command-
     line arguments; see the book for more details.  Note that the options
@@ -165,19 +164,19 @@ RUNNING THE PROGRAMS:  (VERY) BRIEF INTRO
     rpng is a simple PNG viewer that can display transparent PNGs with a
     specified background color; for example,
-        rpng -bgcolor \#ff0000 toucan.png
+	rpng -bgcolor #ff0000 toucan.png
     would display the image with a red background.  rpng2 is a progressive
     viewer that simulates a web browser in some respects; it can display
     images against either a background color or a dynamically generated
     background image.  For example:
-        rpng2 -bgpat 16 toucan.png
+	rpng2 -bgpat 16 toucan.png
     wpng is a purely command-line image converter from binary PBMPLUS/NetPBM
     format (.pgm or .ppm) to PNG; for example,
-        wpng -time < toucan-notrans.ppm > toucan-notrans.png
+	wpng -time < toucan.ppm > toucan.png
     would convert the specified PPM file (using redirection) to PNG, auto-
     matically setting the PNG modification-time chunk.
--- a/contrib/gregbook/makevms.com
+++ b/contrib/gregbook/makevms.com
@@ -20,13 +20,13 @@ $ if zpath .eqs. ""
 $ then
 $   write sys$output "zlib include not found. Exiting..."
 $   exit 2
-$ endif
+$ endif 
 $!
 $ if pngpath .eqs. ""
 $ then
 $   write sys$output "libpng include not found. Exiting..."
 $   exit 2
-$ endif
+$ endif 
 $!
 $!    Look for the compiler used.
 $!
--- a/contrib/gregbook/readpng.c
+++ b/contrib/gregbook/readpng.c
@@ -4,20 +4,13 @@
  ---------------------------------------------------------------------------
-      Copyright (c) 1998-2007 Greg Roelofs.  All rights reserved.
+      Copyright (c) 1998-2000 Greg Roelofs.  All rights reserved.
      This software is provided "as is," without warranty of any kind,
      express or implied.  In no event shall the author or contributors
      be held liable for any damages arising in any way from the use of
      this software.
      The contents of this file are DUAL-LICENSED.  You may modify and/or
      redistribute this software according to the terms of one of the
      following two licenses (at your option):
      LICENSE 1 ("BSD-like with advertising clause"):
      Permission is granted to anyone to use this software for any purpose,
      including commercial applications, and to alter it and redistribute
      it freely, subject to the following restrictions:
@@ -34,30 +27,12 @@
            and contributors for the book, "PNG: The Definitive Guide,"
            published by O'Reilly and Associates.
      LICENSE 2 (GNU GPL v2 or later):
      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 of the License, 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, write to the Free Software Foundation,
      Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ---------------------------------------------------------------------------*/
 #include <stdio.h>
 #include <stdlib.h>
 #include <zlib.h>
-#include "png.h"        /* libpng header */
+#include "png.h"        /* libpng header; includes zlib.h */
 #include "readpng.h"    /* typedefs, common macros, public prototypes */
 /* future versions of libpng will provide this macro: */
@@ -94,7 +69,7 @@ int readpng_init(FILE *infile, ulg *pWidth, ulg *pHeight)
     * have used slightly more general png_sig_cmp() function instead */
    fread(sig, 1, 8, infile);
-    if (png_sig_cmp(sig, 0, 8))
+    if (!png_check_sig(sig, 8))
        return 1;   /* bad signature */
@@ -215,10 +190,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;
    }
@@ -234,14 +205,8 @@ uch *readpng_get_image(double display_exponent, int *pChannels, ulg *pRowbytes)
        png_set_expand(png_ptr);
    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
        png_set_expand(png_ptr);
 #ifdef PNG_READ_16_TO_8_SUPPORTED
    if (bit_depth == 16)
 #  ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
        png_set_scale_16(png_ptr);
 #  else
        png_set_strip_16(png_ptr);
 #  endif
 #endif
    if (color_type == PNG_COLOR_TYPE_GRAY ||
        color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
        png_set_gray_to_rgb(png_ptr);
@@ -274,8 +239,7 @@ uch *readpng_get_image(double display_exponent, int *pChannels, ulg *pRowbytes)
        return NULL;
    }
-    Trace((stderr, "readpng_get_image:  channels = %d, rowbytes = %ld, height = %ld\n",
+    Trace((stderr, "readpng_get_image:  channels = %d, rowbytes = %ld, height = %ld\n", *pChannels, rowbytes, height));
        *pChannels, rowbytes, height));
    /* set the individual row_pointers to point at the correct offsets */
--- a/contrib/gregbook/readpng.h
+++ b/contrib/gregbook/readpng.h
@@ -4,20 +4,13 @@
  ---------------------------------------------------------------------------
-      Copyright (c) 1998-2007 Greg Roelofs.  All rights reserved.
+      Copyright (c) 1998-2000 Greg Roelofs.  All rights reserved.
      This software is provided "as is," without warranty of any kind,
      express or implied.  In no event shall the author or contributors
      be held liable for any damages arising in any way from the use of
      this software.
      The contents of this file are DUAL-LICENSED.  You may modify and/or
      redistribute this software according to the terms of one of the
      following two licenses (at your option):
      LICENSE 1 ("BSD-like with advertising clause"):
      Permission is granted to anyone to use this software for any purpose,
      including commercial applications, and to alter it and redistribute
      it freely, subject to the following restrictions:
@@ -34,23 +27,6 @@
            and contributors for the book, "PNG: The Definitive Guide,"
            published by O'Reilly and Associates.
      LICENSE 2 (GNU GPL v2 or later):
      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 of the License, 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, write to the Free Software Foundation,
      Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ---------------------------------------------------------------------------*/
 #ifndef TRUE
--- a/contrib/gregbook/readpng2.c
+++ b/contrib/gregbook/readpng2.c
@@ -4,20 +4,19 @@
  ---------------------------------------------------------------------------
-      Copyright (c) 1998-2007 Greg Roelofs.  All rights reserved.
+   Changelog:
    - 1.01:  initial public release
    - 1.02:  added code to skip unused chunks (GR-P)
  ---------------------------------------------------------------------------
      Copyright (c) 1998-2002 Greg Roelofs.  All rights reserved.
      This software is provided "as is," without warranty of any kind,
      express or implied.  In no event shall the author or contributors
      be held liable for any damages arising in any way from the use of
      this software.
      The contents of this file are DUAL-LICENSED.  You may modify and/or
      redistribute this software according to the terms of one of the
      following two licenses (at your option):
      LICENSE 1 ("BSD-like with advertising clause"):
      Permission is granted to anyone to use this software for any purpose,
      including commercial applications, and to alter it and redistribute
      it freely, subject to the following restrictions:
@@ -34,31 +33,12 @@
            and contributors for the book, "PNG: The Definitive Guide,"
            published by O'Reilly and Associates.
      LICENSE 2 (GNU GPL v2 or later):
      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 of the License, 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, write to the Free Software Foundation,
      Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ---------------------------------------------------------------------------*/
 #include <stdlib.h>     /* for exit() prototype */
 #include <setjmp.h>
-#include <zlib.h>
+#include "png.h"        /* libpng header; includes zlib.h and setjmp.h */
 #include "png.h"        /* libpng header from the local directory */
 #include "readpng2.h"   /* typedefs, common macros, public prototypes */
@@ -75,10 +55,79 @@ static void readpng2_error_handler(png_structp png_ptr, png_const_charp msg);
 void readpng2_version_info(void)
 {
-    fprintf(stderr, "   Compiled with libpng %s; using libpng %s\n",
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && \
-      PNG_LIBPNG_VER_STRING, png_libpng_ver);
+    (defined(__i386__) || defined(_M_IX86)) && \
    defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200)
    /*
     * WARNING:  This preprocessor approach means that the following code
     *           cannot be used with a libpng DLL older than 1.2.0--the
     *           compiled-in symbols for the new functions will not exist.
     *           (Could use dlopen() and dlsym() on Unix and corresponding
     *           calls for Windows, but not portable...)
     */
    {
        int mmxsupport = png_mmx_support();
        if (mmxsupport < 0)
            fprintf(stderr, "   Compiled with libpng %s; using libpng %s "
              "without MMX support.\n", PNG_LIBPNG_VER_STRING, png_libpng_ver);
        else {
            int compilerID;
            png_uint_32 mmx_mask = png_get_mmx_flagmask(
              PNG_SELECT_READ | PNG_SELECT_WRITE, &compilerID);
-    fprintf(stderr, "   and with zlib %s; using zlib %s.\n",
+            fprintf(stderr, "   Compiled with libpng %s; using libpng %s "
              "with MMX support\n   (%s version).", PNG_LIBPNG_VER_STRING,
              png_libpng_ver, compilerID == 1? "MSVC++" :
              (compilerID == 2? "GNU C" : "unknown"));
            fprintf(stderr, "  Processor %s MMX instructions.\n",
              mmxsupport? "supports" : "does not support");
            if (mmxsupport > 0) {
                int num_optims = 0;
                fprintf(stderr,
                  "      Potential MMX optimizations supported by libpng:\n");
                if (mmx_mask & PNG_ASM_FLAG_MMX_READ_FILTER_SUB)
                    ++num_optims;
                if (mmx_mask & PNG_ASM_FLAG_MMX_READ_FILTER_UP)
                    ++num_optims;
                if (mmx_mask & PNG_ASM_FLAG_MMX_READ_FILTER_AVG)
                    ++num_optims;
                if (mmx_mask & PNG_ASM_FLAG_MMX_READ_FILTER_PAETH)
                    ++num_optims;
                if (num_optims)
                    fprintf(stderr,
                      "         decoding %s row filters (reading)\n",
                      (num_optims == 4)? "all non-trivial" : "some");
                if (mmx_mask & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW) {
                    fprintf(stderr, "         combining rows (reading)\n");
                    ++num_optims;
                }
                if (mmx_mask & PNG_ASM_FLAG_MMX_READ_INTERLACE) {
                    fprintf(stderr,
                      "         expanding interlacing (reading)\n");
                    ++num_optims;
                }
                mmx_mask &= ~( PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  \
                             | PNG_ASM_FLAG_MMX_READ_INTERLACE    \
                             | PNG_ASM_FLAG_MMX_READ_FILTER_SUB   \
                             | PNG_ASM_FLAG_MMX_READ_FILTER_UP    \
                             | PNG_ASM_FLAG_MMX_READ_FILTER_AVG   \
                             | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH );
                if (mmx_mask) {
                    fprintf(stderr, "         other (unknown)\n");
                    ++num_optims;
                }
                if (num_optims == 0)
                    fprintf(stderr, "         (none)\n");
            }
        }
    }
 #else
    fprintf(stderr, "   Compiled with libpng %s; using libpng %s "
      "without MMX support.\n", PNG_LIBPNG_VER_STRING, png_libpng_ver);
 #endif
    fprintf(stderr, "   Compiled with zlib %s; using zlib %s.\n",
      ZLIB_VERSION, zlib_version);
 }
@@ -87,7 +136,7 @@ void readpng2_version_info(void)
 int readpng2_check_sig(uch *sig, int num)
 {
-    return !png_sig_cmp(sig, 0, num);
+    return png_check_sig(sig, num);
 }
@@ -130,38 +179,40 @@ int readpng2_init(mainprog_info *mainprog_ptr)
        return 2;
    }
    /* prepare the reader to ignore all recognized chunks whose data isn't
     * going to be used, i.e., all chunks recognized by libpng except for
     * IHDR, PLTE, IDAT, IEND, tRNS, bKGD, gAMA, and sRGB : */
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
    /* prepare the reader to ignore all recognized chunks whose data won't be
     * used, i.e., all chunks recognized by libpng except for IHDR, PLTE, IDAT,
     * IEND, tRNS, bKGD, gAMA, and sRGB (small performance improvement) */
    {
-        /* These byte strings were copied from png.h.  If a future libpng
+#ifndef HANDLE_CHUNK_NEVER
-         * version recognizes more chunks, add them to this list.  If a
+/* prior to libpng-1.2.5, this macro was internal, so we define it here. */
-         * future version of readpng2.c recognizes more chunks, delete them
+# define HANDLE_CHUNK_NEVER 1
-         * from this list. */
+#endif
-        static /* const */ png_byte chunks_to_ignore[] = {
+       /* these byte strings were copied from png.h.
-             99,  72,  82,  77, '\0',  /* cHRM */
+        * If a future libpng version recognizes more chunks, add them
-            104,  73,  83,  84, '\0',  /* hIST */
+        * to this list.  If a future version of readpng2.c recognizes
-            105,  67,  67,  80, '\0',  /* iCCP */
+        * more chunks, delete them from this list. */
-            105,  84,  88, 116, '\0',  /* iTXt */
+       png_byte png_chunk_types_to_ignore[]=
-            111,  70,  70, 115, '\0',  /* oFFs */
+          { 99,  72,  82,  77, '\0', /* cHRM */
-            112,  67,  65,  76, '\0',  /* pCAL */
+           104,  73,  83,  84, '\0', /* hIST */
-            112,  72,  89, 115, '\0',  /* pHYs */
+           105,  67,  67,  80, '\0', /* iCCP */
-            115,  66,  73,  84, '\0',  /* sBIT */
+           105,  84,  88, 116, '\0', /* iTXt */
-            115,  67,  65,  76, '\0',  /* sCAL */
+           111,  70,  70, 115, '\0', /* oFFs */
-            115,  80,  76,  84, '\0',  /* sPLT */
+           112,  67,  65,  76, '\0', /* pCAL */
-            115,  84,  69,  82, '\0',  /* sTER */
+           115,  67,  65,  76, '\0', /* sCAL */
-            116,  69,  88, 116, '\0',  /* tEXt */
+           112,  72,  89, 115, '\0', /* pHYs */
-            116,  73,  77,  69, '\0',  /* tIME */
+           115,  66,  73,  84, '\0', /* sBIT */
-            122,  84,  88, 116, '\0'   /* zTXt */
+           115,  80,  76,  84, '\0', /* sPLT */
-        };
+           116,  69,  88, 116, '\0', /* tEXt */
           116,  73,  77,  69, '\0', /* tIME */
           122,  84,  88, 116, '\0'}; /* zTXt */
 #define NUM_PNG_CHUNK_TYPES_TO_IGNORE 13
-        png_set_keep_unknown_chunks(png_ptr, 1 /* PNG_HANDLE_CHUNK_NEVER */,
+    png_set_keep_unknown_chunks(png_ptr, HANDLE_CHUNK_NEVER,
-          chunks_to_ignore, sizeof(chunks_to_ignore)/5);
+        png_chunk_types_to_ignore, NUM_PNG_CHUNK_TYPES_TO_IGNORE);
    }
-#endif /* PNG_HANDLE_AS_UNKNOWN_SUPPORTED */
+#endif
    /* instead of doing png_init_io() here, now we set up our callback
     * functions for progressive decoding */
@@ -170,6 +221,96 @@ int readpng2_init(mainprog_info *mainprog_ptr)
      readpng2_info_callback, readpng2_row_callback, readpng2_end_callback);
    /*
     * may as well enable or disable MMX routines here, if supported;
     *
     * to enable all:  mask = png_get_mmx_flagmask (
     *                   PNG_SELECT_READ | PNG_SELECT_WRITE, &compilerID);
     *                 flags = png_get_asm_flags (png_ptr);
     *                 flags |= mask;
     *                 png_set_asm_flags (png_ptr, flags);
     *
     * to disable all:  mask = png_get_mmx_flagmask (
     *                   PNG_SELECT_READ | PNG_SELECT_WRITE, &compilerID);
     *                  flags = png_get_asm_flags (png_ptr);
     *                  flags &= ~mask;
     *                  png_set_asm_flags (png_ptr, flags);
     */
 #if (defined(__i386__) || defined(_M_IX86)) && \
    defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200)
    /*
     * WARNING:  This preprocessor approach means that the following code
     *           cannot be used with a libpng DLL older than 1.2.0--the
     *           compiled-in symbols for the new functions will not exist.
     *           (Could use dlopen() and dlsym() on Unix and corresponding
     *           calls for Windows, but not portable...)
     */
    {
 #ifdef PNG_ASSEMBLER_CODE_SUPPORTED
        png_uint_32 mmx_disable_mask = 0;
        png_uint_32 asm_flags, mmx_mask;
        int compilerID;
        if (mainprog_ptr->nommxfilters)
            mmx_disable_mask |= ( PNG_ASM_FLAG_MMX_READ_FILTER_SUB   \
                                | PNG_ASM_FLAG_MMX_READ_FILTER_UP    \
                                | PNG_ASM_FLAG_MMX_READ_FILTER_AVG   \
                                | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH );
        if (mainprog_ptr->nommxcombine)
            mmx_disable_mask |= PNG_ASM_FLAG_MMX_READ_COMBINE_ROW;
        if (mainprog_ptr->nommxinterlace)
            mmx_disable_mask |= PNG_ASM_FLAG_MMX_READ_INTERLACE;
        asm_flags = png_get_asm_flags(png_ptr);
        png_set_asm_flags(png_ptr, asm_flags & ~mmx_disable_mask);
        /* Now query libpng's asm settings, just for yuks.  Note that this
         * differs from the querying of its *potential* MMX capabilities
         * in readpng2_version_info(); this is true runtime verification. */
        asm_flags = png_get_asm_flags(png_ptr);
        mmx_mask = png_get_mmx_flagmask(PNG_SELECT_READ | PNG_SELECT_WRITE,
          &compilerID);
        if (asm_flags & PNG_ASM_FLAG_MMX_SUPPORT_COMPILED)
            fprintf(stderr,
              "  MMX support (%s version) is compiled into libpng\n",
              compilerID == 1? "MSVC++" :
              (compilerID == 2? "GNU C" : "unknown"));
        else
            fprintf(stderr, "  MMX support is not compiled into libpng\n");
        fprintf(stderr, "  MMX instructions are %ssupported by CPU\n",
          (asm_flags & PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU)? "" : "not ");
        fprintf(stderr, "  MMX read support for combining rows is %sabled\n",
          (asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW)? "en" : "dis");
        fprintf(stderr,
          "  MMX read support for expanding interlacing is %sabled\n",
          (asm_flags & PNG_ASM_FLAG_MMX_READ_INTERLACE)? "en" : "dis");
        fprintf(stderr, "  MMX read support for \"sub\" filter is %sabled\n",
          (asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_SUB)? "en" : "dis");
        fprintf(stderr, "  MMX read support for \"up\" filter is %sabled\n",
          (asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_UP)? "en" : "dis");
        fprintf(stderr, "  MMX read support for \"avg\" filter is %sabled\n",
          (asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_AVG)? "en" : "dis");
        fprintf(stderr, "  MMX read support for \"Paeth\" filter is %sabled\n",
          (asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_PAETH)? "en" : "dis");
        asm_flags &= (mmx_mask & ~( PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  \
                                  | PNG_ASM_FLAG_MMX_READ_INTERLACE    \
                                  | PNG_ASM_FLAG_MMX_READ_FILTER_SUB   \
                                  | PNG_ASM_FLAG_MMX_READ_FILTER_UP    \
                                  | PNG_ASM_FLAG_MMX_READ_FILTER_AVG   \
                                  | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH ));
        if (asm_flags)
            fprintf(stderr,
              "  additional MMX support is also enabled (0x%02lx)\n",
              asm_flags);
 #else  /* !PNG_ASSEMBLER_CODE_SUPPORTED */
        fprintf(stderr, "  MMX querying is disabled in libpng.\n");
 #endif /* ?PNG_ASSEMBLER_CODE_SUPPORTED */
    }
 #endif
    /* make sure we save our pointers for use in readpng2_decode_data() */
    mainprog_ptr->png_ptr = png_ptr;
@@ -217,12 +358,7 @@ static void readpng2_info_callback(png_structp png_ptr, png_infop info_ptr)
 {
    mainprog_info  *mainprog_ptr;
    int  color_type, bit_depth;
    png_uint_32 width, height;
 #ifdef PNG_FLOATING_POINT_SUPPORTED
    double  gamma;
 #else
    png_fixed_point gamma;
 #endif
    /* setjmp() doesn't make sense here, because we'd either have to exit(),
@@ -257,10 +393,8 @@ static void readpng2_info_callback(png_structp png_ptr, png_infop info_ptr)
    /* this is just like in the non-progressive case */
-    png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
+    png_get_IHDR(png_ptr, info_ptr, &mainprog_ptr->width,
-       NULL, NULL, NULL);
+      &mainprog_ptr->height, &bit_depth, &color_type, NULL, NULL, NULL);
    mainprog_ptr->width = (ulg)width;
    mainprog_ptr->height = (ulg)height;
    /* since we know we've read all of the PNG file's "header" (i.e., up
@@ -311,14 +445,8 @@ static void readpng2_info_callback(png_structp png_ptr, png_infop info_ptr)
        png_set_expand(png_ptr);
    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
        png_set_expand(png_ptr);
 #ifdef PNG_READ_16_TO_8_SUPPORTED
    if (bit_depth == 16)
 #  ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
        png_set_scale_16(png_ptr);
 #  else
        png_set_strip_16(png_ptr);
 #  endif
 #endif
    if (color_type == PNG_COLOR_TYPE_GRAY ||
        color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
        png_set_gray_to_rgb(png_ptr);
@@ -339,19 +467,11 @@ static void readpng2_info_callback(png_structp png_ptr, png_infop info_ptr)
     * "gamma" value for the entire display system, i.e., the product of
     * LUT_exponent and CRT_exponent. */
 #ifdef PNG_FLOATING_POINT_SUPPORTED
    if (png_get_gAMA(png_ptr, info_ptr, &gamma))
        png_set_gamma(png_ptr, mainprog_ptr->display_exponent, gamma);
    else
        png_set_gamma(png_ptr, mainprog_ptr->display_exponent, 0.45455);
-#else
+
    if (png_get_gAMA_fixed(png_ptr, info_ptr, &gamma))
        png_set_gamma_fixed(png_ptr,
            (png_fixed_point)(100000*mainprog_ptr->display_exponent+.5), gamma);
    else
        png_set_gamma_fixed(png_ptr,
            (png_fixed_point)(100000*mainprog_ptr->display_exponent+.5), 45455);
 #endif
    /* we'll let libpng expand interlaced images, too */
@@ -500,12 +620,5 @@ static void readpng2_error_handler(png_structp png_ptr, png_const_charp msg)
        exit(99);
    }
    /* Now we have our data structure we can use the information in it
     * to return control to our own higher level code (all the points
     * where 'setjmp' is called in this file.)  This will work with other
     * error handling mechanisms as well - libpng always calls png_error
     * when it can proceed no further, thus, so long as the error handler
     * is intercepted, application code can do its own error recovery.
     */
    longjmp(mainprog_ptr->jmpbuf, 1);
 }
--- a/contrib/gregbook/readpng2.h
+++ b/contrib/gregbook/readpng2.h
@@ -4,20 +4,13 @@
  ---------------------------------------------------------------------------
-      Copyright (c) 1998-2008 Greg Roelofs.  All rights reserved.
+      Copyright (c) 1998-2001 Greg Roelofs.  All rights reserved.
      This software is provided "as is," without warranty of any kind,
      express or implied.  In no event shall the author or contributors
      be held liable for any damages arising in any way from the use of
      this software.
      The contents of this file are DUAL-LICENSED.  You may modify and/or
      redistribute this software according to the terms of one of the
      following two licenses (at your option):
      LICENSE 1 ("BSD-like with advertising clause"):
      Permission is granted to anyone to use this software for any purpose,
      including commercial applications, and to alter it and redistribute
      it freely, subject to the following restrictions:
@@ -34,23 +27,6 @@
            and contributors for the book, "PNG: The Definitive Guide,"
            published by O'Reilly and Associates.
      LICENSE 2 (GNU GPL v2 or later):
      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 of the License, 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, write to the Free Software Foundation,
      Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ---------------------------------------------------------------------------*/
 #ifndef TRUE
@@ -69,12 +45,6 @@
 #  define Trace(x)  ;
 #endif
 enum rpng2_states {
    kPreInit = 0,
    kWindowInit,
    kDone
 };
 typedef unsigned char   uch;
 typedef unsigned short  ush;
 typedef unsigned long   ulg;
@@ -96,7 +66,12 @@ typedef struct _mainprog_info {
    int rowbytes;
    int channels;
    int need_bgcolor;
-    int state;
+#if (defined(__i386__) || defined(_M_IX86))
    int nommxfilters;
    int nommxcombine;
    int nommxinterlace;
 #endif
    int done;
    uch bg_red;
    uch bg_green;
    uch bg_blue;
--- a/contrib/gregbook/readppm.c
+++ b/contrib/gregbook/readppm.c
@@ -1,179 +0,0 @@
 /*---------------------------------------------------------------------------
   rpng - simple PNG display program                              readppm.c
  ---------------------------------------------------------------------------
   This is a special-purpose replacement for readpng.c that allows binary
   PPM files to be used in place of PNG images.
  ---------------------------------------------------------------------------
      Copyright (c) 1998-2007 Greg Roelofs.  All rights reserved.
      This software is provided "as is," without warranty of any kind,
      express or implied.  In no event shall the author or contributors
      be held liable for any damages arising in any way from the use of
      this software.
      The contents of this file are DUAL-LICENSED.  You may modify and/or
      redistribute this software according to the terms of one of the
      following two licenses (at your option):
      LICENSE 1 ("BSD-like with advertising clause"):
      Permission is granted to anyone to use this software for any purpose,
      including commercial applications, and to alter it and redistribute
      it freely, subject to the following restrictions:
      1. Redistributions of source code must retain the above copyright
         notice, disclaimer, and this list of conditions.
      2. Redistributions in binary form must reproduce the above copyright
         notice, disclaimer, and this list of conditions in the documenta-
         tion and/or other materials provided with the distribution.
      3. All advertising materials mentioning features or use of this
         software must display the following acknowledgment:
            This product includes software developed by Greg Roelofs
            and contributors for the book, "PNG: The Definitive Guide,"
            published by O'Reilly and Associates.
      LICENSE 2 (GNU GPL v2 or later):
      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 of the License, 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, write to the Free Software Foundation,
      Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ---------------------------------------------------------------------------*/
 #include <stdio.h>
 #include <stdlib.h>
 #include "readpng.h"    /* typedefs, common macros, public prototypes */
 ulg  width, height;
 int  bit_depth, color_type, channels;
 uch  *image_data = NULL;
 FILE *saved_infile;
 void readpng_version_info()
 {
    fprintf(stderr, "   Compiled without libpng, zlib or PBMPLUS/NetPBM.\n");
 }
 /* return value = 0 for success, 1 for bad sig, 2 for bad IHDR, 4 for no mem */
 int readpng_init(FILE *infile, ulg *pWidth, ulg *pHeight)
 {
    static uch ppmline[256];
    int maxval;
    saved_infile = infile;
    fgets(ppmline, 256, infile);
    if (ppmline[0] != 'P' || ppmline[1] != '6') {
        fprintf(stderr, "ERROR:  not a PPM file\n");
        return 1;
    }
    /* possible color types:  P5 = grayscale (0), P6 = RGB (2), P8 = RGBA (6) */
    if (ppmline[1] == '6') {
        color_type = 2;
        channels = 3;
    } else if (ppmline[1] == '8') {
        color_type = 6;
        channels = 4;
    } else /* if (ppmline[1] == '5') */ {
        color_type = 0;
        channels = 1;
    }
    do {
        fgets(ppmline, 256, infile);
    } while (ppmline[0] == '#');
    sscanf(ppmline, "%lu %lu", &width, &height);
    do {
        fgets(ppmline, 256, infile);
    } while (ppmline[0] == '#');
    sscanf(ppmline, "%d", &maxval);
    if (maxval != 255) {
        fprintf(stderr, "ERROR:  maxval = %d\n", maxval);
        return 2;
    }
    bit_depth = 8;
    *pWidth = width;
    *pHeight = height;
    return 0;
 }
 /* returns 0 if succeeds, 1 if fails due to no bKGD chunk, 2 if libpng error;
 * scales values to 8-bit if necessary */
 int readpng_get_bgcolor(uch *red, uch *green, uch *blue)
 {
    return 1;
 }
 /* display_exponent == LUT_exponent * CRT_exponent */
 uch *readpng_get_image(double display_exponent, int *pChannels, ulg *pRowbytes)
 {
    ulg  rowbytes;
    /* expand palette images to RGB, low-bit-depth grayscale images to 8 bits,
     * transparency chunks to full alpha channel; strip 16-bit-per-sample
     * images to 8 bits per sample; and convert grayscale to RGB[A] */
    /* GRR WARNING:  grayscale needs to be expanded and channels reset! */
    *pRowbytes = rowbytes = channels*width;
    *pChannels = channels;
    if ((image_data = (uch *)malloc(rowbytes*height)) == NULL) {
        return NULL;
    }
    Trace((stderr, "readpng_get_image:  rowbytes = %ld, height = %ld\n", rowbytes, height));
    /* now we can go ahead and just read the whole image */
    fread(image_data, 1L, rowbytes*height, saved_infile);
    return image_data;
 }
 void readpng_cleanup(int free_image_data)
 {
    if (free_image_data && image_data) {
        free(image_data);
        image_data = NULL;
    }
 }
--- a/contrib/gregbook/rpng-win.c
+++ b/contrib/gregbook/rpng-win.c
@@ -22,25 +22,16 @@
    - 1.02:  added extra set of parentheses to png_jmpbuf() macro; fixed
              command-line parsing bug
    - 1.10:  enabled "message window"/console (thanks to David Geldreich)
    - 2.00:  dual-licensed (added GNU GPL)
    - 2.01:  fixed improper display of usage screen on PNG error(s)
  ---------------------------------------------------------------------------
-      Copyright (c) 1998-2008 Greg Roelofs.  All rights reserved.
+      Copyright (c) 1998-2001 Greg Roelofs.  All rights reserved.
      This software is provided "as is," without warranty of any kind,
      express or implied.  In no event shall the author or contributors
      be held liable for any damages arising in any way from the use of
      this software.
      The contents of this file are DUAL-LICENSED.  You may modify and/or
      redistribute this software according to the terms of one of the
      following two licenses (at your option):
      LICENSE 1 ("BSD-like with advertising clause"):
      Permission is granted to anyone to use this software for any purpose,
      including commercial applications, and to alter it and redistribute
      it freely, subject to the following restrictions:
@@ -57,61 +48,18 @@
            and contributors for the book, "PNG: The Definitive Guide,"
            published by O'Reilly and Associates.
      LICENSE 2 (GNU GPL v2 or later):
      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 of the License, 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, write to the Free Software Foundation,
      Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ---------------------------------------------------------------------------*/
 #define PROGNAME  "rpng-win"
 #define LONGNAME  "Simple PNG Viewer for Windows"
-#define VERSION   "2.01 of 16 March 2008"
+#define VERSION   "1.20 of 28 May 2001"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <windows.h>
 #ifdef __CYGWIN__
 /* getch replacement. Turns out, we don't really need this,
 * but leave it here if we ever enable any of the uses of
 * _getch in the main code
 */
 #include <unistd.h>
 #include <termio.h>
 #include <sys/ioctl.h>
 int repl_getch( void )
 {
  char ch;
  int fd = fileno(stdin);
  struct termio old_tty, new_tty;
  ioctl(fd, TCGETA, &old_tty);
  new_tty = old_tty;
  new_tty.c_lflag &= ~(ICANON | ECHO | ISIG);
  ioctl(fd, TCSETA, &new_tty);
  fread(&ch, 1, sizeof(ch), stdin);
  ioctl(fd, TCSETA, &old_tty);
  return ch;
 }
 #define _getch repl_getch
 #else
 #include <conio.h>      /* only for _getch() */
 #endif
 /* #define DEBUG  :  this enables the Trace() macros */
@@ -137,9 +85,10 @@ static void       rpng_win_cleanup(void);
 LRESULT CALLBACK  rpng_win_wndproc(HWND, UINT, WPARAM, LPARAM);
-static char titlebar[1024];
+static char titlebar[1024], *window_name = titlebar;
 static char *progname = PROGNAME;
 static char *appname = LONGNAME;
 static char *icon_name = PROGNAME;     /* GRR:  not (yet) used */
 static char *filename;
 static FILE *infile;
@@ -179,7 +128,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode)
    filename = (char *)NULL;
-#ifndef __CYGWIN__
+
    /* First reenable console output, which normally goes to the bit bucket
     * for windowed apps.  Closing the console window will terminate the
     * app.  Thanks to David.Geldreich@realviz.com for supplying the magical
@@ -188,7 +137,6 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode)
    AllocConsole();
    freopen("CONOUT$", "a", stderr);
    freopen("CONOUT$", "a", stdout);
 #endif
    /* Next set the default value for our display-system exponent, i.e.,
@@ -299,43 +247,9 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode)
        }
    }
-    if (!filename)
+    if (!filename) {
        ++error;
-
+    } else if (!(infile = fopen(filename, "rb"))) {
    /* print usage screen if any errors up to this point */
    if (error) {
 #ifndef __CYGWIN__
        int ch;
 #endif
        fprintf(stderr, "\n%s %s:  %s\n\n", PROGNAME, VERSION, appname);
        readpng_version_info();
        fprintf(stderr, "\n"
          "Usage:  %s [-gamma exp] [-bgcolor bg] file.png\n"
          "    exp \ttransfer-function exponent (``gamma'') of the display\n"
          "\t\t  system in floating-point format (e.g., ``%.1f''); equal\n"
          "\t\t  to the product of the lookup-table exponent (varies)\n"
          "\t\t  and the CRT exponent (usually 2.2); must be positive\n"
          "    bg  \tdesired background color in 7-character hex RGB format\n"
          "\t\t  (e.g., ``#ff7700'' for orange:  same as HTML colors);\n"
          "\t\t  used with transparent images\n"
          "\nPress Q, Esc or mouse button 1 after image is displayed to quit.\n"
 #ifndef __CYGWIN__
          "Press Q or Esc to quit this usage screen.\n"
 #endif
          "\n", PROGNAME, default_display_exponent);
 #ifndef __CYGWIN__
        do
            ch = _getch();
        while (ch != 'q' && ch != 'Q' && ch != 0x1B);
 #endif
        exit(1);
    }
    if (!(infile = fopen(filename, "rb"))) {
        fprintf(stderr, PROGNAME ":  can't open PNG file [%s]\n", filename);
        ++error;
    } else {
@@ -348,7 +262,8 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode)
                    break;
                case 2:
                    fprintf(stderr, PROGNAME
-                      ":  [%s] has bad IHDR (libpng longjmp)\n", filename);
+                      ":  [%s] has bad IHDR (libpng longjmp)\n",
                      filename);
                    break;
                case 4:
                    fprintf(stderr, PROGNAME ":  insufficient memory\n");
@@ -365,25 +280,34 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode)
    }
-    if (error) {
+    /* usage screen */
 #ifndef __CYGWIN__
        int ch;
 #endif
-        fprintf(stderr, PROGNAME ":  aborting.\n");
+    if (error) {
-#ifndef __CYGWIN__
+        int ch;
        fprintf(stderr, "\n%s %s:  %s\n\n", PROGNAME, VERSION, appname);
        readpng_version_info();
        fprintf(stderr, "\n"
          "Usage:  %s [-gamma exp] [-bgcolor bg] file.png\n"
          "    exp \ttransfer-function exponent (``gamma'') of the display\n"
          "\t\t  system in floating-point format (e.g., ``%.1f''); equal\n"
          "\t\t  to the product of the lookup-table exponent (varies)\n"
          "\t\t  and the CRT exponent (usually 2.2); must be positive\n"
          "    bg  \tdesired background color in 7-character hex RGB format\n"
          "\t\t  (e.g., ``#ff7700'' for orange:  same as HTML colors);\n"
          "\t\t  used with transparent images\n"
          "\nPress Q, Esc or mouse button 1 after image is displayed to quit.\n"
          "Press Q or Esc to quit this usage screen.\n"
          "\n", PROGNAME, default_display_exponent);
        do
            ch = _getch();
        while (ch != 'q' && ch != 'Q' && ch != 0x1B);
-#endif
+        exit(1);
        exit(2);
    } else {
        fprintf(stderr, "\n%s %s:  %s\n", PROGNAME, VERSION, appname);
 #ifndef __CYGWIN__
        fprintf(stderr,
          "\n   [console window:  closing this window will terminate %s]\n\n",
          PROGNAME);
 #endif
    }
@@ -401,14 +325,9 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode)
     * check for one in the PNG file--if not, the initialized values of 0
     * (black) will be used */
-    if (have_bg) {
+    if (have_bg)
-        unsigned r, g, b;   /* this approach quiets compiler warnings */
+        sscanf(bgstr+1, "%2x%2x%2x", &bg_red, &bg_green, &bg_blue);
-
+    else if (readpng_get_bgcolor(&bg_red, &bg_green, &bg_blue) > 1) {
        sscanf(bgstr+1, "%2x%2x%2x", &r, &g, &b);
        bg_red   = (uch)r;
        bg_green = (uch)g;
        bg_blue  = (uch)b;
    } else if (readpng_get_bgcolor(&bg_red, &bg_green, &bg_blue) > 1) {
        readpng_cleanup(TRUE);
        fprintf(stderr, PROGNAME
          ":  libpng error while checking for background color\n");
@@ -456,12 +375,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode)
    /* wait for the user to tell us when to quit */
    printf(
-#ifndef __CYGWIN__
+      "Done.  Press Q, Esc or mouse button 1 (within image window) to quit.\n");
      "Done.  Press Q, Esc or mouse button 1 (within image window) to quit.\n"
 #else
      "Done.  Press mouse button 1 (within image window) to quit.\n"
 #endif
    );
    fflush(stdout);
    while (GetMessage(&msg, NULL, 0, 0)) {
--- a/contrib/gregbook/rpng-x.c
+++ b/contrib/gregbook/rpng-x.c
@@ -9,7 +9,7 @@
   by Martin Zinser under OpenVMS; may work under OS/2 with some tweaking).
   to do:
-    - 8-bit (colormapped) X support
+    - 8-bit support
    - use %.1023s to simplify truncation of title-bar string?
  ---------------------------------------------------------------------------
@@ -21,28 +21,18 @@
    - 1.10:  added support for non-default visuals; fixed X pixel-conversion
    - 1.11:  added extra set of parentheses to png_jmpbuf() macro; fixed
              command-line parsing bug
-    - 1.12:  fixed some small X memory leaks (thanks to Fran<EFBFBD>ois Petitjean)
+    - 1.12:  fixed small X memory leak (thanks to Francois Petitjean)
-    - 1.13:  fixed XFreeGC() crash bug (thanks to Patrick Welche)
+    - 1.13:  fixed XFreeGC() crash bug
    - 1.14:  added support for X resources (thanks to Gerhard Niklasch)
    - 2.00:  dual-licensed (added GNU GPL)
    - 2.01:  fixed improper display of usage screen on PNG error(s)
  ---------------------------------------------------------------------------
-      Copyright (c) 1998-2008 Greg Roelofs.  All rights reserved.
+      Copyright (c) 1998-2001 Greg Roelofs.  All rights reserved.
      This software is provided "as is," without warranty of any kind,
      express or implied.  In no event shall the author or contributors
      be held liable for any damages arising in any way from the use of
      this software.
      The contents of this file are DUAL-LICENSED.  You may modify and/or
      redistribute this software according to the terms of one of the
      following two licenses (at your option):
      LICENSE 1 ("BSD-like with advertising clause"):
      Permission is granted to anyone to use this software for any purpose,
      including commercial applications, and to alter it and redistribute
      it freely, subject to the following restrictions:
@@ -59,30 +49,11 @@
            and contributors for the book, "PNG: The Definitive Guide,"
            published by O'Reilly and Associates.
      LICENSE 2 (GNU GPL v2 or later):
      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 of the License, 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, write to the Free Software Foundation,
      Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ---------------------------------------------------------------------------*/
 #define PROGNAME  "rpng-x"
 #define LONGNAME  "Simple PNG Viewer for X"
-#define VERSION   "2.01 of 16 March 2008"
+#define VERSION   "1.13 of 16 August 2001"
 #define RESNAME   "rpng"        /* our X resource application name */
 #define RESCLASS  "Rpng"        /* our X resource class name */
 #include <stdio.h>
 #include <stdlib.h>
@@ -120,8 +91,6 @@ static int  rpng_x_msb(ulg u32val);
 static char titlebar[1024], *window_name = titlebar;
 static char *appname = LONGNAME;
 static char *icon_name = PROGNAME;
 static char *res_name = RESNAME;
 static char *res_class = RESCLASS;
 static char *filename;
 static FILE *infile;
@@ -252,8 +221,8 @@ int main(int argc, char **argv)
            else {
                bgstr = *argv;
                if (strlen(bgstr) != 7 || bgstr[0] != '#')
-                    ++error;
+                    ++error; 
-                else
+                else 
                    have_bg = TRUE;
            }
        } else {
@@ -266,33 +235,9 @@ int main(int argc, char **argv)
        }
    }
-    if (!filename)
+    if (!filename) {
        ++error;
-
+    } else if (!(infile = fopen(filename, "rb"))) {
    /* print usage screen if any errors up to this point */
    if (error) {
        fprintf(stderr, "\n%s %s:  %s\n", PROGNAME, VERSION, appname);
        readpng_version_info();
        fprintf(stderr, "\n"
          "Usage:  %s [-display xdpy] [-gamma exp] [-bgcolor bg] file.png\n"
          "    xdpy\tname of the target X display (e.g., ``hostname:0'')\n"
          "    exp \ttransfer-function exponent (``gamma'') of the display\n"
          "\t\t  system in floating-point format (e.g., ``%.1f''); equal\n"
          "\t\t  to the product of the lookup-table exponent (varies)\n"
          "\t\t  and the CRT exponent (usually 2.2); must be positive\n"
          "    bg  \tdesired background color in 7-character hex RGB format\n"
          "\t\t  (e.g., ``#ff7700'' for orange:  same as HTML colors);\n"
          "\t\t  used with transparent images\n"
          "\nPress Q, Esc or mouse button 1 (within image window, after image\n"
          "is displayed) to quit.\n"
          "\n", PROGNAME, default_display_exponent);
        exit(1);
    }
    if (!(infile = fopen(filename, "rb"))) {
        fprintf(stderr, PROGNAME ":  can't open PNG file [%s]\n", filename);
        ++error;
    } else {
@@ -305,7 +250,8 @@ int main(int argc, char **argv)
                    break;
                case 2:
                    fprintf(stderr, PROGNAME
-                      ":  [%s] has bad IHDR (libpng longjmp)\n", filename);
+                      ":  [%s] has bad IHDR (libpng longjmp)\n",
                      filename);
                    break;
                case 4:
                    fprintf(stderr, PROGNAME ":  insufficient memory\n");
@@ -330,9 +276,25 @@ int main(int argc, char **argv)
    }
    /* usage screen */
    if (error) {
-        fprintf(stderr, PROGNAME ":  aborting.\n");
+        fprintf(stderr, "\n%s %s:  %s\n", PROGNAME, VERSION, appname);
-        exit(2);
+        readpng_version_info();
        fprintf(stderr, "\n"
          "Usage:  %s [-display xdpy] [-gamma exp] [-bgcolor bg] file.png\n"
          "    xdpy\tname of the target X display (e.g., ``hostname:0'')\n"
          "    exp \ttransfer-function exponent (``gamma'') of the display\n"
          "\t\t  system in floating-point format (e.g., ``%.1f''); equal\n"
          "\t\t  to the product of the lookup-table exponent (varies)\n"
          "\t\t  and the CRT exponent (usually 2.2); must be positive\n"
          "    bg  \tdesired background color in 7-character hex RGB format\n"
          "\t\t  (e.g., ``#ff7700'' for orange:  same as HTML colors);\n"
          "\t\t  used with transparent images\n"
          "\nPress Q, Esc or mouse button 1 (within image window, after image\n"
          "is displayed) to quit.\n"
          "\n", PROGNAME, default_display_exponent);
        exit(1);
    }
@@ -437,12 +399,11 @@ static int rpng_x_create_window(void)
    XEvent e;
    XGCValues gcvalues;
    XSetWindowAttributes attr;
    XSizeHints *size_hints;
    XTextProperty windowName, *pWindowName = &windowName;
    XTextProperty iconName, *pIconName = &iconName;
    XVisualInfo visual_info;
    XSizeHints *size_hints;
    XWMHints *wm_hints;
    XClassHint *class_hints;
    screen = DefaultScreen(display);
@@ -565,7 +526,7 @@ static int rpng_x_create_window(void)
    if (!XStringListToTextProperty(&icon_name, 1, pIconName))
        pIconName = NULL;
-    /* OK if any hints allocation fails; XSetWMProperties() allows NULLs */
+    /* OK if either hints allocation fails; XSetWMProperties() allows NULLs */
    if ((size_hints = XAllocSizeHints()) != NULL) {
        /* window will not be resizable */
@@ -581,13 +542,8 @@ static int rpng_x_create_window(void)
        wm_hints->flags = StateHint | InputHint  /* | IconPixmapHint */ ;
    }
    if ((class_hints = XAllocClassHint()) != NULL) {
        class_hints->res_name = res_name;
        class_hints->res_class = res_class;
    }
    XSetWMProperties(display, window, pWindowName, pIconName, NULL, 0,
-      size_hints, wm_hints, class_hints);
+      size_hints, wm_hints, NULL);
    /* various properties and hints no longer needed; free memory */
    if (pWindowName)
@@ -598,8 +554,6 @@ static int rpng_x_create_window(void)
        XFree(size_hints);
    if (wm_hints)
       XFree(wm_hints);
    if (class_hints)
       XFree(class_hints);
    XMapWindow(display, window);
--- a/contrib/gregbook/rpng2-win.c
+++ b/contrib/gregbook/rpng2-win.c
@@ -10,7 +10,7 @@
   tweaking (or maybe not).  Thanks to Adam Costello and Pieter S. van der
   Meulen for the "diamond" and "radial waves" patterns, respectively.
-   to do (someday, maybe):
+   to do:
    - handle quoted command-line args (especially filenames with spaces)
    - finish resizable checkerboard-gradient (sizes 4-128?)
    - use %.1023s to simplify truncation of title-bar string?
@@ -27,29 +27,16 @@
    - 1.10:  enabled "message window"/console (thanks to David Geldreich)
    - 1.20:  added runtime MMX-enabling/disabling and new -mmx* options
    - 1.21:  made minor tweak to usage screen to fit within 25-line console
    - 1.22:  added AMD64/EM64T support (__x86_64__)
    - 2.00:  dual-licensed (added GNU GPL)
    - 2.01:  fixed 64-bit typo in readpng2.c
    - 2.02:  fixed improper display of usage screen on PNG error(s); fixed
              unexpected-EOF and file-read-error cases
    - 2.03:  removed runtime MMX-enabling/disabling and obsolete -mmx* options
  ---------------------------------------------------------------------------
-      Copyright (c) 1998-2008 Greg Roelofs.  All rights reserved.
+      Copyright (c) 1998-2001 Greg Roelofs.  All rights reserved.
      This software is provided "as is," without warranty of any kind,
      express or implied.  In no event shall the author or contributors
      be held liable for any damages arising in any way from the use of
      this software.
      The contents of this file are DUAL-LICENSED.  You may modify and/or
      redistribute this software according to the terms of one of the
      following two licenses (at your option):
      LICENSE 1 ("BSD-like with advertising clause"):
      Permission is granted to anyone to use this software for any purpose,
      including commercial applications, and to alter it and redistribute
      it freely, subject to the following restrictions:
@@ -66,28 +53,11 @@
            and contributors for the book, "PNG: The Definitive Guide,"
            published by O'Reilly and Associates.
      LICENSE 2 (GNU GPL v2 or later):
      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 of the License, 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, write to the Free Software Foundation,
      Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ---------------------------------------------------------------------------*/
 #define PROGNAME  "rpng2-win"
 #define LONGNAME  "Progressive PNG Viewer for Windows"
-#define VERSION   "2.02 of 16 March 2008"
+#define VERSION   "1.21 of 29 June 2001"
 #include <stdio.h>
 #include <stdlib.h>
@@ -96,33 +66,7 @@
 #include <time.h>
 #include <math.h>      /* only for PvdM background code */
 #include <windows.h>
 #ifdef __CYGWIN__
 /* getch replacement. Turns out, we don't really need this,
 * but leave it here if we ever enable any of the uses of
 * _getch in the main code
 */
 #include <unistd.h>
 #include <termio.h>
 #include <sys/ioctl.h>
 int repl_getch( void )
 {
  char ch;
  int fd = fileno(stdin);
  struct termio old_tty, new_tty;
  ioctl(fd, TCGETA, &old_tty);
  new_tty = old_tty;
  new_tty.c_lflag &= ~(ICANON | ECHO | ISIG);
  ioctl(fd, TCSETA, &new_tty);
  fread(&ch, 1, sizeof(ch), stdin);
  ioctl(fd, TCSETA, &old_tty);
  return ch;
 }
 #define _getch repl_getch
 #else
 #include <conio.h>     /* only for _getch() */
 #endif
 /* all for PvdM background code: */
 #ifndef PI
@@ -175,9 +119,10 @@ static void       rpng2_win_cleanup(void);
 LRESULT CALLBACK  rpng2_win_wndproc(HWND, UINT, WPARAM, LPARAM);
-static char titlebar[1024];
+static char titlebar[1024], *window_name = titlebar;
 static char *progname = PROGNAME;
 static char *appname = LONGNAME;
 static char *icon_name = PROGNAME;    /* GRR:  not (yet) used */
 static char *filename;
 static FILE *infile;
@@ -296,7 +241,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode)
    filename = (char *)NULL;
    memset(&rpng2_info, 0, sizeof(mainprog_info));
-#ifndef __CYGWIN__
+
    /* Next reenable console output, which normally goes to the bit bucket
     * for windowed apps.  Closing the console window will terminate the
     * app.  Thanks to David.Geldreich@realviz.com for supplying the magical
@@ -305,7 +250,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode)
    AllocConsole();
    freopen("CONOUT$", "a", stderr);
    freopen("CONOUT$", "a", stdout);
-#endif
+
    /* Set the default value for our display-system exponent, i.e., the
     * product of the CRT exponent and the exponent corresponding to
@@ -422,6 +367,18 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode)
            }
        } else if (!strncmp(*argv, "-timing", 2)) {
            timing = TRUE;
 #if (defined(__i386__) || defined(_M_IX86))
        } else if (!strncmp(*argv, "-nommxfilters", 7)) {
            rpng2_info.nommxfilters = TRUE;
        } else if (!strncmp(*argv, "-nommxcombine", 7)) {
            rpng2_info.nommxcombine = TRUE;
        } else if (!strncmp(*argv, "-nommxinterlace", 7)) {
            rpng2_info.nommxinterlace = TRUE;
        } else if (!strcmp(*argv, "-nommx")) {
            rpng2_info.nommxfilters = TRUE;
            rpng2_info.nommxcombine = TRUE;
            rpng2_info.nommxinterlace = TRUE;
 #endif
        } else {
            if (**argv != '-') {
                filename = *argv;
@@ -432,56 +389,9 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode)
        }
    }
-    if (!filename)
+    if (!filename) {
        ++error;
-
+    } else if (!(infile = fopen(filename, "rb"))) {
    /* print usage screen if any errors up to this point */
    if (error) {
 #ifndef __CYGWIN__
        int ch;
 #endif
        fprintf(stderr, "\n%s %s:  %s\n\n", PROGNAME, VERSION, appname);
        readpng2_version_info();
        fprintf(stderr, "\n"
          "Usage:  %s [-gamma exp] [-bgcolor bg | -bgpat pat] [-timing]\n"
          "        %*s file.png\n\n"
          "    exp \ttransfer-function exponent (``gamma'') of the display\n"
          "\t\t  system in floating-point format (e.g., ``%.1f''); equal\n"
          "\t\t  to the product of the lookup-table exponent (varies)\n"
          "\t\t  and the CRT exponent (usually 2.2); must be positive\n"
          "    bg  \tdesired background color in 7-character hex RGB format\n"
          "\t\t  (e.g., ``#ff7700'' for orange:  same as HTML colors);\n"
          "\t\t  used with transparent images; overrides -bgpat option\n"
          "    pat \tdesired background pattern number (1-%d); used with\n"
          "\t\t  transparent images; overrides -bgcolor option\n"
          "    -timing\tenables delay for every block read, to simulate modem\n"
          "\t\t  download of image (~36 Kbps)\n"
          "\nPress Q, Esc or mouse button 1 after image is displayed to quit.\n"
 #ifndef __CYGWIN__
          "Press Q or Esc to quit this usage screen. ",
 #else
          ,
 #endif
          PROGNAME,
 #if (defined(__i386__) || defined(_M_IX86) || defined(__x86_64__)) && \
    !(defined(__CYGWIN__) || defined(__MINGW32__))
          (int)strlen(PROGNAME), " ",
 #endif
          (int)strlen(PROGNAME), " ", default_display_exponent, num_bgpat);
        fflush(stderr);
 #ifndef __CYGWIN__
        do
            ch = _getch();
        while (ch != 'q' && ch != 'Q' && ch != 0x1B);
 #endif
        exit(1);
    }
    if (!(infile = fopen(filename, "rb"))) {
        fprintf(stderr, PROGNAME ":  can't open PNG file [%s]\n", filename);
        ++error;
    } else {
@@ -495,7 +405,8 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode)
            switch (rc) {
                case 2:
                    fprintf(stderr, PROGNAME
-                      ":  [%s] has bad IHDR (libpng longjmp)\n", filename);
+                      ":  [%s] has bad IHDR (libpng longjmp)\n",
                      filename);
                    break;
                case 4:
                    fprintf(stderr, PROGNAME ":  insufficient memory\n");
@@ -512,25 +423,51 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode)
    }
-    if (error) {
+    /* usage screen */
 #ifndef __CYGWIN__
        int ch;
 #endif
-        fprintf(stderr, PROGNAME ":  aborting.\n");
+    if (error) {
-#ifndef __CYGWIN__
+        int ch;
        fprintf(stderr, "\n%s %s:  %s\n\n", PROGNAME, VERSION, appname);
        readpng2_version_info();
        fprintf(stderr, "\n"
          "Usage:  %s [-gamma exp] [-bgcolor bg | -bgpat pat] [-timing]\n"
 #if (defined(__i386__) || defined(_M_IX86))
          "        %*s [[-nommxfilters] [-nommxcombine] [-nommxinterlace] | -nommx]\n"
 #endif
          "        %*s file.png\n\n"
          "    exp \ttransfer-function exponent (``gamma'') of the display\n"
          "\t\t  system in floating-point format (e.g., ``%.1f''); equal\n"
          "\t\t  to the product of the lookup-table exponent (varies)\n"
          "\t\t  and the CRT exponent (usually 2.2); must be positive\n"
          "    bg  \tdesired background color in 7-character hex RGB format\n"
          "\t\t  (e.g., ``#ff7700'' for orange:  same as HTML colors);\n"
          "\t\t  used with transparent images; overrides -bgpat option\n"
          "    pat \tdesired background pattern number (1-%d); used with\n"
          "\t\t  transparent images; overrides -bgcolor option\n"
          "    -timing\tenables delay for every block read, to simulate modem\n"
          "\t\t  download of image (~36 Kbps)\n"
 #if (defined(__i386__) || defined(_M_IX86))
          "    -nommx*\tdisable optimized MMX routines for decoding row filters,\n"
          "\t\t  combining rows, and expanding interlacing, respectively\n"
 #endif
          "\nPress Q, Esc or mouse button 1 after image is displayed to quit.\n"
          "Press Q or Esc to quit this usage screen. ",
          PROGNAME,
 #if (defined(__i386__) || defined(_M_IX86))
          strlen(PROGNAME), " ",
 #endif
          strlen(PROGNAME), " ", default_display_exponent, num_bgpat);
        fflush(stderr);
        do
            ch = _getch();
        while (ch != 'q' && ch != 'Q' && ch != 0x1B);
-#endif
+        exit(1);
        exit(2);
    } else {
        fprintf(stderr, "\n%s %s:  %s\n", PROGNAME, VERSION, appname);
 #ifndef __CYGWIN__
        fprintf(stderr,
          "\n   [console window:  closing this window will terminate %s]\n\n",
          PROGNAME);
 #endif
        fflush(stderr);
    }
@@ -557,7 +494,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode)
    } else
        rpng2_info.need_bgcolor = TRUE;
-    rpng2_info.state = kPreInit;
+    rpng2_info.done = FALSE;
    rpng2_info.mainprog_init = rpng2_win_init;
    rpng2_info.mainprog_display_row = rpng2_win_display_row;
    rpng2_info.mainprog_finish_display = rpng2_win_finish_display;
@@ -577,27 +514,10 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode)
        if (readpng2_decode_data(&rpng2_info, inbuf, incount))
            ++error;
        Trace((stderr, "done with readpng2_decode_data()\n"))
-
+        if (error || feof(infile) || rpng2_info.done)
        if (error || incount != INBUFSIZE || rpng2_info.state == kDone) {
            if (rpng2_info.state == kDone) {
                Trace((stderr, "done decoding PNG image\n"))
            } else if (ferror(infile)) {
                fprintf(stderr, PROGNAME
                  ":  error while reading PNG image file\n");
                exit(3);
            } else if (feof(infile)) {
                fprintf(stderr, PROGNAME ":  end of file reached "
                  "(unexpectedly) while reading PNG image file\n");
                exit(3);
            } else /* if (error) */ {
                /* will print error message below */
            }
            break;
        }
        if (timing)
            Sleep(1000L);
        incount = fread(inbuf, 1, INBUFSIZE, infile);
    }
@@ -644,7 +564,7 @@ static void rpng2_win_init()
    ulg rowbytes = rpng2_info.rowbytes;
    Trace((stderr, "beginning rpng2_win_init()\n"))
-    Trace((stderr, "  rowbytes = %d\n", rpng2_info.rowbytes))
+    Trace((stderr, "  rowbytes = %ld\n", rpng2_info.rowbytes))
    Trace((stderr, "  width  = %ld\n", rpng2_info.width))
    Trace((stderr, "  height = %ld\n", rpng2_info.height))
@@ -674,8 +594,6 @@ static void rpng2_win_init()
        readpng2_cleanup(&rpng2_info);
        return;
    }
    rpng2_info.state = kWindowInit;
 }
@@ -1171,14 +1089,9 @@ static void rpng2_win_finish_display()
     * we have nothing to do here except set a flag and let the user know
     * that the image is done */
-    rpng2_info.state = kDone;
+    rpng2_info.done = TRUE;
    printf(
-#ifndef __CYGWIN__
+      "Done.  Press Q, Esc or mouse button 1 (within image window) to quit.\n");
      "Done.  Press Q, Esc or mouse button 1 (within image window) to quit.\n"
 #else
      "Done.  Press mouse button 1 (within image window) to quit.\n"
 #endif
    );
    fflush(stdout);
 }
--- a/contrib/gregbook/rpng2-x.c
+++ b/contrib/gregbook/rpng2-x.c
--- a/contrib/gregbook/wpng.c
+++ b/contrib/gregbook/wpng.c
@@ -5,10 +5,8 @@
   This program converts certain NetPBM binary files (grayscale and RGB,
   maxval = 255) to PNG.  Non-interlaced PNGs are written progressively;
   interlaced PNGs are read and written in one memory-intensive blast.
   Thanks to Jean-loup Gailly for providing the necessary trick to read
-   interactive text from the keyboard while stdin is redirected.  Thanks
+   interactive text from the keyboard while stdin is redirected.
   to Cosmin Truta for Cygwin fixes.
   NOTE:  includes provisional support for PNM type "8" (portable alphamap)
          images, presumed to be a 32-bit interleaved RGBA format; no pro-
@@ -26,32 +24,16 @@
    - 1.02:  modified to allow abbreviated options
    - 1.03:  removed extraneous character from usage screen; fixed bug in
              command-line parsing
    - 1.04:  fixed DOS/OS2/Win32 detection, including partial Cygwin fix
              (see http://home.att.net/~perlspinr/diffs/GregBook_cygwin.diff)
    - 2.00:  dual-licensed (added GNU GPL)
        [REPORTED BUG (win32 only):  "contrib/gregbook/wpng.c - cmd line
         dose not work!  In order to do something useful I needed to redirect
         both input and output, with cygwin and with bcc32 as well.  Under
         Linux, the same wpng appears to work fine.  I don't know what is
         the problem."]
  ---------------------------------------------------------------------------
-      Copyright (c) 1998-2007 Greg Roelofs.  All rights reserved.
+      Copyright (c) 1998-2000 Greg Roelofs.  All rights reserved.
      This software is provided "as is," without warranty of any kind,
      express or implied.  In no event shall the author or contributors
      be held liable for any damages arising in any way from the use of
      this software.
      The contents of this file are DUAL-LICENSED.  You may modify and/or
      redistribute this software according to the terms of one of the
      following two licenses (at your option):
      LICENSE 1 ("BSD-like with advertising clause"):
      Permission is granted to anyone to use this software for any purpose,
      including commercial applications, and to alter it and redistribute
      it freely, subject to the following restrictions:
@@ -68,35 +50,16 @@
            and contributors for the book, "PNG: The Definitive Guide,"
            published by O'Reilly and Associates.
      LICENSE 2 (GNU GPL v2 or later):
      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 of the License, 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, write to the Free Software Foundation,
      Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ---------------------------------------------------------------------------*/
 #define PROGNAME  "wpng"
-#define VERSION   "2.00 of 2 June 2007"
+#define VERSION   "1.03 of 19 March 2000"
 #define APPNAME   "Simple PGM/PPM/PAM to PNG Converter"
 #if defined(__MSDOS__) || defined(__OS2__)
 #  define DOS_OS2_W32
-#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
+#elif defined(_WIN32) || defined(__WIN32__)
-#  ifndef __GNUC__   /* treat Win32 native ports of gcc as Unix environments */
+#  define DOS_OS2_W32
 #    define DOS_OS2_W32
 #  endif
 #endif
 #include <stdio.h>
--- a/contrib/gregbook/writepng.c
+++ b/contrib/gregbook/writepng.c
@@ -4,20 +4,13 @@
  ---------------------------------------------------------------------------
-      Copyright (c) 1998-2007 Greg Roelofs.  All rights reserved.
+      Copyright (c) 1998-2000 Greg Roelofs.  All rights reserved.
      This software is provided "as is," without warranty of any kind,
      express or implied.  In no event shall the author or contributors
      be held liable for any damages arising in any way from the use of
      this software.
      The contents of this file are DUAL-LICENSED.  You may modify and/or
      redistribute this software according to the terms of one of the
      following two licenses (at your option):
      LICENSE 1 ("BSD-like with advertising clause"):
      Permission is granted to anyone to use this software for any purpose,
      including commercial applications, and to alter it and redistribute
      it freely, subject to the following restrictions:
@@ -34,30 +27,12 @@
            and contributors for the book, "PNG: The Definitive Guide,"
            published by O'Reilly and Associates.
      LICENSE 2 (GNU GPL v2 or later):
      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 of the License, 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, write to the Free Software Foundation,
      Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ---------------------------------------------------------------------------*/
 #include <stdlib.h>     /* for exit() prototype */
 #include <zlib.h>
-#include "png.h"        /* libpng header, includes setjmp.h */
+#include "png.h"        /* libpng header; includes zlib.h and setjmp.h */
 #include "writepng.h"   /* typedefs, common macros, public prototypes */
@@ -105,8 +80,7 @@ int writepng_init(mainprog_info *mainprog_ptr)
    /* setjmp() must be called in every function that calls a PNG-writing
     * libpng function, unless an alternate error handler was installed--
     * but compatible error handlers must either use longjmp() themselves
-     * (as in this program) or some other method to return control to
+     * (as in this program) or exit immediately, so here we go: */
     * application code, so here we go: */
    if (setjmp(mainprog_ptr->jmpbuf)) {
        png_destroy_write_struct(&png_ptr, &info_ptr);
@@ -390,12 +364,5 @@ static void writepng_error_handler(png_structp png_ptr, png_const_charp msg)
        exit(99);
    }
    /* Now we have our data structure we can use the information in it
     * to return control to our own higher level code (all the points
     * where 'setjmp' is called in this file.)  This will work with other
     * error handling mechanisms as well - libpng always calls png_error
     * when it can proceed no further, thus, so long as the error handler
     * is intercepted, application code can do its own error recovery.
     */
    longjmp(mainprog_ptr->jmpbuf, 1);
 }
--- a/contrib/gregbook/writepng.h
+++ b/contrib/gregbook/writepng.h
@@ -4,20 +4,13 @@
  ---------------------------------------------------------------------------
-      Copyright (c) 1998-2007 Greg Roelofs.  All rights reserved.
+      Copyright (c) 1998-2000 Greg Roelofs.  All rights reserved.
      This software is provided "as is," without warranty of any kind,
      express or implied.  In no event shall the author or contributors
      be held liable for any damages arising in any way from the use of
      this software.
      The contents of this file are DUAL-LICENSED.  You may modify and/or
      redistribute this software according to the terms of one of the
      following two licenses (at your option):
      LICENSE 1 ("BSD-like with advertising clause"):
      Permission is granted to anyone to use this software for any purpose,
      including commercial applications, and to alter it and redistribute
      it freely, subject to the following restrictions:
@@ -34,23 +27,6 @@
            and contributors for the book, "PNG: The Definitive Guide,"
            published by O'Reilly and Associates.
      LICENSE 2 (GNU GPL v2 or later):
      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 of the License, 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, write to the Free Software Foundation,
      Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ---------------------------------------------------------------------------*/
 #ifndef TRUE
--- a/contrib/libtests/pngvalid.c
+++ b/contrib/libtests/pngvalid.c
--- a/contrib/pngminim/README
+++ b/contrib/pngminim/README
@@ -1,4 +0,0 @@
 This demonstrates the use of PNG_USER_CONFIG, pngusr.h and pngusr.dfa
 to build minimal decoder, encoder, and progressive reader applications.
 See the individual README and pngusr.dfa files for more explanation.
--- a/contrib/pngminim/decoder/README
+++ b/contrib/pngminim/decoder/README
@@ -1,10 +0,0 @@
 This demonstrates the use of PNG_USER_CONFIG, pngusr.h and pngusr.dfa
 The makefile builds a minimal read-only decoder with embedded libpng
 and zlib.
 Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC
 on the make command line.
 If you prefer to use the shared libraries, go to contrib/pngminus
 and build the png2pnm application there.
--- a/contrib/pngminim/decoder/makefile
+++ b/contrib/pngminim/decoder/makefile
@@ -1,151 +0,0 @@
 # Makefile for PngMinus (pngm2pnm)
 # Linux / Unix
 #CC=cc
 CC=gcc
 LD=$(CC)
 # If awk fails try
 # make AWK=nawk
 # If cpp fails try
 # make CPP=/lib/cpp
 RM=rm -f
 COPY=cp
 CPPFLAGS=-I. -DPNG_USER_CONFIG -DNO_GZCOMPRESS -DZ_SOLO -DNO_GZIP
 CFLAGS=-O1 -Wall
 C=.c
 O=.o
 L=.a
 E=
 # Where to find the source code:
 PNGSRC =../../..
 ZLIBSRC=$(PNGSRC)/../zlib
 PROGSRC=$(PNGSRC)/contrib/pngminus
 # Zlib (minimal inflate requirements - crc32 is used by libpng)
 # zutil can be eliminated if you provide your own zcalloc and zcfree
 ZSRCS  = adler32$(C) crc32$(C) \
 	 inffast$(C) inflate$(C) inftrees$(C) \
 	 zutil$(C)
 # Standard headers
 ZH     = zlib.h crc32.h inffast.h inffixed.h \
 	 inflate.h inftrees.h zutil.h
 # Machine generated headers
 ZCONF  = zconf.h
 # Headers callers use
 ZINC   = zlib.h $(ZCONF)
 # Headers the Zlib source uses
 ZHDRS  = $(ZH) $(ZCONF)
 ZOBJS  = adler32$(O) crc32$(O) \
 	 inffast$(O) inflate$(O) inftrees$(O) \
 	 zutil$(O)
 # libpng
 PNGSRCS=png$(C) pngerror$(C) pngget$(C) pngmem$(C) \
 	pngread$(C) pngrio$(C) pngrtran$(C) pngrutil$(C) \
 	pngset$(C) pngtrans$(C)
 # Standard headers
 PNGH   =png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h
 # Machine generated headers
 PNGCONF=pnglibconf.h
 # Headers callers use
 PNGINC= png.h pngconf.h pngusr.h $(PNGCONF)
 # Headers the PNG library uses
 PNGHDRS=$(PNGH) $(PNGCONF) pngusr.h
 PNGOBJS=png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
 	pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) \
 	pngset$(O) pngtrans$(O)
 PROGSRCS= pngm2pnm$(C)
 PROGHDRS=
 PROGDOCS=
 PROGOBJS= pngm2pnm$(O)
 OBJS    = $(PROGOBJS) $(PNGOBJS) $(ZOBJS)
 # implicit make rules -------------------------------------------------------
 # note: dependencies do not work on implicit rule lines
 .c$(O):
 	$(CC) $(CPPFLAGS) -c $(CFLAGS) $<
 # dependencies
 all: pngm2pnm$(E)
 pngm2pnm$(E): $(OBJS)
 	$(LD) -o pngm2pnm$(E) $(OBJS)
 # The DFA_XTRA setting turns all libpng options off then
 # turns on those required for this minimal build.
 # The CPP_FLAGS setting causes pngusr.h to be included in
 # both the build of pnglibconf.h and, subsequently, when
 # building libpng itself.
 $(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak $(ZH)\
 	$(PNGSRC)/scripts/pnglibconf.dfa \
 	$(PNGSRC)/scripts/options.awk pngusr.h pngusr.dfa
 	$(RM) pnglibconf.h pnglibconf.dfn
 	$(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
 	    srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG -I."\
 	    DFA_XTRA="pngusr.dfa" $@
 clean:
 	$(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
 	    srcdir=$(PNGSRC) clean
 	$(RM) pngm2pnm$(O)
 	$(RM) pngm2pnm$(E)
 	$(RM) $(OBJS)
 # distclean also removes the copied source and headers
 distclean: clean
 	$(RM) -r scripts # historical reasons
 	$(RM) $(PNGSRCS) $(PNGH)
 	$(RM) $(ZSRCS) $(ZH) $(ZCONF)
 	$(RM) $(PROGSRCS) $(PROGHDRS) $(PROGDOCS)
 # Header file dependencies:
 $(PROGOBJS): $(PROGHDRS) $(PNGINC) $(ZINC)
 $(PNGOBJS): $(PNGHDRS) $(ZINC)
 $(ZOBJS): $(ZHDRS)
 # Gather the source code from the respective directories
 $(PNGSRCS) $(PNGH): $(PNGSRC)/$@
 	$(RM) $@
 	$(COPY) $(PNGSRC)/$@ $@
 # No dependency on the ZLIBSRC target so that it only needs
 # to be specified once.
 $(ZSRCS) $(ZH):
 	$(RM) $@
 	$(COPY) $(ZLIBSRC)/$@ $@
 # The unconfigured zconf.h varies in name according to the
 # zlib release
 $(ZCONF):
 	$(RM) $@
 	@for f in zconf.h.in zconf.in.h zconf.h; do\
 	    test -r $(ZLIBSRC)/$$f &&\
 	    echo $(COPY) $(ZLIBSRC)/$$f $@ &&\
 	    $(COPY) $(ZLIBSRC)/$$f $@ && exit 0;\
 	done; echo copy: $(ZLIBSRC)/zconf.h not found; exit 1
 pngm2pnm.c: $(PROGSRC)/png2pnm.c
 	$(RM) $@
 	$(COPY) $(PROGSRC)/png2pnm.c $@
 # End of makefile for pngm2pnm
--- a/contrib/pngminim/decoder/pngusr.dfa
+++ b/contrib/pngminim/decoder/pngusr.dfa
@@ -1,39 +0,0 @@
 # pngminim/decoder/pngusr.dfa
 #
 # Copyright (c) 2010-2011 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
 # First all the build options off:
 everything = off
 # All that is required is some read code. This example switches
 # on the sequential read code (see ../preader for a progressive
 # read example).
 option SEQUENTIAL_READ on
 # You must choose fixed or floating point arithmetic:
 # option FLOATING_POINT on
 option FIXED_POINT on
 # You must chose the internal fixed point implementation or to
 # use the system floating point.  The latter is considerably
 # smaller (by about 1kbyte on an x86 system):
 # option FLOATING_ARITHMETIC on
 option FLOATING_ARITHMETIC off
 # Your program will probably need other options.  The example
 # program here, pngm2pnm, requires the following.  Take a look
 # at pnglibconf.h to find out the full set of what has to be
 # enabled to make the following work.
 option SETJMP on
 option STDIO on
 option READ_EXPAND on
 option READ_STRIP_16_TO_8 on
--- a/contrib/pngminim/decoder/pngusr.h
+++ b/contrib/pngminim/decoder/pngusr.h
@@ -1,24 +0,0 @@
 /* minrdpngconf.h: headers to make a minimal png-read-only library
 *
 * Copyright (c) 2007, 2010-2011 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
 *
 * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
 */
 #ifndef MINRDPNGCONF_H
 #define MINRDPNGCONF_H
 /* To include pngusr.h set -DPNG_USER_CONFIG in CPPFLAGS */
 /* List options to turn off features of the build that do not
 * affect the API (so are not recorded in pnglibconf.h)
 */
 #define PNG_NO_WARNINGS
 #define PNG_ALIGN_TYPE PNG_ALIGN_NONE
 #endif /* MINRDPNGCONF_H */
--- a/contrib/pngminim/encoder/README
+++ b/contrib/pngminim/encoder/README
@@ -1,10 +0,0 @@
 This demonstrates the use of PNG_USER_CONFIG and pngusr.h
 The makefile builds a minimal write-only encoder with embedded libpng
 and zlib.
 Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC
 on the make command line.
 If you prefer to use the shared libraries, go to contrib/pngminus
 and build the pnm2png application there.
--- a/contrib/pngminim/encoder/makefile
+++ b/contrib/pngminim/encoder/makefile
@@ -1,150 +0,0 @@
 # Makefile for PngMinus (pnm2pngm)
 # Linux / Unix
 #CC=cc
 CC=gcc
 LD=$(CC)
 # If awk fails try
 # make AWK=nawk
 # If cpp fails try
 # make CPP=/lib/cpp
 RM=rm -f
 COPY=cp
 CPPFLAGS=-I. -DPNG_USER_CONFIG -DNO_GZCOMPRESS -DZ_SOLO -DNO_GZIP
 CFLAGS=-O1 -Wall
 C=.c
 O=.o
 L=.a
 E=
 # Where to find the source code:
 PNGSRC =../../..
 ZLIBSRC=$(PNGSRC)/../zlib
 PROGSRC=$(PNGSRC)/contrib/pngminus
 # Zlib
 ZSRCS  = adler32$(C) compress$(C) crc32$(C) deflate$(C) \
 	 trees$(C) zutil$(C)
 # Standard headers
 #ZH     = zlib.h crc32.h deflate.h trees.h zutil.h
 ZH     = zlib.h crc32.h deflate.h trees.h zutil.h
 # Machine generated headers
 ZCONF  = zconf.h
 # Headers callers use
 ZINC   = zlib.h $(ZCONF)
 # Headers the Zlib source uses
 ZHDRS  = $(ZH) $(ZCONF)
 # compress is not required; it is needed to link the zlib
 # code because deflate defines an unused API function deflateBound
 # which itself calls compressBound from compress.
 ZOBJS  = adler32$(O) compress$(O) crc32$(O) deflate$(O) \
 	 trees$(O) zutil$(O)
 # libpng
 PNGSRCS=png$(C) pngerror$(C) pngget$(C) pngmem$(C) \
 	pngset$(C) pngtrans$(C) pngwio$(C) pngwrite$(C) \
 	pngwtran$(C) pngwutil$(C)
 # Standard headers
 PNGH   =png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h
 # Machine generated headers
 PNGCONF=pnglibconf.h
 # Headers callers use
 PNGINC= png.h pngconf.h pngusr.h $(PNGCONF)
 # Headers the PNG library uses
 PNGHDRS=$(PNGH) $(PNGCONF) pngusr.h
 PNGOBJS=png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
 	pngset$(O) pngtrans$(O) pngwio$(O) pngwrite$(O) \
 	pngwtran$(O) pngwutil$(O)
 PROGSRCS= pnm2pngm$(C)
 PROGHDRS=
 PROGDOCS=
 PROGOBJS= pnm2pngm$(O)
 OBJS    = $(PROGOBJS) $(PNGOBJS) $(ZOBJS)
 # implicit make rules -------------------------------------------------------
 .c$(O):
 	$(CC) $(CPPFLAGS) -c $(CFLAGS) $<
 # dependencies
 all: pnm2pngm$(E)
 pnm2pngm$(E): $(OBJS)
 	$(LD) -o pnm2pngm$(E) $(OBJS)
 # The DFA_XTRA setting turns all libpng options off then
 # turns on those required for this minimal build.
 # The CPP_FLAGS setting causes pngusr.h to be included in
 # both the build of pnglibconf.h and, subsequently, when
 # building libpng itself.
 $(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak $(ZH)\
 	$(PNGSRC)/scripts/pnglibconf.dfa \
 	$(PNGSRC)/scripts/options.awk pngusr.h pngusr.dfa
 	$(RM) pnglibconf.h pnglibconf.dfn
 	$(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
 	    srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG -I."\
 	    DFA_XTRA="pngusr.dfa" $@
 clean:
 	$(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
 	    srcdir=$(PNGSRC) clean
 	$(RM) pnm2pngm$(O)
 	$(RM) pnm2pngm$(E)
 	$(RM) $(OBJS)
 # distclean also removes the copied source and headers
 distclean: clean
 	$(RM) -r scripts # historical reasons
 	$(RM) $(PNGSRCS) $(PNGH)
 	$(RM) $(ZSRCS) $(ZH) $(ZCONF)
 	$(RM) $(PROGSRCS) $(PROGHDRS) $(PROGDOCS)
 # Header file dependencies:
 $(PROGOBJS): $(PROGHDRS) $(PNGINC) $(ZINC)
 $(PNGOBJS): $(PNGHDRS) $(ZINC)
 $(ZOBJS): $(ZHDRS)
 # Gather the source code from the respective directories
 $(PNGSRCS) $(PNGH): $(PNGSRC)/$@
 	$(RM) $@
 	$(COPY) $(PNGSRC)/$@ $@
 # No dependency on the ZLIBSRC target so that it only needs
 # to be specified once.
 $(ZSRCS) $(ZH):
 	$(RM) $@
 	$(COPY) $(ZLIBSRC)/$@ $@
 # The unconfigured zconf.h varies in name according to the
 # zlib release
 $(ZCONF):
 	$(RM) $@
 	@for f in zconf.h.in zconf.in.h zconf.h; do\
 	    test -r $(ZLIBSRC)/$$f &&\
 	    echo $(COPY) $(ZLIBSRC)/$$f $@ &&\
 	    $(COPY) $(ZLIBSRC)/$$f $@ && exit 0;\
 	done; echo copy: $(ZLIBSRC)/zconf.h not found; exit 1
 pnm2pngm.c: $(PROGSRC)/pnm2png.c
 	$(RM) $@
 	$(COPY) $(PROGSRC)/pnm2png.c $@
 # End of makefile for pnm2pngm
--- a/contrib/pngminim/encoder/pngusr.dfa
+++ b/contrib/pngminim/encoder/pngusr.dfa
@@ -1,38 +0,0 @@
 # pngminim/encoder/pngusr.dfa
 #
 # Copyright (c) 2010-2013 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
 # First all the build options off:
 everything = off
 # Switch on the write code - this makes a minimalist encoder
 option WRITE on
 # These 2 options are required if you need to read PGM (P1 or P4) PGM files.
 option WRITE_INVERT on
 option WRITE_PACK on
 # You must choose fixed or floating point arithmetic:
 # option FLOATING_POINT on
 option FIXED_POINT on
 # You must chose the internal fixed point implementation or to
 # use the system floating point.  The latter is considerably
 # smaller (by about 1kbyte on an x86 system):
 # option FLOATING_ARITHMETIC on
 option FLOATING_ARITHMETIC off
 # Your program will probably need other options.  The example
 # program here, pnm2pngm, requires the following.  Take a look
 # at pnglibconf.h to find out the full set of what has to be
 # enabled to make the following work.
 option SETJMP on
 option STDIO on
--- a/contrib/pngminim/encoder/pngusr.h
+++ b/contrib/pngminim/encoder/pngusr.h
@@ -1,24 +0,0 @@
 /* minwrpngconf.h: headers to make a minimal png-write-only library
 *
 * Copyright (c) 2007, 2010-2011 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
 *
 * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
 */
 #ifndef MINWRPNGCONF_H
 #define MINWRPNGCONF_H
 /* To include pngusr.h set -DPNG_USER_CONFIG in CPPFLAGS */
 /* List options to turn off features of the build that do not
 * affect the API (so are not recorded in pnglibconf.h)
 */
 #define PNG_NO_WARNINGS
 #define PNG_ALIGN_TYPE PNG_ALIGN_NONE
 #endif /* MINWRPNGCONF_H */
--- a/contrib/pngminim/preader/README
+++ b/contrib/pngminim/preader/README
@@ -1,15 +0,0 @@
 This demonstrates the use of PNG_USER_CONFIG and pngusr.h
 The makefile builds a minimal read-only progressive decoder with
 embedded libpng, zlib and your system's X library.
 Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC
 on the make command line.
 Edit makefile if required, to find your X library and include files,
 then
    make ZLIBSRC=directory
 If you prefer to use the shared libraries, go to contrib/gregbook
 and build the rpng2-x application there.
--- a/contrib/pngminim/preader/makefile
+++ b/contrib/pngminim/preader/makefile
@@ -1,166 +0,0 @@
 # Makefile for PngMinus (rpng2)
 # Linux / Unix
 #CC=cc
 CC=gcc
 LD=$(CC)
 # If awk fails try
 # make AWK=nawk
 # If cpp fails try
 # make CPP=/lib/cpp
 RM=rm -f
 COPY=cp
 #XINC = -I/usr/include			# old-style, stock X distributions
 #XLIB = -L/usr/lib/X11 -lX11		#  (including SGI IRIX)
 #XINC = -I/usr/openwin/include		# Sun workstations (OpenWindows)
 #XLIB = -L/usr/openwin/lib -lX11
 XINC = -I/usr/X11R6/include		# new X distributions (X.org, etc.)
 XLIB = -L/usr/X11R6/lib -lX11
 #XLIB = -L/usr/X11R6/lib64 -lX11	# e.g., Red Hat on AMD64
 #XINC = -I/usr/local/include   		# FreeBSD
 #XLIB = -L/usr/local/lib -lX11
 #LIBS = $(XLIB)
 LIBS = $(XLIB) -lm                      #platforms that need libm
 CPPFLAGS=-I. $(XINC) -DPNG_USER_CONFIG -DNO_GZCOMPRESS -DZ_SOLO -DNO_GZIP
 CFLAGS=-O1 -Wall
 C=.c
 O=.o
 L=.a
 E=
 # Where to find the source code:
 PNGSRC =../../..
 ZLIBSRC=$(PNGSRC)/../zlib
 PROGSRC=$(PNGSRC)/contrib/gregbook
 # Zlib (minimal inflate requirements - crc32 is used by libpng)
 # zutil can be eliminated if you provide your own zcalloc and zcfree
 ZSRCS  = adler32$(C) crc32$(C) \
 	 inffast$(C) inflate$(C) inftrees$(C) \
 	 zutil$(C)
 # Standard headers
 ZH     = zlib.h crc32.h inffast.h inffixed.h \
 	 inflate.h inftrees.h zutil.h
 # Machine generated headers
 ZCONF  = zconf.h
 # Headers callers use
 ZINC   = zlib.h $(ZCONF)
 # Headers the Zlib source uses
 ZHDRS  = $(ZH) $(ZCONF)
 ZOBJS  = adler32$(O) crc32$(O) \
 	 inffast$(O) inflate$(O) inftrees$(O) \
 	 zutil$(O)
 # libpng
 PNGSRCS=png$(C) pngerror$(C) pngget$(C) pngmem$(C) \
 	pngpread$(C) pngread$(C) pngrio$(C) pngrtran$(C) pngrutil$(C) \
 	pngset$(C) pngtrans$(C)
 # Standard headers
 PNGH   =png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h
 # Machine generated headers
 PNGCONF=pnglibconf.h
 # Headers callers use
 PNGINC= png.h pngconf.h pngusr.h $(PNGCONF)
 # Headers the PNG library uses
 PNGHDRS=$(PNGH) $(PNGCONF) pngusr.h
 PNGOBJS=png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
 	pngpread$(O) pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) \
 	pngset$(O) pngtrans$(O)
 PROGSRCS= rpng2-x$(C) readpng2$(C)
 PROGHDRS= readpng2.h
 PROGDOCS= COPYING LICENSE
 PROGOBJS= rpng2-x$(O) readpng2$(O)
 OBJS    = $(PROGOBJS) $(PNGOBJS) $(ZOBJS)
 # implicit make rules -------------------------------------------------------
 .c$(O):
 	$(CC) $(CPPFLAGS) -c $(CFLAGS) $<
 # dependencies
 all: $(PROGDOCS) rpng2-x$(E)
 rpng2-x$(E): $(OBJS)
 	$(LD) -o rpng2-x$(E) $(OBJS) $(LIBS)
 # The DFA_XTRA setting turns all libpng options off then
 # turns on those required for this minimal build.
 # The CPP_FLAGS setting causes pngusr.h to be included in
 # both the build of pnglibconf.h and, subsequently, when
 # building libpng itself.
 $(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak $(ZH)\
 	$(PNGSRC)/scripts/pnglibconf.dfa \
 	$(PNGSRC)/scripts/options.awk pngusr.h pngusr.dfa
 	$(RM) pnglibconf.h pnglibconf.dfn
 	$(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
 	    srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG -I."\
 	    DFA_XTRA="pngusr.dfa" $@
 clean:
 	$(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
 	    srcdir=$(PNGSRC) clean
 	$(RM) rpng2-x$(O)
 	$(RM) rpng2-x$(E)
 	$(RM) $(OBJS)
 # distclean also removes the copied source and headers
 distclean: clean
 	$(RM) -r scripts # historical reasons
 	$(RM) $(PNGSRCS) $(PNGH)
 	$(RM) $(ZSRCS) $(ZH) $(ZCONF)
 	$(RM) $(PROGSRCS) $(PROGHDRS) $(PROGDOCS)
 # Header file dependencies:
 $(PROGOBJS): $(PROGHDRS) $(PNGINC) $(ZINC)
 $(PNGOBJS): $(PNGHDRS) $(ZINC)
 $(ZOBJS): $(ZHDRS)
 # Gather the source code from the respective directories
 $(PNGSRCS) $(PNGH): $(PNGSRC)/$@
 	$(RM) $@
 	$(COPY) $(PNGSRC)/$@ $@
 # No dependency on the ZLIBSRC target so that it only needs
 # to be specified once.
 $(ZSRCS) $(ZH):
 	$(RM) $@
 	$(COPY) $(ZLIBSRC)/$@ $@
 # The unconfigured zconf.h varies in name according to the
 # zlib release
 $(ZCONF):
 	$(RM) $@
 	@for f in zconf.h.in zconf.in.h zconf.h; do\
 	    test -r $(ZLIBSRC)/$$f &&\
 	    echo $(COPY) $(ZLIBSRC)/$$f $@ &&\
 	    $(COPY) $(ZLIBSRC)/$$f $@ && exit 0;\
 	done; echo copy: $(ZLIBSRC)/zconf.h not found; exit 1
 $(PROGSRCS) $(PROGHDRS) $(PROGDOCS): $(PROGSRC)/$@
 	$(RM) $@
 	$(COPY) $(PROGSRC)/$@ $@
 # End of makefile for rpng2-x
--- a/contrib/pngminim/preader/pngusr.dfa
+++ b/contrib/pngminim/preader/pngusr.dfa
@@ -1,40 +0,0 @@
 # pngminim/preader/pngusr.dfa
 #
 # Copyright (c) 2010-2011 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
 # First all the build options off:
 everything = off
 # Just switch on the progressive read code
 option PROGRESSIVE_READ on
 # You may choose fixed or floating point APIs:
 # option FLOATING_POINT on
 option FIXED_POINT on
 # You must chose the internal fixed point implementation or to
 # use the system floating point.  The latter is considerably
 # smaller (by about 1kbyte on an x86 system):
 option FLOATING_ARITHMETIC on
 # option FLOATING_ARITHMETIC off
 # Your program will probably need other options.  The example
 # program here, rpng2-x, requires the following.  Take a look
 # at pnglibconf.h to find out the full set of what has to be
 # enabled to make the following work.
 option SETJMP on
 option STDIO on
 option READ_bKGD on
 option READ_GAMMA on
 option READ_EXPAND on
 option READ_STRIP_16_TO_8 on
 option READ_GRAY_TO_RGB on
--- a/contrib/pngminim/preader/pngusr.h
+++ b/contrib/pngminim/preader/pngusr.h
@@ -1,24 +0,0 @@
 /* minrdpngconf.h: headers to make a minimal png-read-only library
 *
 * Copyright (c) 2009, 2010-2011 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
 *
 * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
 */
 #ifndef MINPRDPNGCONF_H
 #define MINPRDPNGCONF_H
 /* To include pngusr.h set -DPNG_USER_CONFIG in CPPFLAGS */
 /* List options to turn off features of the build that do not
 * affect the API (so are not recorded in pnglibconf.h)
 */
 #define PNG_NO_WARNINGS
 #define PNG_ALIGN_TYPE PNG_ALIGN_NONE
 #endif /* MINPRDPNGCONF_H */
--- a/contrib/pngminus/makefile.std
+++ b/contrib/pngminus/makefile.std
@@ -8,9 +8,9 @@ LD=$(CC)
 RM=rm -f
 #PNGPATH = /usr/local
-#PNGINC = -I$(PNGPATH)/include/libpng15
+#PNGINC = -I$(PNGPATH)/include/libpng12
-#PNGLIB = -L$(PNGPATH)/lib -lpng15
+#PNGLIB = -L$(PNGPATH)/lib -lpng12
-#PNGLIBS = $(PNGPATH)/lib/libpng15.a
+#PNGLIBS = $(PNGPATH)/lib/libpng12.a
 PNGINC = -I../..
 PNGLIB = -L../.. -lpng
 PNGLIBS = ../../libpng.a
@@ -23,9 +23,9 @@ ZINC = -I../../../zlib
 ZLIB = -L../../../zlib -lz
 ZLIBS = ../../../zlib/libz.a
-CFLAGS=$(PNGINC) $(ZINC)
+CFLAGS=-O3 $(PNGINC) $(ZINC)
-LDLIBS=$(PNGLIB) $(ZLIB)
+LDFLAGS=$(PNGLIB) $(ZLIB)
-LDLIBSS=$(PNGLIBS) $(ZLIBS)
+LDFLAGSS=$(PNGLIBS) $(ZLIBS)
 C=.c
 O=.o
 L=.a
@@ -40,19 +40,19 @@ png2pnm$(O): png2pnm$(C)
 	$(CC) -c $(CFLAGS) png2pnm$(C)
 png2pnm$(E): png2pnm$(O)
-	$(LD) $(LDFLAGS) -o png2pnm$(E) png2pnm$(O) $(LDLIBS) -lm
+	$(LD) -o png2pnm$(E) png2pnm$(O) $(LDFLAGS) -lm
 png2pnm-static$(E): png2pnm$(O)
-	$(LD) $(LDFLAGS) -o png2pnm-static$(E) png2pnm$(O) $(LDLIBSS) -lm
+	$(LD) -o png2pnm-static$(E) png2pnm$(O) $(LDFLAGSS) -lm
 pnm2png$(O): pnm2png$(C)
 	$(CC) -c $(CFLAGS) pnm2png$(C)
 pnm2png$(E): pnm2png$(O)
-	$(LD) $(LDFLAGS) -o pnm2png$(E) pnm2png$(O) $(LDLIBS) -lm
+	$(LD) -o pnm2png$(E) pnm2png$(O) $(LDFLAGS) -lm
 pnm2png-static$(E): pnm2png$(O)
-	$(LD) $(LDFLAGS) -o pnm2png-static$(E) pnm2png$(O) $(LDLIBSS) -lm
+	$(LD) -o pnm2png-static$(E) pnm2png$(O) $(LDFLAGSS) -lm
 clean:
 	$(RM) png2pnm$(O)
--- a/contrib/pngminus/png2pnm.c
+++ b/contrib/pngminus/png2pnm.c
@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
  if (png2pnm (fp_rd, fp_wr, fp_al, raw, alpha) == FALSE)
  {
    fprintf (stderr, "PNG2PNM\n");
-    fprintf (stderr, "Error:  unsuccessful conversion of PNG-image\n");
+    fprintf (stderr, "Error:  unsuccessful convertion of PNG-image\n");
    exit(1);
  }
@@ -188,7 +188,7 @@ void usage()
 BOOL png2pnm (FILE *png_file, FILE *pnm_file, FILE *alpha_file, BOOL raw, BOOL alpha)
 {
  png_struct    *png_ptr = NULL;
-  png_info        *info_ptr = NULL;
+  png_info	*info_ptr = NULL;
  png_byte      buf[8];
  png_byte      *png_pixels = NULL;
  png_byte      **row_pointers = NULL;
@@ -211,8 +211,8 @@ BOOL png2pnm (FILE *png_file, FILE *pnm_file, FILE *alpha_file, BOOL raw, BOOL a
  if (ret != 8)
    return FALSE;
-  ret = png_sig_cmp (buf, 0, 8);
+  ret = png_check_sig (buf, 8);
-  if (ret)
+  if (!ret)
    return FALSE;
  /* create png and info structures */
@@ -381,7 +381,7 @@ BOOL png2pnm (FILE *png_file, FILE *pnm_file, FILE *alpha_file, BOOL raw, BOOL a
          fputc ((int) *pix_ptr++ , pnm_file);
        else
          if (bit_depth == 16){
-            dep_16 = (long) *pix_ptr++;
+	    dep_16 = (long) *pix_ptr++;
            fprintf (pnm_file, "%ld ", (dep_16 << 8) + ((long) *pix_ptr++));
          }
          else
@@ -401,9 +401,9 @@ BOOL png2pnm (FILE *png_file, FILE *pnm_file, FILE *alpha_file, BOOL raw, BOOL a
            fputc ((int) *pix_ptr++ , alpha_file);
          else
            if (bit_depth == 16){
-              dep_16 = (long) *pix_ptr++;
+	      dep_16 = (long) *pix_ptr++;
              fprintf (alpha_file, "%ld ", (dep_16 << 8) + (long) *pix_ptr++);
-            }
+	    }  
            else
              fprintf (alpha_file, "%ld ", (long) *pix_ptr++);
        }
--- a/contrib/pngminus/pnm2png.c
+++ b/contrib/pngminus/pnm2png.c
@@ -18,7 +18,6 @@
 #include <mem.h>
 #include <fcntl.h>
 #endif
 #include <zlib.h>
 #ifndef BOOL
 #define BOOL unsigned char
@@ -198,9 +197,6 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_file, FILE *alpha_file, BOOL interlace,
  char          height_token[16];
  char          maxval_token[16];
  int           color_type;
  unsigned long   ul_width=0, ul_alpha_width=0;
  unsigned long   ul_height=0, ul_alpha_height=0;
  unsigned long   ul_maxval=0;
  png_uint_32   width, alpha_width;
  png_uint_32   height, alpha_height;
  png_uint_32   maxval;
@@ -210,9 +206,6 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_file, FILE *alpha_file, BOOL interlace,
  int           alpha_present;
  int           row, col;
  BOOL          raw, alpha_raw = FALSE;
 #if defined(PNG_WRITE_INVERT_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
  BOOL          packed_bitmap = FALSE;
 #endif
  png_uint_32   tmp16;
  int           i;
@@ -225,36 +218,20 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_file, FILE *alpha_file, BOOL interlace,
  }
  else if ((type_token[1] == '1') || (type_token[1] == '4'))
  {
 #if defined(PNG_WRITE_INVERT_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
    raw = (type_token[1] == '4');
    color_type = PNG_COLOR_TYPE_GRAY;
    get_token(pnm_file, width_token);
    sscanf (width_token, "%lu", &ul_width);
    width = (png_uint_32) ul_width;
    get_token(pnm_file, height_token);
    sscanf (height_token, "%lu", &ul_height);
    height = (png_uint_32) ul_height;
    bit_depth = 1;
    packed_bitmap = TRUE;
 #else
    fprintf (stderr, "PNM2PNG built without PNG_WRITE_INVERT_SUPPORTED and \n");
    fprintf (stderr, "PNG_WRITE_PACK_SUPPORTED can't read PBM (P1,P4) files\n");
 #endif
  }
  else if ((type_token[1] == '2') || (type_token[1] == '5'))
  {
    raw = (type_token[1] == '5');
    color_type = PNG_COLOR_TYPE_GRAY;
    get_token(pnm_file, width_token);
-    sscanf (width_token, "%lu", &ul_width);
+    sscanf (width_token, "%lu", &width);
    width = (png_uint_32) ul_width;
    get_token(pnm_file, height_token);
-    sscanf (height_token, "%lu", &ul_height);
+    sscanf (height_token, "%lu", &height);
    height = (png_uint_32) ul_height;
    get_token(pnm_file, maxval_token);
-    sscanf (maxval_token, "%lu", &ul_maxval);
+    sscanf (maxval_token, "%lu", &maxval);
    maxval = (png_uint_32) ul_maxval;
    if (maxval <= 1)
      bit_depth = 1;
    else if (maxval <= 3)
@@ -271,14 +248,11 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_file, FILE *alpha_file, BOOL interlace,
    raw = (type_token[1] == '6');
    color_type = PNG_COLOR_TYPE_RGB;
    get_token(pnm_file, width_token);
-    sscanf (width_token, "%lu", &ul_width);
+    sscanf (width_token, "%lu", &width);
    width = (png_uint_32) ul_width;
    get_token(pnm_file, height_token);
-    sscanf (height_token, "%lu", &ul_height);
+    sscanf (height_token, "%lu", &height);
    height = (png_uint_32) ul_height;
    get_token(pnm_file, maxval_token);
-    sscanf (maxval_token, "%lu", &ul_maxval);
+    sscanf (maxval_token, "%lu", &maxval);
    maxval = (png_uint_32) ul_maxval;
    if (maxval <= 1)
      bit_depth = 1;
    else if (maxval <= 3)
@@ -313,18 +287,15 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_file, FILE *alpha_file, BOOL interlace,
    {
      alpha_raw = (type_token[1] == '5');
      get_token(alpha_file, width_token);
-      sscanf (width_token, "%lu", &ul_alpha_width);
+      sscanf (width_token, "%lu", &alpha_width);
      alpha_width=(png_uint_32) ul_alpha_width;
      if (alpha_width != width)
        return FALSE;
      get_token(alpha_file, height_token);
-      sscanf (height_token, "%lu", &ul_alpha_height);
+      sscanf (height_token, "%lu", &alpha_height);
      alpha_height = (png_uint_32) ul_alpha_height;
      if (alpha_height != height)
        return FALSE;
      get_token(alpha_file, maxval_token);
-      sscanf (maxval_token, "%lu", &ul_maxval);
+      sscanf (maxval_token, "%lu", &maxval);
      maxval = (png_uint_32) ul_maxval;
      if (maxval <= 1)
        alpha_depth = 1;
      else if (maxval <= 3)
@@ -358,14 +329,8 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_file, FILE *alpha_file, BOOL interlace,
  alpha_present = (channels - 1) % 2;
-#if defined(PNG_WRITE_INVERT_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
+  /* row_bytes is the width x number of channels x (bit-depth / 8) */
-  if (packed_bitmap)
+  row_bytes = width * channels * ((bit_depth <= 8) ? 1 : 2);
    /* row data is as many bytes as can fit width x channels x bit_depth */
    row_bytes = (width * channels * bit_depth + 7) / 8;
  else
 #endif
    /* row_bytes is the width x number of channels x (bit-depth / 8) */
    row_bytes = width * channels * ((bit_depth <= 8) ? 1 : 2);
  if ((png_pixels = (png_byte *) malloc (row_bytes * height * sizeof (png_byte))) == NULL)
    return FALSE;
@@ -375,48 +340,40 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_file, FILE *alpha_file, BOOL interlace,
  for (row = 0; row < height; row++)
  {
-#if defined(PNG_WRITE_INVERT_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
+    for (col = 0; col < width; col++)
    if (packed_bitmap) {
      for (i = 0; i < row_bytes; i++)
        /* png supports this format natively so no conversion is needed */
        *pix_ptr++ = get_data (pnm_file, 8);
    } else
 #endif
    {
-      for (col = 0; col < width; col++)
+      for (i = 0; i < (channels - alpha_present); i++)
      {
-        for (i = 0; i < (channels - alpha_present); i++)
+        if (raw)
-        {
+          *pix_ptr++ = get_data (pnm_file, bit_depth);
-          if (raw)
+        else
-            *pix_ptr++ = get_data (pnm_file, bit_depth);
+          if (bit_depth <= 8)
            *pix_ptr++ = get_value (pnm_file, bit_depth);
          else
-            if (bit_depth <= 8)
+          {
-              *pix_ptr++ = get_value (pnm_file, bit_depth);
+            tmp16 = get_value (pnm_file, bit_depth);
-            else
+            *pix_ptr = (png_byte) ((tmp16 >> 8) & 0xFF);
-            {
+            pix_ptr++;
-              tmp16 = get_value (pnm_file, bit_depth);
+            *pix_ptr = (png_byte) (tmp16 & 0xFF);
-              *pix_ptr = (png_byte) ((tmp16 >> 8) & 0xFF);
+            pix_ptr++;
-              pix_ptr++;
+          }
-              *pix_ptr = (png_byte) (tmp16 & 0xFF);
+      }
              pix_ptr++;
            }
        }
-        if (alpha) /* read alpha-channel from pgm file */
+      if (alpha) /* read alpha-channel from pgm file */
-        {
+      {
-          if (alpha_raw)
+        if (alpha_raw)
-            *pix_ptr++ = get_data (alpha_file, alpha_depth);
+          *pix_ptr++ = get_data (alpha_file, alpha_depth);
        else
          if (alpha_depth <= 8)
            *pix_ptr++ = get_value (alpha_file, bit_depth);
          else
-            if (alpha_depth <= 8)
+          {
-              *pix_ptr++ = get_value (alpha_file, bit_depth);
+            tmp16 = get_value (alpha_file, bit_depth);
-            else
+            *pix_ptr++ = (png_byte) ((tmp16 >> 8) & 0xFF);
-            {
+            *pix_ptr++ = (png_byte) (tmp16 & 0xFF);
-              tmp16 = get_value (alpha_file, bit_depth);
+          }
-              *pix_ptr++ = (png_byte) ((tmp16 >> 8) & 0xFF);
+      } /* if alpha */
-              *pix_ptr++ = (png_byte) (tmp16 & 0xFF);
+
            }
        } /* if alpha */
      } /* if packed_bitmap */
    } /* end for col */
  } /* end for row */
@@ -433,14 +390,6 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_file, FILE *alpha_file, BOOL interlace,
    return FALSE;
  }
 #if defined(PNG_WRITE_INVERT_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
  if (packed_bitmap == TRUE)
  {
    png_set_packing (png_ptr);
    png_set_invert_mono (png_ptr);
  }
 #endif
  /* setjmp() must be called in every function that calls a PNG-reading libpng function */
  if (setjmp (png_jmpbuf(png_ptr)))
  {
@@ -497,32 +446,19 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_file, FILE *alpha_file, BOOL interlace,
 void get_token(FILE *pnm_file, char *token)
 {
  int i = 0;
  int ret;
-  /* remove white-space and comment lines */
+  /* remove white-space */
  do
  {
-    ret = fgetc(pnm_file);
+    token[i] = (unsigned char) fgetc (pnm_file);
    if (ret == '#') {
      /* the rest of this line is a comment */
      do
      {
        ret = fgetc(pnm_file);
      }
      while ((ret != '\n') && (ret != '\r') && (ret != EOF));
    }
    if (ret == EOF) break;
    token[i] = (unsigned char) ret;
  }
  while ((token[i] == '\n') || (token[i] == '\r') || (token[i] == ' '));
  /* read string */
  do
  {
    ret = fgetc(pnm_file);
    if (ret == EOF) break;
    i++;
-    token[i] = (unsigned char) ret;
+    token[i] = (unsigned char) fgetc (pnm_file);
  }
  while ((token[i] != '\n') && (token[i] != '\r') && (token[i] != ' '));
@@ -574,7 +510,6 @@ png_uint_32 get_value (FILE *pnm_file, int depth)
 {
  static png_uint_32 mask = 0;
  png_byte token[16];
  unsigned long ul_ret_value;
  png_uint_32 ret_value;
  int i = 0;
@@ -583,8 +518,7 @@ png_uint_32 get_value (FILE *pnm_file, int depth)
      mask = (mask << 1) | 0x01;
  get_token (pnm_file, (char *) token);
-  sscanf ((const char *) token, "%lu", &ul_ret_value);
+  sscanf ((const char *) token, "%lu", &ret_value);
  ret_value = (png_uint_32) ul_ret_value;
  ret_value &= mask;
--- a/contrib/pngsuite/README
+++ b/contrib/pngsuite/README
@@ -1,61 +1,41 @@
 pngsuite
 --------
-(c) Willem van Schaik, 1999, 2011, 2012
+(c) Willem van Schaik, 1999
 Two images are by Glenn Randers-Pehrson, 2012
-Permission to use, copy, modify, and distribute these images for any
+Permission to use, copy, and distribute these images for any purpose and
-purpose and without fee is hereby granted.
+without fee is hereby granted.
-The 15 "bas*.png" images are part of the much larger PngSuite test-set of
+These 15 images are part of the much larger PngSuite test-set of 
-images, available for developers of PNG supporting software. The
+images, available for developers of PNG supporting software. The 
-complete set, available at http:/www.schaik.com/pngsuite/, contains
+complete set, available at http:/www.schaik.com/pngsuite/, contains 
 a variety of images to test interlacing, gamma settings, ancillary
 chunks, etc.
 The "ft*.png" images are "free/libre" replacements for the transparent
 corresponding t*.png images in the PngSuite.
 The images in this directory represent the basic PNG color-types:
 grayscale (1-16 bit deep), full color (8 or 16 bit), paletted
 (1-8 bit) and grayscale or color images with alpha channel. You
 can use them to test the proper functioning of PNG software.
-    filename       depth type
+    filename      depth type
    ------------ ------ --------------
-    basn0g01.png   1-bit grayscale
+    basn0g01.png  1-bit grayscale
-    basn0g02.png   2-bit grayscale
+    basn0g02.png  2-bit grayscale
-    basn0g04.png   4-bit grayscale
+    basn0g04.png  4-bit grayscale
-    basn0g08.png   8-bit grayscale
+    basn0g08.png  8-bit grayscale
-    basn0g16.png  16-bit grayscale
+    basn0g16.png 16-bit grayscale
-    basn2c08.png   8-bit truecolor
+    basn2c08.png  8-bit truecolor
-    basn2c16.png  16-bit truecolor
+    basn2c16.png 16-bit truecolor
-    basn3p01.png   1-bit paletted
+    basn3p01.png  1-bit paletted
-    basn3p02.png   2-bit paletted
+    basn3p02.png  2-bit paletted
-    basn3p04.png   4-bit paletted
+    basn3p04.png  4-bit paletted
-    basn3p08.png   8-bit paletted
+    basn3p08.png  8-bit paletted
-    basn4a08.png   8-bit gray with alpha
+    basn4a08.png  8-bit gray with alpha
-    basn4a16.png  16-bit gray with alpha
+    basn4a16.png 16-bit gray with alpha
-    basn6a08.png   8-bit RGBA
+    basn6a08.png  8-bit RGBA
-    basn6a16.png  16-bit RGBA
+    basn6a16.png 16-bit RGBA
-    ftbbn0g01.png  1-bit grayscale, black bKGD
+Here is the correct result of typing "pngtest -m *.png" in
    ftbbn0g02.png  2-bit grayscale, black bKGD
    ftbbn0g04.png  4-bit grayscale, black bKGD
    ftbbn2c16.png 16-bit truecolor, black bKGD
    ftbbn3p08.png  8-bit paletted, black bKGD
    ftbgn2c16.png 16-bit truecolor, gray bKGD
    ftbgn3p08.png  8-bit paletted, gray bKGD
    ftbrn2c08.png  8-bit truecolor, red bKGD
    ftbwn0g16.png 16-bit gray, white bKGD
    ftbwn3p08.png  8-bit paletted, white bKGD
    ftbyn3p08.png  8-bit paletted, yellow bKGD
    ftp0n0g08.png  8-bit grayscale, opaque
    ftp0n2c08.png  8-bit truecolor, opaque
    ftp0n3p08.png  8-bit paletted, opaque
    ftp1n3p08.png  8-bit paletted, no bKGD
 Here is the correct result of typing "pngtest -m bas*.png" in
 this directory:
 Testing basn0g01.png: PASS (524 zero samples)
--- a/contrib/pngsuite/ftbbn0g01.png
+++ b/contrib/pngsuite/ftbbn0g01.png
--- a/contrib/pngsuite/ftbbn0g02.png
+++ b/contrib/pngsuite/ftbbn0g02.png
--- a/contrib/pngsuite/ftbbn0g04.png
+++ b/contrib/pngsuite/ftbbn0g04.png
--- a/contrib/pngsuite/ftbbn2c16.png
+++ b/contrib/pngsuite/ftbbn2c16.png
--- a/contrib/pngsuite/ftbbn3p08.png
+++ b/contrib/pngsuite/ftbbn3p08.png
--- a/contrib/pngsuite/ftbgn2c16.png
+++ b/contrib/pngsuite/ftbgn2c16.png
--- a/contrib/pngsuite/ftbgn3p08.png
+++ b/contrib/pngsuite/ftbgn3p08.png
--- a/contrib/pngsuite/ftbrn2c08.png
+++ b/contrib/pngsuite/ftbrn2c08.png
--- a/contrib/pngsuite/ftbwn0g16.png
+++ b/contrib/pngsuite/ftbwn0g16.png
--- a/contrib/pngsuite/ftbwn3p08.png
+++ b/contrib/pngsuite/ftbwn3p08.png
--- a/contrib/pngsuite/ftbyn3p08.png
+++ b/contrib/pngsuite/ftbyn3p08.png
--- a/contrib/pngsuite/ftp0n0g08.png
+++ b/contrib/pngsuite/ftp0n0g08.png
--- a/contrib/pngsuite/ftp0n2c08.png
+++ b/contrib/pngsuite/ftp0n2c08.png
--- a/contrib/pngsuite/ftp0n3p08.png
+++ b/contrib/pngsuite/ftp0n3p08.png
--- a/contrib/pngsuite/ftp1n3p08.png
+++ b/contrib/pngsuite/ftp1n3p08.png
--- a/contrib/visupng/PngFile.c
+++ b/contrib/visupng/PngFile.c
@@ -1,19 +1,14 @@
-/*-------------------------------------
+//-------------------------------------
- *  PNGFILE.C -- Image File Functions
+//  PNGFILE.C -- Image File Functions
- *-------------------------------------
+//-------------------------------------
- *
+
- * Copyright 2000, Willem van Schaik.
+// Copyright 2000, Willem van Schaik.  For conditions of distribution and
- *
+// use, see the copyright/license/disclaimer notice in png.h
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */
 #include <windows.h>
 #include <commdlg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <zlib.h>
 #include "png.h"
 #include "pngfile.h"
@@ -30,14 +25,14 @@ static png_structp png_ptr = NULL;
 static png_infop info_ptr = NULL;
-/* cexcept interface */
+// cexcept interface
 static void
 png_cexcept_error(png_structp png_ptr, png_const_charp msg)
 {
   if(png_ptr)
     ;
-#ifdef PNG_CONSOLE_IO_SUPPORTED
+#ifndef PNG_NO_CONSOLE_IO
   fprintf(stderr, "libpng error: %s\n", msg);
 #endif
   {
@@ -45,7 +40,7 @@ png_cexcept_error(png_structp png_ptr, png_const_charp msg)
   }
 }
-/* Windows open-file functions */
+// Windows open-file functions
 void PngFileInitialize (HWND hwnd)
 {
@@ -59,13 +54,13 @@ void PngFileInitialize (HWND hwnd)
    ofn.lpstrCustomFilter = NULL;
    ofn.nMaxCustFilter    = 0;
    ofn.nFilterIndex      = 0;
-    ofn.lpstrFile         = NULL;          /* Set in Open and Close functions */
+    ofn.lpstrFile         = NULL;          // Set in Open and Close functions
    ofn.nMaxFile          = MAX_PATH;
-    ofn.lpstrFileTitle    = NULL;          /* Set in Open and Close functions */
+    ofn.lpstrFileTitle    = NULL;          // Set in Open and Close functions
    ofn.nMaxFileTitle     = MAX_PATH;
    ofn.lpstrInitialDir   = NULL;
    ofn.lpstrTitle        = NULL;
-    ofn.Flags             = 0;             /* Set in Open and Close functions */
+    ofn.Flags             = 0;             // Set in Open and Close functions
    ofn.nFileOffset       = 0;
    ofn.nFileExtension    = 0;
    ofn.lpstrDefExt       = TEXT ("png");
@@ -94,7 +89,7 @@ BOOL PngFileSaveDlg (HWND hwnd, PTSTR pstrFileName, PTSTR pstrTitleName)
    return GetSaveFileName (&ofn);
 }
-/* PNG image handler functions */
+// PNG image handler functions
 BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
                   int *piWidth, int *piHeight, int *piChannels, png_color *pBkgColor)
@@ -111,7 +106,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
    static png_byte   **ppbRowPointers = NULL;
    int                 i;
-    /* open the PNG input file */
+    // open the PNG input file
    if (!pstrFileName)
    {
@@ -125,16 +120,16 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
        return FALSE;
    }
-    /* first check the eight byte PNG signature */
+    // first check the eight byte PNG signature
    fread(pbSig, 1, 8, pfFile);
-    if (png_sig_cmp(pbSig, 0, 8))
+    if (!png_check_sig(pbSig, 8))
    {
        *ppbImageData = pbImageData = NULL;
        return FALSE;
    }
-    /* create the two png(-info) structures */
+    // create the two png(-info) structures
    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL,
      (png_error_ptr)png_cexcept_error, (png_error_ptr)NULL);
@@ -154,37 +149,31 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
    Try
    {
-
+        
-        /* initialize the png structure */
+        // initialize the png structure
-
+        
-#ifdef PNG_STDIO_SUPPORTED
+#if !defined(PNG_NO_STDIO)
        png_init_io(png_ptr, pfFile);
 #else
        png_set_read_fn(png_ptr, (png_voidp)pfFile, png_read_data);
 #endif
-
+        
        png_set_sig_bytes(png_ptr, 8);
-
+        
-        /* read all PNG info up to image data */
+        // read all PNG info up to image data
-
+        
        png_read_info(png_ptr, info_ptr);
-
+        
-        /* get width, height, bit-depth and color-type */
+        // get width, height, bit-depth and color-type
-
+        
        png_get_IHDR(png_ptr, info_ptr, piWidth, piHeight, &iBitDepth,
            &iColorType, NULL, NULL, NULL);
-
+        
-        /* expand images of all color-type and bit-depth to 3x8-bit RGB */
+        // expand images of all color-type and bit-depth to 3x8 bit RGB images
-        /* let the library process alpha, transparency, background, etc. */
+        // let the library process things like alpha, transparency, background
-
+        
-#ifdef PNG_READ_16_TO_8_SUPPORTED
+        if (iBitDepth == 16)
-    if (iBitDepth == 16)
+            png_set_strip_16(png_ptr);
 #  ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
        png_set_scale_16(png_ptr);
 #  else
        png_set_strip_16(png_ptr);
 #  endif
 #endif
        if (iColorType == PNG_COLOR_TYPE_PALETTE)
            png_set_expand(png_ptr);
        if (iBitDepth < 8)
@@ -194,8 +183,8 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
        if (iColorType == PNG_COLOR_TYPE_GRAY ||
            iColorType == PNG_COLOR_TYPE_GRAY_ALPHA)
            png_set_gray_to_rgb(png_ptr);
-
+        
-        /* set the background color to draw transparent and alpha images over */
+        // set the background color to draw transparent and alpha images over.
        if (png_get_bKGD(png_ptr, info_ptr, &pBackground))
        {
            png_set_background(png_ptr, pBackground, PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
@@ -207,30 +196,30 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
        {
            pBkgColor = NULL;
        }
-
+        
-        /* if required set gamma conversion */
+        // if required set gamma conversion
        if (png_get_gAMA(png_ptr, info_ptr, &dGamma))
            png_set_gamma(png_ptr, (double) 2.2, dGamma);
-
+        
-        /* after the transformations are registered, update info_ptr data */
+        // after the transformations have been registered update info_ptr data
-
+        
        png_read_update_info(png_ptr, info_ptr);
-
+        
-        /* get again width, height and the new bit-depth and color-type */
+        // get again width, height and the new bit-depth and color-type
-
+        
        png_get_IHDR(png_ptr, info_ptr, piWidth, piHeight, &iBitDepth,
            &iColorType, NULL, NULL, NULL);
-
+        
-
+        
-        /* row_bytes is the width x number of channels */
+        // row_bytes is the width x number of channels
-
+        
        ulRowBytes = png_get_rowbytes(png_ptr, info_ptr);
        ulChannels = png_get_channels(png_ptr, info_ptr);
-
+        
        *piChannels = ulChannels;
-
+        
-        /* now we can allocate memory to store the image */
+        // now we can allocate memory to store the image
-
+        
        if (pbImageData)
        {
            free (pbImageData);
@@ -242,34 +231,34 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
            png_error(png_ptr, "Visual PNG: out of memory");
        }
        *ppbImageData = pbImageData;
-
+        
-        /* and allocate memory for an array of row-pointers */
+        // and allocate memory for an array of row-pointers
-
+        
        if ((ppbRowPointers = (png_bytepp) malloc((*piHeight)
                            * sizeof(png_bytep))) == NULL)
        {
            png_error(png_ptr, "Visual PNG: out of memory");
        }
-
+        
-        /* set the individual row-pointers to point at the correct offsets */
+        // set the individual row-pointers to point at the correct offsets
-
+        
        for (i = 0; i < (*piHeight); i++)
            ppbRowPointers[i] = pbImageData + i * ulRowBytes;
-
+        
-        /* now we can go ahead and just read the whole image */
+        // now we can go ahead and just read the whole image
-
+        
        png_read_image(png_ptr, ppbRowPointers);
-
+        
-        /* read the additional chunks in the PNG file (not really needed) */
+        // read the additional chunks in the PNG file (not really needed)
-
+        
        png_read_end(png_ptr, NULL);
-
+        
-        /* and we're done */
+        // and we're done
-
+        
        free (ppbRowPointers);
        ppbRowPointers = NULL;
-
+        
-        /* yepp, done */
+        // yepp, done
    }
    Catch (msg)
@@ -277,7 +266,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
        png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
        *ppbImageData = pbImageData = NULL;
-
+        
        if(ppbRowPointers)
            free (ppbRowPointers);
@@ -303,7 +292,7 @@ BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData,
    static png_byte   **ppbRowPointers = NULL;
    int                 i;
-    /* open the PNG output file */
+    // open the PNG output file
    if (!pstrFileName)
        return FALSE;
@@ -311,7 +300,7 @@ BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData,
    if (!(pfFile = fopen(pstrFileName, "wb")))
        return FALSE;
-    /* prepare the standard PNG structures */
+    // prepare the standard PNG structures
    png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL,
      (png_error_ptr)png_cexcept_error, (png_error_ptr)NULL);
@@ -330,60 +319,60 @@ BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData,
    Try
    {
-        /* initialize the png structure */
+        // initialize the png structure
-
+        
-#ifdef PNG_STDIO_SUPPORTED
+#if !defined(PNG_NO_STDIO)
        png_init_io(png_ptr, pfFile);
 #else
        png_set_write_fn(png_ptr, (png_voidp)pfFile, png_write_data, png_flush);
 #endif
-
+        
-        /* we're going to write a very simple 3x8-bit RGB image */
+        // we're going to write a very simple 3x8 bit RGB image
-
+        
        png_set_IHDR(png_ptr, info_ptr, iWidth, iHeight, ciBitDepth,
            PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
            PNG_FILTER_TYPE_BASE);
-
+        
-        /* write the file header information */
+        // write the file header information
-
+        
        png_write_info(png_ptr, info_ptr);
-
+        
-        /* swap the BGR pixels in the DiData structure to RGB */
+        // swap the BGR pixels in the DiData structure to RGB
-
+        
        png_set_bgr(png_ptr);
-
+        
-        /* row_bytes is the width x number of channels */
+        // row_bytes is the width x number of channels
-
+        
        ulRowBytes = iWidth * ciChannels;
-
+        
-        /* we can allocate memory for an array of row-pointers */
+        // we can allocate memory for an array of row-pointers
-
+        
        if ((ppbRowPointers = (png_bytepp) malloc(iHeight * sizeof(png_bytep))) == NULL)
            Throw "Visualpng: Out of memory";
-
+        
-        /* set the individual row-pointers to point at the correct offsets */
+        // set the individual row-pointers to point at the correct offsets
-
+        
        for (i = 0; i < iHeight; i++)
            ppbRowPointers[i] = pDiData + i * (((ulRowBytes + 3) >> 2) << 2);
-
+        
-        /* write out the entire image data in one call */
+        // write out the entire image data in one call
-
+        
        png_write_image (png_ptr, ppbRowPointers);
-
+        
-        /* write the additional chunks to the PNG file (not really needed) */
+        // write the additional chunks to the PNG file (not really needed)
-
+        
        png_write_end(png_ptr, info_ptr);
-
+        
-        /* and we're done */
+        // and we're done
-
+        
        free (ppbRowPointers);
        ppbRowPointers = NULL;
-
+        
-        /* clean up after the write, and free any memory allocated */
+        // clean up after the write, and free any memory allocated
-
+        
        png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
-
+        
-        /* yepp, done */
+        // yepp, done
    }
    Catch (msg)
@@ -397,13 +386,13 @@ BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData,
        return FALSE;
    }
-
+    
    fclose (pfFile);
-
+    
    return TRUE;
 }
-#ifndef PNG_STDIO_SUPPORTED
+#ifdef PNG_NO_STDIO
 static void
 png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
@@ -445,7 +434,6 @@ png_flush(png_structp png_ptr)
 #endif
-/*-----------------
+//-----------------
- *  end of source
+//  end of source
- *-----------------
+//-----------------
 */
--- a/contrib/visupng/PngFile.h
+++ b/contrib/visupng/PngFile.h
@@ -1,12 +1,9 @@
-/*------------------------------------------*/
+//------------------------------------------
-/*  PNGFILE.H -- Header File for pngfile.c*/
+//  PNGFILE.H -- Header File for pngfile.c
-/*------------------------------------------*/
+//------------------------------------------
-/* Copyright 2000, Willem van Schaik.*/
+// Copyright 2000, Willem van Schaik.  For conditions of distribution and
-
+// use, see the copyright/license/disclaimer notice in png.h
 /* This code is released under the libpng license.*/
 /* For conditions of distribution and use, see the disclaimer*/
 /* and license in png.h*/
 #include <stdio.h>
 #include <stdlib.h>
@@ -17,12 +14,12 @@ void PngFileInitialize (HWND hwnd) ;
 BOOL PngFileOpenDlg (HWND hwnd, PTSTR pstrFileName, PTSTR pstrTitleName) ;
 BOOL PngFileSaveDlg (HWND hwnd, PTSTR pstrFileName, PTSTR pstrTitleName) ;
-BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
+BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData, 
                   int *piWidth, int *piHeight, int *piChannels, png_color *pBkgColor);
 BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData,
                   int iWidth, int iHeight, png_color BkgColor);
-#ifndef PNG_STDIO_SUPPORTED
+#if defined(PNG_NO_STDIO)
 static void png_read_data(png_structp png_ptr, png_bytep data, png_size_t length);
 static void png_write_data(png_structp png_ptr, png_bytep data, png_size_t length);
 static void png_flush(png_structp png_ptr);
--- a/contrib/visupng/README.txt
+++ b/contrib/visupng/README.txt
@@ -1,15 +1,12 @@
 Microsoft Developer Studio Build File, Format Version 6.00 for VisualPng
 ------------------------------------------------------------------------
-Copyright 2000, Willem van Schaik.
+Copyright 2000, Willem van Schaik.  For conditions of distribution and
-
+use, see the copyright/license/disclaimer notice in png.h
 This code is released under the libpng license.
 For conditions of distribution and use, see the disclaimer
 and license in png.h
 As a PNG .dll demo VisualPng is finished. More features would only hinder
-the program's objective. However, further extensions (like support for other
+the program's objective. However, further extensions (like support for other 
-graphics formats) are in development. To get these, or for pre-compiled
+graphics formats) are in development. To get these, or for pre-compiled 
 binaries, go to "http://www.schaik.com/png/visualpng.html".
 ------------------------------------------------------------------------
--- a/contrib/visupng/VisualPng.c
+++ b/contrib/visupng/VisualPng.c
@@ -1,43 +1,38 @@
-/*------------------------------------
+//------------------------------------
- *  VisualPng.C -- Shows a PNG image
+//  VisualPng.C -- Shows a PNG image
- *------------------------------------
+//------------------------------------
 *
 * Copyright 2000, Willem van Schaik.
 *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */
-/* switches */
+// Copyright 2000, Willem van Schaik.  For conditions of distribution and
 // use, see the copyright/license/disclaimer notice in png.h
-/* defines */
+// switches
 // defines
 #define PROGNAME  "VisualPng"
 #define LONGNAME  "Win32 Viewer for PNG-files"
 #define VERSION   "1.0 of 2000 June 07"
-/* constants */
+// constants
 #define MARGIN 8
-/* standard includes */
+// standard includes
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <windows.h>
 #include <zlib.h>
-/* application includes */
+// application includes
 #include "png.h"
 #include "pngfile.h"
 #include "resource.h"
-/* macros */
+// macros
-/* function prototypes */
+// function prototypes
 LRESULT CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM);
 BOOL    CALLBACK AboutDlgProc (HWND, UINT, WPARAM, LPARAM) ;
@@ -67,14 +62,14 @@ BOOL FillBitmap (
        BYTE *pbImage, int cxImgSize, int cyImgSize, int cImgChannels,
        BOOL bStretched);
-/* a few global variables */
+// a few global variables
 static char *szProgName = PROGNAME;
 static char *szAppName = LONGNAME;
 static char *szIconName = PROGNAME;
 static char szCmdFileName [MAX_PATH];
-/* MAIN routine */
+// MAIN routine
 int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance,
                    PSTR szCmdLine, int iCmdShow)
@@ -92,7 +87,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance,
    wndclass.hInstance     = hInstance;
    wndclass.hIcon         = LoadIcon (hInstance, szIconName) ;
    wndclass.hCursor       = LoadCursor (NULL, IDC_ARROW);
-    wndclass.hbrBackground = NULL; /* (HBRUSH) GetStockObject (GRAY_BRUSH); */
+    wndclass.hbrBackground = NULL; // (HBRUSH) GetStockObject (GRAY_BRUSH);
    wndclass.lpszMenuName  = szProgName;
    wndclass.lpszClassName = szProgName;
@@ -103,7 +98,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance,
        return 0;
    }
-    /* if filename given on commandline, store it */
+    // if filename given on commandline, store it
    if ((szCmdLine != NULL) && (*szCmdLine != '\0'))
        if (szCmdLine[0] == '"')
            strncpy (szCmdFileName, szCmdLine + 1, strlen(szCmdLine) - 2);
@@ -112,20 +107,20 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance,
    else
        strcpy (szCmdFileName, "");
-    /* calculate size of window-borders */
+    // calculate size of window-borders
    ixBorders = 2 * (GetSystemMetrics (SM_CXBORDER) +
                     GetSystemMetrics (SM_CXDLGFRAME));
    iyBorders = 2 * (GetSystemMetrics (SM_CYBORDER) +
                     GetSystemMetrics (SM_CYDLGFRAME)) +
                     GetSystemMetrics (SM_CYCAPTION) +
                     GetSystemMetrics (SM_CYMENUSIZE) +
-                     1; /* WvS: don't ask me why?  */
+                     1; /* WvS: don't ask me why? */
    hwnd = CreateWindow (szProgName, szAppName,
        WS_OVERLAPPEDWINDOW,
        CW_USEDEFAULT, CW_USEDEFAULT,
        512 + 2 * MARGIN + ixBorders, 384 + 2 * MARGIN + iyBorders,
-/*      CW_USEDEFAULT, CW_USEDEFAULT, */
+//      CW_USEDEFAULT, CW_USEDEFAULT,
        NULL, NULL, hInstance, NULL);
    ShowWindow (hwnd, iCmdShow);
@@ -182,29 +177,29 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam,
        strcpy (szImgPathName, "");
-        /* in case we process file given on command-line */
+        // in case we process file given on command-line
        if (szCmdFileName[0] != '\0')
        {
            strcpy (szImgPathName, szCmdFileName);
-            /* read the other png-files in the directory for later */
+            // read the other png-files in the directory for later
-            /* next/previous commands */
+            // next/previous commands
            BuildPngList (szImgPathName, &pPngFileList, &iPngFileCount,
                          &iPngFileIndex);
-            /* load the image from file */
+            // load the image from file
            if (!LoadImageFile (hwnd, szImgPathName,
                &pbImage, &cxImgSize, &cyImgSize, &cImgChannels, &bkgColor))
                return 0;
-            /* invalidate the client area for later update */
+            // invalidate the client area for later update
            InvalidateRect (hwnd, NULL, TRUE);
-            /* display the PNG into the DIBitmap */
+            // display the PNG into the DIBitmap
            DisplayImage (hwnd, &pDib, &pDiData, cxWinSize, cyWinSize,
                pbImage, cxImgSize, cyImgSize, cImgChannels, bStretched);
@@ -216,11 +211,11 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam,
        cxWinSize = LOWORD (lParam);
        cyWinSize = HIWORD (lParam);
-        /* invalidate the client area for later update */
+        // invalidate the client area for later update
        InvalidateRect (hwnd, NULL, TRUE);
-        /* display the PNG into the DIBitmap */
+        // display the PNG into the DIBitmap
        DisplayImage (hwnd, &pDib, &pDiData, cxWinSize, cyWinSize,
            pbImage, cxImgSize, cyImgSize, cImgChannels, bStretched);
@@ -244,28 +239,28 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam,
        {
        case IDM_FILE_OPEN:
-            /* show the File Open dialog box */
+            // show the File Open dialog box
            if (!PngFileOpenDlg (hwnd, szImgPathName, szTitleName))
                return 0;
-            /* read the other png-files in the directory for later */
+            // read the other png-files in the directory for later
-            /* next/previous commands */
+            // next/previous commands
            BuildPngList (szImgPathName, &pPngFileList, &iPngFileCount,
                          &iPngFileIndex);
-            /* load the image from file */
+            // load the image from file
            if (!LoadImageFile (hwnd, szImgPathName,
                &pbImage, &cxImgSize, &cyImgSize, &cImgChannels, &bkgColor))
                return 0;
-            /* invalidate the client area for later update */
+            // invalidate the client area for later update
            InvalidateRect (hwnd, NULL, TRUE);
-            /* display the PNG into the DIBitmap */
+            // display the PNG into the DIBitmap
            DisplayImage (hwnd, &pDib, &pDiData, cxWinSize, cyWinSize,
                pbImage, cxImgSize, cyImgSize, cImgChannels, bStretched);
@@ -274,12 +269,12 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam,
        case IDM_FILE_SAVE:
-            /* show the File Save dialog box */
+            // show the File Save dialog box
            if (!PngFileSaveDlg (hwnd, szImgPathName, szTitleName))
                return 0;
-            /* save the PNG to a disk file */
+            // save the PNG to a disk file
            SetCursor (LoadCursor (NULL, IDC_WAIT));
            ShowCursor (TRUE);
@@ -297,55 +292,55 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam,
        case IDM_FILE_NEXT:
-            /* read next entry in the directory */
+            // read next entry in the directory
            if (SearchPngList (pPngFileList, iPngFileCount, &iPngFileIndex,
                NULL, szImgPathName))
            {
                if (strcmp (szImgPathName, "") == 0)
                    return 0;
-
+                
-                /* load the image from file */
+                // load the image from file
-
+                
                if (!LoadImageFile (hwnd, szImgPathName, &pbImage,
                        &cxImgSize, &cyImgSize, &cImgChannels, &bkgColor))
                    return 0;
-
+                
-                /* invalidate the client area for later update */
+                // invalidate the client area for later update
-
+                
                InvalidateRect (hwnd, NULL, TRUE);
-
+                
-                /* display the PNG into the DIBitmap */
+                // display the PNG into the DIBitmap
-
+                
                DisplayImage (hwnd, &pDib, &pDiData, cxWinSize, cyWinSize,
                    pbImage, cxImgSize, cyImgSize, cImgChannels, bStretched);
            }
-
+            
            return 0;
        case IDM_FILE_PREVIOUS:
-            /* read previous entry in the directory */
+            // read previous entry in the directory
            if (SearchPngList (pPngFileList, iPngFileCount, &iPngFileIndex,
                szImgPathName, NULL))
            {
-
+                
                if (strcmp (szImgPathName, "") == 0)
                    return 0;
-
+                
-                /* load the image from file */
+                // load the image from file
-
+                
                if (!LoadImageFile (hwnd, szImgPathName, &pbImage, &cxImgSize,
                    &cyImgSize, &cImgChannels, &bkgColor))
                    return 0;
-
+                
-                /* invalidate the client area for later update */
+                // invalidate the client area for later update
-
+                
                InvalidateRect (hwnd, NULL, TRUE);
-
+                
-                /* display the PNG into the DIBitmap */
+                // display the PNG into the DIBitmap
-
+                
                DisplayImage (hwnd, &pDib, &pDiData, cxWinSize, cyWinSize,
                    pbImage, cxImgSize, cyImgSize, cImgChannels, bStretched);
            }
@@ -354,9 +349,9 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam,
        case IDM_FILE_EXIT:
-            /* more cleanup needed... */
+            // more cleanup needed...
-            /* free image buffer */
+            // free image buffer
            if (pDib != NULL)
            {
@@ -364,7 +359,7 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam,
                pDib = NULL;
            }
-            /* free file-list */
+            // free file-list
            if (pPngFileList != NULL)
            {
@@ -372,7 +367,7 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam,
                pPngFileList = NULL;
            }
-            /* let's go ... */
+            // let's go ...
            exit (0);
@@ -385,11 +380,11 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam,
            else
                CheckMenuItem (hMenu, IDM_OPTIONS_STRETCH, MF_UNCHECKED);
-            /* invalidate the client area for later update */
+            // invalidate the client area for later update
            InvalidateRect (hwnd, NULL, TRUE);
-            /* display the PNG into the DIBitmap */
+            // display the PNG into the DIBitmap
            DisplayImage (hwnd, &pDib, &pDiData, cxWinSize, cyWinSize,
                pbImage, cxImgSize, cyImgSize, cImgChannels, bStretched);
@@ -400,7 +395,7 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam,
            DialogBox (hInstance, TEXT ("AboutBox"), hwnd, AboutDlgProc) ;
            return 0;
-        } /* end switch */
+        } // end switch
        break;
@@ -452,10 +447,10 @@ BOOL CALLBACK AboutDlgProc (HWND hDlg, UINT message,
     return FALSE ;
 }
-/*---------------
+//---------------
- *  CenterAbout
+//  CenterAbout
- *---------------
+//---------------
- */
+
 BOOL CenterAbout (HWND hwndChild, HWND hwndParent)
 {
   RECT    rChild, rParent, rWorkArea;
@@ -463,19 +458,19 @@ BOOL CenterAbout (HWND hwndChild, HWND hwndParent)
   int     xNew, yNew;
   BOOL  bResult;
-   /* Get the Height and Width of the child window */
+   // Get the Height and Width of the child window
   GetWindowRect (hwndChild, &rChild);
   wChild = rChild.right - rChild.left;
   hChild = rChild.bottom - rChild.top;
-   /* Get the Height and Width of the parent window */
+   // Get the Height and Width of the parent window
   GetWindowRect (hwndParent, &rParent);
   wParent = rParent.right - rParent.left;
   hParent = rParent.bottom - rParent.top;
-   /* Get the limits of the 'workarea' */
+   // Get the limits of the 'workarea'
   bResult = SystemParametersInfo(
-      SPI_GETWORKAREA,  /* system parameter to query or set */
+      SPI_GETWORKAREA,  // system parameter to query or set
      sizeof(RECT),
      &rWorkArea,
      0);
@@ -485,7 +480,7 @@ BOOL CenterAbout (HWND hwndChild, HWND hwndParent)
      rWorkArea.bottom = GetSystemMetrics(SM_CYSCREEN);
   }
-   /* Calculate new X position, then adjust for workarea */
+   // Calculate new X position, then adjust for workarea
   xNew = rParent.left + ((wParent - wChild) /2);
   if (xNew < rWorkArea.left) {
      xNew = rWorkArea.left;
@@ -493,7 +488,7 @@ BOOL CenterAbout (HWND hwndChild, HWND hwndParent)
      xNew = rWorkArea.right - wChild;
   }
-   /* Calculate new Y position, then adjust for workarea */
+   // Calculate new Y position, then adjust for workarea
   yNew = rParent.top  + ((hParent - hChild) /2);
   if (yNew < rWorkArea.top) {
      yNew = rWorkArea.top;
@@ -501,15 +496,15 @@ BOOL CenterAbout (HWND hwndChild, HWND hwndParent)
      yNew = rWorkArea.bottom - hChild;
   }
-   /* Set it, and return */
+   // Set it, and return
   return SetWindowPos (hwndChild, NULL, xNew, yNew, 0, 0, SWP_NOSIZE |
          SWP_NOZORDER);
 }
-/*----------------
+//----------------
- *  BuildPngList
+//  BuildPngList
- *----------------
+//----------------
- */
+
 BOOL BuildPngList (PTSTR pstrPathName, TCHAR **ppFileList, int *pFileCount,
     int *pFileIndex)
 {
@@ -525,7 +520,7 @@ BOOL BuildPngList (PTSTR pstrPathName, TCHAR **ppFileList, int *pFileCount,
    int                       i, ii;
    int                       j, jj;
-    /* free previous file-list */
+    // free previous file-list
    if (*ppFileList != NULL)
    {
@@ -533,7 +528,7 @@ BOOL BuildPngList (PTSTR pstrPathName, TCHAR **ppFileList, int *pFileCount,
        *ppFileList = NULL;
    }
-    /* extract foldername, filename and search-name */
+    // extract foldername, filename and search-name
    strcpy (szImgPathName, pstrPathName);
    strcpy (szImgFileName, strrchr (pstrPathName, '\\') + 1);
@@ -542,7 +537,7 @@ BOOL BuildPngList (PTSTR pstrPathName, TCHAR **ppFileList, int *pFileCount,
    *(strrchr (szImgFindName, '\\') + 1) = '\0';
    strcat (szImgFindName, "*.png");
-    /* first cycle: count number of files in directory for memory allocation */
+    // first cycle: count number of files in directory for memory allocation
    *pFileCount = 0;
@@ -556,11 +551,11 @@ BOOL BuildPngList (PTSTR pstrPathName, TCHAR **ppFileList, int *pFileCount,
    }
    FindClose(hFind);
-    /* allocation memory for file-list */
+    // allocation memory for file-list
    *ppFileList = (TCHAR *) malloc (*pFileCount * MAX_PATH);
-    /* second cycle: read directory and store filenames in file-list */
+    // second cycle: read directory and store filenames in file-list
    hFind = FindFirstFile(szImgFindName, &finddata);
    bOk = (hFind != (HANDLE) -1);
@@ -582,7 +577,7 @@ BOOL BuildPngList (PTSTR pstrPathName, TCHAR **ppFileList, int *pFileCount,
    }
    FindClose(hFind);
-    /* finally we must sort the file-list */
+    // finally we must sort the file-list
    for (i = 0; i < *pFileCount - 1; i++)
    {
@@ -596,7 +591,7 @@ BOOL BuildPngList (PTSTR pstrPathName, TCHAR **ppFileList, int *pFileCount,
                strcpy (*ppFileList + jj, *ppFileList + ii);
                strcpy (*ppFileList + ii, szTmp);
-                /* check if this was the current image that we moved */
+                // check if this was the current image that we moved
                if (*pFileIndex == i)
                    *pFileIndex = j;
@@ -610,10 +605,9 @@ BOOL BuildPngList (PTSTR pstrPathName, TCHAR **ppFileList, int *pFileCount,
    return TRUE;
 }
-/*----------------
+//----------------
- *  SearchPngList
+//  SearchPngList
- *----------------
+//----------------
 */
 BOOL SearchPngList (
        TCHAR *pFileList, int FileCount, int *pFileIndex,
@@ -621,30 +615,30 @@ BOOL SearchPngList (
 {
    if (FileCount > 0)
    {
-        /* get previous entry */
+        // get previous entry
-
+        
        if (pstrPrevName != NULL)
        {
            if (*pFileIndex > 0)
                *pFileIndex -= 1;
            else
                *pFileIndex = FileCount - 1;
-
+            
            strcpy (pstrPrevName, pFileList + (*pFileIndex * MAX_PATH));
        }
-
+        
-        /* get next entry */
+        // get next entry
-
+        
        if (pstrNextName != NULL)
        {
            if (*pFileIndex < FileCount - 1)
                *pFileIndex += 1;
            else
                *pFileIndex = 0;
-
+            
            strcpy (pstrNextName, pFileList + (*pFileIndex * MAX_PATH));
        }
-
+        
        return TRUE;
    }
    else
@@ -653,10 +647,9 @@ BOOL SearchPngList (
    }
 }
-/*-----------------
+//-----------------
- *  LoadImageFile
+//  LoadImageFile
- *-----------------
+//-----------------
 */
 BOOL LoadImageFile (HWND hwnd, PTSTR pstrPathName,
                png_byte **ppbImage, int *pxImgSize, int *pyImgSize,
@@ -664,7 +657,7 @@ BOOL LoadImageFile (HWND hwnd, PTSTR pstrPathName,
 {
    static TCHAR szTmp [MAX_PATH];
-    /* if there's an existing PNG, free the memory */
+    // if there's an existing PNG, free the memory
    if (*ppbImage)
    {
@@ -672,7 +665,7 @@ BOOL LoadImageFile (HWND hwnd, PTSTR pstrPathName,
        *ppbImage = NULL;
    }
-    /* Load the entire PNG into memory */
+    // Load the entire PNG into memory
    SetCursor (LoadCursor (NULL, IDC_WAIT));
    ShowCursor (TRUE);
@@ -698,10 +691,10 @@ BOOL LoadImageFile (HWND hwnd, PTSTR pstrPathName,
    return TRUE;
 }
-/*----------------
+//----------------
- *  DisplayImage
+//  DisplayImage
- *----------------
+//----------------
- */
+
 BOOL DisplayImage (HWND hwnd, BYTE **ppDib,
        BYTE **ppDiData, int cxWinSize, int cyWinSize,
        BYTE *pbImage, int cxImgSize, int cyImgSize, int cImgChannels,
@@ -709,14 +702,14 @@ BOOL DisplayImage (HWND hwnd, BYTE **ppDib,
 {
    BYTE                       *pDib = *ppDib;
    BYTE                       *pDiData = *ppDiData;
-    /* BITMAPFILEHEADER        *pbmfh; */
+    // BITMAPFILEHEADER        *pbmfh;
    BITMAPINFOHEADER           *pbmih;
    WORD                        wDIRowBytes;
    png_color                   bkgBlack = {0, 0, 0};
    png_color                   bkgGray  = {127, 127, 127};
    png_color                   bkgWhite = {255, 255, 255};
-    /* allocate memory for the Device Independant bitmap */
+    // allocate memory for the Device Independant bitmap
    wDIRowBytes = (WORD) ((3 * cxWinSize + 3L) >> 2) << 2;
@@ -737,7 +730,7 @@ BOOL DisplayImage (HWND hwnd, BYTE **ppDib,
    *ppDib = pDib;
    memset (pDib, 0, sizeof(BITMAPINFOHEADER));
-    /* initialize the dib-structure */
+    // initialize the dib-structure
    pbmih = (BITMAPINFOHEADER *) pDib;
    pbmih->biSize = sizeof(BITMAPINFOHEADER);
@@ -749,11 +742,11 @@ BOOL DisplayImage (HWND hwnd, BYTE **ppDib,
    pDiData = pDib + sizeof(BITMAPINFOHEADER);
    *ppDiData = pDiData;
-    /* first fill bitmap with gray and image border */
+    // first fill bitmap with gray and image border
    InitBitmap (pDiData, cxWinSize, cyWinSize);
-    /* then fill bitmap with image */
+    // then fill bitmap with image
    if (pbImage)
    {
@@ -766,16 +759,16 @@ BOOL DisplayImage (HWND hwnd, BYTE **ppDib,
    return TRUE;
 }
-/*--------------
+//--------------
- *  InitBitmap
+//  InitBitmap
- *--------------
+//--------------
- */
+
 BOOL InitBitmap (BYTE *pDiData, int cxWinSize, int cyWinSize)
 {
    BYTE *dst;
    int x, y, col;
-    /* initialize the background with gray */
+    // initialize the background with gray
    dst = pDiData;
    for (y = 0; y < cyWinSize; y++)
@@ -783,13 +776,13 @@ BOOL InitBitmap (BYTE *pDiData, int cxWinSize, int cyWinSize)
        col = 0;
        for (x = 0; x < cxWinSize; x++)
        {
-            /* fill with GRAY */
+            // fill with GRAY
            *dst++ = 127;
            *dst++ = 127;
            *dst++ = 127;
            col += 3;
        }
-        /* rows start on 4 byte boundaries */
+        // rows start on 4 byte boundaries
        while ((col % 4) != 0)
        {
            dst++;
@@ -800,10 +793,10 @@ BOOL InitBitmap (BYTE *pDiData, int cxWinSize, int cyWinSize)
    return TRUE;
 }
-/*--------------
+//--------------
- *  FillBitmap
+//  FillBitmap
- *--------------
+//--------------
- */
+
 BOOL FillBitmap (
        BYTE *pDiData, int cxWinSize, int cyWinSize,
        BYTE *pbImage, int cxImgSize, int cyImgSize, int cImgChannels,
@@ -828,12 +821,11 @@ BOOL FillBitmap (
        cxNewSize = cxWinSize - 2 * MARGIN;
        cyNewSize = cyWinSize - 2 * MARGIN;
-        /* stretch the image to it's window determined size */
+        // stretch the image to it's window determined size
-        /* the following two are mathematically the same, but the first
+        // the following two are the same, but the first has side-effects
-         * has side-effects because of rounding
+        // because of rounding
-         */
+//      if ((cyNewSize / cxNewSize) > (cyImgSize / cxImgSize))
 /*      if ((cyNewSize / cxNewSize) > (cyImgSize / cxImgSize)) */
        if ((cyNewSize * cxImgSize) > (cyImgSize * cxNewSize))
        {
            cyNewSize = cxNewSize * cyImgSize / cxImgSize;
@@ -872,12 +864,12 @@ BOOL FillBitmap (
            }
        }
-        /* calculate row-bytes */
+        // calculate row-bytes
        wImgRowBytes = cImgChannels * cxNewSize;
        wDIRowBytes = (WORD) ((cDIChannels * cxWinSize + 3L) >> 2) << 2;
-        /* copy image to screen */
+        // copy image to screen
        for (yImg = 0, yWin = cyImgPos; yImg < cyNewSize; yImg++, yWin++)
        {
@@ -893,7 +885,7 @@ BOOL FillBitmap (
                r = *src++;
                g = *src++;
                b = *src++;
-                *dst++ = b; /* note the reverse order  */
+                *dst++ = b; /* note the reverse order */
                *dst++ = g;
                *dst++ = r;
                if (cImgChannels == 4)
@@ -903,7 +895,7 @@ BOOL FillBitmap (
            }
        }
-        /* free memory */
+        // free memory
        if (pStretchedImage != NULL)
        {
@@ -913,28 +905,28 @@ BOOL FillBitmap (
    }
-    /* process the image not-stretched */
+    // process the image not-stretched
    else
    {
-        /* calculate the central position */
+        // calculate the central position
        cxImgPos = (cxWinSize - cxImgSize) / 2;
        cyImgPos = (cyWinSize - cyImgSize) / 2;
-        /* check for image larger than window */
+        // check for image larger than window
        if (cxImgPos < MARGIN)
            cxImgPos = MARGIN;
        if (cyImgPos < MARGIN)
            cyImgPos = MARGIN;
-        /* calculate both row-bytes */
+        // calculate both row-bytes
        wImgRowBytes = cImgChannels * cxImgSize;
        wDIRowBytes = (WORD) ((cDIChannels * cxWinSize + 3L) >> 2) << 2;
-        /* copy image to screen */
+        // copy image to screen
        for (yImg = 0, yWin = cyImgPos; yImg < cyImgSize; yImg++, yWin++)
        {
@@ -950,7 +942,7 @@ BOOL FillBitmap (
                r = *src++;
                g = *src++;
                b = *src++;
-                *dst++ = b; /* note the reverse order  */
+                *dst++ = b; /* note the reverse order */
                *dst++ = g;
                *dst++ = r;
                if (cImgChannels == 4)
@@ -964,7 +956,6 @@ BOOL FillBitmap (
    return TRUE;
 }
-/*-----------------
+//-----------------
- *  end of source
+//  end of source
- *-----------------
+//-----------------
 */
--- a/contrib/visupng/VisualPng.dsp
+++ b/contrib/visupng/VisualPng.dsp
@@ -43,9 +43,9 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_NO_STDIO" /FD /c
+# ADD BASE CPP /nologo /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_NO_STDIO" /D "PNG_NO_GLOBAL_ARRAYS" /FD /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_NO_STDIO" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_NO_STDIO" /D "PNG_NO_GLOBAL_ARRAYS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -77,9 +77,9 @@ PostBuild_Cmds=$(outdir)\VisualPng.exe ..\..\contrib\pngsuite\basn6a16.png
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "PNG_NO_STDIO" /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "PNG_NO_STDIO" /D "PNG_NO_GLOBAL_ARRAYS" /FD /GZ /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "PNG_NO_STDIO" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "PNG_NO_STDIO" /D "PNG_NO_GLOBAL_ARRAYS" /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
--- a/contrib/visupng/cexcept.h
+++ b/contrib/visupng/cexcept.h
@@ -1,30 +1,25 @@
 /*===
-cexcept.h 2.0.1 (2008-Jul-19-Sat)
+cexcept.h 2.0.0 (2001-Jul-12-Thu)
-http://www.nicemice.net/cexcept/
+Adam M. Costello <amc@cs.berkeley.edu>
 Adam M. Costello
 http://www.nicemice.net/amc/
 An interface for exception-handling in ANSI C (C89 and subsequent ISO
-standards), developed jointly with Cosmin Truta.
+standards), developed jointly with Cosmin Truta <cosmin@cs.toronto.edu>.
-    Copyright (c) 2000-2008 Adam M. Costello and Cosmin Truta.
+    Copyright (c) 2001 Adam M. Costello and Cosmin Truta.  Everyone
-    This software may be modified only if its author and version
+    is hereby granted permission to do whatever they like with this
-    information is updated accurately, and may be redistributed
+    file, provided that if they modify it they take reasonable steps to
-    only if accompanied by this unaltered notice.  Subject to those
+    avoid confusing or misleading people about the authors, version,
-    restrictions, permission is granted to anyone to do anything
+    and terms of use of the derived file.  The copyright holders make
-    with this software.  The copyright holders make no guarantees
+    no guarantees regarding this file, and are not responsible for any
-    regarding this software, and are not responsible for any damage
+    damage resulting from its use.
    resulting from its use.
-The cexcept interface is not compatible with and cannot interact
+Only user-defined exceptions are supported, not "real" exceptions like
-with system exceptions (like division by zero or memory segmentation
+division by zero or memory segmentation violations.
 violation), compiler-generated exceptions (like C++ exceptions), or
 other exception-handling interfaces.
-When using this interface across multiple .c files, do not include
+If this interface is used by multiple .c files, they shouldn't include
 this header file directly.  Instead, create a wrapper header file that
 includes this header file and then invokes the define_exception_type
-macro (see below).  The .c files should then include that header file.
+macro (see below), and let your .c files include that header file.
 The interface consists of one type, one well-known name, and six macros.
@@ -169,7 +164,7 @@ Throw expression;
    be compatible with the type passed to define_exception_type().  The
    exception must be caught, otherwise the program may crash.
-    Slight limitation:  If the expression is a comma-expression, it must
+    Slight limitation:  If the expression is a comma-expression it must
    be enclosed in parentheses.
@@ -214,11 +209,11 @@ struct exception_context { \
    exception__prev = the_exception_context->penv; \
    the_exception_context->penv = &exception__env; \
    if (setjmp(exception__env) == 0) { \
-      do
+      if (&exception__prev)
 #define exception__catch(action) \
-      while (the_exception_context->caught = 0, \
+      else { } \
-             the_exception_context->caught); \
+      the_exception_context->caught = 0; \
    } \
    else { \
      the_exception_context->caught = 1; \
@@ -231,14 +226,14 @@ struct exception_context { \
 #define Catch(e) exception__catch(((e) = the_exception_context->v.etmp, 0))
 #define Catch_anonymous exception__catch(0)
-/* Try ends with do, and Catch begins with while(0) and ends with     */
+/* Try ends with if(), and Catch begins and ends with else.  This     */
-/* else, to ensure that Try/Catch syntax is similar to if/else        */
+/* ensures that the Try/Catch syntax is really the same as the        */
-/* syntax.                                                            */
+/* if/else syntax.                                                    */
 /*                                                                    */
-/* The 0 in while(0) is expressed as x=0,x in order to appease        */
+/* We use &exception__prev instead of 1 to appease compilers that     */
-/* compilers that warn about constant expressions inside while().     */
+/* warn about constant expressions inside if().  Most compilers       */
-/* Most compilers should still recognize that the condition is always */
+/* should still recognize that &exception__prev is never zero and     */
-/* false and avoid generating code for it.                            */
+/* avoid generating test code.                                        */
 #define Throw \
  for (;; longjmp(*the_exception_context->penv, 1)) \
--- a/contrib/visupng/resource.h
+++ b/contrib/visupng/resource.h
@@ -12,7 +12,7 @@
 #define IDM_HELP_ABOUT                  40008
 // Next default values for new objects
-//
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        113
--- a/808
+++ b/808
@@ -1,9 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
-
+# Copyright 1999, 2000 Free Software Foundation, Inc.
 scriptversion=2013-05-30.07; # UTC
 # Copyright (C) 1999-2013 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
@@ -16,7 +14,9 @@ scriptversion=2013-05-30.07; # UTC
 # 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/>.
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -25,112 +25,17 @@ scriptversion=2013-05-30.07; # UTC
 # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
 case $1 in
  '')
    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
    exit 1;
    ;;
  -h | --h*)
    cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
 Run PROGRAMS ARGS to compile a file, generating dependencies
 as side-effects.
 Environment variables:
  depmode     Dependency tracking mode.
  source      Source file read by 'PROGRAMS ARGS'.
  object      Object file output by 'PROGRAMS ARGS'.
  DEPDIR      directory where to store dependencies.
  depfile     Dependency file to output.
  tmpdepfile  Temporary file to use when outputting dependencies.
  libtool     Whether libtool is used (yes/no).
 Report bugs to <bug-automake@gnu.org>.
 EOF
    exit $?
    ;;
  -v | --v*)
    echo "depcomp $scriptversion"
    exit $?
    ;;
 esac
 # Get the directory component of the given path, and save it in the
 # global variables '$dir'.  Note that this directory component will
 # be either empty or ending with a '/' character.  This is deliberate.
 set_dir_from ()
 {
  case $1 in
    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
      *) dir=;;
  esac
 }
 # Get the suffix-stripped basename of the given path, and save it the
 # global variable '$base'.
 set_base_from ()
 {
  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
 }
 # If no dependency file was actually created by the compiler invocation,
 # we still have to create a dummy depfile, to avoid errors with the
 # Makefile "include basename.Plo" scheme.
 make_dummy_depfile ()
 {
  echo "#dummy" > "$depfile"
 }
 # Factor out some common post-processing of the generated depfile.
 # Requires the auxiliary global variable '$tmpdepfile' to be set.
 aix_post_process_depfile ()
 {
  # If the compiler actually managed to produce a dependency file,
  # post-process it.
  if test -f "$tmpdepfile"; then
    # Each line is of the form 'foo.o: dependency.h'.
    # Do two passes, one to just change these to
    #   $object: dependency.h
    # and one to simply output
    #   dependency.h:
    # which is needed to avoid the deleted-header problem.
    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
    } > "$depfile"
    rm -f "$tmpdepfile"
  else
    make_dummy_depfile
  fi
 }
 # A tabulation character.
 tab='	'
 # A newline character.
 nl='
 '
 # Character ranges might be problematic outside the C locale.
 # These definitions help.
 upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
 lower=abcdefghijklmnopqrstuvwxyz
 digits=0123456789
 alpha=${upper}${lower}
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
  echo "depcomp: Variables source, object and depmode must be set" 1>&2
  exit 1
 fi
 # `libtool' can also be set to `yes' or `no'.
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
 depfile=${depfile-`echo "$object" |
  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 rm -f "$tmpdepfile"
 # Avoid interferences from the environment.
 gccflag= dashmflag=
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -142,32 +47,9 @@ if test "$depmode" = hp; then
 fi
 if test "$depmode" = dashXmstdout; then
-  # This is just like dashmstdout with a different argument.
+   # This is just like dashmstdout with a different argument.
-  dashmflag=-xM
+   dashmflag=-xM
-  depmode=dashmstdout
+   depmode=dashmstdout
 fi
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
  # This is just like msvisualcpp but w/o cygpath translation.
  # Just convert the backslash-escaped backslashes to single forward
  # slashes to satisfy depend.m4
  cygpath_u='sed s,\\\\,/,g'
  depmode=msvisualcpp
 fi
 if test "$depmode" = msvc7msys; then
  # This is just like msvc7 but w/o cygpath translation.
  # Just convert the backslash-escaped backslashes to single forward
  # slashes to satisfy depend.m4
  cygpath_u='sed s,\\\\,/,g'
  depmode=msvc7
 fi
 if test "$depmode" = xlc; then
  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
  gccflag=-qmakedep=gcc,-MF
  depmode=gcc
 fi
 case "$depmode" in
@@ -175,22 +57,10 @@ gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
 ## the command line argument order; so add the flags where they
 ## appear in depend2.am.  Note that the slowdown incurred here
 ## affects only configure: in makefiles, %FASTDEP% shortcuts this.
  for arg
  do
    case $arg in
    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
    *)  set fnord "$@" "$arg" ;;
    esac
    shift # fnord
    shift # $arg
  done
  "$@"
  stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
  else
    rm -f "$tmpdepfile"
    exit $stat
  fi
@@ -198,17 +68,13 @@ gcc3)
  ;;
 gcc)
 ## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
 ## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
 ## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   -MM, not -M (despite what the docs say).
 ##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
  if test -z "$gccflag"; then
@@ -216,31 +82,31 @@ gcc)
  fi
  "$@" -Wp,"$gccflag$tmpdepfile"
  stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
  else
    rm -f "$tmpdepfile"
    exit $stat
  fi
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
-  # The second -e expression handles DOS-style file names with drive
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-  # letters.
+## The second -e expression handles DOS-style file names with drive letters.
  sed -e 's/^[^:]*: / /' \
      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the "deleted header file" problem.
+## This next piece of magic avoids the `deleted header file' problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-## Some versions of gcc put a space before the ':'.  On the theory
+  tr ' ' '
 ' < "$tmpdepfile" |
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.  hp depmode also adds that space, but also prefixes the VPATH
+## well.
 ## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-  tr ' ' "$nl" < "$tmpdepfile" \
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
    | sed -e 's/$/ :/' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
@@ -258,7 +124,8 @@ sgi)
    "$@" -MDupdate "$tmpdepfile"
  fi
  stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
  else
    rm -f "$tmpdepfile"
    exit $stat
  fi
@@ -266,302 +133,106 @@ sgi)
  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
    echo "$object : \\" > "$depfile"
    # Clip off the initial element (the dependent).  Don't try to be
    # clever and replace this with sed code, as IRIX sed won't handle
    # lines with more than a fixed number of characters (4096 in
    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like '#:fec' to the end of the
+    # the IRIX cc adds comments like `#:fec' to the end of the
    # dependency line.
-    tr ' ' "$nl" < "$tmpdepfile" \
+    tr ' ' '
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+' < "$tmpdepfile" \
-      | tr "$nl" ' ' >> "$depfile"
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    echo >> "$depfile"
+    tr '
 ' ' ' >> $depfile
    echo >> $depfile
    # The second pass generates a dummy entry for each header file.
-    tr ' ' "$nl" < "$tmpdepfile" \
+    tr ' ' '
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+' < "$tmpdepfile" \
-      >> "$depfile"
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
   >> $depfile
  else
-    make_dummy_depfile
+    # The sourcefile does not contain any dependencies, so just
    # store a dummy comment line, to avoid errors with the Makefile
    # "include basename.Plo" scheme.
    echo "#dummy" > "$depfile"
  fi
  rm -f "$tmpdepfile"
  ;;
 xlc)
  # This case exists only to let depend.m4 do its work.  It works by
  # looking at the text of this script.  This case will never be run,
  # since it is checked for above.
  exit 1
  ;;
 aix)
  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
+  # in a .u file.  This file always lives in the current directory.
-  # current directory.  Also, the AIX compiler puts '$object:' at the
+  # Also, the AIX compiler puts `$object:' at the start of each line;
-  # start of each line; $object doesn't have directory information.
+  # $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
+  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
-  set_dir_from "$object"
+  tmpdepfile="$stripped.u"
-  set_base_from "$object"
+  outname="$stripped.o"
  if test "$libtool" = yes; then
    tmpdepfile1=$dir$base.u
    tmpdepfile2=$base.u
    tmpdepfile3=$dir.libs/$base.u
    "$@" -Wc,-M
  else
    tmpdepfile1=$dir$base.u
    tmpdepfile2=$dir$base.u
    tmpdepfile3=$dir$base.u
    "$@" -M
  fi
  stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
    exit $stat
  fi
  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
  do
    test -f "$tmpdepfile" && break
  done
  aix_post_process_depfile
  ;;
 tcc)
  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
  # FIXME: That version still under development at the moment of writing.
  #        Make that this statement remains true also for stable, released
  #        versions.
  # It will wrap lines (doesn't matter whether long or short) with a
  # trailing '\', as in:
  #
  #   foo.o : \
  #    foo.c \
  #    foo.h \
  #
  # It will put a trailing '\' even on the last line, and will use leading
  # spaces rather than leading tabs (at least since its commit 0394caf7
  # "Emit spaces for -MD").
  "$@" -MD -MF "$tmpdepfile"
  stat=$?
  if test $stat -ne 0; then
    rm -f "$tmpdepfile"
    exit $stat
  fi
  rm -f "$depfile"
  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
  # We have to change lines of the first kind to '$object: \'.
  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
  # And for each line of the second kind, we have to emit a 'dep.h:'
  # dummy dependency, to avoid the deleted-header problem.
  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
 ## The order of this option in the case statement is important, since the
 ## shell code in configure will try each of these formats in the order
 ## listed in this file.  A plain '-MD' option would be understood by many
 ## compilers, so we must ensure this comes after the gcc and icc options.
 pgcc)
  # Portland's C compiler understands '-MD'.
  # Will always output deps to 'file.d' where file is the root name of the
  # source file under compilation, even if file resides in a subdirectory.
  # The object file name does not affect the name of the '.d' file.
  # pgcc 10.2 will output
  #    foo.o: sub/foo.c sub/foo.h
  # and will wrap long lines using '\' :
  #    foo.o: sub/foo.c ... \
  #     sub/foo.h ... \
  #     ...
  set_dir_from "$object"
  # Use the source, not the object, to determine the base name, since
  # that's sadly what pgcc will do too.
  set_base_from "$source"
  tmpdepfile=$base.d
  # For projects that build the same source file twice into different object
  # files, the pgcc approach of using the *source* file root name can cause
  # problems in parallel builds.  Use a locking strategy to avoid stomping on
  # the same $tmpdepfile.
  lockdir=$base.d-lock
  trap "
    echo '$0: caught signal, cleaning up...' >&2
    rmdir '$lockdir'
    exit 1
  " 1 2 13 15
  numtries=100
  i=$numtries
  while test $i -gt 0; do
    # mkdir is a portable test-and-set.
    if mkdir "$lockdir" 2>/dev/null; then
      # This process acquired the lock.
      "$@" -MD
      stat=$?
      # Release the lock.
      rmdir "$lockdir"
      break
    else
      # If the lock is being held by a different process, wait
      # until the winning process is done or we timeout.
      while test -d "$lockdir" && test $i -gt 0; do
        sleep 1
        i=`expr $i - 1`
      done
    fi
    i=`expr $i - 1`
  done
  trap - 1 2 13 15
  if test $i -le 0; then
    echo "$0: failed to acquire lock after $numtries attempts" >&2
    echo "$0: check lockdir '$lockdir'" >&2
    exit 1
  fi
  if test $stat -ne 0; then
    rm -f "$tmpdepfile"
    exit $stat
  fi
  rm -f "$depfile"
  # Each line is of the form `foo.o: dependent.h',
  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
  # Do two passes, one to just change these to
  # `$object: dependent.h' and one to simply `dependent.h:'.
  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
  # Some versions of the HPUX 10.20 sed can't process this invocation
  # correctly.  Breaking it into two sed invocations is a workaround.
  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
    | sed -e 's/$/ :/' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
 hp2)
  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
  # compilers, which have integrated preprocessors.  The correct option
  # to use with these is +Maked; it writes dependencies to a file named
  # 'foo.d', which lands next to the object file, wherever that
  # happens to be.
  # Much of this is similar to the tru64 case; see comments there.
  set_dir_from  "$object"
  set_base_from "$object"
  if test "$libtool" = yes; then
    tmpdepfile1=$dir$base.d
    tmpdepfile2=$dir.libs/$base.d
    "$@" -Wc,+Maked
  else
-    tmpdepfile1=$dir$base.d
+    rm -f "$tmpdepfile"
-    tmpdepfile2=$dir$base.d
+    exit $stat
    "$@" +Maked
  fi
  stat=$?
  if test $stat -ne 0; then
     rm -f "$tmpdepfile1" "$tmpdepfile2"
     exit $stat
  fi
  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
  do
    test -f "$tmpdepfile" && break
  done
  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Each line is of the form `foo.o: dependent.h'.
-    # Add 'dependent.h:' lines.
+    # Do two passes, one to just change these to
-    sed -ne '2,${
+    # `$object: dependent.h' and one to simply `dependent.h:'.
-               s/^ *//
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-               s/ \\*$//
+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
               s/$/:/
               p
             }' "$tmpdepfile" >> "$depfile"
  else
-    make_dummy_depfile
+    # The sourcefile does not contain any dependencies, so just
    # store a dummy comment line, to avoid errors with the Makefile
    # "include basename.Plo" scheme.
    echo "#dummy" > "$depfile"
  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
+  rm -f "$tmpdepfile"
  ;;
 tru64)
-  # The Tru64 compiler uses -MD to generate dependencies as a side
+   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
-  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
-  # dependencies in 'foo.d' instead, so we check for that too.
+   # dependencies in `foo.d' instead, so we check for that too.
-  # Subdirectories are respected.
+   # Subdirectories are respected.
  set_dir_from  "$object"
  set_base_from "$object"
-  if test "$libtool" = yes; then
+   tmpdepfile1="$object.d"
-    # Libtool generates 2 separate objects for the 2 libraries.  These
+   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
-    # two compilations output dependencies in $dir.libs/$base.o.d and
+   if test "$libtool" = yes; then
-    # in $dir$base.o.d.  We have to check for both files, because
+      "$@" -Wc,-MD
-    # one of the two compilations can be disabled.  We should prefer
+   else
-    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      "$@" -MD
-    # automatically cleaned when .libs/ is deleted, while ignoring
+   fi
    # the former would cause a distcleancheck panic.
    tmpdepfile1=$dir$base.o.d          # libtool 1.5
    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
    "$@" -Wc,-MD
  else
    tmpdepfile1=$dir$base.d
    tmpdepfile2=$dir$base.d
    tmpdepfile3=$dir$base.d
    "$@" -MD
  fi
-  stat=$?
+   stat=$?
-  if test $stat -ne 0; then
+   if test $stat -eq 0; then :
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+   else
-    exit $stat
+      rm -f "$tmpdepfile1" "$tmpdepfile2"
-  fi
+      exit $stat
   fi
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+   if test -f "$tmpdepfile1"; then
-  do
+      tmpdepfile="$tmpdepfile1"
-    test -f "$tmpdepfile" && break
+   else
-  done
+      tmpdepfile="$tmpdepfile2"
-  # Same post-processing that is required for AIX mode.
+   fi
-  aix_post_process_depfile
+   if test -f "$tmpdepfile"; then
-  ;;
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-
+      # That's a space and a tab in the [].
-msvc7)
+      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  if test "$libtool" = yes; then
+   else
-    showIncludes=-Wc,-showIncludes
+      echo "#dummy" > "$depfile"
-  else
+   fi
-    showIncludes=-showIncludes
+   rm -f "$tmpdepfile"
-  fi
+   ;;
  "$@" $showIncludes > "$tmpdepfile"
  stat=$?
  grep -v '^Note: including file: ' "$tmpdepfile"
  if test $stat -ne 0; then
    rm -f "$tmpdepfile"
    exit $stat
  fi
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
  # The first sed program below extracts the file names and escapes
  # backslashes for cygpath.  The second sed program outputs the file
  # name when reading, but also accumulates all include files in the
  # hold buffer in order to output them again at the end.  This only
  # works with sed implementations that can handle large buffers.
  sed < "$tmpdepfile" -n '
 /^Note: including file:  *\(.*\)/ {
  s//\1/
  s/\\/\\\\/g
  p
 }' | $cygpath_u | sort -u | sed -n '
 s/ /\\ /g
 s/\(.*\)/'"$tab"'\1 \\/p
 s/.\(.*\) \\/\1:/
 H
 $ {
  s/.*/'"$tab"'/
  G
  p
 }' >> "$depfile"
  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
  rm -f "$tmpdepfile"
  ;;
 msvc7msys)
  # This case exists only to let depend.m4 do its work.  It works by
  # looking at the text of this script.  This case will never be run,
  # since it is checked for above.
  exit 1
  ;;
 #nosideeffect)
  # This comment above is used by automake to tell side-effect
@@ -569,49 +240,41 @@ msvc7msys)
 dashmstdout)
  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
+  # always write the proprocessed file to stdout, regardless of -o,
-  "$@" || exit $?
+  # because we must use -o when running libtool.
-
+  test -z "$dashmflag" && dashmflag=-M
-  # Remove the call to Libtool.
+  ( IFS=" "
-  if test "$libtool" = yes; then
+    case " $* " in
-    while test "X$1" != 'X--mode=compile'; do
+    *" --mode=compile "*) # this is libtool, let us make it quiet
-      shift
+      for arg
-    done
+      do # cycle over the arguments
-    shift
+        case "$arg" in
-  fi
+	"--mode=compile")
-
+	  # insert --quiet before "--mode=compile"
-  # Remove '-o $object'.
+	  set fnord "$@" --quiet
-  IFS=" "
+	  shift # fnord
-  for arg
+	  ;;
-  do
+	esac
-    case $arg in
+	set fnord "$@" "$arg"
-    -o)
+	shift # fnord
-      shift
+	shift # "$arg"
-      ;;
+      done
    $object)
      shift
      ;;
    *)
      set fnord "$@" "$arg"
      shift # fnord
      shift # $arg
      ;;
    esac
-  done
+    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
-
+  ) &
-  test -z "$dashmflag" && dashmflag=-M
+  proc=$!
-  # Require at least two characters before searching for ':'
+  "$@"
-  # in the target name.  This is to cope with DOS-style filenames:
+  stat=$?
-  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+  wait "$proc"
-  "$@" $dashmflag |
+  if test "$stat" != 0; then exit $stat; fi
    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
  rm -f "$depfile"
  cat < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  tr ' ' '
-  # correctly.  Breaking it into two sed invocations is a workaround.
+' < "$tmpdepfile" | \
-  tr ' ' "$nl" < "$tmpdepfile" \
+## Some versions of the HPUX 10.20 sed can't process this invocation
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+## correctly.  Breaking it into two sed invocations is a workaround.
-    | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
@@ -622,93 +285,74 @@ dashXmstdout)
  ;;
 makedepend)
  "$@" || exit $?
  # Remove any Libtool call
  if test "$libtool" = yes; then
    while test "X$1" != 'X--mode=compile'; do
      shift
    done
    shift
  fi
  # X makedepend
-  shift
+  (
-  cleared=no eat=no
+    shift
-  for arg
+    cleared=no
-  do
+    for arg in "$@"; do
-    case $cleared in
+      case $cleared in no)
-    no)
+        set ""; shift
-      set ""; shift
+	cleared=yes
-      cleared=yes ;;
+      esac
-    esac
+      case "$arg" in
-    if test $eat = yes; then
+        -D*|-I*)
-      eat=no
+	  set fnord "$@" "$arg"; shift;;
-      continue
+	-*)
-    fi
+	  ;;
-    case "$arg" in
+	*)
-    -D*|-I*)
+	  set fnord "$@" "$arg"; shift;;
-      set fnord "$@" "$arg"; shift ;;
+      esac
-    # Strip any option that makedepend may not understand.  Remove
+    done
-    # the object too, otherwise makedepend will parse it as a source file.
+    obj_suffix="`echo $object | sed 's/^.*\././'`"
-    -arch)
+    touch "$tmpdepfile"
-      eat=yes ;;
+    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
-    -*|$object)
+  ) &
-      ;;
+  proc=$!
-    *)
+  "$@"
-      set fnord "$@" "$arg"; shift ;;
+  stat=$?
-    esac
+  wait "$proc"
-  done
+  if test "$stat" != 0; then exit $stat; fi
  obj_suffix=`echo "$object" | sed 's/^.*\././'`
  touch "$tmpdepfile"
  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
  rm -f "$depfile"
-  # makedepend may prepend the VPATH from the source file name to the object.
+  cat < "$tmpdepfile" > "$depfile"
-  # No need to regex-escape $object, excess matching of '.' is harmless.
+  tail +3 "$tmpdepfile" | tr ' ' '
-  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+' | \
-  # Some versions of the HPUX 10.20 sed can't process the last invocation
+## Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
+## correctly.  Breaking it into two sed invocations is a workaround.
-  sed '1,2d' "$tmpdepfile" \
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
    | tr ' ' "$nl" \
    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
    | sed -e 's/$/ :/' >> "$depfile"
  rm -f "$tmpdepfile" "$tmpdepfile".bak
  ;;
 cpp)
  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
+  # always write the proprocessed file to stdout, regardless of -o,
-  "$@" || exit $?
+  # because we must use -o when running libtool.
-
+  ( IFS=" "
-  # Remove the call to Libtool.
+    case " $* " in
-  if test "$libtool" = yes; then
+    *" --mode=compile "*)
-    while test "X$1" != 'X--mode=compile'; do
+      for arg
-      shift
+      do # cycle over the arguments
-    done
+        case $arg in
-    shift
+	"--mode=compile")
-  fi
+	  # insert --quiet before "--mode=compile"
-
+	  set fnord "$@" --quiet
-  # Remove '-o $object'.
+	  shift # fnord
-  IFS=" "
+	  ;;
-  for arg
+	esac
-  do
+	set fnord "$@" "$arg"
-    case $arg in
+	shift # fnord
-    -o)
+	shift # "$arg"
-      shift
+      done
      ;;
    $object)
      shift
      ;;
    *)
      set fnord "$@" "$arg"
      shift # fnord
      shift # $arg
      ;;
    esac
-  done
+    "$@" -E |
-
+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-  "$@" -E \
+    sed '$ s: \\$::' > "$tmpdepfile"
-    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+  ) &
-             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+  proc=$!
-    | sed '$ s: \\$::' > "$tmpdepfile"
+  "$@"
  stat=$?
  wait "$proc"
  if test "$stat" != 0; then exit $stat; fi
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
  cat < "$tmpdepfile" >> "$depfile"
@@ -718,56 +362,42 @@ cpp)
 msvisualcpp)
  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
+  # always write the proprocessed file to stdout, regardless of -o,
-  "$@" || exit $?
+  # because we must use -o when running libtool.
-
+  ( IFS=" "
-  # Remove the call to Libtool.
+    case " $* " in
-  if test "$libtool" = yes; then
+    *" --mode=compile "*)
-    while test "X$1" != 'X--mode=compile'; do
+      for arg
-      shift
+      do # cycle over the arguments
-    done
+        case $arg in
-    shift
+	"--mode=compile")
-  fi
+	  # insert --quiet before "--mode=compile"
-
+	  set fnord "$@" --quiet
-  IFS=" "
+	  shift # fnord
-  for arg
+	  ;;
-  do
+	esac
-    case "$arg" in
+	set fnord "$@" "$arg"
-    -o)
+	shift # fnord
-      shift
+	shift # "$arg"
      done
      ;;
    $object)
      shift
      ;;
    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
        set fnord "$@"
        shift
        shift
        ;;
    *)
        set fnord "$@" "$arg"
        shift
        shift
        ;;
    esac
-  done
+    "$@" -E |
-  "$@" -E 2>/dev/null |
+    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  ) &
  proc=$!
  "$@"
  stat=$?
  wait "$proc"
  if test "$stat" != 0; then exit $stat; fi
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "$tab" >> "$depfile"
+  echo "	" >> "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
 msvcmsys)
  # This case exists only to let depend.m4 do its work.  It works by
  # looking at the text of this script.  This case will never be run,
  # since it is checked for above.
  exit 1
  ;;
 none)
  exec "$@"
  ;;
@@ -779,13 +409,3 @@ none)
 esac
 exit 0
 # 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:
--- a/example.c
+++ b/example.c
@@ -2,19 +2,18 @@
 #if 0 /* in case someone actually tries to compile this */
 /* example.c - an example of using libpng
- * Last changed in libpng 1.5.19 [August 21, 2014]
+ * Last changed in libpng 1.2.1 December 7, 2001.
- * Maintained 1998-2014 Glenn Randers-Pehrson
+ * This file has been placed in the public domain by the authors.
- * Maintained 1996, 1997 Andreas Dilger
+ * Maintained 1998-2001 Glenn Randers-Pehrson
- * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Maintained 1996, 1997 Andreas Dilger)
 * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
 */
 /* This is an example of how to use libpng to read and write PNG files.
- * The file libpng-manual.txt is much more verbose then this.  If you have not
+ * The file libpng.txt is much more verbose then this.  If you have not
 * read it, do so first.  This was designed to be a starting point of an
 * implementation.  This is not officially part of libpng, is hereby placed
 * in the public domain, and therefore does not require a copyright notice.
 * To the extent possible under law, the authors have waived all copyright and
 * related or neighboring rights to this file.
 *
 * This file does not currently compile, because it is missing certain
 * parts, like allocating memory to hold an image.  You will have to
@@ -23,10 +22,6 @@
 * see also the programs in the contrib directory.
 */
 #define _POSIX_SOURCE 1  /* libpng and zlib are POSIX-compliant.  You may
                          * change this if your application uses non-POSIX
                          * extensions. */
 #include "png.h"
 /* The png_jmpbuf() macro, used in error handling, became available in
@@ -36,7 +31,7 @@
  */
 #ifndef png_jmpbuf
-#  define png_jmpbuf(png_ptr) ((png_ptr)->png_jmpbuf)
+#  define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
 #endif
 /* Check to see if a file is a PNG file using png_sig_cmp().  png_sig_cmp()
@@ -96,15 +91,14 @@ void read_png(char *file_name)  /* We need to open the file */
   if ((fp = fopen(file_name, "rb")) == NULL)
      return (ERROR);
 #else no_open_file /* prototype 2 */
-void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */
+void read_png(FILE *fp, unsigned int sig_read)  /* file is already open */
 {
   png_structp png_ptr;
   png_infop info_ptr;
   png_uint_32 width, height;
   int bit_depth, color_type, interlace_type;
-#endif no_open_file /* Only use one prototype! */
+#endif no_open_file /* only use one prototype! */
   /* Create and initialize the png_struct with the desired error handler
    * functions.  If you want to use the default stderr and longjump method,
@@ -126,7 +120,7 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */
   if (info_ptr == NULL)
   {
      fclose(fp);
-      png_destroy_read_struct(&png_ptr, NULL, NULL);
+      png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
      return (ERROR);
   }
@@ -138,7 +132,7 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */
   if (setjmp(png_jmpbuf(png_ptr)))
   {
      /* Free all of the memory associated with the png_ptr and info_ptr */
-      png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+      png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
      fclose(fp);
      /* If we get here, we had a problem reading the file */
      return (ERROR);
@@ -165,12 +159,11 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */
    * If you have enough memory to read in the entire image at once,
    * and you need to specify only transforms that can be controlled
    * with one of the PNG_TRANSFORM_* bits (this presently excludes
-    * quantizing, filling, setting background, and doing gamma
+    * dithering, filling, setting background, and doing gamma
    * adjustment), then you can read the entire image (including
    * pixels) into the info structure with this call:
    */
-   png_read_png(png_ptr, info_ptr, png_transforms, NULL);
+   png_read_png(png_ptr, info_ptr, png_transforms, png_voidp_NULL);
 #else
   /* OK, you're doing it the hard way, with the lower-level functions */
@@ -180,23 +173,16 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */
   png_read_info(png_ptr, info_ptr);
   png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
-       &interlace_type, NULL, NULL);
+       &interlace_type, int_p_NULL, int_p_NULL);
-   /* Set up the data transformations you want.  Note that these are all
+/* Set up the data transformations you want.  Note that these are all
-    * optional.  Only call them if you want/need them.  Many of the
+ * optional.  Only call them if you want/need them.  Many of the
-    * transformations only work on specific types of images, and many
+ * transformations only work on specific types of images, and many
-    * are mutually exclusive.
+ * are mutually exclusive.
-    */
+ */
-   /* Tell libpng to strip 16 bit/color files down to 8 bits/color.
+   /* tell libpng to strip 16 bit/color files down to 8 bits/color */
    * Use accurate scaling if it's available, otherwise just chop off the
    * low byte.
    */
 #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
    png_set_scale_16(png_ptr);
 #else
   png_set_strip_16(png_ptr);
 #endif
   /* Strip alpha bytes from the input data without combining with the
    * background (not recommended).
@@ -218,7 +204,7 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */
   /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-      png_set_expand_gray_1_2_4_to_8(png_ptr);
+      png_set_gray_1_2_4_to_8(png_ptr);
   /* Expand paletted or RGB images with transparency to full alpha channels
    * so the data will be available as RGBA quartets.
@@ -242,11 +228,10 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */
      png_set_background(png_ptr, &my_background,
                         PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
-   /* Some suggestions as to how to get a screen gamma value
+   /* Some suggestions as to how to get a screen gamma value */
-    *
+
-    * Note that screen gamma is the display_exponent, which includes
+   /* Note that screen gamma is the display_exponent, which includes
-    * the CRT_exponent and any correction for viewing conditions
+    * the CRT_exponent and any correction for viewing conditions */
    */
   if (/* We have a user-defined screen gamma value */)
   {
      screen_gamma = user-defined screen_gamma;
@@ -259,9 +244,9 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */
   /* If we don't have another value */
   else
   {
-      screen_gamma = PNG_DEFAULT_sRGB;  /* A good guess for a PC monitor
+      screen_gamma = 2.2;  /* A good guess for a PC monitors in a dimly
-                                           in a dimly lit room */
+                              lit room */
-      screen_gamma = PNG_GAMMA_MAC_18 or 1.0; /* Good guesses for Mac systems */
+      screen_gamma = 1.7 or 1.0;  /* A good guess for Mac systems */
   }
   /* Tell libpng to handle the gamma conversion for you.  The final call
@@ -273,7 +258,7 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */
   int intent;
   if (png_get_sRGB(png_ptr, info_ptr, &intent))
-      png_set_gamma(png_ptr, screen_gamma, PNG_DEFAULT_sRGB);
+      png_set_gamma(png_ptr, screen_gamma, 0.45455);
   else
   {
      double image_gamma;
@@ -283,8 +268,7 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */
         png_set_gamma(png_ptr, screen_gamma, 0.45455);
   }
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
+   /* Dither RGB files down to 8 bit palette or reduce palettes
   /* Quantize RGB files down to 8 bit palette or reduce palettes
    * to the number of colors available on your screen.
    */
   if (color_type & PNG_COLOR_MASK_COLOR)
@@ -293,13 +277,13 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */
      png_colorp palette;
      /* This reduces the image to the application supplied palette */
-      if (/* We have our own palette */)
+      if (/* we have our own palette */)
      {
-         /* An array of colors to which the image should be quantized */
+         /* An array of colors to which the image should be dithered */
         png_color std_color_cube[MAX_SCREEN_COLORS];
-         png_set_quantize(png_ptr, std_color_cube, MAX_SCREEN_COLORS,
+         png_set_dither(png_ptr, std_color_cube, MAX_SCREEN_COLORS,
-            MAX_SCREEN_COLORS, NULL, 0);
+            MAX_SCREEN_COLORS, png_uint_16p_NULL, 0);
      }
      /* This reduces the image to the palette supplied in the file */
      else if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette))
@@ -308,13 +292,12 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */
         png_get_hIST(png_ptr, info_ptr, &histogram);
-         png_set_quantize(png_ptr, palette, num_palette,
+         png_set_dither(png_ptr, palette, num_palette,
                        max_screen_colors, histogram, 0);
      }
   }
 #endif /* PNG_READ_QUANTIZE_SUPPORTED */
-   /* Invert monochrome files to have 0 as white and 1 as black */
+   /* invert monochrome files to have 0 as white and 1 as black */
   png_set_invert_mono(png_ptr);
   /* If you want to shift the pixel values from the range [0,255] or
@@ -323,35 +306,30 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */
    */
   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT))
   {
-      png_color_8p sig_bit_p;
+      png_color_8p sig_bit;
-      png_get_sBIT(png_ptr, info_ptr, &sig_bit_p);
+      png_get_sBIT(png_ptr, info_ptr, &sig_bit);
-      png_set_shift(png_ptr, sig_bit_p);
+      png_set_shift(png_ptr, sig_bit);
   }
-   /* Flip the RGB pixels to BGR (or RGBA to BGRA) */
+   /* flip the RGB pixels to BGR (or RGBA to BGRA) */
   if (color_type & PNG_COLOR_MASK_COLOR)
      png_set_bgr(png_ptr);
-   /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */
+   /* swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */
   png_set_swap_alpha(png_ptr);
-   /* Swap bytes of 16 bit files to least significant byte first */
+   /* swap bytes of 16 bit files to least significant byte first */
   png_set_swap(png_ptr);
   /* Add filler (or alpha) byte (before/after each RGB triplet) */
   png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
 #ifdef PNG_READ_INTERLACING_SUPPORTED
   /* Turn on interlace handling.  REQUIRED if you are not using
    * png_read_image().  To see how to handle interlacing passes,
    * see the png_read_row() method below:
    */
   number_passes = png_set_interlace_handling(png_ptr);
 #else
   number_passes = 1;
 #endif /* PNG_READ_INTERLACING_SUPPORTED */
   /* Optional call to gamma correct and add the background to the palette
    * and update info structure.  REQUIRED if you are expecting libpng to
@@ -364,13 +342,11 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */
   /* The easiest way to read the image: */
   png_bytep row_pointers[height];
   /* Clear the pointer array */
   for (row = 0; row < height; row++)
      row_pointers[row] = NULL;
   for (row = 0; row < height; row++)
   {
      row_pointers[row] = png_malloc(png_ptr, png_get_rowbytes(png_ptr,
         info_ptr));
   }
   /* Now it's time to read the image.  One of these methods is REQUIRED */
 #ifdef entire /* Read the entire image in one go */
@@ -384,43 +360,44 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */
 #ifdef single /* Read the image a single row at a time */
      for (y = 0; y < height; y++)
      {
-         png_read_rows(png_ptr, &row_pointers[y], NULL, 1);
+         png_read_rows(png_ptr, &row_pointers[y], png_bytepp_NULL, 1);
      }
 #else no_single /* Read the image several rows at a time */
      for (y = 0; y < height; y += number_of_rows)
      {
 #ifdef sparkle /* Read the image using the "sparkle" effect. */
-         png_read_rows(png_ptr, &row_pointers[y], NULL,
+         png_read_rows(png_ptr, &row_pointers[y], png_bytepp_NULL,
            number_of_rows);
 #else no_sparkle /* Read the image using the "rectangle" effect */
-         png_read_rows(png_ptr, NULL, &row_pointers[y],
+         png_read_rows(png_ptr, png_bytepp_NULL, &row_pointers[y],
            number_of_rows);
-#endif no_sparkle /* Use only one of these two methods */
+#endif no_sparkle /* use only one of these two methods */
      }
-      /* If you want to display the image after every pass, do so here */
+      /* if you want to display the image after every pass, do
-#endif no_single /* Use only one of these two methods */
+         so here */
 #endif no_single /* use only one of these two methods */
   }
-#endif no_entire /* Use only one of these two methods */
+#endif no_entire /* use only one of these two methods */
-   /* Read rest of file, and get additional chunks in info_ptr - REQUIRED */
+   /* read rest of file, and get additional chunks in info_ptr - REQUIRED */
   png_read_end(png_ptr, info_ptr);
 #endif hilevel
   /* At this point you have read the entire image */
-   /* Clean up after the read, and free any memory allocated - REQUIRED */
+   /* clean up after the read, and free any memory allocated - REQUIRED */
-   png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+   png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-   /* Close the file */
+   /* close the file */
   fclose(fp);
-   /* That's it */
+   /* that's it */
   return (OK);
 }
-/* Progressively read a file */
+/* progressively read a file */
 int
 initialize_png_reader(png_structp *png_ptr, png_infop *info_ptr)
@@ -444,13 +421,13 @@ initialize_png_reader(png_structp *png_ptr, png_infop *info_ptr)
   if (*info_ptr == NULL)
   {
-      png_destroy_read_struct(png_ptr, info_ptr, NULL);
+      png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
      return (ERROR);
   }
   if (setjmp(png_jmpbuf((*png_ptr))))
   {
-      png_destroy_read_struct(png_ptr, info_ptr, NULL);
+      png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
      return (ERROR);
   }
@@ -479,13 +456,13 @@ process_data(png_structp *png_ptr, png_infop *info_ptr,
   if (setjmp(png_jmpbuf((*png_ptr))))
   {
      /* Free the png_ptr and info_ptr memory on error */
-      png_destroy_read_struct(png_ptr, info_ptr, NULL);
+      png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
      return (ERROR);
   }
   /* This one's new also.  Simply give it chunks of data as
    * they arrive from the data stream (in order, of course).
-    * On segmented machines, don't give it any more than 64K.
+    * On Segmented machines, don't give it any more than 64K.
    * The library seems to run fine with sizes of 4K, although
    * you can give it much less if necessary (I assume you can
    * give it chunks of 1 byte, but I haven't tried with less
@@ -499,86 +476,86 @@ process_data(png_structp *png_ptr, png_infop *info_ptr,
 info_callback(png_structp png_ptr, png_infop info)
 {
-   /* Do any setup here, including setting any of the transformations
+/* do any setup here, including setting any of the transformations
-    * mentioned in the Reading PNG files section.  For now, you _must_
+ * mentioned in the Reading PNG files section.  For now, you _must_
-    * call either png_start_read_image() or png_read_update_info()
+ * call either png_start_read_image() or png_read_update_info()
-    * after all the transformations are set (even if you don't set
+ * after all the transformations are set (even if you don't set
-    * any).  You may start getting rows before png_process_data()
+ * any).  You may start getting rows before png_process_data()
-    * returns, so this is your last chance to prepare for that.
+ * returns, so this is your last chance to prepare for that.
-    */
+ */
 }
 row_callback(png_structp png_ptr, png_bytep new_row,
   png_uint_32 row_num, int pass)
 {
-   /*
+/*
-    * This function is called for every row in the image.  If the
+ * This function is called for every row in the image.  If the
-    * image is interlaced, and you turned on the interlace handler,
+ * image is interlaced, and you turned on the interlace handler,
-    * this function will be called for every row in every pass.
+ * this function will be called for every row in every pass.
-    *
+ *
-    * In this function you will receive a pointer to new row data from
+ * In this function you will receive a pointer to new row data from
-    * libpng called new_row that is to replace a corresponding row (of
+ * libpng called new_row that is to replace a corresponding row (of
-    * the same data format) in a buffer allocated by your application.
+ * the same data format) in a buffer allocated by your application.
-    *
+ *
-    * The new row data pointer "new_row" may be NULL, indicating there is
+ * The new row data pointer new_row may be NULL, indicating there is
-    * no new data to be replaced (in cases of interlace loading).
+ * no new data to be replaced (in cases of interlace loading).
-    *
+ *
-    * If new_row is not NULL then you need to call
+ * If new_row is not NULL then you need to call
-    * png_progressive_combine_row() to replace the corresponding row as
+ * png_progressive_combine_row() to replace the corresponding row as
-    * shown below:
+ * shown below:
-    */
+ */
   /* Check if row_num is in bounds. */
   if((row_num >= 0) && (row_num < height))
   {
     /* Get pointer to corresponding row in our
      * PNG read buffer.
      */
     png_bytep old_row = ((png_bytep *)our_data)[row_num];
-   /* Get pointer to corresponding row in our
+     /* If both rows are allocated then copy the new row
-    * PNG read buffer.
+      * data to the corresponding row data.
-    */
+      */
-   png_bytep old_row = ((png_bytep *)our_data)[row_num];
+     if((old_row != NULL) && (new_row != NULL))
-
+     png_progressive_combine_row(png_ptr, old_row, new_row);
-#ifdef PNG_READ_INTERLACING_SUPPORTED
+   }
-   /* If both rows are allocated then copy the new row
+/*
-    * data to the corresponding row data.
+ * The rows and passes are called in order, so you don't really
-    */
+ * need the row_num and pass, but I'm supplying them because it
-   if ((old_row != NULL) && (new_row != NULL))
+ * may make your life easier.
-   png_progressive_combine_row(png_ptr, old_row, new_row);
+ *
-
+ * For the non-NULL rows of interlaced images, you must call
-   /*
+ * png_progressive_combine_row() passing in the new row and the
-    * The rows and passes are called in order, so you don't really
+ * old row, as demonstrated above.  You can call this function for
-    * need the row_num and pass, but I'm supplying them because it
+ * NULL rows (it will just return) and for non-interlaced images
-    * may make your life easier.
+ * (it just does the png_memcpy for you) if it will make the code
-    *
+ * easier.  Thus, you can just do this for all cases:
-    * For the non-NULL rows of interlaced images, you must call
+ */
    * png_progressive_combine_row() passing in the new row and the
    * old row, as demonstrated above.  You can call this function for
    * NULL rows (it will just return) and for non-interlaced images
    * (it just does the png_memcpy for you) if it will make the code
    * easier.  Thus, you can just do this for all cases:
    */
   png_progressive_combine_row(png_ptr, old_row, new_row);
-   /* where old_row is what was displayed for previous rows.  Note
+/* where old_row is what was displayed for previous rows.  Note
-    * that the first pass (pass == 0 really) will completely cover
+ * that the first pass (pass == 0 really) will completely cover
-    * the old row, so the rows do not have to be initialized.  After
+ * the old row, so the rows do not have to be initialized.  After
-    * the first pass (and only for interlaced images), you will have
+ * the first pass (and only for interlaced images), you will have
-    * to pass the current row as new_row, and the function will combine
+ * to pass the current row as new_row, and the function will combine
-    * the old row and the new row.
+ * the old row and the new row.
-    */
+ */
 #endif /* PNG_READ_INTERLACING_SUPPORTED */
 }
 end_callback(png_structp png_ptr, png_infop info)
 {
-   /* This function is called when the whole image has been read,
+/* this function is called when the whole image has been read,
-    * including any chunks after the image (up to and including
+ * including any chunks after the image (up to and including
-    * the IEND).  You will usually have the same info chunk as you
+ * the IEND).  You will usually have the same info chunk as you
-    * had in the header, although some data may have been added
+ * had in the header, although some data may have been added
-    * to the comments and time fields.
+ * to the comments and time fields.
-    *
+ *
-    * Most people won't do much here, perhaps setting a flag that
+ * Most people won't do much here, perhaps setting a flag that
-    * marks the image as finished.
+ * marks the image as finished.
-    */
+ */
 }
-/* Write a png file */
+/* write a png file */
 void write_png(char *file_name /* , ... other image information ... */)
 {
   FILE *fp;
@@ -586,7 +563,7 @@ void write_png(char *file_name /* , ... other image information ... */)
   png_infop info_ptr;
   png_colorp palette;
-   /* Open the file */
+   /* open the file */
   fp = fopen(file_name, "wb");
   if (fp == NULL)
      return (ERROR);
@@ -611,7 +588,7 @@ void write_png(char *file_name /* , ... other image information ... */)
   if (info_ptr == NULL)
   {
      fclose(fp);
-      png_destroy_write_struct(&png_ptr,  NULL);
+      png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
      return (ERROR);
   }
@@ -620,34 +597,30 @@ void write_png(char *file_name /* , ... other image information ... */)
    */
   if (setjmp(png_jmpbuf(png_ptr)))
   {
-      /* If we get here, we had a problem writing the file */
+      /* If we get here, we had a problem reading the file */
      fclose(fp);
      png_destroy_write_struct(&png_ptr, &info_ptr);
      return (ERROR);
   }
   /* One of the following I/O initialization functions is REQUIRED */
 #ifdef streams /* I/O initialization method 1 */
-   /* Set up the output control if you are using standard C streams */
+   /* set up the output control if you are using standard C streams */
   png_init_io(png_ptr, fp);
 #else no_streams /* I/O initialization method 2 */
-   /* If you are using replacement write functions, instead of calling
+   /* If you are using replacement read functions, instead of calling
-    * png_init_io() here you would call
+    * png_init_io() here you would call */
    */
   png_set_write_fn(png_ptr, (void *)user_io_ptr, user_write_fn,
      user_IO_flush_function);
   /* where user_io_ptr is a structure you want available to the callbacks */
-#endif no_streams /* Only use one initialization method */
+#endif no_streams /* only use one initialization method */
 #ifdef hilevel
   /* This is the easy way.  Use it if you already have all the
-    * image info living in the structure.  You could "|" many
+    * image info living info in the structure.  You could "|" many
    * PNG_TRANSFORM flags into the png_transforms integer here.
    */
-   png_write_png(png_ptr, info_ptr, png_transforms, NULL);
+   png_write_png(png_ptr, info_ptr, png_transforms, png_voidp_NULL);
 #else
   /* This is the hard way */
@@ -662,31 +635,25 @@ void write_png(char *file_name /* , ... other image information ... */)
   png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, PNG_COLOR_TYPE_???,
      PNG_INTERLACE_????, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-   /* Set the palette if there is one.  REQUIRED for indexed-color images */
+   /* set the palette if there is one.  REQUIRED for indexed-color images */
   palette = (png_colorp)png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH
-             * png_sizeof(png_color));
+             * png_sizeof (png_color));
-   /* ... Set palette colors ... */
+   /* ... set palette colors ... */
   png_set_PLTE(png_ptr, info_ptr, palette, PNG_MAX_PALETTE_LENGTH);
   /* You must not free palette here, because png_set_PLTE only makes a link to
-    * the palette that you malloced.  Wait until you are about to destroy
+      the palette that you malloced.  Wait until you are about to destroy
-    * the png structure.
+      the png structure. */
    */
-   /* Optional significant bit (sBIT) chunk */
+   /* optional significant bit chunk */
-   png_color_8 sig_bit;
+   /* if we are dealing with a grayscale image then */
   /* If we are dealing with a grayscale image then */
   sig_bit.gray = true_bit_depth;
-
+   /* otherwise, if we are dealing with a color image then */
   /* Otherwise, if we are dealing with a color image then */
   sig_bit.red = true_red_bit_depth;
   sig_bit.green = true_green_bit_depth;
   sig_bit.blue = true_blue_bit_depth;
-
+   /* if the image has an alpha channel then */
   /* If the image has an alpha channel then */
   sig_bit.alpha = true_alpha_bit_depth;
-
+   png_set_sBIT(png_ptr, info_ptr, sig_bit);
   png_set_sBIT(png_ptr, info_ptr, &sig_bit);
   /* Optional gamma chunk is strongly suggested if you have any guess
@@ -695,45 +662,25 @@ void write_png(char *file_name /* , ... other image information ... */)
   png_set_gAMA(png_ptr, info_ptr, gamma);
   /* Optionally write comments into the image */
-   {
+   text_ptr[0].key = "Title";
-      png_text text_ptr[3];
+   text_ptr[0].text = "Mona Lisa";
   text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE;
   text_ptr[1].key = "Author";
   text_ptr[1].text = "Leonardo DaVinci";
   text_ptr[1].compression = PNG_TEXT_COMPRESSION_NONE;
   text_ptr[2].key = "Description";
   text_ptr[2].text = "<long text>";
   text_ptr[2].compression = PNG_TEXT_COMPRESSION_zTXt;
 #ifdef PNG_iTXt_SUPPORTED
   text_ptr[0].lang = NULL;
   text_ptr[1].lang = NULL;
   text_ptr[2].lang = NULL;
 #endif
   png_set_text(png_ptr, info_ptr, text_ptr, 3);
-      char key0[]="Title";
+   /* other optional chunks like cHRM, bKGD, tRNS, tIME, oFFs, pHYs, */
-      char text0[]="Mona Lisa";
+   /* note that if sRGB is present the gAMA and cHRM chunks must be ignored
-      text_ptr[0].key = key0;
+    * on read and must be written in accordance with the sRGB profile */
      text_ptr[0].text = text0;
      text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE;
      text_ptr[0].itxt_length = 0;
      text_ptr[0].lang = NULL;
      text_ptr[0].lang_key = NULL;
      char key1[]="Author";
      char text1[]="Leonardo DaVinci";
      text_ptr[1].key = key1;
      text_ptr[1].text = text1;
      text_ptr[1].compression = PNG_TEXT_COMPRESSION_NONE;
      text_ptr[1].itxt_length = 0;
      text_ptr[1].lang = NULL;
      text_ptr[1].lang_key = NULL;
      char key2[]="Description";
      char text2[]="<long text>";
      text_ptr[2].key = key2;
      text_ptr[2].text = text2;
      text_ptr[2].compression = PNG_TEXT_COMPRESSION_zTXt;
      text_ptr[2].itxt_length = 0;
      text_ptr[2].lang = NULL;
      text_ptr[2].lang_key = NULL;
      png_set_text(write_ptr, write_info_ptr, text_ptr, 3);
   }
   /* Other optional chunks like cHRM, bKGD, tRNS, tIME, oFFs, pHYs */
   /* Note that if sRGB is present the gAMA and cHRM chunks must be ignored
    * on read and, if your application chooses to write them, they must
    * be written in accordance with the sRGB profile
    */
   /* Write the file header information.  REQUIRED */
   png_write_info(png_ptr, info_ptr);
@@ -745,21 +692,21 @@ void write_png(char *file_name /* , ... other image information ... */)
    *   write_my_chunk();
    *   png_write_info(png_ptr, info_ptr);
    *
-    * However, given the level of known- and unknown-chunk support in 1.2.0
+    * However, given the level of known- and unknown-chunk support in 1.1.0
    * and up, this should no longer be necessary.
    */
   /* Once we write out the header, the compression type on the text
-    * chunk gets changed to PNG_TEXT_COMPRESSION_NONE_WR or
+    * chunks gets changed to PNG_TEXT_COMPRESSION_NONE_WR or
    * PNG_TEXT_COMPRESSION_zTXt_WR, so it doesn't get written out again
    * at the end.
    */
-   /* Set up the transformations you want.  Note that these are
+   /* set up the transformations you want.  Note that these are
    * all optional.  Only call them if you want them.
    */
-   /* Invert monochrome pixels */
+   /* invert monochrome pixels */
   png_set_invert_mono(png_ptr);
   /* Shift the pixels up to a legal bit depth and fill in
@@ -767,10 +714,10 @@ void write_png(char *file_name /* , ... other image information ... */)
    */
   png_set_shift(png_ptr, &sig_bit);
-   /* Pack pixels into bytes */
+   /* pack pixels into bytes */
   png_set_packing(png_ptr);
-   /* Swap location of alpha bytes from ARGB to RGBA */
+   /* swap location of alpha bytes from ARGB to RGBA */
   png_set_swap_alpha(png_ptr);
   /* Get rid of filler (OR ALPHA) bytes, pack XRGB/RGBX/ARGB/RGBA into
@@ -778,19 +725,18 @@ void write_png(char *file_name /* , ... other image information ... */)
    */
   png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
-   /* Flip BGR pixels to RGB */
+   /* flip BGR pixels to RGB */
   png_set_bgr(png_ptr);
-   /* Swap bytes of 16-bit files to most significant byte first */
+   /* swap bytes of 16-bit files to most significant byte first */
   png_set_swap(png_ptr);
-   /* Swap bits of 1, 2, 4 bit packed pixel formats */
+   /* swap bits of 1, 2, 4 bit packed pixel formats */
   png_set_packswap(png_ptr);
-   /* Turn on interlace handling if you are not using png_write_image() */
+   /* turn on interlace handling if you are not using png_write_image() */
-   if (interlacing != 0)
+   if (interlacing)
      number_passes = png_set_interlace_handling(png_ptr);
   else
      number_passes = 1;
@@ -799,28 +745,22 @@ void write_png(char *file_name /* , ... other image information ... */)
    * use the first method if you aren't handling interlacing yourself.
    */
   png_uint_32 k, height, width;
-
+   png_byte image[height][width*bytes_per_pixel];
   /* In this example, "image" is a one-dimensional array of bytes */
   png_byte image[height*width*bytes_per_pixel];
   png_bytep row_pointers[height];
   if (height > PNG_UINT_32_MAX/png_sizeof(png_bytep))
     png_error (png_ptr, "Image is too tall to process in memory");
   /* Set up pointers into your "image" byte array */
   for (k = 0; k < height; k++)
     row_pointers[k] = image + k*width*bytes_per_pixel;
   /* One of the following output methods is REQUIRED */
-
+#ifdef entire /* write out the entire image data in one call */
 #ifdef entire /* Write out the entire image data in one call */
   png_write_image(png_ptr, row_pointers);
-   /* The other way to write the image - deal with interlacing */
+   /* the other way to write the image - deal with interlacing */
 #else no_entire /* Write out the image data by one or more scanlines */
 #else no_entire /* write out the image data by one or more scanlines */
   /* The number of passes is either 1 for non-interlaced images,
    * or 7 for interlaced images.
    */
@@ -831,12 +771,14 @@ void write_png(char *file_name /* , ... other image information ... */)
      /* If you are only writing one row at a time, this works */
      for (y = 0; y < height; y++)
      {
         png_write_rows(png_ptr, &row_pointers[y], 1);
      }
   }
-#endif no_entire /* Use only one output method */
+#endif no_entire /* use only one output method */
   /* You can write optional chunks like tEXt, zTXt, and tIME at the end
-    * as well.  Shouldn't be necessary in 1.2.0 and up as all the public
+    * as well.  Shouldn't be necessary in 1.1.0 and up as all the public
    * chunks are supported and you can use png_set_unknown_chunks() to
    * register unknown chunks into the info structure to be written out.
    */
@@ -846,33 +788,26 @@ void write_png(char *file_name /* , ... other image information ... */)
 #endif hilevel
   /* If you png_malloced a palette, free it here (don't free info_ptr->palette,
-    * as recommended in versions 1.0.5m and earlier of this example; if
+      as recommended in versions 1.0.5m and earlier of this example; if
-    * libpng mallocs info_ptr->palette, libpng will free it).  If you
+      libpng mallocs info_ptr->palette, libpng will free it).  If you
-    * allocated it with malloc() instead of png_malloc(), use free() instead
+      allocated it with malloc() instead of png_malloc(), use free() instead
-    * of png_free().
+      of png_free(). */
    */
   png_free(png_ptr, palette);
-   palette = NULL;
+   palette=NULL;
   /* Similarly, if you png_malloced any data that you passed in with
-    * png_set_something(), such as a hist or trans array, free it here,
+      png_set_something(), such as a hist or trans array, free it here,
-    * when you can be sure that libpng is through with it.
+      when you can be sure that libpng is through with it. */
    */
   png_free(png_ptr, trans);
-   trans = NULL;
+   trans=NULL;
   /* Whenever you use png_free() it is a good idea to set the pointer to
    * NULL in case your application inadvertently tries to png_free() it
    * again.  When png_free() sees a NULL it returns without action, thus
    * avoiding the double-free security problem.
    */
-   /* Clean up after the write, and free any memory allocated */
+   /* clean up after the write, and free any memory allocated */
   png_destroy_write_struct(&png_ptr, &info_ptr);
-   /* Close the file */
+   /* close the file */
   fclose(fp);
-   /* That's it */
+   /* that's it */
   return (OK);
 }
--- a/710
+++ b/710
@@ -1,527 +1,251 @@
 #!/bin/sh
 #
 # install - install a program, script, or datafile
-
+# This comes from X11R5 (mit/util/scripts/install.sh).
 scriptversion=2011-11-20.07; # UTC
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
 # following copyright and license.
 #
-# Copyright (C) 1994 X Consortium
+# Copyright 1991 by the Massachusetts Institute of Technology
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Permission to use, copy, modify, distribute, and sell this software and its
-# of this software and associated documentation files (the "Software"), to
+# documentation for any purpose is hereby granted without fee, provided that
-# deal in the Software without restriction, including without limitation the
+# the above copyright notice appear in all copies and that both that
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# copyright notice and this permission notice appear in supporting
-# sell copies of the Software, and to permit persons to whom the Software is
+# documentation, and that the name of M.I.T. not be used in advertising or
-# furnished to do so, subject to the following conditions:
+# publicity pertaining to distribution of the software without specific,
-#
+# written prior permission.  M.I.T. makes no representations about the
-# The above copyright notice and this permission notice shall be included in
+# suitability of this software for any purpose.  It is provided "as is"
-# all copies or substantial portions of the Software.
+# without express or implied warranty.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
 # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 # Except as contained in this notice, the name of the X Consortium shall not
 # be used in advertising or otherwise to promote the sale, use or other deal-
 # ings in this Software without prior written authorization from the X Consor-
 # tium.
 #
 #
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# 'make' implicit rules from creating a file called install from it
+# `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.
+# from scratch.  It can only install one file at a time, a restriction
 # shared with many OS's install programs.
 nl='
 '
 IFS=" ""	$nl"
 # set DOITPROG to echo to test this script
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
+doit="${DOITPROG-}"
 if test -z "$doit"; then
  doit_exec=exec
 else
  doit_exec=$doit
 fi
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
-chgrpprog=${CHGRPPROG-chgrp}
+# put in absolute paths if you don't have them in your path; or use env. vars.
 chmodprog=${CHMODPROG-chmod}
 chownprog=${CHOWNPROG-chown}
 cmpprog=${CMPPROG-cmp}
 cpprog=${CPPROG-cp}
 mkdirprog=${MKDIRPROG-mkdir}
 mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
-posix_glob='?'
+mvprog="${MVPROG-mv}"
-initialize_posix_glob='
+cpprog="${CPPROG-cp}"
-  test "$posix_glob" != "?" || {
+chmodprog="${CHMODPROG-chmod}"
-    if (set -f) 2>/dev/null; then
+chownprog="${CHOWNPROG-chown}"
-      posix_glob=
+chgrpprog="${CHGRPPROG-chgrp}"
-    else
+stripprog="${STRIPPROG-strip}"
-      posix_glob=:
+rmprog="${RMPROG-rm}"
-    fi
+mkdirprog="${MKDIRPROG-mkdir}"
  }
 '
-posix_mkdir=
+transformbasename=""
-
+transform_arg=""
-# Desired mode of installed file.
+instcmd="$mvprog"
-mode=0755
+chmodcmd="$chmodprog 0755"
-
+chowncmd=""
-chgrpcmd=
+chgrpcmd=""
-chmodcmd=$chmodprog
+stripcmd=""
 chowncmd=
 mvcmd=$mvprog
 rmcmd="$rmprog -f"
-stripcmd=
+mvcmd="$mvprog"
 src=""
 dst=""
 dir_arg=""
-src=
+while [ x"$1" != x ]; do
-dst=
+    case $1 in
-dir_arg=
+	-c) instcmd="$cpprog"
-dst_arg=
+	    shift
 	    continue;;
-copy_on_change=false
+	-d) dir_arg=true
-no_target_directory=
+	    shift
 	    continue;;
-usage="\
+	-m) chmodcmd="$chmodprog $2"
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+	    shift
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
+	    shift
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+	    continue;;
   or: $0 [OPTION]... -d DIRECTORIES...
-In the 1st form, copy SRCFILE to DSTFILE.
+	-o) chowncmd="$chownprog $2"
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+	    shift
-In the 4th, create DIRECTORIES.
+	    shift
 	    continue;;
-Options:
+	-g) chgrpcmd="$chgrpprog $2"
-     --help     display this help and exit.
+	    shift
-     --version  display version info and exit.
+	    shift
 	    continue;;
-  -c            (ignored)
+	-s) stripcmd="$stripprog"
-  -C            install only if different (preserve the last data modification time)
+	    shift
-  -d            create directories instead of installing files.
+	    continue;;
  -g GROUP      $chgrpprog installed files to GROUP.
  -m MODE       $chmodprog installed files to MODE.
  -o USER       $chownprog installed files to USER.
  -s            $stripprog installed files.
  -t DIRECTORY  install into DIRECTORY.
  -T            report an error if DSTFILE is a directory.
-Environment variables override the default commands:
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+	    shift
-  RMPROG STRIPPROG
+	    continue;;
 "
-while test $# -ne 0; do
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-  case $1 in
+	    shift
-    -c) ;;
+	    continue;;
-    -C) copy_on_change=true;;
+	*)  if [ x"$src" = x ]
    -d) dir_arg=true;;
    -g) chgrpcmd="$chgrpprog $2"
 	shift;;
    --help) echo "$usage"; exit $?;;
    -m) mode=$2
 	case $mode in
 	  *' '* | *'	'* | *'
 '*	  | *'*'* | *'?'* | *'['*)
 	    echo "$0: invalid mode: $mode" >&2
 	    exit 1;;
 	esac
 	shift;;
    -o) chowncmd="$chownprog $2"
 	shift;;
    -s) stripcmd=$stripprog;;
    -t) dst_arg=$2
 	# Protect names problematic for 'test' and other utilities.
 	case $dst_arg in
 	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
 	esac
 	shift;;
    -T) no_target_directory=true;;
    --version) echo "$0 $scriptversion"; exit $?;;
    --)	shift
 	break;;
    -*)	echo "$0: invalid option: $1" >&2
 	exit 1;;
    *)  break;;
  esac
  shift
 done
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
  # When -d is used, all remaining arguments are directories to create.
  # When -t is used, the destination is already specified.
  # Otherwise, the last argument is the destination.  Remove it from $@.
  for arg
  do
    if test -n "$dst_arg"; then
      # $@ is not empty: it contains at least $arg.
      set fnord "$@" "$dst_arg"
      shift # fnord
    fi
    shift # arg
    dst_arg=$arg
    # Protect names problematic for 'test' and other utilities.
    case $dst_arg in
      -* | [=\(\)!]) dst_arg=./$dst_arg;;
    esac
  done
 fi
 if test $# -eq 0; then
  if test -z "$dir_arg"; then
    echo "$0: no input file specified." >&2
    exit 1
  fi
  # It's OK to call 'install-sh -d' without argument.
  # This can happen when creating conditional directories.
  exit 0
 fi
 if test -z "$dir_arg"; then
  do_exit='(exit $ret); exit $ret'
  trap "ret=129; $do_exit" 1
  trap "ret=130; $do_exit" 2
  trap "ret=141; $do_exit" 13
  trap "ret=143; $do_exit" 15
  # Set umask so as not to create temps with too-generous modes.
  # However, 'strip' requires both read and write access to temps.
  case $mode in
    # Optimize common cases.
    *644) cp_umask=133;;
    *755) cp_umask=22;;
    *[0-7])
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw='% 200'
      fi
      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
    *)
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw=,u+rw
      fi
      cp_umask=$mode$u_plus_rw;;
  esac
 fi
 for src
 do
  # Protect names problematic for 'test' and other utilities.
  case $src in
    -* | [=\(\)!]) src=./$src;;
  esac
  if test -n "$dir_arg"; then
    dst=$src
    dstdir=$dst
    test -d "$dstdir"
    dstdir_status=$?
  else
    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
    # might cause directories to be created, which would be especially bad
    # if $src (and thus $dsttmp) contains '*'.
    if test ! -f "$src" && test ! -d "$src"; then
      echo "$0: $src does not exist." >&2
      exit 1
    fi
    if test -z "$dst_arg"; then
      echo "$0: no destination specified." >&2
      exit 1
    fi
    dst=$dst_arg
    # If destination is a directory, append the input filename; won't work
    # if double slashes aren't ignored.
    if test -d "$dst"; then
      if test -n "$no_target_directory"; then
 	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
      fi
      dstdir=$dst
      dst=$dstdir/`basename "$src"`
      dstdir_status=0
    else
      # Prefer dirname, but fall back on a substitute if dirname fails.
      dstdir=`
 	(dirname "$dst") 2>/dev/null ||
 	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	     X"$dst" : 'X\(//\)[^/]' \| \
 	     X"$dst" : 'X\(//\)$' \| \
 	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
 	echo X"$dst" |
 	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)[^/].*/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\).*/{
 		   s//\1/
 		   q
 		 }
 		 s/.*/./; q'
      `
      test -d "$dstdir"
      dstdir_status=$?
    fi
  fi
  obsolete_mkdir_used=false
  if test $dstdir_status != 0; then
    case $posix_mkdir in
      '')
 	# Create intermediate dirs using mode 755 as modified by the umask.
 	# This is like FreeBSD 'install' as of 1997-10-28.
 	umask=`umask`
 	case $stripcmd.$umask in
 	  # Optimize common cases.
 	  *[2367][2367]) mkdir_umask=$umask;;
 	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
 	  *[0-7])
 	    mkdir_umask=`expr $umask + 22 \
 	      - $umask % 100 % 40 + $umask % 20 \
 	      - $umask % 10 % 4 + $umask % 2
 	    `;;
 	  *) mkdir_umask=$umask,go-w;;
 	esac
 	# With -d, create the new directory with the user-specified mode.
 	# Otherwise, rely on $mkdir_umask.
 	if test -n "$dir_arg"; then
 	  mkdir_mode=-m$mode
 	else
 	  mkdir_mode=
 	fi
 	posix_mkdir=false
 	case $umask in
 	  *[123567][0-7][0-7])
 	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
 	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
 	    ;;
 	  *)
 	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
 	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
 	    if (umask $mkdir_umask &&
 		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
 	    then
-	      if test -z "$dir_arg" || {
+		src=$1
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
 		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
 		     d????-?r-*) different_mode=700;;
 		     d????-?--*) different_mode=755;;
 		     *) false;;
 		   esac &&
 		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
 		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
 		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
 		   }
 		 }
 	      then posix_mkdir=:
 	      fi
 	      rmdir "$tmpdir/d" "$tmpdir"
 	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
+		# this colon is to work around a 386BSD /bin/sh bug
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+		:
 		dst=$1
 	    fi
-	    trap '' 0;;
+	    shift
-	esac;;
+	    continue;;
    esac
    if
      $posix_mkdir && (
 	umask $mkdir_umask &&
 	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
      )
    then :
    else
      # The umask is ridiculous, or mkdir does not conform to POSIX,
      # or it failed possibly due to a race condition.  Create the
      # directory the slow way, step by step, checking for races as we go.
      case $dstdir in
 	/*) prefix='/';;
 	[-=\(\)!]*) prefix='./';;
 	*)  prefix='';;
      esac
      eval "$initialize_posix_glob"
      oIFS=$IFS
      IFS=/
      $posix_glob set -f
      set fnord $dstdir
      shift
      $posix_glob set +f
      IFS=$oIFS
      prefixes=
      for d
      do
 	test X"$d" = X && continue
 	prefix=$prefix$d
 	if test -d "$prefix"; then
 	  prefixes=
 	else
 	  if $posix_mkdir; then
 	    (umask=$mkdir_umask &&
 	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
 	    # Don't fail if two instances are running concurrently.
 	    test -d "$prefix" || exit 1
 	  else
 	    case $prefix in
 	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
 	      *) qprefix=$prefix;;
 	    esac
 	    prefixes="$prefixes '$qprefix'"
 	  fi
 	fi
 	prefix=$prefix/
      done
      if test -n "$prefixes"; then
 	# Don't fail if two instances are running concurrently.
 	(umask $mkdir_umask &&
 	 eval "\$doit_exec \$mkdirprog $prefixes") ||
 	  test -d "$dstdir" || exit 1
 	obsolete_mkdir_used=true
      fi
    fi
  fi
  if test -n "$dir_arg"; then
    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
  else
    # Make a couple of temp file names in the proper directory.
    dsttmp=$dstdir/_inst.$$_
    rmtmp=$dstdir/_rm.$$_
    # Trap to clean up those temp files at exit.
    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
    # Copy the file name to the temp name.
    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
    # and set any options; do chmod last to preserve setuid bits.
    #
    # If any of these fail, we abort the whole thing.  If we want to
    # ignore errors from any of these, just make sure not to ignore
    # errors from the above "$doit $cpprog $src $dsttmp" command.
    #
    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
    # If -C, don't bother to copy if it wouldn't change the file.
    if $copy_on_change &&
       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
       eval "$initialize_posix_glob" &&
       $posix_glob set -f &&
       set X $old && old=:$2:$4:$5:$6 &&
       set X $new && new=:$2:$4:$5:$6 &&
       $posix_glob set +f &&
       test "$old" = "$new" &&
       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
    then
      rm -f "$dsttmp"
    else
      # Rename the file to the real destination.
      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
      # The rename failed, perhaps because mv can't rename something else
      # to itself, or perhaps because mv is so ancient that it does not
      # support -f.
      {
 	# Now remove or move aside any old file at destination location.
 	# We try this two ways since rm can't unlink itself on some
 	# systems and the destination file might be busy for other
 	# reasons.  In this case, the final cleanup might fail but the new
 	# file should still install successfully.
 	{
 	  test ! -f "$dst" ||
 	  $doit $rmcmd -f "$dst" 2>/dev/null ||
 	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
 	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
 	  } ||
 	  { echo "$0: cannot unlink or rename $dst" >&2
 	    (exit 1); exit 1
 	  }
 	} &&
 	# Now rename the file to the real destination.
 	$doit $mvcmd "$dsttmp" "$dst"
      }
    fi || exit 1
    trap '' 0
  fi
 done
-# Local variables:
+if [ x"$src" = x ]
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+then
-# time-stamp-start: "scriptversion="
+	echo "install:	no input file specified"
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+	exit 1
-# time-stamp-time-zone: "UTC"
+else
-# time-stamp-end: "; # UTC"
+	true
-# End:
+fi
 if [ x"$dir_arg" != x ]; then
 	dst=$src
 	src=""
 	if [ -d $dst ]; then
 		instcmd=:
 		chmodcmd=""
 	else
 		instcmd=mkdir
 	fi
 else
 # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
 # might cause directories to be created, which would be especially bad 
 # if $src (and thus $dsttmp) contains '*'.
 	if [ -f $src -o -d $src ]
 	then
 		true
 	else
 		echo "install:  $src does not exist"
 		exit 1
 	fi
 	if [ x"$dst" = x ]
 	then
 		echo "install:	no destination specified"
 		exit 1
 	else
 		true
 	fi
 # If destination is a directory, append the input filename; if your system
 # does not like double slashes in filenames, you may need to add some logic
 	if [ -d $dst ]
 	then
 		dst="$dst"/`basename $src`
 	else
 		true
 	fi
 fi
 ## this sed command emulates the dirname command
 dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 # Make sure that the destination directory exists.
 #  this part is taken from Noah Friedman's mkinstalldirs script
 # Skip lots of stat calls in the usual case.
 if [ ! -d "$dstdir" ]; then
 defaultIFS='	
 '
 IFS="${IFS-${defaultIFS}}"
 oIFS="${IFS}"
 # Some sh's can't handle IFS=/ for some reason.
 IFS='%'
 set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
 IFS="${oIFS}"
 pathcomp=''
 while [ $# -ne 0 ] ; do
 	pathcomp="${pathcomp}${1}"
 	shift
 	if [ ! -d "${pathcomp}" ] ;
        then
 		$mkdirprog "${pathcomp}"
 	else
 		true
 	fi
 	pathcomp="${pathcomp}/"
 done
 fi
 if [ x"$dir_arg" != x ]
 then
 	$doit $instcmd $dst &&
 	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
 	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
 	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
 	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
 else
 # If we're going to rename the final executable, determine the name now.
 	if [ x"$transformarg" = x ] 
 	then
 		dstfile=`basename $dst`
 	else
 		dstfile=`basename $dst $transformbasename | 
 			sed $transformarg`$transformbasename
 	fi
 # don't allow the sed command to completely eliminate the filename
 	if [ x"$dstfile" = x ] 
 	then
 		dstfile=`basename $dst`
 	else
 		true
 	fi
 # Make a temp file name in the proper directory.
 	dsttmp=$dstdir/#inst.$$#
 # Move or copy the file name to the temp name
 	$doit $instcmd $src $dsttmp &&
 	trap "rm -f ${dsttmp}" 0 &&
 # and set any options; do chmod last to preserve setuid bits
 # If any of these fail, we abort the whole thing.  If we want to
 # ignore errors from any of these, just make sure not to ignore
 # errors from the above "$doit $instcmd $src $dsttmp" command.
 	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
 	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
 	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
 	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
 # Now rename the file to the real destination.
 	$doit $rmcmd -f $dstdir/$dstfile &&
 	$doit $mvcmd $dsttmp $dstdir/$dstfile 
 fi &&
 exit 0
--- a/libpng.3
+++ b/libpng.3
--- a/libpng.pc.in
+++ b/libpng.pc.in
@@ -1,11 +0,0 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
 Name: libpng
 Description: Loads and saves PNG files
 Version: @PNGLIB_VERSION@
 Libs: -L${libdir} -lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
 Libs.private: @LIBS@
 Cflags: -I${includedir}
--- a/libpng-manual.txt
+++ b/libpng-manual.txt
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,18 +1,784 @@
-.TH LIBPNGPF 3 "November 20, 2014"
+.TH LIBPNGPF 3 "November 15, 2006"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.5.20
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.21
 (private functions)
 .SH SYNOPSIS
-\fB#include \fI"pngpriv.h"
+\fB#include <png.h>\fP
-\fBAs of libpng version \fP\fI1.5.1\fP\fB, this section is no longer \fP\fImaintained\fP\fB, now that the private function prototypes are hidden in pngpriv.h and not accessible to applications. Look in pngpriv.h for the prototypes and a short description of each \fIfunction.
+\fI\fB
 \fI\fB
 \fBvoid png_build_gamma_table (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_build_grayscale_palette (int \fP\fIbit_depth\fP\fB, png_colorp \fIpalette\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_calculate_crc (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIptr\fP\fB, png_size_t \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_check_chunk_name (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIchunk_name\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBpng_size_t png_check_keyword (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charpp \fInew_key\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_combine_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fImask\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_correct_palette (png_structp \fP\fIpng_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, int \fInum_palette\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBint png_crc_error (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBint png_crc_finish (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIskip\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_crc_read (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuf\fP\fB, png_size_t \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBpng_voidp png_create_struct (int \fItype\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBpng_voidp png_create_struct_2 (int \fP\fItype\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_voidp \fImem_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBpng_charp png_decompress_chunk (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIcomp_type\fP\fB, png_charp \fP\fIchunkdata\fP\fB, png_size_t \fP\fIchunklength\fP\fB, png_size_t \fP\fIprefix_length\fP\fB, png_size_t \fI*data_length\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_destroy_struct (png_voidp \fIstruct_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_destroy_struct_2 (png_voidp \fP\fIstruct_ptr\fP\fB, png_free_ptr \fP\fIfree_fn\fP\fB, png_voidp \fImem_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_background (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_16p \fP\fItrans_values\fP\fB, png_color_16p \fP\fIbackground\fP\fB, png_color_16p \fP\fIbackground_1\fP\fB, png_bytep \fP\fIgamma_table\fP\fB, png_bytep \fP\fIgamma_from_1\fP\fB, png_bytep \fP\fIgamma_to_1\fP\fB, png_uint_16pp \fP\fIgamma_16\fP\fB, png_uint_16pp \fP\fIgamma_16_from_1\fP\fB, png_uint_16pp \fP\fIgamma_16_to_1\fP\fB, int \fIgamma_shift\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_bgr (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_chop (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_dither (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIpalette_lookup\fP\fB, png_bytep \fIdither_lookup\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_expand (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_16p \fItrans_value\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_expand_palette (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_colorp \fP\fIpalette\fP\fB, png_bytep \fP\fItrans\fP\fB, int \fInum_trans\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_gamma (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIgamma_table\fP\fB, png_uint_16pp \fP\fIgamma_16_table\fP\fB, int \fIgamma_shift\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_gray_to_rgb (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_invert (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_pack (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fIbit_depth\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_packswap (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_read_filler (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fP\fIfiller\fP\fB, png_uint_32 \fIflags\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_read_interlace (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fP\fIpass\fP\fB, png_uint_32 \fItransformations\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_read_invert_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_read_swap_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_read_transformations (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBint png_do_rgb_to_gray (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_shift (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_8p \fIbit_depth\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_strip_filler (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fIflags\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_swap (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_unpack (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_unshift (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_8p \fIsig_bits\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_write_interlace (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fIpass\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_write_invert_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_write_swap_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_do_write_transformations (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid *png_far_to_near (png_structp png_ptr,png_voidp \fP\fIptr\fP\fB, int \fIcheck\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_flush (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_bKGD (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_gAMA (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_IEND (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_iTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_sCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_sRGB (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_unknown (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_handle_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_info_destroy (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_init_mmx_flags (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_init_read_transformations (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_process_IDAT_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIbuffer_length\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_process_some_data (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_check_crc (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_crc_finish (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_crc_skip (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_fill_buffer (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_handle_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_handle_unknown (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_handle_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_have_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_have_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_have_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIrow\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_process_row (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_read_chunk (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_read_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_read_IDAT (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_read_sig (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_read_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_read_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_restore_buffer (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIbuffer_length\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_push_save_buffer (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_read_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_read_filter_row (png_structp \fP\fIpng_ptr\fP\fB, png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIprev_row\fP\fB, int \fIfilter\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_read_finish_row (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_read_push_finish_row (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_read_start_row (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_read_transform_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_reset_crc (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBint png_set_text_2 (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_textp \fP\fItext_ptr\fP\fB, int \fInum_text\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_cHRM (png_structp \fP\fIpng_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
 \fI\fB
 \fI\fB
 \fBvoid png_write_cHRM_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIwhite_x\fP\fB, png_uint_32 \fP\fIwhite_y\fP\fB, png_uint_32 \fP\fIred_x\fP\fB, png_uint_32 \fP\fIred_y\fP\fB, png_uint_32 \fP\fIgreen_x\fP\fB, png_uint_32 \fP\fIgreen_y\fP\fB, png_uint_32 \fP\fIblue_x\fP\fB, png_uint_32 \fIblue_y\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_filtered_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIfiltered_row\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_find_filter (png_structp \fP\fIpng_ptr\fP\fB, png_row_infop \fIrow_info\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_finish_row (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_gAMA (png_structp \fP\fIpng_ptr\fP\fB, double \fIfile_gamma\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_gAMA_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIint_file_gamma\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_uint_16p \fP\fIhist\fP\fB, int \fInum_hist\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIname\fP\fB, int \fP\fIcompression_type\fP\fB, png_charp \fP\fIprofile\fP\fB, int \fIproflen\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_IDAT (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_IEND (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIwidth\fP\fB, png_uint_32 \fP\fIheight\fP\fB, int \fP\fIbit_depth\fP\fB, int \fP\fIcolor_type\fP\fB, int \fP\fIcompression_type\fP\fB, int \fP\fIfilter_type\fP\fB, int \fIinterlace_type\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_iTXt (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIcompression\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fIlang\fP\fB, png_charp \fP\fItranslated_key\fP\fB, png_charp \fItext\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIx_offset\fP\fB, png_uint_32 \fP\fIy_offset\fP\fB, int \fIunit_type\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIpurpose\fP\fB, png_int_32 \fP\fIX0\fP\fB, png_int_32 \fP\fIX1\fP\fB, int \fP\fItype\fP\fB, int \fP\fInparams\fP\fB, png_charp \fP\fIunits\fP\fB, png_charpp \fIparams\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIx_pixels_per_unit\fP\fB, png_uint_32 \fP\fIy_pixels_per_unit\fP\fB, int \fIunit_type\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, png_uint_32 \fInum_pal\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_color_8p \fP\fIsbit\fP\fB, int \fIcolor_type\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_sCAL (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIunit\fP\fB, double \fP\fIwidth\fP\fB, double \fIheight\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_sCAL_s (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIunit\fP\fB, png_charp \fP\fIwidth\fP\fB, png_charp \fIheight\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_sig (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_sRGB (png_structp \fP\fIpng_ptr\fP\fB, int \fIintent\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_spalette_p \fIpalette\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_start_row (png_structp \fIpng_ptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fItext\fP\fB, png_size_t \fItext_len\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_timep \fImod_time\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fItrans\fP\fB, png_color_16p \fP\fIvalues\fP\fB, int \fP\fInumber\fP\fB, int \fIcolor_type\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_write_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fItext\fP\fB, png_size_t \fP\fItext_len\fP\fB, int \fIcompression\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoidpf png_zalloc (voidpf \fP\fIpng_ptr\fP\fB, uInt \fP\fIitems\fP\fB, uInt \fIsize\fP\fB);\fP
 \fI\fB
 \fI\fB
 \fBvoid png_zfree (voidpf \fP\fIpng_ptr\fP\fB, voidpf \fIptr\fP\fB);\fP
 \fI\fB
 \fI\fB
 .SH DESCRIPTION
-The functions previously listed here are used privately by libpng
+The functions listed above are used privately by libpng
 and are not recommended for use by applications.  They are
-not "exported" to applications using shared libraries.
+not "exported" to applications using shared libraries.  They
 are listed alphabetically here as an aid to libpng maintainers.
 See png.h for more information on these functions.
 .SH SEE ALSO
-.BR "png"(5), " libpng"(3), " zlib"(3), " deflate"(5), " " and " zlib"(5)
+libpng(3), png(5)
 .SH AUTHOR
 Glenn Randers-Pehrson
--- a/ltmain.sh
+++ b/ltmain.sh
--- a/404
+++ b/404
@@ -1,10 +1,7 @@
 #! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
+# Common stub for a few missing GNU programs while installing.
-
+# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
-scriptversion=2013-10-28.13; # UTC
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 # 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
@@ -17,7 +14,9 @@ scriptversion=2013-10-28.13; # UTC
 # 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/>.
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -25,191 +24,260 @@ scriptversion=2013-10-28.13; # UTC
 # the same distribution terms that you use for the rest of that program.
 if test $# -eq 0; then
-  echo 1>&2 "Try '$0 --help' for more information"
+  echo 1>&2 "Try \`$0 --help' for more information"
  exit 1
 fi
-case $1 in
+run=:
-  --is-lightweight)
+# In the cases where this matters, `missing' is being run in the
-    # Used by our autoconf macros to check whether the available missing
+# srcdir already.
-    # script is modern enough.
+if test -f configure.ac; then
-    exit 0
+  configure_ac=configure.ac
-    ;;
+else
  configure_ac=configure.in
 fi
-  --run)
+case "$1" in
-    # Back-compat with the calling convention used by older automake.
+--run)
-    shift
+  # Try to run requested program, and just exit if it succeeds.
-    ;;
+  run=
  shift
  "$@" && exit 0
  ;;
 esac
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
 case "$1" in
  -h|--h|--he|--hel|--help)
    echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
-Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-to PROGRAM being missing or too old.
+error status if there is no known handling for PROGRAM.
 Options:
  -h, --help      display this help and exit
  -v, --version   output version information and exit
  --run           try to run the given command, and emulate it if it fails
 Supported PROGRAM values:
-  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  aclocal      touch file \`aclocal.m4'
-  bison     yacc      flex         lex       help2man
+  autoconf     touch file \`configure'
-
+  autoheader   touch file \`config.h.in'
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+  automake     touch all \`Makefile.in' files
-'g' are ignored when checking the name.
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-
+  flex         create \`lex.yy.c', if possible, from existing .c
-Send bug reports to <bug-automake@gnu.org>."
+  help2man     touch the output file
-    exit $?
+  lex          create \`lex.yy.c', if possible, from existing .c
  makeinfo     touch the output file
  tar          try tar, gnutar, gtar, then tar without non-portable flags
  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
    ;;
  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
+    echo "missing 0.3 - GNU automake"
    exit $?
    ;;
  -*)
-    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try '$0 --help' for more information"
+    echo 1>&2 "Try \`$0 --help' for more information"
    exit 1
    ;;
  aclocal)
    echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
         to install the \`Automake' and \`Perl' packages.  Grab them from
         any GNU archive site."
    touch aclocal.m4
    ;;
  autoconf)
    echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
         you modified \`${configure_ac}'.  You might want to install the
         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
         archive site."
    touch configure
    ;;
  autoheader)
    echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
         from any GNU archive site."
    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
    test -z "$files" && files="config.h"
    touch_files=
    for f in $files; do
      case "$f" in
      *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
      *) touch_files="$touch_files $f.in";;
      esac
    done
    touch $touch_files
    ;;
  automake)
    echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
         You might want to install the \`Automake' and \`Perl' packages.
         Grab them from any GNU archive site."
    find . -type f -name Makefile.am -print |
 	   sed 's/\.am$/.in/' |
 	   while read f; do touch "$f"; done
    ;;
  bison|yacc)
    echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
         you modified a \`.y' file.  You may need the \`Bison' package
         in order for those modifications to take effect.  You can get
         \`Bison' from any GNU archive site."
    rm -f y.tab.c y.tab.h
    if [ $# -ne 1 ]; then
        eval LASTARG="\${$#}"
 	case "$LASTARG" in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
 	    if [ -f "$SRCFILE" ]; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
 	    if [ -f "$SRCFILE" ]; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
    fi
    if [ ! -f y.tab.h ]; then
 	echo >y.tab.h
    fi
    if [ ! -f y.tab.c ]; then
 	echo 'main() { return 0; }' >y.tab.c
    fi
    ;;
  lex|flex)
    echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
         you modified a \`.l' file.  You may need the \`Flex' package
         in order for those modifications to take effect.  You can get
         \`Flex' from any GNU archive site."
    rm -f lex.yy.c
    if [ $# -ne 1 ]; then
        eval LASTARG="\${$#}"
 	case "$LASTARG" in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
 	    if [ -f "$SRCFILE" ]; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
    fi
    if [ ! -f lex.yy.c ]; then
 	echo 'main() { return 0; }' >lex.yy.c
    fi
    ;;
  help2man)
    echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
    if test -z "$file"; then
 	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
    fi
    if [ -f "$file" ]; then
 	touch $file
    else
 	test -z "$file" || exec >$file
 	echo ".ab help2man is required to generate this page"
 	exit 1
    fi
    ;;
  makeinfo)
    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
       # We have makeinfo, but it failed.
       exit 1
    fi
    echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
         you modified a \`.texi' or \`.texinfo' file, or any other file
         indirectly affecting the aspect of the manual.  The spurious
         call might also be the consequence of using a buggy \`make' (AIX,
         DU, IRIX).  You might want to install the \`Texinfo' package or
         the \`GNU make' package.  Grab either from any GNU archive site."
    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
    if test -z "$file"; then
      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
    fi
    touch $file
    ;;
  tar)
    shift
    if test -n "$run"; then
      echo 1>&2 "ERROR: \`tar' requires --run"
      exit 1
    fi
    # We have already tried tar in the generic part.
    # Look for gnutar/gtar before invocation to avoid ugly error
    # messages.
    if (gnutar --version > /dev/null 2>&1); then
       gnutar ${1+"$@"} && exit 0
    fi
    if (gtar --version > /dev/null 2>&1); then
       gtar ${1+"$@"} && exit 0
    fi
    firstarg="$1"
    if shift; then
 	case "$firstarg" in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" ${1+"$@"} && exit 0
 	    ;;
 	esac
 	case "$firstarg" in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" ${1+"$@"} && exit 0
 	    ;;
 	esac
    fi
    echo 1>&2 "\
 WARNING: I can't seem to be able to run \`tar' with the given arguments.
         You may want to install GNU tar or Free paxutils, or check the
         command line arguments."
    exit 1
    ;;
  *)
    echo 1>&2 "\
 WARNING: \`$1' is needed, and you do not seem to have it handy on your
         system.  You might have modified some files without having the
         proper tools for further handling them.  Check the \`README' file,
         it often tells you about the needed prerequirements for installing
         this package.  You may also peek at any GNU archive site, in case
         some other package would contain this missing \`$1' program."
    exit 1
    ;;
 esac
-# Run the given program, remember its exit status.
+exit 0
 "$@"; st=$?
 # If it succeeded, we are done.
 test $st -eq 0 && exit 0
 # Also exit now if we it failed (or wasn't found), and '--version' was
 # passed; such an option is passed most likely to detect whether the
 # program is present and works.
 case $2 in --version|--help) exit $st;; esac
 # Exit code 63 means version mismatch.  This often happens when the user
 # tries to use an ancient version of a tool on a file that requires a
 # minimum version.
 if test $st -eq 63; then
  msg="probably too old"
 elif test $st -eq 127; then
  # Program was missing.
  msg="missing on your system"
 else
  # Program was found and executed, but failed.  Give up.
  exit $st
 fi
 perl_URL=http://www.perl.org/
 flex_URL=http://flex.sourceforge.net/
 gnu_software_URL=http://www.gnu.org/software
 program_details ()
 {
  case $1 in
    aclocal|automake)
      echo "The '$1' program is part of the GNU Automake package:"
      echo "<$gnu_software_URL/automake>"
      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
      echo "<$gnu_software_URL/autoconf>"
      echo "<$gnu_software_URL/m4/>"
      echo "<$perl_URL>"
      ;;
    autoconf|autom4te|autoheader)
      echo "The '$1' program is part of the GNU Autoconf package:"
      echo "<$gnu_software_URL/autoconf/>"
      echo "It also requires GNU m4 and Perl in order to run:"
      echo "<$gnu_software_URL/m4/>"
      echo "<$perl_URL>"
      ;;
  esac
 }
 give_advice ()
 {
  # Normalize program name to check for.
  normalized_program=`echo "$1" | sed '
    s/^gnu-//; t
    s/^gnu//; t
    s/^g//; t'`
  printf '%s\n' "'$1' is $msg."
  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
  case $normalized_program in
    autoconf*)
      echo "You should only need it if you modified 'configure.ac',"
      echo "or m4 files included by it."
      program_details 'autoconf'
      ;;
    autoheader*)
      echo "You should only need it if you modified 'acconfig.h' or"
      echo "$configure_deps."
      program_details 'autoheader'
      ;;
    automake*)
      echo "You should only need it if you modified 'Makefile.am' or"
      echo "$configure_deps."
      program_details 'automake'
      ;;
    aclocal*)
      echo "You should only need it if you modified 'acinclude.m4' or"
      echo "$configure_deps."
      program_details 'aclocal'
      ;;
   autom4te*)
      echo "You might have modified some maintainer files that require"
      echo "the 'autom4te' program to be rebuilt."
      program_details 'autom4te'
      ;;
    bison*|yacc*)
      echo "You should only need it if you modified a '.y' file."
      echo "You may want to install the GNU Bison package:"
      echo "<$gnu_software_URL/bison/>"
      ;;
    lex*|flex*)
      echo "You should only need it if you modified a '.l' file."
      echo "You may want to install the Fast Lexical Analyzer package:"
      echo "<$flex_URL>"
      ;;
    help2man*)
      echo "You should only need it if you modified a dependency" \
           "of a man page."
      echo "You may want to install the GNU Help2man package:"
      echo "<$gnu_software_URL/help2man/>"
    ;;
    makeinfo*)
      echo "You should only need it if you modified a '.texi' file, or"
      echo "any other file indirectly affecting the aspect of the manual."
      echo "You might want to install the Texinfo package:"
      echo "<$gnu_software_URL/texinfo/>"
      echo "The spurious makeinfo call might also be the consequence of"
      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
      echo "want to install GNU make:"
      echo "<$gnu_software_URL/make/>"
      ;;
    *)
      echo "You might have modified some files without having the proper"
      echo "tools for further handling them.  Check the 'README' file, it"
      echo "often tells you about the needed prerequisites for installing"
      echo "this package.  You may also peek at any GNU archive site, in"
      echo "case some other package contains this missing '$1' program."
      ;;
  esac
 }
 give_advice "$1" | sed -e '1s/^/WARNING: /' \
                       -e '2,$s/^/         /' >&2
 # Propagate the correct exit status (expected to be 127 for a program
 # not found, 63 for a program that failed due to version mismatch).
 exit $st
 # Local variables:
 # 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:
--- a/40
+++ b/40
@@ -0,0 +1,40 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 # Author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
 # Public domain
 # $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
 errstatus=0
 for file
 do
   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
   shift
   pathcomp=
   for d
   do
     pathcomp="$pathcomp$d"
     case "$pathcomp" in
       -* ) pathcomp=./$pathcomp ;;
     esac
     if test ! -d "$pathcomp"; then
        echo "mkdir $pathcomp"
        mkdir "$pathcomp" || lasterr=$?
        if test ! -d "$pathcomp"; then
  	  errstatus=$lasterr
        fi
     fi
     pathcomp="$pathcomp/"
   done
 done
 exit $errstatus
 # mkinstalldirs ends here
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "November 20, 2014"
+.TH PNG 5 "November 15, 2006"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
@@ -18,7 +18,7 @@ gamma and chromaticity data for improved color matching on heterogeneous
 platforms.
 .SH "SEE ALSO"
-.BR "libpng"(3), " libpngpf"(3), " zlib"(3), " deflate"(5), " " and " zlib"(5)
+.IR libpng(3), zlib(3), deflate(5), and zlib(5)
 .LP
 PNG specification (second edition), November 2003:
 .IP
--- a/png.c
+++ b/png.c
--- a/png.h
+++ b/png.h
--- a/pngconf.h
+++ b/pngconf.h
--- a/pngdebug.h
+++ b/pngdebug.h
@@ -1,154 +0,0 @@
 /* pngdebug.h - Debugging macros for libpng, also used in pngtest.c
 *
 * Copyright (c) 1998-2014 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.18 [February 6, 2014]
 *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */
 /* Define PNG_DEBUG at compile time for debugging information.  Higher
 * numbers for PNG_DEBUG mean more debugging information.  This has
 * only been added since version 0.95 so it is not implemented throughout
 * libpng yet, but more support will be added as needed.
 *
 * png_debug[1-2]?(level, message ,arg{0-2})
 *   Expands to a statement (either a simple expression or a compound
 *   do..while(0) statement) that outputs a message with parameter
 *   substitution if PNG_DEBUG is defined to 2 or more.  If PNG_DEBUG
 *   is undefined, 0 or 1 every png_debug expands to a simple expression
 *   (actually ((void)0)).
 *
 *   level: level of detail of message, starting at 0.  A level 'n'
 *          message is preceded by 'n' 3-space indentations (not implemented
 *          on Microsoft compilers unless PNG_DEBUG_FILE is also
 *          defined, to allow debug DLL compilation with no standard IO).
 *   message: a printf(3) style text string.  A trailing '\n' is added
 *            to the message.
 *   arg: 0 to 2 arguments for printf(3) style substitution in message.
 */
 #ifndef PNGDEBUG_H
 #define PNGDEBUG_H
 /* These settings control the formatting of messages in png.c and pngerror.c */
 /* Moved to pngdebug.h at 1.5.0 */
 #  ifndef PNG_LITERAL_SHARP
 #    define PNG_LITERAL_SHARP 0x23
 #  endif
 #  ifndef PNG_LITERAL_LEFT_SQUARE_BRACKET
 #    define PNG_LITERAL_LEFT_SQUARE_BRACKET 0x5b
 #  endif
 #  ifndef PNG_LITERAL_RIGHT_SQUARE_BRACKET
 #    define PNG_LITERAL_RIGHT_SQUARE_BRACKET 0x5d
 #  endif
 #  ifndef PNG_STRING_NEWLINE
 #    define PNG_STRING_NEWLINE "\n"
 #  endif
 #ifdef PNG_DEBUG
 #  if (PNG_DEBUG > 0)
 #    if !defined(PNG_DEBUG_FILE) && defined(_MSC_VER)
 #      include <crtdbg.h>
 #      if (PNG_DEBUG > 1)
 #        ifndef _DEBUG
 #          define _DEBUG
 #        endif
 #        ifndef png_debug
 #          define png_debug(l,m)  _RPT0(_CRT_WARN,m PNG_STRING_NEWLINE)
 #        endif
 #        ifndef png_debug1
 #          define png_debug1(l,m,p1)  _RPT1(_CRT_WARN,m PNG_STRING_NEWLINE,p1)
 #        endif
 #        ifndef png_debug2
 #          define png_debug2(l,m,p1,p2) \
             _RPT2(_CRT_WARN,m PNG_STRING_NEWLINE,p1,p2)
 #        endif
 #      endif
 #    else /* PNG_DEBUG_FILE || !_MSC_VER */
 #      ifndef PNG_STDIO_SUPPORTED
 #        include <stdio.h> /* not included yet */
 #      endif
 #      ifndef PNG_DEBUG_FILE
 #        define PNG_DEBUG_FILE stderr
 #      endif /* PNG_DEBUG_FILE */
 #      if (PNG_DEBUG > 1)
 #        ifdef __STDC__
 #          ifndef png_debug
 #            define png_debug(l,m) \
       do { \
       int num_tabs=l; \
       fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? "   " : \
         (num_tabs==2 ? "      " : (num_tabs>2 ? "         " : "")))); \
       } while (0)
 #          endif
 #          ifndef png_debug1
 #            define png_debug1(l,m,p1) \
       do { \
       int num_tabs=l; \
       fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? "   " : \
         (num_tabs==2 ? "      " : (num_tabs>2 ? "         " : ""))),p1); \
       } while (0)
 #          endif
 #          ifndef png_debug2
 #            define png_debug2(l,m,p1,p2) \
       do { \
       int num_tabs=l; \
       fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? "   " : \
         (num_tabs==2 ? "      " : (num_tabs>2 ? "         " : ""))),p1,p2);\
       } while (0)
 #          endif
 #        else /* __STDC __ */
 #          ifndef png_debug
 #            define png_debug(l,m) \
       do { \
       int num_tabs=l; \
       char format[256]; \
       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
         m,PNG_STRING_NEWLINE); \
       fprintf(PNG_DEBUG_FILE,format); \
       } while (0)
 #          endif
 #          ifndef png_debug1
 #            define png_debug1(l,m,p1) \
       do { \
       int num_tabs=l; \
       char format[256]; \
       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
         m,PNG_STRING_NEWLINE); \
       fprintf(PNG_DEBUG_FILE,format,p1); \
       } while (0)
 #          endif
 #          ifndef png_debug2
 #            define png_debug2(l,m,p1,p2) \
       do { \
       int num_tabs=l; \
       char format[256]; \
       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
         m,PNG_STRING_NEWLINE); \
       fprintf(PNG_DEBUG_FILE,format,p1,p2); \
       } while (0)
 #          endif
 #        endif /* __STDC __ */
 #      endif /* (PNG_DEBUG > 1) */
 #    endif /* _MSC_VER */
 #  endif /* (PNG_DEBUG > 0) */
 #endif /* PNG_DEBUG */
 #ifndef png_debug
 #  define png_debug(l, m) ((void)0)
 #endif
 #ifndef png_debug1
 #  define png_debug1(l, m, p1) ((void)0)
 #endif
 #ifndef png_debug2
 #  define png_debug2(l, m, p1, p2) ((void)0)
 #endif
 #endif /* PNGDEBUG_H */
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,79 +1,69 @@
 /* pngerror.c - stub functions for i/o and memory allocation
 *
- * Last changed in libpng 1.5.19 [August 21, 2014]
+ * Last changed in libpng 1.2.13 November 13, 2006
- * Copyright (c) 1998-2014 Glenn Randers-Pehrson
+ * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2006 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.)
 *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
 * This file provides a location for all error handling.  Users who
 * need special error handling are expected to write replacement functions
 * and use png_set_error_fn() to use those functions.  See the instructions
 * at each function.
 */
-#include "pngpriv.h"
+#define PNG_INTERNAL
 #include "png.h"
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
+static void /* PRIVATE */
-static PNG_FUNCTION(void, png_default_error,PNGARG((png_structp png_ptr,
+png_default_error PNGARG((png_structp png_ptr,
-    png_const_charp error_message)),PNG_NORETURN);
+  png_const_charp error_message));
 #ifdef PNG_WARNINGS_SUPPORTED
 static void /* PRIVATE */
 png_default_warning PNGARG((png_structp png_ptr,
-   png_const_charp warning_message));
+  png_const_charp warning_message));
 #endif /* PNG_WARNINGS_SUPPORTED */
 /* This function is called whenever there is a fatal error.  This function
 * should not be changed.  If there is a need to handle errors differently,
 * you should supply a replacement error function and use png_set_error_fn()
 * to replace the error function at run-time.
 */
-#ifdef PNG_ERROR_TEXT_SUPPORTED
+void PNGAPI
-PNG_FUNCTION(void,PNGAPI
+png_error(png_structp png_ptr, png_const_charp error_message)
 png_error,(png_structp png_ptr, png_const_charp error_message),PNG_NORETURN)
 {
 #ifdef PNG_ERROR_NUMBERS_SUPPORTED
   char msg[16];
   if (png_ptr != NULL)
   {
-      if (png_ptr->flags&
+     if (png_ptr->flags&
-         (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
+       (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
-      {
+     {
-         if (*error_message == PNG_LITERAL_SHARP)
+       if (*error_message == '#')
-         {
+       {
-            /* Strip "#nnnn " from beginning of error message. */
+           int offset;
-            int offset;
+           for (offset=1; offset<15; offset++)
-            for (offset = 1; offset<15; offset++)
+              if (*(error_message+offset) == ' ')
               if (error_message[offset] == ' ')
                  break;
-
+           if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
-            if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
+           {
-            {
+              int i;
-               int i;
+              for (i=0; i<offset-1; i++)
-               for (i = 0; i < offset - 1; i++)
+                 msg[i]=error_message[i+1];
-                  msg[i] = error_message[i + 1];
+              msg[i]='\0';
-               msg[i - 1] = '\0';
+              error_message=msg;
-               error_message = msg;
+           }
-            }
+           else
-
+              error_message+=offset;
-            else
+       }
-               error_message += offset;
+       else
-      }
+       {
-
+           if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
-      else
+           {
-      {
+              msg[0]='0';
-         if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
+              msg[1]='\0';
-         {
+              error_message=msg;
-            msg[0] = '0';
+           }
            msg[1] = '\0';
            error_message = msg;
         }
       }
     }
   }
@@ -85,126 +75,7 @@ png_error,(png_structp png_ptr, png_const_charp error_message),PNG_NORETURN)
      use the default handler, which will not return. */
   png_default_error(png_ptr, error_message);
 }
 #else
 PNG_FUNCTION(void,PNGAPI
 png_err,(png_structp png_ptr),PNG_NORETURN)
 {
   /* Prior to 1.5.2 the error_fn received a NULL pointer, expressed
    * erroneously as '\0', instead of the empty string "".  This was
    * apparently an error, introduced in libpng-1.2.20, and png_default_error
    * will crash in this case.
    */
   if (png_ptr != NULL && png_ptr->error_fn != NULL)
      (*(png_ptr->error_fn))(png_ptr, "");
   /* If the custom handler doesn't exist, or if it returns,
      use the default handler, which will not return. */
   png_default_error(png_ptr, "");
 }
 #endif /* PNG_ERROR_TEXT_SUPPORTED */
 /* Utility to safely appends strings to a buffer.  This never errors out so
 * error checking is not required in the caller.
 */
 size_t
 png_safecat(png_charp buffer, size_t bufsize, size_t pos,
   png_const_charp string)
 {
   if (buffer != NULL && pos < bufsize)
   {
      if (string != NULL)
         while (*string != '\0' && pos < bufsize-1)
           buffer[pos++] = *string++;
      buffer[pos] = '\0';
   }
   return pos;
 }
 #if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_TIME_RFC1123_SUPPORTED)
 /* Utility to dump an unsigned value into a buffer, given a start pointer and
 * and end pointer (which should point just *beyond* the end of the buffer!)
 * Returns the pointer to the start of the formatted string.
 */
 png_charp
 png_format_number(png_const_charp start, png_charp end, int format,
   png_alloc_size_t number)
 {
   int count = 0;    /* number of digits output */
   int mincount = 1; /* minimum number required */
   int output = 0;   /* digit output (for the fixed point format) */
   *--end = '\0';
   /* This is written so that the loop always runs at least once, even with
    * number zero.
    */
   while (end > start && (number != 0 || count < mincount))
   {
      static const char digits[] = "0123456789ABCDEF";
      switch (format)
      {
         case PNG_NUMBER_FORMAT_fixed:
            /* Needs five digits (the fraction) */
            mincount = 5;
            if (output || number % 10 != 0)
            {
               *--end = digits[number % 10];
               output = 1;
            }
            number /= 10;
            break;
         case PNG_NUMBER_FORMAT_02u:
            /* Expects at least 2 digits. */
            mincount = 2;
            /* FALL THROUGH */
         case PNG_NUMBER_FORMAT_u:
            *--end = digits[number % 10];
            number /= 10;
            break;
         case PNG_NUMBER_FORMAT_02x:
            /* This format expects at least two digits */
            mincount = 2;
            /* FALL THROUGH */
         case PNG_NUMBER_FORMAT_x:
            *--end = digits[number & 0xf];
            number >>= 4;
            break;
         default: /* an error */
            number = 0;
            break;
      }
      /* Keep track of the number of digits added */
      ++count;
      /* Float a fixed number here: */
      if (format == PNG_NUMBER_FORMAT_fixed) if (count == 5) if (end > start)
      {
         /* End of the fraction, but maybe nothing was output?  In that case
          * drop the decimal point.  If the number is a true zero handle that
          * here.
          */
         if (output != 0)
            *--end = '.';
         else if (number == 0) /* and !output */
            *--end = '0';
      }
   }
   return end;
 }
 #endif
 #ifdef PNG_WARNINGS_SUPPORTED
 /* This function is called whenever there is a non-fatal error.  This function
 * should not be changed.  If there is a need to handle warnings differently,
 * you should supply a replacement warning function and use
@@ -218,153 +89,23 @@ png_warning(png_structp png_ptr, png_const_charp warning_message)
   {
 #ifdef PNG_ERROR_NUMBERS_SUPPORTED
   if (png_ptr->flags&
-       (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
+     (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
 #endif
-      {
+     {
-         if (*warning_message == PNG_LITERAL_SHARP)
+       if (*warning_message == '#')
-         {
+       {
-            for (offset = 1; offset < 15; offset++)
+           for (offset=1; offset<15; offset++)
-               if (warning_message[offset] == ' ')
+              if (*(warning_message+offset) == ' ')
                  break;
-         }
+       }
-      }
+     }
     if (png_ptr != NULL && png_ptr->warning_fn != NULL)
        (*(png_ptr->warning_fn))(png_ptr, warning_message+offset);
   }
   if (png_ptr != NULL && png_ptr->warning_fn != NULL)
      (*(png_ptr->warning_fn))(png_ptr, warning_message + offset);
   else
-      png_default_warning(png_ptr, warning_message + offset);
+      png_default_warning(png_ptr, warning_message+offset);
 }
 /* These functions support 'formatted' warning messages with up to
 * PNG_WARNING_PARAMETER_COUNT parameters.  In the format string the parameter
 * is introduced by @<number>, where 'number' starts at 1.  This follows the
 * standard established by X/Open for internationalizable error messages.
 */
 void
 png_warning_parameter(png_warning_parameters p, int number,
   png_const_charp string)
 {
   if (number > 0 && number <= PNG_WARNING_PARAMETER_COUNT)
      (void)png_safecat(p[number-1], (sizeof p[number-1]), 0, string);
 }
 void
 png_warning_parameter_unsigned(png_warning_parameters p, int number, int format,
   png_alloc_size_t value)
 {
   char buffer[PNG_NUMBER_BUFFER_SIZE];
   png_warning_parameter(p, number, PNG_FORMAT_NUMBER(buffer, format, value));
 }
 void
 png_warning_parameter_signed(png_warning_parameters p, int number, int format,
   png_int_32 value)
 {
   png_alloc_size_t u;
   png_charp str;
   char buffer[PNG_NUMBER_BUFFER_SIZE];
   /* Avoid overflow by doing the negate in a png_alloc_size_t: */
   u = (png_alloc_size_t)value;
   if (value < 0)
      u = ~u + 1;
   str = PNG_FORMAT_NUMBER(buffer, format, u);
   if (value < 0 && str > buffer)
      *--str = '-';
   png_warning_parameter(p, number, str);
 }
 void
 png_formatted_warning(png_structp png_ptr, png_warning_parameters p,
   png_const_charp message)
 {
   /* The internal buffer is just 192 bytes - enough for all our messages,
    * overflow doesn't happen because this code checks!  If someone figures
    * out how to send us a message longer than 192 bytes, all that will
    * happen is that the message will be truncated appropriately.
    */
   size_t i = 0; /* Index in the msg[] buffer: */
   char msg[192];
   /* Each iteration through the following loop writes at most one character
    * to msg[i++] then returns here to validate that there is still space for
    * the trailing '\0'.  It may (in the case of a parameter) read more than
    * one character from message[]; it must check for '\0' and continue to the
    * test if it finds the end of string.
    */
   while (i<(sizeof msg)-1 && *message != '\0')
   {
      /* '@' at end of string is now just printed (previously it was skipped);
       * it is an error in the calling code to terminate the string with @.
       */
      if (p != NULL && *message == '@' && message[1] != '\0')
      {
         int parameter_char = *++message; /* Consume the '@' */
         static const char valid_parameters[] = "123456789";
         int parameter = 0;
         /* Search for the parameter digit, the index in the string is the
          * parameter to use.
          */
         while (valid_parameters[parameter] != parameter_char &&
            valid_parameters[parameter] != '\0')
            ++parameter;
         /* If the parameter digit is out of range it will just get printed. */
         if (parameter < PNG_WARNING_PARAMETER_COUNT)
         {
            /* Append this parameter */
            png_const_charp parm = p[parameter];
            png_const_charp pend = p[parameter] + (sizeof p[parameter]);
            /* No need to copy the trailing '\0' here, but there is no guarantee
             * that parm[] has been initialized, so there is no guarantee of a
             * trailing '\0':
             */
            while (i<(sizeof msg)-1 && *parm != '\0' && parm < pend)
               msg[i++] = *parm++;
            /* Consume the parameter digit too: */
            ++message;
            continue;
         }
         /* else not a parameter and there is a character after the @ sign; just
          * copy that.  This is known not to be '\0' because of the test above.
          */
      }
      /* At this point *message can't be '\0', even in the bad parameter case
       * above where there is a lone '@' at the end of the message string.
       */
      msg[i++] = *message++;
   }
   /* i is always less than (sizeof msg), so: */
   msg[i] = '\0';
   /* And this is the formatted message, it may be larger than
    * PNG_MAX_ERROR_TEXT, but that is only used for 'chunk' errors and these are
    * not (currently) formatted.
    */
   png_warning(png_ptr, msg);
 }
 #endif /* PNG_WARNINGS_SUPPORTED */
 #ifdef PNG_BENIGN_ERRORS_SUPPORTED
 void PNGAPI
 png_benign_error(png_structp png_ptr, png_const_charp error_message)
 {
  if (png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN)
     png_warning(png_ptr, error_message);
  else
     png_error(png_ptr, error_message);
 }
 #endif
 /* These utilities are used internally to build an error message that relates
 * to the current chunk.  The chunk name comes from png_ptr->chunk_name,
 * this is used to prefix the message.  The message is limited in length
@@ -377,216 +118,122 @@ static PNG_CONST char png_digit[16] = {
   'A', 'B', 'C', 'D', 'E', 'F'
 };
 #define PNG_MAX_ERROR_TEXT 64
 #if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_ERROR_TEXT_SUPPORTED)
 static void /* PRIVATE */
 png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
-    error_message)
+   error_message)
 {
-   png_uint_32 chunk_name = png_ptr->chunk_name;
+   int iout = 0, iin = 0;
   int iout = 0, ishift = 24;
-   while (ishift >= 0)
+   while (iin < 4)
   {
-      int c = (int)(chunk_name >> ishift) & 0xff;
+      int c = png_ptr->chunk_name[iin++];
      ishift -= 8;
      if (isnonalpha(c))
      {
-         buffer[iout++] = PNG_LITERAL_LEFT_SQUARE_BRACKET;
+         buffer[iout++] = '[';
         buffer[iout++] = png_digit[(c & 0xf0) >> 4];
         buffer[iout++] = png_digit[c & 0x0f];
-         buffer[iout++] = PNG_LITERAL_RIGHT_SQUARE_BRACKET;
+         buffer[iout++] = ']';
      }
      else
      {
-         buffer[iout++] = (char)c;
+         buffer[iout++] = (png_byte)c;
      }
   }
   if (error_message == NULL)
-      buffer[iout] = '\0';
+      buffer[iout] = 0;
   else
   {
      int iin = 0;
      buffer[iout++] = ':';
      buffer[iout++] = ' ';
-
+      png_strncpy(buffer+iout, error_message, 63);
-      while (iin < PNG_MAX_ERROR_TEXT-1 && error_message[iin] != '\0')
+      buffer[iout+63] = 0;
         buffer[iout++] = error_message[iin++];
      /* iin < PNG_MAX_ERROR_TEXT, so the following is safe: */
      buffer[iout] = '\0';
   }
 }
 #endif /* PNG_WARNINGS_SUPPORTED || PNG_ERROR_TEXT_SUPPORTED */
-#if defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)
+void PNGAPI
-PNG_FUNCTION(void,PNGAPI
+png_chunk_error(png_structp png_ptr, png_const_charp error_message)
 png_chunk_error,(png_structp png_ptr, png_const_charp error_message),
   PNG_NORETURN)
 {
-   char msg[18+PNG_MAX_ERROR_TEXT];
+   char msg[18+64];
   if (png_ptr == NULL)
-      png_error(png_ptr, error_message);
+     png_error(png_ptr, error_message);
   else
   {
-      png_format_buffer(png_ptr, msg, error_message);
+     png_format_buffer(png_ptr, msg, error_message);
-      png_error(png_ptr, msg);
+     png_error(png_ptr, msg);
   }
 }
 #endif /* PNG_READ_SUPPORTED && PNG_ERROR_TEXT_SUPPORTED */
 #ifdef PNG_WARNINGS_SUPPORTED
 void PNGAPI
 png_chunk_warning(png_structp png_ptr, png_const_charp warning_message)
 {
-   char msg[18+PNG_MAX_ERROR_TEXT];
+   char msg[18+64];
   if (png_ptr == NULL)
-      png_warning(png_ptr, warning_message);
+     png_warning(png_ptr, warning_message);
   else
   {
-      png_format_buffer(png_ptr, msg, warning_message);
+     png_format_buffer(png_ptr, msg, warning_message);
-      png_warning(png_ptr, msg);
+     png_warning(png_ptr, msg);
   }
 }
 #endif /* PNG_WARNINGS_SUPPORTED */
 #ifdef PNG_READ_SUPPORTED
 #ifdef PNG_BENIGN_ERRORS_SUPPORTED
 void PNGAPI
 png_chunk_benign_error(png_structp png_ptr, png_const_charp error_message)
 {
   if (png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN)
      png_chunk_warning(png_ptr, error_message);
   else
      png_chunk_error(png_ptr, error_message);
 }
 #endif
 #endif /* PNG_READ_SUPPORTED */
 #ifdef PNG_ERROR_TEXT_SUPPORTED
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 PNG_FUNCTION(void,
 png_fixed_error,(png_structp png_ptr, png_const_charp name),PNG_NORETURN)
 {
 #  define fixed_message "fixed point overflow in "
 #  define fixed_message_ln ((sizeof fixed_message)-1)
   int  iin;
   char msg[fixed_message_ln+PNG_MAX_ERROR_TEXT];
   png_memcpy(msg, fixed_message, fixed_message_ln);
   iin = 0;
   if (name != NULL) while (iin < (PNG_MAX_ERROR_TEXT-1) && name[iin] != 0)
   {
      msg[fixed_message_ln + iin] = name[iin];
      ++iin;
   }
   msg[fixed_message_ln + iin] = 0;
   png_error(png_ptr, msg);
 }
 #endif
 #endif
 #ifdef PNG_SETJMP_SUPPORTED
 /* This API only exists if ANSI-C style error handling is used,
 * otherwise it is necessary for png_default_error to be overridden.
 */
 jmp_buf* PNGAPI
 png_set_longjmp_fn(png_structp png_ptr, png_longjmp_ptr longjmp_fn,
    size_t jmp_buf_size)
 {
   if (png_ptr == NULL || jmp_buf_size != png_sizeof(jmp_buf))
      return NULL;
   png_ptr->longjmp_fn = longjmp_fn;
   return &png_ptr->longjmp_buffer;
 }
 #endif
 /* This is the default error handling function.  Note that replacements for
 * this function MUST NOT RETURN, or the program will likely crash.  This
 * function is used by default, or if the program supplies NULL for the
 * error function pointer in png_set_error_fn().
 */
-static PNG_FUNCTION(void /* PRIVATE */,
+static void /* PRIVATE */
-png_default_error,(png_structp png_ptr, png_const_charp error_message),
+png_default_error(png_structp png_ptr, png_const_charp error_message)
   PNG_NORETURN)
 {
-#ifdef PNG_CONSOLE_IO_SUPPORTED
+#ifndef PNG_NO_CONSOLE_IO
 #ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   /* Check on NULL only added in 1.5.4 */
+   if (*error_message == '#')
   if (error_message != NULL && *error_message == PNG_LITERAL_SHARP)
   {
-      /* Strip "#nnnn " from beginning of error message. */
+     int offset;
-      int offset;
+     char error_number[16];
-      char error_number[16];
+     for (offset=0; offset<15; offset++)
-      for (offset = 0; offset<15; offset++)
+     {
-      {
+         error_number[offset] = *(error_message+offset+1);
-         error_number[offset] = error_message[offset + 1];
+         if (*(error_message+offset) == ' ')
-         if (error_message[offset] == ' ')
+             break;
-            break;
+     }
-      }
+     if((offset > 1) && (offset < 15))
-
+     {
-      if ((offset > 1) && (offset < 15))
+       error_number[offset-1]='\0';
-      {
+       fprintf(stderr, "libpng error no. %s: %s\n", error_number,
-         error_number[offset - 1] = '\0';
+          error_message+offset);
-         fprintf(stderr, "libpng error no. %s: %s",
+     }
-             error_number, error_message + offset + 1);
+     else
-         fprintf(stderr, PNG_STRING_NEWLINE);
+       fprintf(stderr, "libpng error: %s, offset=%d\n", error_message,offset);
      }
      else
      {
         fprintf(stderr, "libpng error: %s, offset=%d",
             error_message, offset);
         fprintf(stderr, PNG_STRING_NEWLINE);
      }
   }
   else
 #endif
-   {
+   fprintf(stderr, "libpng error: %s\n", error_message);
      fprintf(stderr, "libpng error: %s", error_message ? error_message :
         "undefined");
      fprintf(stderr, PNG_STRING_NEWLINE);
   }
 #else
   PNG_UNUSED(error_message) /* Make compiler happy */
 #endif
   png_longjmp(png_ptr, 1);
 }
 PNG_FUNCTION(void,PNGAPI
 png_longjmp,(png_structp png_ptr, int val),PNG_NORETURN)
 {
 #ifdef PNG_SETJMP_SUPPORTED
-   if (png_ptr && png_ptr->longjmp_fn)
+   if (png_ptr)
   {
 #  ifdef USE_FAR_KEYWORD
-      {
+   {
-         jmp_buf tmp_jmpbuf;
+      jmp_buf jmpbuf;
-         png_memcpy(tmp_jmpbuf, png_ptr->longjmp_buffer, png_sizeof(jmp_buf));
+      png_memcpy(jmpbuf,png_ptr->jmpbuf,png_sizeof(jmp_buf));
-         png_ptr->longjmp_fn(tmp_jmpbuf, val);
+      longjmp(jmpbuf, 1);
-      }
+   }
 #  else
-   png_ptr->longjmp_fn(png_ptr->longjmp_buffer, val);
+   longjmp(png_ptr->jmpbuf, 1);
 #  endif
   }
 #else
   PNG_UNUSED(png_ptr);
   PNG_UNUSED(val);
 #endif
   /* Here if not setjmp support or if png_ptr is null. */
   PNG_ABORT();
 #endif
 #ifdef PNG_NO_CONSOLE_IO
   /* make compiler happy */ ;
   if (&error_message != NULL)
      return;
 #endif
 }
 #ifdef PNG_WARNINGS_SUPPORTED
 /* This function is called when there is a warning, but the library thinks
 * it can continue anyway.  Replacement functions don't have to do anything
 * here if you don't want them to.  In the default configuration, png_ptr is
@@ -595,67 +242,54 @@ png_longjmp,(png_structp png_ptr, int val),PNG_NORETURN)
 static void /* PRIVATE */
 png_default_warning(png_structp png_ptr, png_const_charp warning_message)
 {
-#ifdef PNG_CONSOLE_IO_SUPPORTED
+#ifndef PNG_NO_CONSOLE_IO
 #  ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   if (*warning_message == PNG_LITERAL_SHARP)
+   if (*warning_message == '#')
   {
-      int offset;
+     int offset;
-      char warning_number[16];
+     char warning_number[16];
-      for (offset = 0; offset < 15; offset++)
+     for (offset=0; offset<15; offset++)
-      {
+     {
-         warning_number[offset] = warning_message[offset + 1];
+        warning_number[offset]=*(warning_message+offset+1);
-         if (warning_message[offset] == ' ')
+        if (*(warning_message+offset) == ' ')
            break;
-      }
+     }
-
+     if((offset > 1) && (offset < 15))
-      if ((offset > 1) && (offset < 15))
+     {
-      {
+       warning_number[offset-1]='\0';
-         warning_number[offset + 1] = '\0';
+       fprintf(stderr, "libpng warning no. %s: %s\n", warning_number,
-         fprintf(stderr, "libpng warning no. %s: %s",
+          warning_message+offset);
-             warning_number, warning_message + offset);
+     }
-         fprintf(stderr, PNG_STRING_NEWLINE);
+     else
-      }
+       fprintf(stderr, "libpng warning: %s\n", warning_message);
      else
      {
         fprintf(stderr, "libpng warning: %s",
             warning_message);
         fprintf(stderr, PNG_STRING_NEWLINE);
      }
   }
   else
 #  endif
-
+     fprintf(stderr, "libpng warning: %s\n", warning_message);
   {
      fprintf(stderr, "libpng warning: %s", warning_message);
      fprintf(stderr, PNG_STRING_NEWLINE);
   }
 #else
-   PNG_UNUSED(warning_message) /* Make compiler happy */
+   /* make compiler happy */ ;
   if (warning_message)
     return;
 #endif
-   PNG_UNUSED(png_ptr) /* Make compiler happy */
+   /* make compiler happy */ ;
   if (png_ptr)
      return;
 }
 #endif /* PNG_WARNINGS_SUPPORTED */
 /* This function is called when the application wants to use another method
 * of handling errors and warnings.  Note that the error function MUST NOT
 * return to the calling routine or serious problems will occur.  The return
- * method used in the default routine calls longjmp(png_ptr->longjmp_buffer, 1)
+ * method used in the default routine calls longjmp(png_ptr->jmpbuf, 1)
 */
 void PNGAPI
 png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warning_fn)
+   png_error_ptr error_fn, png_error_ptr warning_fn)
 {
   if (png_ptr == NULL)
      return;
   png_ptr->error_ptr = error_ptr;
   png_ptr->error_fn = error_fn;
 #ifdef PNG_WARNINGS_SUPPORTED
   png_ptr->warning_fn = warning_fn;
 #else
   PNG_UNUSED(warning_fn)
 #endif
 }
@@ -664,11 +298,10 @@ png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
 * pointer before png_write_destroy and png_read_destroy are called.
 */
 png_voidp PNGAPI
-png_get_error_ptr(png_const_structp png_ptr)
+png_get_error_ptr(png_structp png_ptr)
 {
   if (png_ptr == NULL)
      return NULL;
   return ((png_voidp)png_ptr->error_ptr);
 }
@@ -677,11 +310,10 @@ png_get_error_ptr(png_const_structp png_ptr)
 void PNGAPI
 png_set_strip_error_numbers(png_structp png_ptr, png_uint_32 strip_mode)
 {
-   if (png_ptr != NULL)
+   if(png_ptr != NULL)
   {
-      png_ptr->flags &=
+     png_ptr->flags &=
-         ((~(PNG_FLAG_STRIP_ERROR_NUMBERS |
+       ((~(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))&strip_mode);
         PNG_FLAG_STRIP_ERROR_TEXT))&strip_mode);
   }
 }
 #endif
--- a/pnggccrd.c
+++ b/pnggccrd.c
--- a/pngget.c
+++ b/pngget.c
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Glenn Randers-Pehrson	64b481e714	[libpng10] Imported from libpng-1.0.21.tar	2011-09-03 12:23:41 -05:00
Glenn Randers-Pehrson	0f5e1e5a39	[libpng10] Imported from libpng-1.0.21rc2.tar	2011-09-03 12:23:38 -05:00
Glenn Randers-Pehrson	6fbb54d253	[libpng10] Imported from libpng-1.0.21rc1.tar	2011-09-03 12:23:36 -05:00
Glenn Randers-Pehrson	fba872492b	[libpng10] Imported from libpng-1.0.20.tar	2011-09-03 12:23:33 -05:00
Glenn Randers-Pehrson	82282113b9	[libpng10] Imported from libpng-1.0.19.tar	2011-09-03 12:23:31 -05:00
Glenn Randers-Pehrson	a095d92224	[libpng10] Imported from libpng-1.0.19rc5.tar	2011-09-03 12:23:28 -05:00
Glenn Randers-Pehrson	ff518067c3	[libpng10] Imported from libpng-1.0.19rc2.tar	2011-09-03 12:23:26 -05:00
Glenn Randers-Pehrson	db576fa76b	[libpng10] Imported from libpng-1.0.19rc1.tar	2011-09-03 12:23:23 -05:00
Glenn Randers-Pehrson	b6c4193528	[libpng10] Imported from libpng-1.0.18.tar	2011-09-03 12:23:20 -05:00
Glenn Randers-Pehrson	df8fc6680e	[libpng10] Imported from libpng-1.0.17.tar	2011-09-03 12:23:18 -05:00
Glenn Randers-Pehrson	f47b4b1bf7	[libpng10] Imported from libpng-1.0.16.tar	2011-09-03 12:23:16 -05:00
Glenn Randers-Pehrson	4fc3118b59	[libpng10] Imported from libpng-1.0.15.tar	2011-09-03 12:23:14 -05:00
Glenn Randers-Pehrson	3bdb7fed6e	[libpng10] Imported from libpng-1.0.15rc3.tar	2011-09-03 12:23:11 -05:00
Glenn Randers-Pehrson	0e928a62e9	[libpng10] Imported from libpng-1.0.15rc2.tar	2011-09-03 12:23:09 -05:00
Glenn Randers-Pehrson	88f07c8451	[libpng10] Imported from libpng-1.0.15rc1.tar	2011-09-03 12:23:07 -05:00
Glenn Randers-Pehrson	787081f75b	[libpng10] Imported from libpng-1.0.14.tar	2011-09-03 12:23:05 -05:00
Glenn Randers-Pehrson	80b4f15ae3	[libpng10] Imported from libpng-1.0.13.tar	2011-09-03 12:23:02 -05:00