libpng 1.5.17

git-svn-id: svn://tug.org/texlive/trunk@31035 c570f23f-e606-0410-a88d-b1316a301751

229 files changed, 313 insertions, 242 deletions

diff --git a/Build/source/libs/README b/Build/source/libs/README
index e78666feaa1..7f840b965fa 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -14,7 +14,7 @@ cairo 1.12.14 - checked 25may13
 
 freetype 1.5 - ?
 
-freetype2 2.4.12 - checked 18may13
+freetype2 2.5.0.1 - checked 19jun13
   http://savannah.nongnu.org/download/freetype/
 
 gd 2.1.0 - checked 26jun13
@@ -29,7 +29,7 @@ harfbuzz 0.9.18 - checked 2jun13
 icu 51.1 (51_1) - checked 21mar13
   http://download.icu-project.org/files/icu4c/
 
-libpng 1.6.2 - checked 3jun13
+libpng 1.5.17 - checked 29jun13 (1.6.2 does not work)
   http://www.libpng.org/ - used by many
   http://www.libpng.org/pub/png/pngcode.html
 
diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog
index 3cf82cc71e3..7802f3d4422 100644
--- a/Build/source/libs/libpng/ChangeLog
+++ b/Build/source/libs/libpng/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import libpng-1.5.17.
+	* version.ac: Adjust.
+
 2013-06-26  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am (SUBDIRS): Build the library first.
diff --git a/Build/source/libs/libpng/configure b/Build/source/libs/libpng/configure
index a5ae84541e7..4551d5492db 100755
--- a/Build/source/libs/libpng/configure
+++ b/Build/source/libs/libpng/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libpng for TeX Live 1.5.16.
+# Generated by GNU Autoconf 2.69 for libpng for TeX Live 1.5.17.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -580,12 +580,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libpng for TeX Live'
 PACKAGE_TARNAME='libpng-for-tex-live'
-PACKAGE_VERSION='1.5.16'
-PACKAGE_STRING='libpng for TeX Live 1.5.16'
+PACKAGE_VERSION='1.5.17'
+PACKAGE_STRING='libpng for TeX Live 1.5.17'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="libpng-1.5.16/pngget.c"
+ac_unique_file="libpng-1.5.17/pngget.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1286,7 +1286,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libpng for TeX Live 1.5.16 to adapt to many kinds of systems.
+\`configure' configures libpng for TeX Live 1.5.17 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1353,7 +1353,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libpng for TeX Live 1.5.16:";;
+     short | recursive ) echo "Configuration of libpng for TeX Live 1.5.17:";;
    esac
   cat <<\_ACEOF
 
@@ -1458,7 +1458,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libpng for TeX Live configure 1.5.16
+libpng for TeX Live configure 1.5.17
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1881,7 +1881,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libpng for TeX Live $as_me 1.5.16, which was
+It was created by libpng for TeX Live $as_me 1.5.17, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3804,7 +3804,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libpng-for-tex-live'
- VERSION='1.5.16'
+ VERSION='1.5.17'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5681,7 +5681,7 @@ LIBS=$kpse_save_LIBS
 echo timestamp >config.force
 fi
 
-LIBPNG_TREE=libpng-1.5.16
+LIBPNG_TREE=libpng-1.5.17
 
 
 LIBPNG_DEFINES='-DPNG_CONFIGURE_LIBPNG -DPNG_NO_MMX_CODE'
@@ -6232,7 +6232,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libpng for TeX Live $as_me 1.5.16, which was
+This file was extended by libpng for TeX Live $as_me 1.5.17, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6298,7 +6298,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libpng for TeX Live config.status 1.5.16
+libpng for TeX Live config.status 1.5.17
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/libs/libpng/libpng-1.5.16/ANNOUNCE b/Build/source/libs/libpng/libpng-1.5.16/ANNOUNCE
deleted file mode 100644
index 36f2d5192c3..00000000000
--- a/Build/source/libs/libpng/libpng-1.5.16/ANNOUNCE
+++ /dev/null
@@ -1,60 +0,0 @@
-
-Libpng 1.5.16 - May 23, 2013
-
-This is a public release of libpng, intended for use in production codes.
-
-Files available for download:
-
-Source files with LF line endings (for Unix/Linux) and with a
-"configure" script
-
-   libpng-1.5.16.tar.xz (LZMA-compressed, recommended)
-   libpng-1.5.16.tar.gz
-   libpng-1.5.16.tar.bz2
-
-Source files with CRLF line endings (for Windows), without the
-"configure" script
-
-   lpng1516.7z  (LZMA-compressed, recommended)
-   lpng1516.zip
-
-Other information:
-
-   libpng-1.5.16-README.txt
-   libpng-1.5.16-LICENSE.txt
-
-Changes since the last public release (1.5.15):
-
-  Corrected a misplaced closing bracket in contrib/libtests/pngvalid.c
-    (Flavio Medeiros).
-  Revised stack marking in arm/filter_neon.S and configure.ac
-  Ensure that NEON filter stuff is completely disabled when switched 'off'.
-    Previously the ARM NEON specific files were still built if the option
-    was switched 'off' as opposed to being explicitly disabled.
-  Avoid a compiler warning about unused png_ptr in translate_gamma_flags()
-  Revise pngtest.c to skip tests of unsupported features.
-  Test for 'arm*' not just 'arm' in the host_cpu configure variable.
-  Rebuilt the configure scripts.
-  Expanded manual paragraph about writing private chunks, particularly
-    the need to call png_set_keep_unknown_chunks() when writing them.
-  Updated contrib/pngminus/pnm2png.c (Paul Stewart):
-    Check for EOF
-    Ignore "#" delimited comments in input file to pnm2png.c.
-    Fixed whitespace handling
-    Added a call to png_set_packing()
-    Initialize dimension values so if sscanf fails at least we have known
-      invalid values.
-  Allow contrib/pnminus/pnm2png.c to compile without WRITE_INVERT and WRITE_PACK
-    supported (writes error message that it can't read P1 or P4 PBM files).
-  Revised contrib/pngminim/*/makefile to separate CPPFLAGS and CFLAGS, and
-    to generate pnglibconf.h with the right zlib header files.
-  Ported contrib/pngminus/pnm2png.c changes back from libpng-1.6.3beta06,
-    to use unsigned long, not png_uint_32 arguments to sscanf().
-
-Send comments/corrections/commendations to png-mng-implement at lists.sf.net
-(subscription required; visit
-https://lists.sourceforge.net/lists/listinfo/png-mng-implement
-to subscribe)
-or to glennrp at users.sourceforge.net
-
-Glenn R-P
diff --git a/Build/source/libs/libpng/libpng-1.5.16-PATCHES/ChangeLog b/Build/source/libs/libpng/libpng-1.5.17-PATCHES/ChangeLog
index 26311ea5079..26311ea5079 100644
--- a/Build/source/libs/libpng/libpng-1.5.16-PATCHES/ChangeLog
+++ b/Build/source/libs/libpng/libpng-1.5.17-PATCHES/ChangeLog
diff --git a/Build/source/libs/libpng/libpng-1.5.16-PATCHES/TL-Changes b/Build/source/libs/libpng/libpng-1.5.17-PATCHES/TL-Changes
index 433ef85414d..b81b0a5b52a 100644
--- a/Build/source/libs/libpng/libpng-1.5.16-PATCHES/TL-Changes
+++ b/Build/source/libs/libpng/libpng-1.5.17-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
-Changes applied to the libpng-1.5.16/ tree as obtained from:
-	http://www.libpng.org/ libpng-1.5.16.tar.xz
+Changes applied to the libpng-1.5.17/ tree as obtained from:
+	http://www.libpng.org/ libpng-1.5.17.tar.xz
 
 Copied:
 	scripts/pnglibconf.h.prebuilt -> pnglibconf.h
diff --git a/Build/source/libs/libpng/libpng-1.5.17/ANNOUNCE b/Build/source/libs/libpng/libpng-1.5.17/ANNOUNCE
new file mode 100644
index 00000000000..c5ef18ec9a9
--- /dev/null
+++ b/Build/source/libs/libpng/libpng-1.5.17/ANNOUNCE
@@ -0,0 +1,60 @@
+
+Libpng 1.5.17 - June 27, 2013
+
+This is a public release of libpng, intended for use in production codes.
+
+Files available for download:
+
+Source files with LF line endings (for Unix/Linux) and with a
+"configure" script
+
+   libpng-1.5.17.tar.xz (LZMA-compressed, recommended)
+   libpng-1.5.17.tar.gz
+   libpng-1.5.17.tar.bz2
+
+Source files with CRLF line endings (for Windows), without the
+"configure" script
+
+   lpng1517.7z  (LZMA-compressed, recommended)
+   lpng1517.zip
+
+Other information:
+
+   libpng-1.5.17-README.txt
+   libpng-1.5.17-LICENSE.txt
+
+Changes since the last public release (1.5.16):
+
+  Removed a redundant test from png_set_IHDR().
+  Added set(CMAKE_CONFIGURATION_TYPES ...) to CMakeLists.txt (Andrew Hundt)
+  Deleted set(CMAKE_BUILD_TYPE) block from CMakeLists.txt
+  Make ARM NEON support work at compile time (not just configure time).
+    This moves the test on __ARM_NEON__ into pngconf.h to avoid issues when
+    using a compiler that compiles for multiple architectures at one time.
+  Removed PNG_FILTER_OPTIMIZATIONS and PNG_ARM_NEON_SUPPORTED from
+    pnglibconf.h, allowing more of the decisions to be made internally
+    (pngpriv.h) during the compile.  Without this, symbol prefixing is broken
+    under certain circumstances on ARM platforms.  Now only the API parts of
+    the optimizations ('check' vs 'api') are exposed in the public header files
+    except that the new setting PNG_ARM_NEON_OPT documents how libpng makes the
+    decision about whether or not to use the optimizations.
+  Protect symbol prefixing against CC/CPPFLAGS/CFLAGS useage.
+    Previous iOS/Xcode fixes for the ARM NEON optimizations moved the test
+    on __ARM_NEON__ from configure time to compile time.  This breaks symbol
+    prefixing because the definition of the special png_init_filter_functions
+    call was hidden at configure time if the relevant compiler arguments are
+    passed in CFLAGS as opposed to CC.  This change attempts to avoid all
+    the confusion that would result by declaring the init function even when
+    it is not used, so that it will always get prefixed.
+  Revised libpng.3 so that "doclifter" can process it.
+  Revised example.c to illustrate use of PNG_DEFAULT_sRGB and PNG_GAMMA_MAC_18
+    as parameters for png_set_gamma().  These have been available since
+    libpng-1.5.4.
+
+Send comments/corrections/commendations to png-mng-implement at lists.sf.net
+(subscription required; visit
+https://lists.sourceforge.net/lists/listinfo/png-mng-implement
+to subscribe)
+or to glennrp at users.sourceforge.net
+
+Glenn R-P
diff --git a/Build/source/libs/libpng/libpng-1.5.16/CHANGES b/Build/source/libs/libpng/libpng-1.5.17/CHANGES
index 097f9041577..ff0e8507b1a 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/CHANGES
+++ b/Build/source/libs/libpng/libpng-1.5.17/CHANGES
@@ -4111,6 +4111,44 @@ Version 1.5.16rc01 [May 16, 2013]
   No changes.
 
 Version 1.5.16 [May 23, 2013]
+  No changes.
+
+Version 1.5.17beta01 [June 8, 2013]
+  Removed a redundant test from png_set_IHDR().
+  Added set(CMAKE_CONFIGURATION_TYPES ...) to CMakeLists.txt (Andrew Hundt)
+  Deleted set(CMAKE_BUILD_TYPE) block from CMakeLists.txt
+  Make ARM NEON support work at compile time (not just configure time).
+    This moves the test on __ARM_NEON__ into pngconf.h to avoid issues when
+    using a compiler that compiles for multiple architectures at one time.
+  Removed PNG_FILTER_OPTIMIZATIONS and PNG_ARM_NEON_SUPPORTED from
+    pnglibconf.h, allowing more of the decisions to be made internally
+    (pngpriv.h) during the compile.  Without this, symbol prefixing is broken
+    under certain circumstances on ARM platforms.  Now only the API parts of
+    the optimizations ('check' vs 'api') are exposed in the public header files
+    except that the new setting PNG_ARM_NEON_OPT documents how libpng makes the
+    decision about whether or not to use the optimizations.
+  Protect symbol prefixing against CC/CPPFLAGS/CFLAGS useage.
+    Previous iOS/Xcode fixes for the ARM NEON optimizations moved the test
+    on __ARM_NEON__ from configure time to compile time.  This breaks symbol
+    prefixing because the definition of the special png_init_filter_functions
+    call was hidden at configure time if the relevant compiler arguments are
+    passed in CFLAGS as opposed to CC.  This change attempts to avoid all
+    the confusion that would result by declaring the init function even when
+    it is not used, so that it will always get prefixed.
+
+Version 1.5.17rc01 [June 17, 2013]
+  No changes.
+
+Version 1.5.17rc02 [June 18, 2013]
+  Revised libpng.3 so that "doclifter" can process it.
+
+Version 1.5.17rc03 [June 25, 2013]
+  Revised example.c to illustrate use of PNG_DEFAULT_sRGB and PNG_GAMMA_MAC_18
+    as parameters for png_set_gamma().  These have been available since
+    libpng-1.5.4.
+
+Version 1.5.17 [June 27, 2013]
+  No changes.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/Build/source/libs/libpng/libpng-1.5.16/CMakeLists.txt b/Build/source/libs/libpng/libpng-1.5.17/CMakeLists.txt
index bea0af53fb5..f0514d08f34 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/CMakeLists.txt
+++ b/Build/source/libs/libpng/libpng-1.5.17/CMakeLists.txt
@@ -1,6 +1,6 @@
 # CMakeLists.txt
 
-# Copyright (C) 2007-2011 Glenn Randers-Pehrson
+# Copyright (C) 2007-2013 Glenn Randers-Pehrson
 
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
@@ -9,33 +9,14 @@
 cmake_minimum_required(VERSION 2.4.4)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
-if(UNIX AND NOT DEFINED CMAKE_BUILD_TYPE)
-  if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
-    # workaround CMake 2.4.x bug
-    set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
-        "Choose the type of build, options are:
-           None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used)
-           Debug
-           Release
-           RelWithDebInfo
-           MinSizeRel.")
-  else()
-    set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
-        "Choose the type of build, options are:
-           None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used)
-           Debug
-           Release
-           RelWithDebInfo
-           MinSizeRel.")
-  endif()
-endif()
+set(CMAKE_CONFIGURATION_TYPES "Release;Debug;MinSizeRel;RelWithDebInfo")
 
 project(libpng C)
 enable_testing()
 
 set(PNGLIB_MAJOR 1)
 set(PNGLIB_MINOR 5)
-set(PNGLIB_RELEASE 16)
+set(PNGLIB_RELEASE 17)
 set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
 set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
 
@@ -236,7 +217,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW)
 # SET UP LINKS
 if(PNG_SHARED)
   set_target_properties(${PNG_LIB_NAME} PROPERTIES
-#   VERSION 15.${PNGLIB_RELEASE}.1.5.16
+#   VERSION 15.${PNGLIB_RELEASE}.1.5.17
     VERSION 15.${PNGLIB_RELEASE}.0
     SOVERSION 15
     CLEAN_DIRECT_OUTPUT 1)
diff --git a/Build/source/libs/libpng/libpng-1.5.16/INSTALL b/Build/source/libs/libpng/libpng-1.5.17/INSTALL
index f9873780098..f9873780098 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/INSTALL
+++ b/Build/source/libs/libpng/libpng-1.5.17/INSTALL
diff --git a/Build/source/libs/libpng/libpng-1.5.16/LICENSE b/Build/source/libs/libpng/libpng-1.5.17/LICENSE
index f84edc6d1df..ddd935196b2 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/LICENSE
+++ b/Build/source/libs/libpng/libpng-1.5.17/LICENSE
@@ -10,7 +10,7 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.2.6, August 15, 2004, through 1.5.16, May 23, 2013, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.17, June 27, 2013, are
 Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-May 23, 2013
+June 27, 2013
diff --git a/Build/source/libs/libpng/libpng-1.5.16/Makefile.am b/Build/source/libs/libpng/libpng-1.5.17/Makefile.am
index c3fb718dead..c3fb718dead 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/Makefile.am
+++ b/Build/source/libs/libpng/libpng-1.5.17/Makefile.am
diff --git a/Build/source/libs/libpng/libpng-1.5.16/README b/Build/source/libs/libpng/libpng-1.5.17/README
index e0ee0c159d3..24eedec3593 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/README
+++ b/Build/source/libs/libpng/libpng-1.5.17/README
@@ -1,11 +1,12 @@
-README for libpng version 1.5.16 - May 23, 2013 (shared library 15.0)
+README for libpng version 1.5.17 - June 27, 2013 (shared library 15.0)
 See the note about version numbers near the top of png.h
 
 See INSTALL for instructions on how to install libpng.
 
 Libpng comes in several distribution formats.  Get libpng-*.tar.gz,
 libpng-*.tar.xz or libpng-*.tar.bz2 if you want UNIX-style line endings
-in the text files, or lpng*.zip if you want DOS-style line endings.
+in the text files, or lpng*.7z 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
@@ -77,17 +78,15 @@ 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.
-ftp://ftp.info-zip.org/pub/infozip/zlib
+zlib should be available at the same place that libpng is, or at zlib.net.
 
 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 on CompuServe, Lib 20 (PNG SUPPORT)
-at GO GRAPHSUP.  If you can't find it in any of those places,
-e-mail me, and I'll help you find it.
+[DOWNLOAD] area, and at ftp://ftp.simplesystems.org.  If you can't find it
+in any of those places, e-mail me, and I'll help you find it.
 
 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,
@@ -105,7 +104,7 @@ based in a large way on Guy's and Andreas' earlier work), and the PNG
 development group.
 
 Send comments/corrections/commendations to png-mng-implement at
-lists.sourceforge.net (subscription required; visit 
+lists.sourceforge.net (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
 to subscribe) or to glennrp at users.sourceforge.net
 
@@ -123,7 +122,7 @@ 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 sixteen years now, and it is official and
+been discussing PNG for eighteen 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.
@@ -167,23 +166,23 @@ 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
-       msvctest     =>  Builds and runs pngtest using a MSVC workspace
-       pngminus     =>  Simple pnm2png and png2pnm programs
-       pngsuite     =>  Test images
-       visupng      =>  Contains a MSVC workspace for VisualPng
+       libtests         =>  Contains the pngvalid.c test program
+       pngminim         =>  Minimal decoder, encoder, and progressive decoder
+                            programs demonstrating use of pngusr.dfa
+       pngminus         =>  Simple pnm2png and png2pnm programs
+       pngsuite         =>  Test images
+       visupng          =>  Contains a MSVC workspace for VisualPng
       projects      =>  Contains project files and workspaces for
                         building a DLL
-       cbuilder5        =>  Contains a Borland workspace for building
-                            libpng and zlib
-       visualc6         =>  Contains a Microsoft Visual C++ (MSVC)
-                            workspace for building libpng and zlib
+       owatcom          =>  Contains a WATCOM project for building libpng
        visualc71        =>  Contains a Microsoft Visual C++ (MSVC)
                             workspace for building libpng and zlib
-       xcode            =>  Contains an Apple xcode
+       vstudio          =>  Contains a Microsoft Visual C++ (MSVC)
                             workspace for building libpng and zlib
       scripts       =>  Directory containing scripts for building libpng:
                             (see scripts/README.txt for the list of scripts)
diff --git a/Build/source/libs/libpng/libpng-1.5.16/TODO b/Build/source/libs/libpng/libpng-1.5.17/TODO
index 6e1f028bd75..6e1f028bd75 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/TODO
+++ b/Build/source/libs/libpng/libpng-1.5.17/TODO
diff --git a/Build/source/libs/libpng/libpng-1.5.16/arm/arm_init.c b/Build/source/libs/libpng/libpng-1.5.17/arm/arm_init.c
index d9753e129e5..a55d6a60795 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/arm/arm_init.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/arm/arm_init.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2013 Glenn Randers-Pehrson
  * Written by Mans Rullgard, 2011.
- * Last changed in libpng 1.5.16 [May 23, 2013]
+ * Last changed in libpng 1.5.17 [$RDATE%]
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer
@@ -16,7 +16,7 @@
 
 #include "../pngpriv.h"
 
-#ifdef PNG_ARM_NEON_SUPPORTED
+#if PNG_ARM_NEON_OPT > 0
 #ifdef PNG_ARM_NEON_CHECK_SUPPORTED /* Do run-time checks */
 #include <signal.h> /* for sig_atomic_t */
 
@@ -216,4 +216,4 @@ png_init_filter_functions_neon(png_structp pp, unsigned int bpp)
           png_read_filter_row_paeth4_neon;
    }
 }
-#endif /* PNG_ARM_NEON_SUPPORTED */
+#endif /* PNG_ARM_NEON_OPT > 0 */
diff --git a/Build/source/libs/libpng/libpng-1.5.16/arm/filter_neon.S b/Build/source/libs/libpng/libpng-1.5.17/arm/filter_neon.S
index 8df62523934..e21f2eb3dea 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/arm/filter_neon.S
+++ b/Build/source/libs/libpng/libpng-1.5.17/arm/filter_neon.S
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2013 Glenn Randers-Pehrson
  * Written by Mans Rullgard, 2011.
- * Last changed in libpng 1.5.16 [May 23, 2013]
+ * Last changed in libpng 1.5.17 [$RDATE%]
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer
@@ -11,7 +11,7 @@
  */
 
 /* This is required to get the symbol renames, which are #defines, and also
- * includes the definition (or not) of PNG_ARM_NEON_SUPPORTED.
+ * includes the definition (or not) of PNG_ARM_NEON_OPT.
  */
 #define PNG_VERSION_INFO_ONLY
 #include "../pngpriv.h"
@@ -20,7 +20,7 @@
 .section .note.GNU-stack,"",%progbits /* mark stack as non-executable */
 #endif
 
-#ifdef PNG_ARM_NEON_SUPPORTED
+#if PNG_ARM_NEON_OPT > 0
 
 #ifdef __ELF__
 #   define ELF
@@ -232,4 +232,4 @@ func    png_read_filter_row_paeth3_neon, export=1
 
         pop             {r4,pc}
 endfunc
-#endif /* PNG_ARM_NEON_SUPPORTED */
+#endif /* PNG_ARM_NEON_OPT > 0 */
diff --git a/Build/source/libs/libpng/libpng-1.5.16/autogen.sh b/Build/source/libs/libpng/libpng-1.5.17/autogen.sh
index 5be104eb1d9..5be104eb1d9 100755
--- a/Build/source/libs/libpng/libpng-1.5.16/autogen.sh
+++ b/Build/source/libs/libpng/libpng-1.5.17/autogen.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.16/config.h.in b/Build/source/libs/libpng/libpng-1.5.17/config.h.in
index cad335d49ea..8693551153c 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/config.h.in
+++ b/Build/source/libs/libpng/libpng-1.5.17/config.h.in
@@ -80,10 +80,7 @@
 #undef PNG_ARM_NEON_CHECK_SUPPORTED
 
 /* Enable ARM Neon optimizations */
-#undef PNG_ARM_NEON_SUPPORTED
-
-/* Disable ARM Neon optimizations */
-#undef PNG_NO_ARM_NEON
+#undef PNG_ARM_NEON_OPT
 
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
diff --git a/Build/source/libs/libpng/libpng-1.5.16/configure.ac b/Build/source/libs/libpng/libpng-1.5.17/configure.ac
index f8dd7e02824..680f209a844 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/configure.ac
+++ b/Build/source/libs/libpng/libpng-1.5.17/configure.ac
@@ -18,15 +18,15 @@ AC_PREREQ(2.59)
 
 dnl Version number stuff here:
 
-AC_INIT([libpng], [1.5.16], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.5.17], [png-mng-implement@lists.sourceforge.net])
 AM_INIT_AUTOMAKE([serial-tests])
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE
 
-PNGLIB_VERSION=1.5.16
+PNGLIB_VERSION=1.5.17
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=5
-PNGLIB_RELEASE=16
+PNGLIB_RELEASE=17
 
 dnl End of version number stuff
 
@@ -179,11 +179,12 @@ AC_ARG_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.]),
+      [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_NO_ARM_NEON], [],
+         AC_DEFINE([PNG_ARM_NEON_OPT], [0],
                    [Disable ARM Neon optimizations])
          # Prevent inclusion of the assembler files below:
          enable_arm_neon=no;;
@@ -194,8 +195,11 @@ AC_ARG_ENABLE([arm-neon],
          AC_DEFINE([PNG_ARM_NEON_API_SUPPORTED], [],
                    [Turn on ARM Neon optimizations at run-time]);;
       yes|on)
-         AC_DEFINE([PNG_ARM_NEON_SUPPORTED], [],
-                   [Enable ARM Neon optimizations]);;
+         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])
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/README.txt b/Build/source/libs/libpng/libpng-1.5.17/contrib/README.txt
index bcd433d3523..bcd433d3523 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/README.txt
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/README.txt
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/COPYING b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/COPYING
index a3e97747969..a3e97747969 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/COPYING
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/COPYING
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/LICENSE b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/LICENSE
index d9567178cb6..d9567178cb6 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/LICENSE
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/LICENSE
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/Makefile.mingw32 b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/Makefile.mingw32
index e70a59aef2b..e70a59aef2b 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/Makefile.mingw32
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/Makefile.mingw32
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/Makefile.sgi b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/Makefile.sgi
index 91623acf068..91623acf068 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/Makefile.sgi
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/Makefile.sgi
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/Makefile.unx b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/Makefile.unx
index b52d8b6aa65..b52d8b6aa65 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/Makefile.unx
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/Makefile.unx
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/Makefile.w32 b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/Makefile.w32
index 41cfb231a2c..41cfb231a2c 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/Makefile.w32
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/Makefile.w32
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/README b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/README
index 7b1f6a3ea62..7b1f6a3ea62 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/README
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/README
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/makevms.com b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/makevms.com
index f32bcaba7f9..f32bcaba7f9 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/makevms.com
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/makevms.com
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/readpng.c b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/readpng.c
index f5e1fb1a4e2..f5e1fb1a4e2 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/readpng.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/readpng.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/readpng.h b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/readpng.h
index fad9fe3b4c5..fad9fe3b4c5 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/readpng.h
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/readpng.h
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/readpng2.c b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/readpng2.c
index b9746b75608..b9746b75608 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/readpng2.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/readpng2.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/readpng2.h b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/readpng2.h
index 6b3660d7c17..6b3660d7c17 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/readpng2.h
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/readpng2.h
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/readppm.c b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/readppm.c
index be9a56d95fd..be9a56d95fd 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/readppm.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/readppm.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/rpng-win.c b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/rpng-win.c
index f53ddc8ece6..f53ddc8ece6 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/rpng-win.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/rpng-win.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/rpng-x.c b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/rpng-x.c
index 6d10e1b84ed..6d10e1b84ed 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/rpng-x.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/rpng-x.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/rpng2-win.c b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/rpng2-win.c
index 223e737409a..223e737409a 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/rpng2-win.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/rpng2-win.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/rpng2-x.c b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/rpng2-x.c
index 7f24b632be0..7f24b632be0 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/rpng2-x.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/rpng2-x.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/toucan.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/toucan.png
index 03960d49399..03960d49399 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/toucan.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/toucan.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/wpng.c b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/wpng.c
index a06e3529ecb..a06e3529ecb 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/wpng.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/wpng.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/writepng.c b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/writepng.c
index 0dda62ea8c5..0dda62ea8c5 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/writepng.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/writepng.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/writepng.h b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/writepng.h
index 78b966b5874..78b966b5874 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/gregbook/writepng.h
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/gregbook/writepng.h
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/libtests/pngvalid.c b/Build/source/libs/libpng/libpng-1.5.17/contrib/libtests/pngvalid.c
index 71545a3ff19..71545a3ff19 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/libtests/pngvalid.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/libtests/pngvalid.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/README b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/README
index 51d5a3c2305..51d5a3c2305 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/README
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/README
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/decoder/README b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/decoder/README
index fa979fcb727..fa979fcb727 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/decoder/README
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/decoder/README
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/decoder/makefile b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/decoder/makefile
index 25e2ee0c980..25e2ee0c980 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/decoder/makefile
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/decoder/makefile
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/decoder/pngusr.dfa b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/decoder/pngusr.dfa
index 70d528bc9f9..70d528bc9f9 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/decoder/pngusr.dfa
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/decoder/pngusr.dfa
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/decoder/pngusr.h b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/decoder/pngusr.h
index 9d9c50c4078..9d9c50c4078 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/decoder/pngusr.h
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/decoder/pngusr.h
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/encoder/README b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/encoder/README
index d8d9a6466e2..d8d9a6466e2 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/encoder/README
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/encoder/README
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/encoder/makefile b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/encoder/makefile
index e2ccbbc280f..e2ccbbc280f 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/encoder/makefile
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/encoder/makefile
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/encoder/pngusr.dfa b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/encoder/pngusr.dfa
index 334d5e34919..334d5e34919 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/encoder/pngusr.dfa
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/encoder/pngusr.dfa
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/encoder/pngusr.h b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/encoder/pngusr.h
index 2033aadb200..2033aadb200 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/encoder/pngusr.h
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/encoder/pngusr.h
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/preader/README b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/preader/README
index faa83560a72..faa83560a72 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/preader/README
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/preader/README
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/preader/makefile b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/preader/makefile
index e9bb303e888..e9bb303e888 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/preader/makefile
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/preader/makefile
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/preader/pngusr.dfa b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/preader/pngusr.dfa
index 216c421ca66..216c421ca66 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/preader/pngusr.dfa
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/preader/pngusr.dfa
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/preader/pngusr.h b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/preader/pngusr.h
index 73cfecfbf06..73cfecfbf06 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminim/preader/pngusr.h
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminim/preader/pngusr.h
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/README b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/README
index bbe7407ecce..bbe7407ecce 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/README
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/README
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/makefile.std b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/makefile.std
index fa7b5909fcc..fa7b5909fcc 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/makefile.std
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/makefile.std
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/makefile.tc3 b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/makefile.tc3
index 404f18d5b15..404f18d5b15 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/makefile.tc3
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/makefile.tc3
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/makevms.com b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/makevms.com
index 00561bcd0d7..00561bcd0d7 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/makevms.com
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/makevms.com
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/png2pnm.bat b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/png2pnm.bat
index 449cf36750b..449cf36750b 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/png2pnm.bat
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/png2pnm.bat
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/png2pnm.c b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/png2pnm.c
index 2281429435d..2281429435d 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/png2pnm.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/png2pnm.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/png2pnm.sh b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/png2pnm.sh
index b1c05370dff..b1c05370dff 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/png2pnm.sh
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/png2pnm.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/pngminus.bat b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/pngminus.bat
index 911bb8dff9e..911bb8dff9e 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/pngminus.bat
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/pngminus.bat
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/pngminus.sh b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/pngminus.sh
index 2a0a9d8fbba..2a0a9d8fbba 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/pngminus.sh
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/pngminus.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/pnm2png.bat b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/pnm2png.bat
index f756cb84de4..f756cb84de4 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/pnm2png.bat
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/pnm2png.bat
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/pnm2png.c b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/pnm2png.c
index f9903dd324d..f9903dd324d 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/pnm2png.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/pnm2png.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/pnm2png.sh b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/pnm2png.sh
index d79df2fae08..d79df2fae08 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngminus/pnm2png.sh
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngminus/pnm2png.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/README b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/README
index ec4af9473f1..ec4af9473f1 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/README
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/README
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn0g01.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn0g01.png
index e31e1c7a635..e31e1c7a635 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn0g01.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn0g01.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn0g02.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn0g02.png
index 68809dd8fc0..68809dd8fc0 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn0g02.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn0g02.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn0g04.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn0g04.png
index 6fa089cb8a4..6fa089cb8a4 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn0g04.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn0g04.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn0g08.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn0g08.png
index bf522eef001..bf522eef001 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn0g08.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn0g08.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn0g16.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn0g16.png
index 318ebcadf4f..318ebcadf4f 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn0g16.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn0g16.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn2c08.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn2c08.png
index 21d2f91a868..21d2f91a868 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn2c08.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn2c08.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn2c16.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn2c16.png
index 1bd4a4d0e2c..1bd4a4d0e2c 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn2c16.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn2c16.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn3p01.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn3p01.png
index a21db597746..a21db597746 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn3p01.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn3p01.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn3p02.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn3p02.png
index 1d0ab6197cc..1d0ab6197cc 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn3p02.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn3p02.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn3p04.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn3p04.png
index 6dc6eac83f3..6dc6eac83f3 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn3p04.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn3p04.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn3p08.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn3p08.png
index 0e07f483c0e..0e07f483c0e 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn3p08.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn4a08.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn4a08.png
index 3bb0dd06b51..3bb0dd06b51 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn4a08.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn4a08.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn4a16.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn4a16.png
index 6dbee9fbdb9..6dbee9fbdb9 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn4a16.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn4a16.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn6a08.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn6a08.png
index 61062308548..61062308548 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn6a08.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn6a08.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn6a16.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn6a16.png
index a9bf3cb4612..a9bf3cb4612 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/basn6a16.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/basn6a16.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbbn0g01.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbbn0g01.png
index ba746ffb2f5..ba746ffb2f5 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbbn0g01.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbbn0g01.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbbn0g02.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbbn0g02.png
index 3d83bd6900b..3d83bd6900b 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbbn0g02.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbbn0g02.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbbn0g04.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbbn0g04.png
index 39a7050d27a..39a7050d27a 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbbn0g04.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbbn0g04.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbbn2c16.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbbn2c16.png
index dd3168e5c86..dd3168e5c86 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbbn2c16.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbbn2c16.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbbn3p08.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbbn3p08.png
index 0ede3574db0..0ede3574db0 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbbn3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbbn3p08.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbgn2c16.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbgn2c16.png
index 85cec395c01..85cec395c01 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbgn2c16.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbgn2c16.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbgn3p08.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbgn3p08.png
index 8cf2e6fb6aa..8cf2e6fb6aa 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbgn3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbgn3p08.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbrn2c08.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbrn2c08.png
index 5cca0d62104..5cca0d62104 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbrn2c08.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbrn2c08.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbwn0g16.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbwn0g16.png
index 99bdeed2b3b..99bdeed2b3b 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbwn0g16.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbwn0g16.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbwn3p08.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbwn3p08.png
index eacab7a144c..eacab7a144c 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbwn3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbwn3p08.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbyn3p08.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbyn3p08.png
index 656db0989ad..656db0989ad 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftbyn3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftbyn3p08.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftp0n0g08.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftp0n0g08.png
index 333465fcdc9..333465fcdc9 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftp0n0g08.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftp0n0g08.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftp0n2c08.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftp0n2c08.png
index fc6e42cb420..fc6e42cb420 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftp0n2c08.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftp0n2c08.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftp0n3p08.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftp0n3p08.png
index 69a69e58722..69a69e58722 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftp0n3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftp0n3p08.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftp1n3p08.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftp1n3p08.png
index a6c9f35a862..a6c9f35a862 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/pngsuite/ftp1n3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/pngsuite/ftp1n3p08.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/PngFile.c b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/PngFile.c
index dcde18a3af4..dcde18a3af4 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/PngFile.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/PngFile.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/PngFile.h b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/PngFile.h
index 474426c22ea..474426c22ea 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/PngFile.h
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/PngFile.h
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/README.txt b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/README.txt
index 72c5cba1790..72c5cba1790 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/README.txt
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/README.txt
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/VisualPng.c b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/VisualPng.c
index 236525a59fe..236525a59fe 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/VisualPng.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/VisualPng.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/VisualPng.dsp b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/VisualPng.dsp
index 741ef6ce76f..741ef6ce76f 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/VisualPng.dsp
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/VisualPng.dsp
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/VisualPng.dsw b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/VisualPng.dsw
index a30e1cc1cdb..a30e1cc1cdb 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/VisualPng.dsw
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/VisualPng.dsw
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/VisualPng.ico b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/VisualPng.ico
index 68aa3719fb5..68aa3719fb5 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/VisualPng.ico
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/VisualPng.ico
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/VisualPng.png b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/VisualPng.png
index c6aa80a9bfa..c6aa80a9bfa 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/VisualPng.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/VisualPng.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/VisualPng.rc b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/VisualPng.rc
index 6e0623a73cf..6e0623a73cf 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/VisualPng.rc
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/VisualPng.rc
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/cexcept.h b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/cexcept.h
index 5f45d769758..5f45d769758 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/cexcept.h
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/cexcept.h
diff --git a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/resource.h b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/resource.h
index b62176d1dca..b62176d1dca 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/contrib/visupng/resource.h
+++ b/Build/source/libs/libpng/libpng-1.5.17/contrib/visupng/resource.h
diff --git a/Build/source/libs/libpng/libpng-1.5.16/example.c b/Build/source/libs/libpng/libpng-1.5.17/example.c
index 86068ea1ebf..b7ca40ac9aa 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/example.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/example.c
@@ -2,8 +2,8 @@
 #if 0 /* in case someone actually tries to compile this */
 
 /* example.c - an example of using libpng
- * Last changed in libpng 1.5.10 [March 8, 2012]
- * Maintained 1998-2012 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.17 [June 27, 2013]
+ * Maintained 1998-2013 Glenn Randers-Pehrson
  * Maintained 1996, 1997 Andreas Dilger
  * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  */
@@ -259,9 +259,9 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */
    /* If we don't have another value */
    else
    {
-      screen_gamma = 2.2;  /* A good guess for a PC monitor in a dimly
-                              lit room */
-      screen_gamma = 1.7 or 1.0;  /* A good guess for Mac systems */
+      screen_gamma = PNG_DEFAULT_sRGB;  /* A good guess for a PC monitor
+                                           in a dimly lit room */
+      screen_gamma = PNG_GAMMA_MAC_18 or 1.0; /* Good guesses for Mac systems */
    }
 
    /* Tell libpng to handle the gamma conversion for you.  The final call
@@ -273,7 +273,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, 0.45455);
+      png_set_gamma(png_ptr, screen_gamma, PNG_DEFAULT_sRGB);
    else
    {
       double image_gamma;
diff --git a/Build/source/libs/libpng/libpng-1.5.16/libpng-config.in b/Build/source/libs/libpng/libpng-1.5.17/libpng-config.in
index 69bf8e33f0b..69bf8e33f0b 100755
--- a/Build/source/libs/libpng/libpng-1.5.16/libpng-config.in
+++ b/Build/source/libs/libpng/libpng-1.5.17/libpng-config.in
diff --git a/Build/source/libs/libpng/libpng-1.5.16/libpng-manual.txt b/Build/source/libs/libpng/libpng-1.5.17/libpng-manual.txt
index 3fc4f301a22..985d5b3578b 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/libpng-manual.txt
+++ b/Build/source/libs/libpng/libpng-1.5.17/libpng-manual.txt
@@ -1,6 +1,6 @@
 Libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.5.16 - May 23, 2013
+ libpng version 1.5.17 - June 27, 2013
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2013 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@ Libpng-manual.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.5.16 - May 23, 2013
+ libpng versions 0.97, January 1998, through 1.5.17 - June 27, 2013
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2013 Glenn Randers-Pehrson
 
@@ -3875,7 +3875,7 @@ the message, "message" is the formatted string to be printed,
 and p1 and p2 are parameters that are to be embedded in the string
 according to printf-style formatting directives.  For example,
 
-   png_debug1(2, "foo=%d\n", foo);
+   png_debug1(2, "foo=%d", foo);
 
 is expanded to
 
@@ -4655,13 +4655,13 @@ Other rules can be inferred by inspecting the libpng source.
 
 XIV. Y2K Compliance in libpng
 
-May 23, 2013
+June 27, 2013
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
 
 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.5.16 are Y2K compliant.  It is my belief that earlier
+upward through 1.5.17 are Y2K compliant.  It is my belief that earlier
 versions were also Y2K compliant.
 
 Libpng only has two year fields.  One is a 2-byte unsigned integer that
diff --git a/Build/source/libs/libpng/libpng-1.5.16/libpng.3 b/Build/source/libs/libpng/libpng-1.5.17/libpng.3
index b151afcef74..c26c213b509 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/libpng.3
+++ b/Build/source/libs/libpng/libpng-1.5.17/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "May 23, 2013"
+.TH LIBPNG 3 "June 27, 2013"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.5.16
+libpng \- Portable Network Graphics (PNG) Reference Library 1.5.17
 .SH SYNOPSIS
 \fB
 #include <png.h>\fP
@@ -492,7 +492,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
 .SH LIBPNG.TXT
 Libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.5.16 - May 23, 2013
+ libpng version 1.5.17 - June 27, 2013
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2013 Glenn Randers-Pehrson
@@ -503,7 +503,7 @@ Libpng-manual.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.5.16 - May 23, 2013
+ libpng versions 0.97, January 1998, through 1.5.17 - June 27, 2013
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2013 Glenn Randers-Pehrson
 
@@ -4368,12 +4368,12 @@ the message, "message" is the formatted string to be printed,
 and p1 and p2 are parameters that are to be embedded in the string
 according to printf-style formatting directives.  For example,
 
-   png_debug1(2, "foo=%d\n", foo);
+   png_debug1(2, "foo=%d", foo);
 
 is expanded to
 
    if (PNG_DEBUG > 2)
-      fprintf(PNG_DEBUG_FILE, "foo=%d\n", foo);
+      fprintf(PNG_DEBUG_FILE, "foo=%d\en", foo);
 
 When PNG_DEBUG is defined but is zero, the macros aren't defined, but you
 can still use PNG_DEBUG to control your own debugging:
@@ -5148,13 +5148,13 @@ Other rules can be inferred by inspecting the libpng source.
 
 .SH XIV. Y2K Compliance in libpng
 
-May 23, 2013
+June 27, 2013
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
 
 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.5.16 are Y2K compliant.  It is my belief that earlier
+upward through 1.5.17 are Y2K compliant.  It is my belief that earlier
 versions were also Y2K compliant.
 
 Libpng only has two year fields.  One is a 2-byte unsigned integer that
@@ -5383,6 +5383,9 @@ the first widely used release:
  1.5.16beta01-06     15    10516  15.so.15.16[.0]
  1.5.16rc01          15    10516  15.so.15.16[.0]
  1.5.16              15    10516  15.so.15.16[.0]
+ 1.5.17beta01        15    10517  15.so.15.17[.0]
+ 1.5.17rc01-03       15    10517  15.so.15.17[.0]
+ 1.5.17              15    10517  15.so.15.17[.0]
 
 Henceforth the source version will match the shared-library minor
 and patch numbers; the shared-library major version number will be
@@ -5439,7 +5442,7 @@ possible without all of you.
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.5.16 - May 23, 2013:
+Libpng version 1.5.17 - June 27, 2013:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
 
@@ -5462,7 +5465,7 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.2.6, August 15, 2004, through 1.5.16, May 23, 2013, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.17, June 27, 2013, are
 Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
@@ -5561,7 +5564,7 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-May 23, 2013
+June 27, 2013
 
 .\" end of man page
 
diff --git a/Build/source/libs/libpng/libpng-1.5.16/libpng.pc.in b/Build/source/libs/libpng/libpng-1.5.17/libpng.pc.in
index 3e7e2c58a7e..3e7e2c58a7e 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/libpng.pc.in
+++ b/Build/source/libs/libpng/libpng-1.5.17/libpng.pc.in
diff --git a/Build/source/libs/libpng/libpng-1.5.16/libpngpf.3 b/Build/source/libs/libpng/libpng-1.5.17/libpngpf.3
index 79715447011..9b6e69e0365 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/libpngpf.3
+++ b/Build/source/libs/libpng/libpng-1.5.17/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "May 23, 2013"
+.TH LIBPNGPF 3 "June 27, 2013"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.5.16
+libpng \- Portable Network Graphics (PNG) Reference Library 1.5.17
 (private functions)
 .SH SYNOPSIS
 \fB#include \fI"pngpriv.h"
diff --git a/Build/source/libs/libpng/libpng-1.5.16/png.5 b/Build/source/libs/libpng/libpng-1.5.17/png.5
index 678038d7bc1..94e304f1ce7 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/png.5
+++ b/Build/source/libs/libpng/libpng-1.5.17/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "May 23, 2013"
+.TH PNG 5 "June 27, 2013"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
diff --git a/Build/source/libs/libpng/libpng-1.5.16/png.c b/Build/source/libs/libpng/libpng-1.5.17/png.c
index dffcbb67226..559308a9d2d 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/png.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/png.c
@@ -14,7 +14,7 @@
 #include "pngpriv.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_5_16 Your_png_h_is_not_version_1_5_16;
+typedef png_libpng_version_1_5_17 Your_png_h_is_not_version_1_5_17;
 
 /* Tells libpng that we have already handled the first "num_bytes" bytes
  * of the PNG file signature.  If the PNG data is embedded into another
@@ -658,13 +658,13 @@ png_get_copyright(png_const_structp png_ptr)
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-     "libpng version 1.5.16 - May 23, 2013" PNG_STRING_NEWLINE \
+     "libpng version 1.5.17 - June 27, 2013" PNG_STRING_NEWLINE \
      "Copyright (c) 1998-2013 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
      "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
      "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
      PNG_STRING_NEWLINE;
 #  else
-      return "libpng version 1.5.16 - May 23, 2013\
+      return "libpng version 1.5.17 - June 27, 2013\
       Copyright (c) 1998-2013 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
diff --git a/Build/source/libs/libpng/libpng-1.5.16/png.h b/Build/source/libs/libpng/libpng-1.5.17/png.h
index c3ac5c7d65a..85d9933bd65 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/png.h
+++ b/Build/source/libs/libpng/libpng-1.5.17/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.5.16 - May 23, 2013
+ * libpng version 1.5.17 - June 27, 2013
  * Copyright (c) 1998-2013 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -11,7 +11,7 @@
  * Authors and maintainers:
  *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
  *   libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *   libpng versions 0.97, January 1998, through 1.5.16 - May 23, 2013: Glenn
+ *   libpng versions 0.97, January 1998, through 1.5.17 - June 27, 2013: Glenn
  *   See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -190,6 +190,9 @@
  *    1.5.16beta01-06         15    10516  15.so.15.16[.0]
  *    1.5.16rc01              15    10516  15.so.15.16[.0]
  *    1.5.16                  15    10516  15.so.15.16[.0]
+ *    1.5.17beta01            15    10517  15.so.15.17[.0]
+ *    1.5.17rc01-03           15    10517  15.so.15.17[.0]
+ *    1.5.17                  15    10517  15.so.15.17[.0]
  *
  *   Henceforth the source version will match the shared-library major
  *   and minor numbers; the shared-library major version number will be
@@ -221,7 +224,7 @@
  *
  * This code is released under the libpng license.
  *
- * libpng versions 1.2.6, August 15, 2004, through 1.5.16, May 23, 2013, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.5.17, June 27, 2013, are
  * Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are
  * distributed according to the same disclaimer and license as libpng-1.2.5
  * with the following individual added to the list of Contributing Authors:
@@ -333,13 +336,13 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    May 23, 2013
+ *    June 27, 2013
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
  *
  *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.5.16 are Y2K compliant.  It is my belief that
+ *    upward through 1.5.17 are Y2K compliant.  It is my belief that
  *    earlier versions were also Y2K compliant.
  *
  *    Libpng only has two year fields.  One is a 2-byte unsigned integer
@@ -398,9 +401,9 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.5.16"
+#define PNG_LIBPNG_VER_STRING "1.5.17"
 #define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.5.16 - May 23, 2013\n"
+     " libpng version 1.5.17 - June 27, 2013\n"
 
 #define PNG_LIBPNG_VER_SONUM   15
 #define PNG_LIBPNG_VER_DLLNUM  15
@@ -408,7 +411,7 @@
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
 #define PNG_LIBPNG_VER_MAJOR   1
 #define PNG_LIBPNG_VER_MINOR   5
-#define PNG_LIBPNG_VER_RELEASE 16
+#define PNG_LIBPNG_VER_RELEASE 17
 
 /* This should match the numeric part of the final component of
  * PNG_LIBPNG_VER_STRING, omitting any leading zero:
@@ -439,7 +442,7 @@
  * version 1.0.0 was mis-numbered 100 instead of 10000).  From
  * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release
  */
-#define PNG_LIBPNG_VER 10516 /* 1.5.16 */
+#define PNG_LIBPNG_VER 10517 /* 1.5.17 */
 
 /* Library configuration: these options cannot be changed after
  * the library has been built.
@@ -561,7 +564,7 @@ extern "C" {
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef char* png_libpng_version_1_5_16;
+typedef char* png_libpng_version_1_5_17;
 
 /* Three color definitions.  The order of the red, green, and blue, (and the
  * exact size) is not important, although the size of the fields need to
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngbar.jpg b/Build/source/libs/libpng/libpng-1.5.17/pngbar.jpg
index 70ba8d817ce..70ba8d817ce 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngbar.jpg
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngbar.jpg
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngbar.png b/Build/source/libs/libpng/libpng-1.5.17/pngbar.png
index 49798c8ed95..49798c8ed95 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngbar.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngbar.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngconf.h b/Build/source/libs/libpng/libpng-1.5.17/pngconf.h
index 92b1f016215..61d6331d1e7 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngconf.h
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.5.16 - May 23, 2013
+ * libpng version 1.5.17 - June 27, 2013
  *
  * Copyright (c) 1998-2013 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngdebug.h b/Build/source/libs/libpng/libpng-1.5.17/pngdebug.h
index 16f81fdd141..16f81fdd141 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngdebug.h
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngdebug.h
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngerror.c b/Build/source/libs/libpng/libpng-1.5.17/pngerror.c
index ba398797740..ba398797740 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngerror.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngerror.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngget.c b/Build/source/libs/libpng/libpng-1.5.17/pngget.c
index 1eafae030d4..1eafae030d4 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngget.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngget.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pnginfo.h b/Build/source/libs/libpng/libpng-1.5.17/pnginfo.h
index 0e5c977dd9c..0e5c977dd9c 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pnginfo.h
+++ b/Build/source/libs/libpng/libpng-1.5.17/pnginfo.h
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pnglibconf.h b/Build/source/libs/libpng/libpng-1.5.17/pnglibconf.h
index d2a6eee09d5..b35fe529307 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pnglibconf.h
+++ b/Build/source/libs/libpng/libpng-1.5.17/pnglibconf.h
@@ -1,7 +1,7 @@
-/* 1.5.16 STANDARD API DEFINITION */
+/* 1.5.17 STANDARD API DEFINITION */
 /* pnglibconf.h - library build configuration */
 
-/* libpng version 1.5.16 - May 23, 2013 */
+/* libpng version 1.5.17 - June 27, 2013 */
 
 /* Copyright (c) 1998-2013 Glenn Randers-Pehrson */
 
@@ -19,7 +19,6 @@
 #define PNG_ALIGNED_MEMORY_SUPPORTED
 /*#undef PNG_ARM_NEON_API_SUPPORTED*/
 /*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
-/*#undef PNG_ARM_NEON_SUPPORTED*/
 #define PNG_BENIGN_ERRORS_SUPPORTED
 #define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
 #define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngmem.c b/Build/source/libs/libpng/libpng-1.5.17/pngmem.c
index f885533fbb0..f885533fbb0 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngmem.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngmem.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngnow.png b/Build/source/libs/libpng/libpng-1.5.17/pngnow.png
index 82793ebddb7..82793ebddb7 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngnow.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngnow.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngpread.c b/Build/source/libs/libpng/libpng-1.5.17/pngpread.c
index 6b65ba8f4eb..6b65ba8f4eb 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngpread.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngpread.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngpriv.h b/Build/source/libs/libpng/libpng-1.5.17/pngpriv.h
index ad40225a0a2..05ff9de8e26 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngpriv.h
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngpriv.h
@@ -6,7 +6,7 @@
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
- * Last changed in libpng 1.5.15 [March 28, 2013]
+ * 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
@@ -62,6 +62,46 @@
 #  endif
 #endif
 
+/* Compile time options.
+ * =====================
+ * In a multi-arch build the compiler may compile the code several times for the
+ * same object module, producing different binaries for different architectures.
+ * When this happens configure-time setting of the target host options cannot be
+ * done and this interferes with the handling of the ARM NEON optimizations, and
+ * possibly other similar optimizations.  Put additional tests here; in general
+ * this is needed when the same option can be changed at both compile time and
+ * run time depending on the target OS (i.e. iOS vs Android.)
+ *
+ * NOTE: symbol prefixing does not pass $(CFLAGS) to the preprocessor, because
+ * this is not possible with certain compilers (Oracle SUN OS CC), as a result
+ * it is necessary to ensure that all extern functions that *might* be used
+ * regardless of $(CFLAGS) get declared in this file.  The test on __ARM_NEON__
+ * below is one example of this behavior because it is controlled by the
+ * presence or not of -mfpu=neon on the GCC command line, it is possible to do
+ * this in $(CC), e.g. "CC=gcc -mfpu=neon", but people who build libpng rarely
+ * do this.
+ */
+#ifndef PNG_ARM_NEON_OPT
+   /* ARM NEON optimizations are being controlled by the compiler settings,
+    * typically the target FPU.  If the FPU has been set to NEON (-mfpu=neon
+    * with GCC) then the compiler will define __ARM_NEON__ and we can rely
+    * unconditionally on NEON instructions not crashing, otherwise we must
+    * disable use of NEON instructions:
+    */
+#  ifdef __ARM_NEON__
+#     define PNG_ARM_NEON_OPT 2
+#  else
+#     define PNG_ARM_NEON_OPT 0
+#  endif
+#endif
+
+#if PNG_ARM_NEON_OPT > 0
+   /* NEON optimizations are to be at least considered by libpng, so enable the
+    * callbacks to do this.
+    */
+#  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_neon
+#endif
+
 /* Is this a build of a DLL where compilation of the object modules requires
  * different preprocessor settings to those required for a simple library?  If
  * so PNG_BUILD_DLL must be set.
@@ -1728,13 +1768,21 @@ PNG_EXTERN void png_set_rgb_to_gray_fixed PNGARG((png_structp png_ptr,
 #endif
 #endif /* FIX MISSING !FIXED_POINT DECLARATIONS */
 
+/* These are initialization functions for hardware specific PNG filter
+ * optimizations; list these here then select the appropriate one at compile
+ * time using the macro PNG_FILTER_OPTIMIZATIONS.  If the macro is not defined
+ * the generic code is used.
+ */
 #ifdef PNG_FILTER_OPTIMIZATIONS
 PNG_EXTERN void PNG_FILTER_OPTIMIZATIONS(png_structp png_ptr, unsigned int bpp);
-   /* This is the initialization function for hardware specific optimizations,
-    * one implementation (for ARM NEON machines) is contained in
-    * arm/filter_neon.c.  It need not be defined - the generic code will be used
-    * if not.
+   /* Just declare the optimization that will be used */
+#else
+   /* List *all* the possible optimizations here - this branch is required if
+    * the builder of libpng passes the definition of PNG_FILTER_OPTIMIZATIONS in
+    * CFLAGS in place of CPPFLAGS *and* uses symbol prefixing.
     */
+PNG_EXTERN void png_init_filter_functions_neon(png_structp png_ptr,
+    unsigned int bpp);
 #endif
 
 /* Maintainer: Put new private prototypes here ^ */
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngread.c b/Build/source/libs/libpng/libpng-1.5.17/pngread.c
index 4296cf1cb66..4296cf1cb66 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngread.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngread.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngrio.c b/Build/source/libs/libpng/libpng-1.5.17/pngrio.c
index e9c381c5ba4..e9c381c5ba4 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngrio.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngrio.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngrtran.c b/Build/source/libs/libpng/libpng-1.5.17/pngrtran.c
index 5673193cf85..5673193cf85 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngrtran.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngrtran.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngrutil.c b/Build/source/libs/libpng/libpng-1.5.17/pngrutil.c
index 802ff20833e..802ff20833e 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngrutil.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngrutil.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngset.c b/Build/source/libs/libpng/libpng-1.5.17/pngset.c
index 6e9358b2896..4177e62afa4 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngset.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngset.c
@@ -1,7 +1,7 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * Last changed in libpng 1.5.14 [January 24, 2013]
+ * Last changed in libpng 1.5.17 [June 27, 2013]
  * Copyright (c) 1998-2013 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -252,16 +252,7 @@ png_set_IHDR(png_structp png_ptr, png_infop info_ptr,
 
    info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
 
-   /* Check for potential overflow */
-   if (width >
-       (PNG_UINT_32_MAX >> 3)      /* 8-byte RRGGBBAA pixels */
-       - 48       /* bigrowbuf hack */
-       - 1        /* filter byte */
-       - 7*8      /* rounding of width to multiple of 8 pixels */
-       - 8)       /* extra max_pixel_depth pad */
-      info_ptr->rowbytes = 0;
-   else
-      info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
+   info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
 }
 
 #ifdef PNG_oFFs_SUPPORTED
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngstruct.h b/Build/source/libs/libpng/libpng-1.5.17/pngstruct.h
index 21911de1331..21911de1331 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngstruct.h
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngstruct.h
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngtest.c b/Build/source/libs/libpng/libpng-1.5.17/pngtest.c
index e79ef776eb1..8367698ae2d 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngtest.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngtest.c
@@ -1962,4 +1962,4 @@ main(void)
 #endif
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_5_16 Your_png_h_is_not_version_1_5_16;
+typedef png_libpng_version_1_5_17 Your_png_h_is_not_version_1_5_17;
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngtest.png b/Build/source/libs/libpng/libpng-1.5.17/pngtest.png
index cb3fef4cf84..cb3fef4cf84 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngtest.png
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngtest.png
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngtrans.c b/Build/source/libs/libpng/libpng-1.5.17/pngtrans.c
index ee60957fc19..ee60957fc19 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngtrans.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngtrans.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngusr.dfa b/Build/source/libs/libpng/libpng-1.5.17/pngusr.dfa
index 9d39564b51d..9d39564b51d 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngusr.dfa
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngusr.dfa
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngwio.c b/Build/source/libs/libpng/libpng-1.5.17/pngwio.c
index 95ffb3429f1..95ffb3429f1 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngwio.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngwio.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngwrite.c b/Build/source/libs/libpng/libpng-1.5.17/pngwrite.c
index 680878d948d..680878d948d 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngwrite.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngwrite.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngwtran.c b/Build/source/libs/libpng/libpng-1.5.17/pngwtran.c
index 743581327b6..743581327b6 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngwtran.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngwtran.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/pngwutil.c b/Build/source/libs/libpng/libpng-1.5.17/pngwutil.c
index 604ad32aacc..604ad32aacc 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/pngwutil.c
+++ b/Build/source/libs/libpng/libpng-1.5.17/pngwutil.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/owatcom/libpng.tgt b/Build/source/libs/libpng/libpng-1.5.17/projects/owatcom/libpng.tgt
index 4a9622e68cf..4a9622e68cf 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/owatcom/libpng.tgt
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/owatcom/libpng.tgt
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/owatcom/libpng.wpj b/Build/source/libs/libpng/libpng-1.5.17/projects/owatcom/libpng.wpj
index cddf9f1f10e..cddf9f1f10e 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/owatcom/libpng.wpj
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/owatcom/libpng.wpj
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/owatcom/pngconfig.mak b/Build/source/libs/libpng/libpng-1.5.17/projects/owatcom/pngconfig.mak
index 0f988780513..0f988780513 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/owatcom/pngconfig.mak
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/owatcom/pngconfig.mak
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/owatcom/pngtest.tgt b/Build/source/libs/libpng/libpng-1.5.17/projects/owatcom/pngtest.tgt
index 211f1a74886..211f1a74886 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/owatcom/pngtest.tgt
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/owatcom/pngtest.tgt
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/owatcom/pngvalid.tgt b/Build/source/libs/libpng/libpng-1.5.17/projects/owatcom/pngvalid.tgt
index 1e78e75cb6c..1e78e75cb6c 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/owatcom/pngvalid.tgt
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/owatcom/pngvalid.tgt
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/visualc71/PRJ0041.mak b/Build/source/libs/libpng/libpng-1.5.17/projects/visualc71/PRJ0041.mak
index c7a68b503e7..c7a68b503e7 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/visualc71/PRJ0041.mak
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/visualc71/PRJ0041.mak
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/visualc71/README.txt b/Build/source/libs/libpng/libpng-1.5.17/projects/visualc71/README.txt
index 625eefcab7f..625eefcab7f 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/visualc71/README.txt
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/visualc71/README.txt
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/visualc71/README_zlib.txt b/Build/source/libs/libpng/libpng-1.5.17/projects/visualc71/README_zlib.txt
index 81d11cbb577..81d11cbb577 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/visualc71/README_zlib.txt
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/visualc71/README_zlib.txt
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/visualc71/libpng.sln b/Build/source/libs/libpng/libpng-1.5.17/projects/visualc71/libpng.sln
index eeb101f2e31..eeb101f2e31 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/visualc71/libpng.sln
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/visualc71/libpng.sln
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/visualc71/libpng.vcproj b/Build/source/libs/libpng/libpng-1.5.17/projects/visualc71/libpng.vcproj
index 4c5acf94c8b..4c5acf94c8b 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/visualc71/libpng.vcproj
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/visualc71/libpng.vcproj
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/visualc71/pngtest.vcproj b/Build/source/libs/libpng/libpng-1.5.17/projects/visualc71/pngtest.vcproj
index ff330ae350f..ff330ae350f 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/visualc71/pngtest.vcproj
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/visualc71/pngtest.vcproj
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/visualc71/zlib.vcproj b/Build/source/libs/libpng/libpng-1.5.17/projects/visualc71/zlib.vcproj
index eb218488dcf..eb218488dcf 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/visualc71/zlib.vcproj
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/visualc71/zlib.vcproj
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/WARNING b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/WARNING
index 16968138d04..16968138d04 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/WARNING
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/WARNING
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/libpng/libpng.vcxproj b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/libpng/libpng.vcxproj
index f2efa73f71e..f2efa73f71e 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/libpng/libpng.vcxproj
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/libpng/libpng.vcxproj
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/pnglibconf/pnglibconf.vcxproj
index e2a232cb631..e2a232cb631 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/pnglibconf/pnglibconf.vcxproj
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/pnglibconf/pnglibconf.vcxproj
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/pngtest/pngtest.vcxproj b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/pngtest/pngtest.vcxproj
index 561370d01da..561370d01da 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/pngtest/pngtest.vcxproj
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/pngtest/pngtest.vcxproj
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/pngvalid/pngvalid.vcxproj b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/pngvalid/pngvalid.vcxproj
index 2cd0e7bf69d..2cd0e7bf69d 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/pngvalid/pngvalid.vcxproj
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/pngvalid/pngvalid.vcxproj
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/readme.txt b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/readme.txt
index b4eb04a1a7a..6764b6d0b4c 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/readme.txt
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
 
 VisualStudio instructions
 
-libpng version 1.5.16 - May 23, 2013
+libpng version 1.5.17 - June 27, 2013
 
 Copyright (c) 1998-2010 Glenn Randers-Pehrson
 
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/vstudio.sln b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/vstudio.sln
index 4ab66418ca3..4ab66418ca3 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/vstudio.sln
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/vstudio.sln
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/zlib.props b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/zlib.props
index 8a3809fecca..988ddda3bac 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/zlib.props
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
 <!--
  * zlib.props - location of zlib source
  *
- * libpng version 1.5.16 - May 23, 2013
+ * libpng version 1.5.17 - June 27, 2013
  *
  * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *
diff --git a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/zlib/zlib.vcxproj b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/zlib/zlib.vcxproj
index 4857ffadd7d..4857ffadd7d 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/projects/vstudio/zlib/zlib.vcxproj
+++ b/Build/source/libs/libpng/libpng-1.5.17/projects/vstudio/zlib/zlib.vcxproj
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/README.txt b/Build/source/libs/libpng/libpng-1.5.17/scripts/README.txt
index ba178bea0e1..442082a133b 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/README.txt
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/README.txt
@@ -1,9 +1,9 @@
 
-Makefiles for  libpng version 1.5.16 - May 23, 2013
+Makefiles for  libpng version 1.5.17 - June 27, 2013
 
 pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng15.so.15.1.5.16)
+                       (gcc, creates libpng15.so.15.1.5.17)
  makefile.gcc      =>  Generic makefile (gcc, creates static libpng.a)
  makefile.knr      =>  Archaic UNIX Makefile that converts files with
                        ansi2knr (Requires ansi2knr.c from
@@ -21,7 +21,7 @@ pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.dec      =>  DEC Alpha UNIX makefile
  makefile.dj2      =>  DJGPP 2 makefile
  makefile.elf      =>  Linux/ELF makefile symbol versioning,
-                       (gcc, creates libpng15.so.15.1.5.16)
+                       (gcc, creates libpng15.so.15.1.5.17)
  makefile.freebsd  =>  FreeBSD makefile
  makefile.gcc      =>  Generic gcc makefile
  makefile.hpgcc    =>  HPUX makefile using gcc
@@ -36,12 +36,12 @@ pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.os2      =>  OS/2 Makefile (gcc and emx, requires libpng.def)
  makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc
  makefile.sggcc    =>  Silicon Graphics (gcc,
-                       creates libpng15.so.15.1.5.16)
+                       creates libpng15.so.15.1.5.17)
  makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
  makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng15.so.15.1.5.16)
+                       creates libpng15.so.15.1.5.17)
  makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng15.so.15.1.5.16)
+                       creates libpng15.so.15.1.5.17)
  makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
  makefile.sunos    =>  Sun makefile
  makefile.32sunu   =>  Sun Ultra 32-bit makefile
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/SCOPTIONS.ppc b/Build/source/libs/libpng/libpng-1.5.17/scripts/SCOPTIONS.ppc
index 2c3503e9eb2..2c3503e9eb2 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/SCOPTIONS.ppc
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/SCOPTIONS.ppc
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/checksym.awk b/Build/source/libs/libpng/libpng-1.5.17/scripts/checksym.awk
index fe3af55e05e..fe3af55e05e 100755
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/checksym.awk
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/checksym.awk
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/chkfmt b/Build/source/libs/libpng/libpng-1.5.17/scripts/chkfmt
index 9da6475fd4e..9da6475fd4e 100755
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/chkfmt
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/chkfmt
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/def.dfn b/Build/source/libs/libpng/libpng-1.5.17/scripts/def.dfn
index 8f061fd851c..8f061fd851c 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/def.dfn
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/def.dfn
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/descrip.mms b/Build/source/libs/libpng/libpng-1.5.17/scripts/descrip.mms
index 99ea1abccd1..99ea1abccd1 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/descrip.mms
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/descrip.mms
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/dfn.awk b/Build/source/libs/libpng/libpng-1.5.17/scripts/dfn.awk
index 89b92d5d9e9..89b92d5d9e9 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/dfn.awk
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/dfn.awk
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/libpng-config-body.in b/Build/source/libs/libpng/libpng-1.5.17/scripts/libpng-config-body.in
index b466432d546..b466432d546 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/libpng-config-body.in
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/libpng-config-body.in
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/libpng-config-head.in b/Build/source/libs/libpng/libpng-1.5.17/scripts/libpng-config-head.in
index 3d269eca3ef..613355ddfe4 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/libpng-config-head.in
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version=1.5.16
+version=1.5.17
 prefix=""
 libdir=""
 libs=""
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/libpng.pc.in b/Build/source/libs/libpng/libpng-1.5.17/scripts/libpng.pc.in
index f2d960e5ab3..101bf643694 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/libpng.pc.in
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng15
 
 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.5.16
+Version: 1.5.17
 Libs: -L${libdir} -lpng15
 Cflags: -I${includedir}
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.32sunu b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.32sunu
index b5e5a33a06f..b5e5a33a06f 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.32sunu
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.32sunu
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.64sunu b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.64sunu
index a0331d670e0..a0331d670e0 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.64sunu
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.64sunu
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.acorn b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.acorn
index 00b8fb5b35c..00b8fb5b35c 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.acorn
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.acorn
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.aix b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.aix
index bb4c40d4b0d..bb4c40d4b0d 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.aix
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.aix
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.amiga b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.amiga
index 228b5c22a75..228b5c22a75 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.amiga
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.amiga
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.atari b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.atari
index 1aeb7d5b7dd..1aeb7d5b7dd 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.atari
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.atari
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.bc32 b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.bc32
index ebbd5ce3d27..ebbd5ce3d27 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.bc32
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.bc32
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.beos b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.beos
index 749db78ad32..749db78ad32 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.beos
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.beos
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.bor b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.bor
index 96d5e861a3a..96d5e861a3a 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.bor
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.bor
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.cegcc b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.cegcc
index 2c71e758ebb..843952f5455 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.cegcc
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.cegcc
@@ -23,7 +23,7 @@
 
 VERMAJ = 1
 VERMIN = 5
-VERMIC = 16
+VERMIC = 17
 VER = $(VERMAJ).$(VERMIN).$(VERMIC)
 NAME = libpng
 PACKAGE = $(NAME)-$(VER)
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.darwin b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.darwin
index 48805d4a7df..48805d4a7df 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.darwin
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.darwin
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.dec b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.dec
index 5301d87d33e..5301d87d33e 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.dec
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.dec
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.dj2 b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.dj2
index 87a05a364ac..87a05a364ac 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.dj2
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.dj2
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.elf b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.elf
index 5af43b18452..5af43b18452 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.elf
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.elf
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.freebsd b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.freebsd
index 0eb1eeece9e..0eb1eeece9e 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.freebsd
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.freebsd
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.gcc b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.gcc
index 2e5b611367f..2e5b611367f 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.gcc
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.gcc
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.hp64 b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.hp64
index b5b631d11c7..b5b631d11c7 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.hp64
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.hp64
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.hpgcc b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.hpgcc
index 3fe21177a4c..3fe21177a4c 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.hpgcc
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.hpgcc
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.hpux b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.hpux
index 650ab4f6621..650ab4f6621 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.hpux
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.hpux
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.ibmc b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.ibmc
index 209d513b1cb..209d513b1cb 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.ibmc
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.ibmc
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.intel b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.intel
index 1cb9ef37497..1cb9ef37497 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.intel
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.intel
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.knr b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.knr
index 18a39f53755..18a39f53755 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.knr
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.knr
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.linux b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.linux
index b216448571c..bbf78709ffe 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.linux
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.linux
@@ -10,7 +10,7 @@
 # Library name:
 LIBNAME = libpng15
 PNGMAJ = 15
-RELEASE = 16
+RELEASE = 17
 
 # Shared library names:
 LIBSO=$(LIBNAME).so
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.mips b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.mips
index 179d3850b69..179d3850b69 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.mips
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.mips
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.msc b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.msc
index baa863dad99..baa863dad99 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.msc
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.msc
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.msys b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.msys
index 960555fc839..c164543872d 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.msys
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.msys
@@ -18,7 +18,7 @@ exec_prefix=$(prefix)
 # Library name:
 LIBNAME = libpng15
 PNGMAJ = 15
-RELEASE = 16
+RELEASE = 17
 
 # Shared library names:
 LIBSO=$(LIBNAME).dll
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.ne12bsd b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.ne12bsd
index e3ebe92674a..ae07f22041d 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.ne12bsd
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng15
 
 LIB=	png15
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.5.16
+SHLIB_MINOR=	1.5.17
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.netbsd b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.netbsd
index 4b52128297e..9523d1db208 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.netbsd
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.netbsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
 
 LIB=	png
 SHLIB_MAJOR=	15
-SHLIB_MINOR=	1.5.16
+SHLIB_MINOR=	1.5.17
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.openbsd b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.openbsd
index ff12b49f5ce..493e465c4cb 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.openbsd
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.openbsd
@@ -11,7 +11,7 @@ LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat
 
 SHLIB_MAJOR=	15
-SHLIB_MINOR=	1.5.16
+SHLIB_MINOR=	1.5.17
 
 LIB=	png
 SRCS=	png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.sco b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.sco
index 0aad789a981..0aad789a981 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.sco
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.sco
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.sggcc b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.sggcc
index 1611638ba6c..1611638ba6c 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.sggcc
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.sggcc
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.sgi b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.sgi
index 83db59f817e..83db59f817e 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.sgi
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.sgi
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.so9 b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.so9
index 615c2e34580..615c2e34580 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.so9
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.so9
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.solaris b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.solaris
index 24bd61033ce..24bd61033ce 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.solaris
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.solaris
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.solaris-x86 b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.solaris-x86
index 76467622a85..76467622a85 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.solaris-x86
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.solaris-x86
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.std b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.std
index 7fa66e1564f..7fa66e1564f 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.std
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.std
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.sunos b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.sunos
index 383954987ee..383954987ee 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.sunos
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.sunos
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.tc3 b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.tc3
index 462c47fece9..462c47fece9 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.tc3
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.tc3
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.vcwin32 b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.vcwin32
index 6bfeac03f7e..6bfeac03f7e 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makefile.vcwin32
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makefile.vcwin32
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/makevms.com b/Build/source/libs/libpng/libpng-1.5.17/scripts/makevms.com
index f6c326103c2..f6c326103c2 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/makevms.com
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/makevms.com
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/options.awk b/Build/source/libs/libpng/libpng-1.5.17/scripts/options.awk
index c3a850173d0..c3a850173d0 100755
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/options.awk
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/options.awk
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/pnglibconf.dfa b/Build/source/libs/libpng/libpng-1.5.17/scripts/pnglibconf.dfa
index dd6331f6572..2b44aec00ea 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/pnglibconf.dfa
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/pnglibconf.dfa
@@ -110,7 +110,7 @@ logunsupported = 1
 #
 # If you create a private DLL you need to define the following
 # macros in the file 'pngusr.h' and set -DPNG_USER_CONFIG for
-# compilation (i.e. in CFLAGS.)
+# compilation (i.e. in CPPFLAGS.)
 # #define PNG_USER_PRIVATEBUILD \
 #     <Describes by whom and why this version of the DLL was built>
 #  e.g. #define PNG_USER_PRIVATEBUILD "Build by MyCompany for xyz reasons."
@@ -185,29 +185,39 @@ option READ_INT_FUNCTIONS requires READ
 option WRITE_INT_FUNCTIONS disabled
 option WRITE enables WRITE_INT_FUNCTIONS
 
-# This setting allows a hardware or configuration specific filter optimization
-# function to be specified, the argument is the name of the filter initializaion
-# function to use.
-
-setting FILTER_OPTIMIZATIONS
-
 # Implementation specific control of the optimizations, enabled by those
 # hardware or software options that need it (typically when run-time choices
 # must be made by the user)
 option SET_OPTION disabled
- 
-# These options are specific to the ARM NEON hardware optimizations:
+
+# These options are specific to the ARM NEON hardware optimizations.  At present
+# these optimizations depend on GCC specific pre-processing of an assembler (.S)
+# file so they probably won't work with other compilers.
 #
-# ARM_NEON: the optimization itself
-# ARM_NEON_API: allow the optimization to be switched on with png_set_hardware
-# ARM_NEON_CHECK: compile a run-time check to see if Neon extensions are
-#                 supported, this is poorly supported and deprectated - use the
-#                 png_set_hardware API.
-option ARM_NEON disabled,
-   sets FILTER_OPTIMIZATIONS png_init_filter_functions_neon
-option ARM_NEON_API disabled enables SET_OPTION ARM_NEON
-option ARM_NEON_CHECK disabled enables ARM_NEON
- 
+# ARM_NEON_OPT: unset: check at compile time (__ARM_NEON__ must be defined by
+#                      the compiler, typically as a result of specifying
+#                      CC="gcc -mfpu=neon".)
+#                   0: disable (even if the CPU has a NEON FPU.)
+#                   1: check at run time (via ARM_NEON_{API,CHECK})
+#                   2: switch on unconditionally (inadvisable - instead pass
+#                      -mfpu=neon to GCC in CC)
+#           When building libpng avoid using any setting other than '0'; '1' is
+#           set automatically when either 'API' or 'CHECK' are configured in,
+#           '2' should not be necessary as -mfpu=neon will achieve the same
+#           effect as well as applying NEON optimizations to the rest of the
+#           libpng code.
+#           NOTE: any setting other than '0' requires ALIGNED_MEMORY
+# ARM_NEON_API:   (PNG_ARM_NEON == 1) allow the optimization to be switched on
+#                 with png_set_option
+# ARM_NEON_CHECK: (PNG_ARM_NEON == 1) compile a run-time check to see if Neon
+#                 extensions are supported, this is poorly supported and
+#                 deprectated - use the png_set_option API.
+setting ARM_NEON_OPT
+option ARM_NEON_API disabled requires ALIGNED_MEMORY enables SET_OPTION,
+   sets ARM_NEON_OPT 1
+option ARM_NEON_CHECK disabled requires ALIGNED_MEMORY,
+   sets ARM_NEON_OPT 1
+
 # Generic options - affect both read and write.
 
 option WARNINGS
@@ -380,12 +390,6 @@ option INCH_CONVERSIONS
 
 option BUILD_GRAYSCALE_PALETTE
 
-# This changes the default for the ARM NEON optimizations according to
-# __ARM_NEON__
-@#ifdef __ARM_NEON__
-@#  define PNG_ARM_NEON_SUPPORTED
-@#endif
-
 # IN DEVELOPMENT
 # These are currently experimental features; define them if you want
 
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/pnglibconf.h.prebuilt b/Build/source/libs/libpng/libpng-1.5.17/scripts/pnglibconf.h.prebuilt
index d2a6eee09d5..b35fe529307 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/pnglibconf.h.prebuilt
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/pnglibconf.h.prebuilt
@@ -1,7 +1,7 @@
-/* 1.5.16 STANDARD API DEFINITION */
+/* 1.5.17 STANDARD API DEFINITION */
 /* pnglibconf.h - library build configuration */
 
-/* libpng version 1.5.16 - May 23, 2013 */
+/* libpng version 1.5.17 - June 27, 2013 */
 
 /* Copyright (c) 1998-2013 Glenn Randers-Pehrson */
 
@@ -19,7 +19,6 @@
 #define PNG_ALIGNED_MEMORY_SUPPORTED
 /*#undef PNG_ARM_NEON_API_SUPPORTED*/
 /*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
-/*#undef PNG_ARM_NEON_SUPPORTED*/
 #define PNG_BENIGN_ERRORS_SUPPORTED
 #define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
 #define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/pnglibconf.mak b/Build/source/libs/libpng/libpng-1.5.17/scripts/pnglibconf.mak
index 9521f5087d7..9521f5087d7 100755
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/pnglibconf.mak
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/pnglibconf.mak
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/pngwin.rc b/Build/source/libs/libpng/libpng-1.5.17/scripts/pngwin.rc
index 9335cbbe03b..9335cbbe03b 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/pngwin.rc
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/pngwin.rc
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/smakefile.ppc b/Build/source/libs/libpng/libpng-1.5.17/scripts/smakefile.ppc
index 2e7380b1f98..2e7380b1f98 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/smakefile.ppc
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/smakefile.ppc
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/sym.dfn b/Build/source/libs/libpng/libpng-1.5.17/scripts/sym.dfn
index a9b7ce316ab..a9b7ce316ab 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/sym.dfn
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/sym.dfn
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/symbols.def b/Build/source/libs/libpng/libpng-1.5.17/scripts/symbols.def
index d2c6897cc13..7c08b8cd376 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/symbols.def
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/symbols.def
@@ -1,4 +1,4 @@
-;Version 1.5.16
+;Version 1.5.17
 ;--------------------------------------------------------------
 ; LIBPNG symbol list as a Win32 DEF file
 ; Contains all the symbols that can be exported from libpng
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/symbols.dfn b/Build/source/libs/libpng/libpng-1.5.17/scripts/symbols.dfn
index 0341268f2fd..0341268f2fd 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/symbols.dfn
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/symbols.dfn
diff --git a/Build/source/libs/libpng/libpng-1.5.16/scripts/vers.dfn b/Build/source/libs/libpng/libpng-1.5.17/scripts/vers.dfn
index b9ee5b58a2b..b9ee5b58a2b 100644
--- a/Build/source/libs/libpng/libpng-1.5.16/scripts/vers.dfn
+++ b/Build/source/libs/libpng/libpng-1.5.17/scripts/vers.dfn
diff --git a/Build/source/libs/libpng/libpng-1.5.16/test-pngtest.sh b/Build/source/libs/libpng/libpng-1.5.17/test-pngtest.sh
index bba128b6319..bba128b6319 100755
--- a/Build/source/libs/libpng/libpng-1.5.16/test-pngtest.sh
+++ b/Build/source/libs/libpng/libpng-1.5.17/test-pngtest.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.16/test-pngvalid-full.sh b/Build/source/libs/libpng/libpng-1.5.17/test-pngvalid-full.sh
index f7d1b2b5d58..f7d1b2b5d58 100755
--- a/Build/source/libs/libpng/libpng-1.5.16/test-pngvalid-full.sh
+++ b/Build/source/libs/libpng/libpng-1.5.17/test-pngvalid-full.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.16/test-pngvalid-simple.sh b/Build/source/libs/libpng/libpng-1.5.17/test-pngvalid-simple.sh
index 7d4d9d83c28..7d4d9d83c28 100755
--- a/Build/source/libs/libpng/libpng-1.5.16/test-pngvalid-simple.sh
+++ b/Build/source/libs/libpng/libpng-1.5.17/test-pngvalid-simple.sh
diff --git a/Build/source/libs/libpng/version.ac b/Build/source/libs/libpng/version.ac
index c582f50ea12..9e0c88cce70 100644
--- a/Build/source/libs/libpng/version.ac
+++ b/Build/source/libs/libpng/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current libpng version
-m4_define([libpng_version], [1.5.16])
+m4_define([libpng_version], [1.5.17])