summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-07-12 06:26:27 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-07-12 06:26:27 +0000
commit8cf6c7c99500728be625ac00986c46905079eda6 (patch)
tree694183e8540a8de8c1a89adbffa6ef18b4375807 /Build/source/libs
parentb13aba1af09480e6e9b61272ad68ae3c624bebae (diff)
libpng 1.5.12
git-svn-id: svn://tug.org/texlive/trunk@27009 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r--Build/source/libs/libpng/ChangeLog5
-rwxr-xr-xBuild/source/libs/libpng/configure24
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/ANNOUNCE64
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12-PATCHES/ChangeLog (renamed from Build/source/libs/libpng/libpng-1.5.10-PATCHES/ChangeLog)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12-PATCHES/TL-Changes (renamed from Build/source/libs/libpng/libpng-1.5.10-PATCHES/TL-Changes)4
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/ANNOUNCE38
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/CHANGES (renamed from Build/source/libs/libpng/libpng-1.5.10/CHANGES)42
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/CMakeLists.txt (renamed from Build/source/libs/libpng/libpng-1.5.10/CMakeLists.txt)10
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/INSTALL (renamed from Build/source/libs/libpng/libpng-1.5.10/INSTALL)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/LICENSE (renamed from Build/source/libs/libpng/libpng-1.5.10/LICENSE)6
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/Makefile.am (renamed from Build/source/libs/libpng/libpng-1.5.10/Makefile.am)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/Makefile.in (renamed from Build/source/libs/libpng/libpng-1.5.10/Makefile.in)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/README (renamed from Build/source/libs/libpng/libpng-1.5.10/README)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/TODO (renamed from Build/source/libs/libpng/libpng-1.5.10/TODO)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/aclocal.m4 (renamed from Build/source/libs/libpng/libpng-1.5.10/aclocal.m4)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/arm/filter_neon.S (renamed from Build/source/libs/libpng/libpng-1.5.10/arm/filter_neon.S)0
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.12/autogen.sh (renamed from Build/source/libs/libpng/libpng-1.5.10/autogen.sh)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/config.h.in (renamed from Build/source/libs/libpng/libpng-1.5.10/config.h.in)0
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.12/configure (renamed from Build/source/libs/libpng/libpng-1.5.10/configure)30
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/configure.ac (renamed from Build/source/libs/libpng/libpng-1.5.10/configure.ac)12
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/README.txt (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/README.txt)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/COPYING (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/COPYING)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/LICENSE (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/LICENSE)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/Makefile.mingw32 (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.mingw32)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/Makefile.sgi (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.sgi)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/Makefile.unx (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.unx)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/Makefile.w32 (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.w32)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/README (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/README)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/makevms.com (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/makevms.com)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/readpng.c (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng.c)3
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/readpng.h (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/readpng2.c (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng2.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/readpng2.h (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng2.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/readppm.c (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readppm.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/rpng-win.c (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng-win.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/rpng-x.c (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng-x.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/rpng2-win.c (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng2-win.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/rpng2-x.c (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng2-x.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/toucan.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/toucan.png)bin12901 -> 12901 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/wpng.c (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/wpng.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/writepng.c (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/writepng.c)3
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/writepng.h (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/writepng.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/libtests/pngvalid.c (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/libtests/pngvalid.c)32
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/README (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/README)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/decoder/README (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/README)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/decoder/makefile (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/makefile)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/decoder/pngusr.dfa (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/pngusr.dfa)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/decoder/pngusr.h (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/pngusr.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/encoder/README (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/README)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/encoder/makefile (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/makefile)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/encoder/pngusr.dfa (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/pngusr.dfa)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/encoder/pngusr.h (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/pngusr.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/preader/README (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/README)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/preader/makefile (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/makefile)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/preader/pngusr.dfa (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/pngusr.dfa)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/preader/pngusr.h (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/pngusr.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/README (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/README)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/makefile.std (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makefile.std)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/makefile.tc3 (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makefile.tc3)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/makevms.com (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makevms.com)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/png2pnm.bat (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.bat)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/png2pnm.c (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/png2pnm.sh (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.sh)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/pngminus.bat (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pngminus.bat)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/pngminus.sh (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pngminus.sh)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/pnm2png.bat (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.bat)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/pnm2png.c (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/pnm2png.sh (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.sh)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/README (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/README)5
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn0g01.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g01.png)bin164 -> 164 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn0g02.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g02.png)bin104 -> 104 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn0g04.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g04.png)bin145 -> 145 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn0g08.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g08.png)bin138 -> 138 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn0g16.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g16.png)bin167 -> 167 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn2c08.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn2c08.png)bin145 -> 145 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn2c16.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn2c16.png)bin302 -> 302 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn3p01.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p01.png)bin112 -> 112 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn3p02.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p02.png)bin146 -> 146 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn3p04.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p04.png)bin216 -> 216 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn3p08.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p08.png)bin1286 -> 1286 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn4a08.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn4a08.png)bin126 -> 126 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn4a16.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn4a16.png)bin2206 -> 2206 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn6a08.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn6a08.png)bin184 -> 184 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn6a16.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn6a16.png)bin3435 -> 3435 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbbn0g01.pngbin0 -> 176 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbbn0g02.pngbin0 -> 197 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbbn0g04.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn1g04.png)bin429 -> 429 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbbn2c16.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn2c16.png)bin2041 -> 2041 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbbn3p08.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn3p08.png)bin1499 -> 1499 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbgn2c16.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbgn2c16.png)bin2041 -> 2041 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbgn3p08.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbgn3p08.png)bin1499 -> 1499 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbrn2c08.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbrn2c08.png)bin1633 -> 1633 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbwn0g16.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbwn1g16.png)bin1313 -> 1313 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbwn3p08.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbwn3p08.png)bin1496 -> 1496 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbyn3p08.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbyn3p08.png)bin1499 -> 1499 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftp0n0g08.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n1g08.png)bin719 -> 719 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftp0n2c08.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n2c08.png)bin1594 -> 1594 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftp0n3p08.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n3p08.png)bin1476 -> 1476 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftp1n3p08.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp1n3p08.png)bin1483 -> 1483 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/PngFile.c (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/PngFile.c)1
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/PngFile.h (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/PngFile.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/README.txt (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/README.txt)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.c (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.c)1
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.dsp (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.dsp)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.dsw (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.dsw)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.ico (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.ico)bin766 -> 766 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.png (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.png)bin208 -> 208 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.rc (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.rc)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/cexcept.h (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/cexcept.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/resource.h (renamed from Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/resource.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/example.c (renamed from Build/source/libs/libpng/libpng-1.5.10/example.c)0
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.12/libpng-config.in (renamed from Build/source/libs/libpng/libpng-1.5.10/libpng-config.in)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/libpng-manual.txt (renamed from Build/source/libs/libpng/libpng-1.5.10/libpng-manual.txt)49
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/libpng.3 (renamed from Build/source/libs/libpng/libpng-1.5.10/libpng.3)63
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/libpng.pc.in (renamed from Build/source/libs/libpng/libpng-1.5.10/libpng.pc.in)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/libpngpf.3 (renamed from Build/source/libs/libpng/libpng-1.5.10/libpngpf.3)4
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/png.5 (renamed from Build/source/libs/libpng/libpng-1.5.10/png.5)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/png.c (renamed from Build/source/libs/libpng/libpng-1.5.10/png.c)18
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/png.h (renamed from Build/source/libs/libpng/libpng-1.5.10/png.h)27
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngbar.jpg (renamed from Build/source/libs/libpng/libpng-1.5.10/pngbar.jpg)bin2498 -> 2498 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngbar.png (renamed from Build/source/libs/libpng/libpng-1.5.10/pngbar.png)bin2399 -> 2399 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngconf.h (renamed from Build/source/libs/libpng/libpng-1.5.10/pngconf.h)4
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngdebug.h (renamed from Build/source/libs/libpng/libpng-1.5.10/pngdebug.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngerror.c (renamed from Build/source/libs/libpng/libpng-1.5.10/pngerror.c)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngget.c (renamed from Build/source/libs/libpng/libpng-1.5.10/pngget.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pnginfo.h (renamed from Build/source/libs/libpng/libpng-1.5.10/pnginfo.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pnglibconf.h (renamed from Build/source/libs/libpng/libpng-1.5.10/pnglibconf.h)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngmem.c (renamed from Build/source/libs/libpng/libpng-1.5.10/pngmem.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngnow.png (renamed from Build/source/libs/libpng/libpng-1.5.10/pngnow.png)bin2069 -> 2069 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngpread.c (renamed from Build/source/libs/libpng/libpng-1.5.10/pngpread.c)5
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngpriv.h (renamed from Build/source/libs/libpng/libpng-1.5.10/pngpriv.h)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngread.c (renamed from Build/source/libs/libpng/libpng-1.5.10/pngread.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngrio.c (renamed from Build/source/libs/libpng/libpng-1.5.10/pngrio.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngrtran.c (renamed from Build/source/libs/libpng/libpng-1.5.10/pngrtran.c)13
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngrutil.c (renamed from Build/source/libs/libpng/libpng-1.5.10/pngrutil.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngset.c (renamed from Build/source/libs/libpng/libpng-1.5.10/pngset.c)10
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngstruct.h (renamed from Build/source/libs/libpng/libpng-1.5.10/pngstruct.h)5
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngtest.c (renamed from Build/source/libs/libpng/libpng-1.5.10/pngtest.c)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngtest.png (renamed from Build/source/libs/libpng/libpng-1.5.10/pngtest.png)bin8695 -> 8695 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngtrans.c (renamed from Build/source/libs/libpng/libpng-1.5.10/pngtrans.c)6
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngusr.dfa (renamed from Build/source/libs/libpng/libpng-1.5.10/pngusr.dfa)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngwio.c (renamed from Build/source/libs/libpng/libpng-1.5.10/pngwio.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngwrite.c (renamed from Build/source/libs/libpng/libpng-1.5.10/pngwrite.c)5
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngwtran.c (renamed from Build/source/libs/libpng/libpng-1.5.10/pngwtran.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/pngwutil.c (renamed from Build/source/libs/libpng/libpng-1.5.10/pngwutil.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/owatcom/libpng.tgt (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/libpng.tgt)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/owatcom/libpng.wpj (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/libpng.wpj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/owatcom/pngconfig.mak (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngconfig.mak)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/owatcom/pngtest.tgt (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngtest.tgt)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/owatcom/pngvalid.tgt (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngvalid.tgt)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/PRJ0041.mak (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/PRJ0041.mak)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/README.txt (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/README.txt)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/README_zlib.txt (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/README_zlib.txt)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/libpng.sln (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/libpng.sln)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/libpng.vcproj (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/libpng.vcproj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/pngtest.vcproj (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/pngtest.vcproj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/zlib.vcproj (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/zlib.vcproj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/libpng/libpng.vcxproj (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/libpng/libpng.vcxproj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/pnglibconf/pnglibconf.vcxproj (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pnglibconf/pnglibconf.vcxproj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/pngtest/pngtest.vcxproj (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pngtest/pngtest.vcxproj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/pngvalid/pngvalid.vcxproj (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pngvalid/pngvalid.vcxproj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/readme.txt (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/readme.txt)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/vstudio.sln (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/vstudio.sln)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/zlib.props (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/zlib.props)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/zlib/zlib.vcxproj (renamed from Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/zlib/zlib.vcxproj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/README.txt (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/README.txt)17
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/SCOPTIONS.ppc (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/SCOPTIONS.ppc)0
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.12/scripts/checksym.awk (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/checksym.awk)0
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.12/scripts/chkfmt (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/chkfmt)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/def.dfn (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/def.dfn)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/descrip.mms (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/descrip.mms)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/libpng-config-body.in (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/libpng-config-body.in)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/libpng-config-head.in (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/libpng-config-head.in)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/libpng.pc.in (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/libpng.pc.in)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.32sunu (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.32sunu)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.64sunu (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.64sunu)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.acorn (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.acorn)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.aix (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.aix)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.amiga (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.amiga)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.atari (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.atari)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.bc32 (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.bc32)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.beos (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.beos)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.bor (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.bor)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.cegcc (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.cegcc)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.darwin (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.darwin)16
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.dec (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.dec)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.dj2 (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.dj2)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.elf (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.elf)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.freebsd (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.freebsd)7
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.gcc (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.gcc)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.hp64 (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hp64)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.hpgcc (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hpgcc)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.hpux (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hpux)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.ibmc (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.ibmc)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.intel (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.intel)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.knr (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.knr)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.linux (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.linux)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.mips (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.mips)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.msc (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.msc)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.ne12bsd (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.ne12bsd)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.netbsd (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.netbsd)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.openbsd (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.openbsd)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.sco (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sco)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.sggcc (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sggcc)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.sgi (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sgi)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.so9 (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.so9)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.solaris (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.solaris)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.solaris-x86 (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.solaris-x86)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.std (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.std)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.sunos (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sunos)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.tc3 (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.tc3)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.vcwin32 (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.vcwin32)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/makevms.com (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/makevms.com)0
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.12/scripts/options.awk (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/options.awk)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/pnglibconf.dfa (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.dfa)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/pnglibconf.h.prebuilt (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.h.prebuilt)2
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.12/scripts/pnglibconf.mak (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.mak)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/pngwin.rc (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/pngwin.rc)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/smakefile.ppc (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/smakefile.ppc)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/sym.dfn (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/sym.dfn)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/symbols.def (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/symbols.def)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/symbols.dfn (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/symbols.dfn)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.12/scripts/vers.dfn (renamed from Build/source/libs/libpng/libpng-1.5.10/scripts/vers.dfn)0
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.12/test-pngtest.sh (renamed from Build/source/libs/libpng/libpng-1.5.10/test-pngtest.sh)0
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.12/test-pngvalid-full.sh (renamed from Build/source/libs/libpng/libpng-1.5.10/test-pngvalid-full.sh)0
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.12/test-pngvalid-simple.sh (renamed from Build/source/libs/libpng/libpng-1.5.10/test-pngvalid-simple.sh)0
-rw-r--r--Build/source/libs/libpng/version.ac2
227 files changed, 310 insertions, 259 deletions
diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog
index 182dda902a1..9df0884d3f4 100644
--- a/Build/source/libs/libpng/ChangeLog
+++ b/Build/source/libs/libpng/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-11 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import libpng-1.5.12.
+ * version.ac: Adjust.
+
2012-03-30 Peter Breitenlohner <peb@mppmu.mpg.de>
Import libpng-1.5.10.
diff --git a/Build/source/libs/libpng/configure b/Build/source/libs/libpng/configure
index 5d4e2404e6e..51af2c42f3b 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.10.
+# Generated by GNU Autoconf 2.69 for libpng for TeX Live 1.5.12.
#
# 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.10'
-PACKAGE_STRING='libpng for TeX Live 1.5.10'
+PACKAGE_VERSION='1.5.12'
+PACKAGE_STRING='libpng for TeX Live 1.5.12'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="libpng-1.5.10/pngget.c"
+ac_unique_file="libpng-1.5.12/pngget.c"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1281,7 +1281,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.10 to adapt to many kinds of systems.
+\`configure' configures libpng for TeX Live 1.5.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1348,7 +1348,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.10:";;
+ short | recursive ) echo "Configuration of libpng for TeX Live 1.5.12:";;
esac
cat <<\_ACEOF
@@ -1451,7 +1451,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng for TeX Live configure 1.5.10
+libpng for TeX Live configure 1.5.12
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1874,7 +1874,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.10, which was
+It was created by libpng for TeX Live $as_me 1.5.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2702,7 +2702,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng-for-tex-live'
- VERSION='1.5.10'
+ VERSION='1.5.12'
cat >>confdefs.h <<_ACEOF
@@ -4774,7 +4774,7 @@ LIBS=$kpse_save_LIBS
echo timestamp >config.force
fi
-LIBPNG_TREE=libpng-1.5.10
+LIBPNG_TREE=libpng-1.5.12
LIBPNG_DEFINES='-DPNG_CONFIGURE_LIBPNG -DPNG_NO_MMX_CODE'
@@ -5321,7 +5321,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.10, which was
+This file was extended by libpng for TeX Live $as_me 1.5.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5387,7 +5387,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.10
+libpng for TeX Live config.status 1.5.12
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/libs/libpng/libpng-1.5.10/ANNOUNCE b/Build/source/libs/libpng/libpng-1.5.10/ANNOUNCE
deleted file mode 100644
index dbc2ed17300..00000000000
--- a/Build/source/libs/libpng/libpng-1.5.10/ANNOUNCE
+++ /dev/null
@@ -1,64 +0,0 @@
-
-Libpng 1.5.10 - March 29, 2012
-
-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.10.tar.xz (LZMA-compressed, recommended)
- libpng-1.5.10.tar.gz
- libpng-1.5.10.tar.bz2
-
-Source files with CRLF line endings (for Windows), without the
-"configure" script
-
- lpng1510.7z (LZMA-compressed, recommended)
- lpng1510.zip
-
-Other information:
-
- libpng-1.5.10-README.txt
- libpng-1.5.10-LICENSE.txt
-
-Changes since the last public release (1.5.9):
-
- Removed two useless #ifdef directives from pngread.c and one from pngrutil.c
- Always put the CMAKE_LIBRARY in "lib" (removed special WIN32 case).
- Removed empty vstudio/pngstest directory (Clifford Yapp).
- Eliminated redundant png_push_read_tEXt|zTXt|iTXt|unknown code from
- pngpread.c and use the sequential png_handle_tEXt, etc., in pngrutil.c;
- now that png_ptr->buffer is inaccessible to applications, the special
- handling is no longer useful.
- Fixed bug with png_handle_hIST with odd chunk length (Frank Busse).
- Added PNG_SAFE_LIMITS feature to pnglibconf.dfa and code in pngconf.h
- to reset the user limits to safe ones if PNG_SAFE_LIMITS is defined.
- To enable, use "CPPFLAGS=-DPNG_SAFE_LIMITS_SUPPORTED" on the configure
- command or put "#define PNG_SAFE_LIMITS_SUPPORTED" in pnglibconf.h.
- Revised the SAFE_LIMITS feature to be the same as the feature in libpng16.
- Added information about the new limits in the manual.
- Updated Makefile.in
- Removed unused "current_text" members of png_struct and the png_free()
- of png_ptr->current_text from pngread.c
- Fixed PNG_LIBPNG_BUILD_BASE_TYPE definition.
- Fixed CMF optimization of non-IDAT compressed chunks, which was added at
- libpng-1.5.4. It sometimes produced too small of a window.
- Reject all iCCP chunks after the first, even if the first one is invalid.
- Added palette-index checking. Issue a png_benign_error() if an invalid
- index is found.
- Revised example.c to put text strings in a temporary character array
- instead of directly assigning string constants to png_textp members.
- This avoids compiler warnings when -Wwrite-strings is enabled.
- Prevent PNG_EXPAND+PNG_SHIFT doing the shift twice.
- Revised png_set_text_2() to avoid potential memory corruption (fixes
- CVE-2011-3048).
-
-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.10-PATCHES/ChangeLog b/Build/source/libs/libpng/libpng-1.5.12-PATCHES/ChangeLog
index 26311ea5079..26311ea5079 100644
--- a/Build/source/libs/libpng/libpng-1.5.10-PATCHES/ChangeLog
+++ b/Build/source/libs/libpng/libpng-1.5.12-PATCHES/ChangeLog
diff --git a/Build/source/libs/libpng/libpng-1.5.10-PATCHES/TL-Changes b/Build/source/libs/libpng/libpng-1.5.12-PATCHES/TL-Changes
index ae4c2f26739..0c1175e35cc 100644
--- a/Build/source/libs/libpng/libpng-1.5.10-PATCHES/TL-Changes
+++ b/Build/source/libs/libpng/libpng-1.5.12-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
-Changes applied to the libpng-1.5.10/ tree as obtained from:
- http://www.libpng.org/ libpng-1.5.10.tar.xz
+Changes applied to the libpng-1.5.12/ tree as obtained from:
+ http://www.libpng.org/ libpng-1.5.12.tar.xz
Copied:
scripts/pnglibconf.h.prebuilt -> pnglibconf.h
diff --git a/Build/source/libs/libpng/libpng-1.5.12/ANNOUNCE b/Build/source/libs/libpng/libpng-1.5.12/ANNOUNCE
new file mode 100644
index 00000000000..17fc962d4d5
--- /dev/null
+++ b/Build/source/libs/libpng/libpng-1.5.12/ANNOUNCE
@@ -0,0 +1,38 @@
+
+Libpng 1.5.12 - July 11, 2012
+
+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.12.tar.xz (LZMA-compressed, recommended)
+ libpng-1.5.12.tar.gz
+ libpng-1.5.12.tar.bz2
+
+Source files with CRLF line endings (for Windows), without the
+"configure" script
+
+ lpng1512.7z (LZMA-compressed, recommended)
+ lpng1512.zip
+
+Other information:
+
+ libpng-1.5.12-README.txt
+ libpng-1.5.12-LICENSE.txt
+
+Changes since the last public release (1.5.11):
+
+ Removed scripts/makefile.cegcc from the *.zip and *.7z distributions; it
+ depends on configure, which is not included in those archives.
+ Changed "a+w" to "u+w" in Makefile.in to fix CVE-2012-3386.
+
+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.10/CHANGES b/Build/source/libs/libpng/libpng-1.5.12/CHANGES
index 70af8273e71..83f8f0846b7 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/CHANGES
+++ b/Build/source/libs/libpng/libpng-1.5.12/CHANGES
@@ -3854,6 +3854,48 @@ Version 1.5.10 [March 29, 2012]
Revised png_set_text_2() to avoid potential memory corruption (fixes
CVE-2011-3048).
+Version 1.5.11beta01 [April 28, 2012]
+ Revised scripts/makefile.darwin: use system zlib; remove quotes around
+ architecture list; add missing ppc architecture; add architecture options
+ to shared library link; don't try to create a shared lib based on missing
+ RELEASE variable.
+ Enable png_set_check_for_invalid_index() for both read and write.
+ Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED/#endif in pngpriv.h around
+ declaration of png_handle_unknown().
+ Added -lssp_nonshared in a comment in scripts/makefile.freebsd
+ and changed deprecated NOOBJ and NOPROFILE to NO_OBJ and NO_PROFILE.
+
+Version 1.5.11rc01 [May 23, 2012]
+ No changes.
+
+Version 1.5.11rc02 [May 29, 2012]
+ Fixed some typos in comments.
+ Revised CMakeLists.txt to not attempt to make a symlink under mingw.
+ Added two images to contrib/pngsuite (1-bit and 2-bit transparent grayscale),
+ and renamed three whose names were inconsistent with those in
+ pngsuite/README.txt.
+
+Version 1.5.11rc03 [June 4, 2012]
+ Do not depend upon a GCC feature macro being available for use in generating
+ the linker mapfile symbol prefix.
+ Made fixes for new optimization warnings from gcc 4.7.0. The compiler
+ performed an optimization which is safe but then warned about it.
+ Changing the type of 'palette_number' in pngvalid.c removes the warning.
+
+Version 1.5.11rc04 [June 6, 2012]
+ Improved performance of new do_check_palette_indexes() function.
+
+Version 1.5.11rc05 [June 7, 2012]
+ Don't check palette indexes if num_palette is 0 (as it can be in MNG files).
+
+Version 1.5.11 [June 14, 2012]
+ Include zlib.h in contrib/gregbook and contrib/visupng examples.
+
+Version 1.5.12 [July 11, 2012]
+ Removed scripts/makefile.cegcc from the *.zip and *.7z distributions; it
+ depends on configure, which is not included in those archives.
+ Changed "a+w" to "u+w" in Makefile.in to fix CVE-2012-3386.
+
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/Build/source/libs/libpng/libpng-1.5.10/CMakeLists.txt b/Build/source/libs/libpng/libpng-1.5.12/CMakeLists.txt
index b5117891d64..318a1196c31 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/CMakeLists.txt
+++ b/Build/source/libs/libpng/libpng-1.5.12/CMakeLists.txt
@@ -35,7 +35,7 @@ enable_testing()
set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 5)
-set(PNGLIB_RELEASE 10)
+set(PNGLIB_RELEASE 12)
set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
@@ -184,7 +184,7 @@ ENDIF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
# copies if different.
macro(CREATE_SYMLINK SRC_FILE DEST_FILE)
FILE(REMOVE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE})
- if(WIN32 AND NOT CYGWIN AND NOT MINGW)
+ if(WIN32 AND NOT CYGWIN AND NOT MSYS)
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${DEST_FILE}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${SRC_FILE} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE}
@@ -192,10 +192,10 @@ macro(CREATE_SYMLINK SRC_FILE DEST_FILE)
DEPENDS ${PNG_LIB_NAME} ${PNG_LIB_NAME_STATIC}
)
ADD_CUSTOM_TARGET(${DEST_FILE}_COPY ALL DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE})
- else(WIN32 AND NOT CYGWIN AND NOT MINGW)
+ else(WIN32 AND NOT CYGWIN AND NOT MSYS)
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SRC_FILE} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SRC_FILE} ${DEST_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- endif(WIN32 AND NOT CYGWIN AND NOT MINGW)
+ endif(WIN32 AND NOT CYGWIN AND NOT MSYS)
endmacro()
# libpng is a library so default to 'lib'
@@ -225,7 +225,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW)
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 15.${PNGLIB_RELEASE}.1.5.10
+# VERSION 15.${PNGLIB_RELEASE}.1.5.12
VERSION 15.${PNGLIB_RELEASE}.0
SOVERSION 15
CLEAN_DIRECT_OUTPUT 1)
diff --git a/Build/source/libs/libpng/libpng-1.5.10/INSTALL b/Build/source/libs/libpng/libpng-1.5.12/INSTALL
index e6979c6fb01..e6979c6fb01 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/INSTALL
+++ b/Build/source/libs/libpng/libpng-1.5.12/INSTALL
diff --git a/Build/source/libs/libpng/libpng-1.5.10/LICENSE b/Build/source/libs/libpng/libpng-1.5.12/LICENSE
index b72d1258e3a..3a67d545888 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/LICENSE
+++ b/Build/source/libs/libpng/libpng-1.5.12/LICENSE
@@ -10,8 +10,8 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.5.10, March 29, 2012, are
-Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
+libpng versions 1.2.6, August 15, 2004, through 1.5.12, July 11, 2012, are
+Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-March 29, 2012
+July 11, 2012
diff --git a/Build/source/libs/libpng/libpng-1.5.10/Makefile.am b/Build/source/libs/libpng/libpng-1.5.12/Makefile.am
index 19652c4bdad..19652c4bdad 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/Makefile.am
+++ b/Build/source/libs/libpng/libpng-1.5.12/Makefile.am
diff --git a/Build/source/libs/libpng/libpng-1.5.10/Makefile.in b/Build/source/libs/libpng/libpng-1.5.12/Makefile.in
index 2ff35f74ab0..9d086a6b770 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/Makefile.in
+++ b/Build/source/libs/libpng/libpng-1.5.12/Makefile.in
@@ -1116,7 +1116,7 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
+ chmod -R a-w $(distdir); chmod u+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
diff --git a/Build/source/libs/libpng/libpng-1.5.10/README b/Build/source/libs/libpng/libpng-1.5.12/README
index e821ee4c878..3f5b0d6b644 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/README
+++ b/Build/source/libs/libpng/libpng-1.5.12/README
@@ -1,4 +1,4 @@
-README for libpng version 1.5.10 - March 29, 2012 (shared library 15.0)
+README for libpng version 1.5.12 - July 11, 2012 (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.
diff --git a/Build/source/libs/libpng/libpng-1.5.10/TODO b/Build/source/libs/libpng/libpng-1.5.12/TODO
index 6e1f028bd75..6e1f028bd75 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/TODO
+++ b/Build/source/libs/libpng/libpng-1.5.12/TODO
diff --git a/Build/source/libs/libpng/libpng-1.5.10/aclocal.m4 b/Build/source/libs/libpng/libpng-1.5.12/aclocal.m4
index 004cd559f14..004cd559f14 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/aclocal.m4
+++ b/Build/source/libs/libpng/libpng-1.5.12/aclocal.m4
diff --git a/Build/source/libs/libpng/libpng-1.5.10/arm/filter_neon.S b/Build/source/libs/libpng/libpng-1.5.12/arm/filter_neon.S
index 63a5d8c17ff..63a5d8c17ff 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/arm/filter_neon.S
+++ b/Build/source/libs/libpng/libpng-1.5.12/arm/filter_neon.S
diff --git a/Build/source/libs/libpng/libpng-1.5.10/autogen.sh b/Build/source/libs/libpng/libpng-1.5.12/autogen.sh
index 5be104eb1d9..5be104eb1d9 100755
--- a/Build/source/libs/libpng/libpng-1.5.10/autogen.sh
+++ b/Build/source/libs/libpng/libpng-1.5.12/autogen.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.10/config.h.in b/Build/source/libs/libpng/libpng-1.5.12/config.h.in
index d1547427384..d1547427384 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/config.h.in
+++ b/Build/source/libs/libpng/libpng-1.5.12/config.h.in
diff --git a/Build/source/libs/libpng/libpng-1.5.10/configure b/Build/source/libs/libpng/libpng-1.5.12/configure
index df2d1734c2c..d751d5157a4 100755
--- a/Build/source/libs/libpng/libpng-1.5.10/configure
+++ b/Build/source/libs/libpng/libpng-1.5.12/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libpng 1.5.10.
+# Generated by GNU Autoconf 2.68 for libpng 1.5.12.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.5.10'
-PACKAGE_STRING='libpng 1.5.10'
+PACKAGE_VERSION='1.5.12'
+PACKAGE_STRING='libpng 1.5.12'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL=''
@@ -1321,7 +1321,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libpng 1.5.10 to adapt to many kinds of systems.
+\`configure' configures libpng 1.5.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1391,7 +1391,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng 1.5.10:";;
+ short | recursive ) echo "Configuration of libpng 1.5.12:";;
esac
cat <<\_ACEOF
@@ -1502,7 +1502,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.5.10
+libpng configure 1.5.12
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1925,7 +1925,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libpng $as_me 1.5.10, which was
+It was created by libpng $as_me 1.5.12, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2740,7 +2740,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.5.10'
+ VERSION='1.5.12'
cat >>confdefs.h <<_ACEOF
@@ -2804,10 +2804,10 @@ fi
-PNGLIB_VERSION=1.5.10
+PNGLIB_VERSION=1.5.12
PNGLIB_MAJOR=1
PNGLIB_MINOR=5
-PNGLIB_RELEASE=10
+PNGLIB_RELEASE=12
@@ -12784,9 +12784,9 @@ if test "$have_ld_version_script" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbol prefix" >&5
$as_echo_n "checking for symbol prefix... " >&6; }
SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \
- | ${CPP-${CC-gcc} -E} - 2>&1 \
- | ${EGREP-grep} "^PREFIX=" \
- | ${SED-sed} "s:^PREFIX=::"`
+ | ${CPP-${CC-gcc} -E} - 2>&1 \
+ | ${EGREP-grep} "^PREFIX=" \
+ | ${SED-sed} -e "s:^PREFIX=::" -e "s:__USER_LABEL_PREFIX__::"`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYMBOL_PREFIX" >&5
$as_echo "$SYMBOL_PREFIX" >&6; }
@@ -13417,7 +13417,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libpng $as_me 1.5.10, which was
+This file was extended by libpng $as_me 1.5.12, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13483,7 +13483,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libpng config.status 1.5.10
+libpng config.status 1.5.12
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/libs/libpng/libpng-1.5.10/configure.ac b/Build/source/libs/libpng/libpng-1.5.12/configure.ac
index 023aba43b3d..beeeb812ca5 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/configure.ac
+++ b/Build/source/libs/libpng/libpng-1.5.12/configure.ac
@@ -18,15 +18,15 @@ AC_PREREQ(2.59)
dnl Version number stuff here:
-AC_INIT([libpng], [1.5.10], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.5.12], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.5.10
+PNGLIB_VERSION=1.5.12
PNGLIB_MAJOR=1
PNGLIB_MINOR=5
-PNGLIB_RELEASE=10
+PNGLIB_RELEASE=12
dnl End of version number stuff
@@ -145,9 +145,9 @@ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
if test "$have_ld_version_script" = "yes"; then
AC_MSG_CHECKING([for symbol prefix])
SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \
- | ${CPP-${CC-gcc} -E} - 2>&1 \
- | ${EGREP-grep} "^PREFIX=" \
- | ${SED-sed} "s:^PREFIX=::"`
+ | ${CPP-${CC-gcc} -E} - 2>&1 \
+ | ${EGREP-grep} "^PREFIX=" \
+ | ${SED-sed} -e "s:^PREFIX=::" -e "s:__USER_LABEL_PREFIX__::"`
AC_SUBST(SYMBOL_PREFIX)
AC_MSG_RESULT($SYMBOL_PREFIX)
fi
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/README.txt b/Build/source/libs/libpng/libpng-1.5.12/contrib/README.txt
index bcd433d3523..bcd433d3523 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/README.txt
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/README.txt
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/COPYING b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/COPYING
index a3e97747969..a3e97747969 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/COPYING
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/COPYING
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/LICENSE b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/LICENSE
index d9567178cb6..d9567178cb6 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/LICENSE
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/LICENSE
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.mingw32 b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/Makefile.mingw32
index e70a59aef2b..e70a59aef2b 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.mingw32
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/Makefile.mingw32
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.sgi b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/Makefile.sgi
index 91623acf068..91623acf068 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.sgi
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/Makefile.sgi
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.unx b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/Makefile.unx
index b52d8b6aa65..b52d8b6aa65 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.unx
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/Makefile.unx
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.w32 b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/Makefile.w32
index 41cfb231a2c..41cfb231a2c 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.w32
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/Makefile.w32
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/README b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/README
index 7b1f6a3ea62..7b1f6a3ea62 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/README
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/README
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/makevms.com b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/makevms.com
index f32bcaba7f9..f32bcaba7f9 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/makevms.com
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/makevms.com
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng.c b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/readpng.c
index df42c301b3c..0b75fac6dfc 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/readpng.c
@@ -55,8 +55,9 @@
#include <stdio.h>
#include <stdlib.h>
+#include <zlib.h>
-#include "png.h" /* libpng header; includes zlib.h */
+#include "png.h" /* libpng header */
#include "readpng.h" /* typedefs, common macros, public prototypes */
/* future versions of libpng will provide this macro: */
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng.h b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/readpng.h
index fad9fe3b4c5..fad9fe3b4c5 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng.h
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/readpng.h
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng2.c b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/readpng2.c
index b9746b75608..b9746b75608 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng2.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/readpng2.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng2.h b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/readpng2.h
index 6b3660d7c17..6b3660d7c17 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng2.h
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/readpng2.h
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readppm.c b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/readppm.c
index be9a56d95fd..be9a56d95fd 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readppm.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/readppm.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng-win.c b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/rpng-win.c
index f53ddc8ece6..f53ddc8ece6 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng-win.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/rpng-win.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng-x.c b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/rpng-x.c
index 6d10e1b84ed..6d10e1b84ed 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng-x.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/rpng-x.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng2-win.c b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/rpng2-win.c
index 223e737409a..223e737409a 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng2-win.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/rpng2-win.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng2-x.c b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/rpng2-x.c
index 7f24b632be0..7f24b632be0 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng2-x.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/rpng2-x.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/toucan.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/toucan.png
index 03960d49399..03960d49399 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/toucan.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/toucan.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/wpng.c b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/wpng.c
index a06e3529ecb..a06e3529ecb 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/wpng.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/wpng.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/writepng.c b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/writepng.c
index f07f4a8a02d..0dda62ea8c5 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/writepng.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/writepng.c
@@ -55,8 +55,9 @@
#include <stdlib.h> /* for exit() prototype */
+#include <zlib.h>
-#include "png.h" /* libpng header; includes zlib.h and setjmp.h */
+#include "png.h" /* libpng header, includes setjmp.h */
#include "writepng.h" /* typedefs, common macros, public prototypes */
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/writepng.h b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/writepng.h
index 78b966b5874..78b966b5874 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/writepng.h
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/gregbook/writepng.h
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/libtests/pngvalid.c b/Build/source/libs/libpng/libpng-1.5.12/contrib/libtests/pngvalid.c
index 3dd6f2133ca..e10381d8117 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/libtests/pngvalid.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/libtests/pngvalid.c
@@ -1,7 +1,7 @@
/* pngvalid.c - validate libpng by constructing then reading png files.
*
- * Last changed in libpng 1.5.8 [%RDATE%]
+ * Last changed in libpng 1.5.8 [February 1, 2012]
* Copyright (c) 2012 Glenn Randers-Pehrson
* Written by John Cunningham Bowler
*
@@ -244,7 +244,7 @@ random_choice(void)
#define COL_FROM_ID(id) ((png_byte)((id)& 0x7U))
#define DEPTH_FROM_ID(id) ((png_byte)(((id) >> 3) & 0x1fU))
-#define PALETTE_FROM_ID(id) ((int)(((id) >> 8) & 0x1f))
+#define PALETTE_FROM_ID(id) (((id) >> 8) & 0x1f)
#define INTERLACE_FROM_ID(id) ((int)(((id) >> 13) & 0x3))
#define DO_INTERLACE_FROM_ID(id) ((int)(((id)>>15) & 1))
#define WIDTH_FROM_ID(id) (((id)>>16) & 0xff)
@@ -253,7 +253,7 @@ random_choice(void)
/* Utility to construct a standard name for a standard image. */
static size_t
standard_name(char *buffer, size_t bufsize, size_t pos, png_byte colour_type,
- int bit_depth, int npalette, int interlace_type,
+ int bit_depth, unsigned int npalette, int interlace_type,
png_uint_32 w, png_uint_32 h, int do_interlace)
{
pos = safecat(buffer, bufsize, pos, colour_types[colour_type]);
@@ -315,10 +315,11 @@ standard_name_from_id(char *buffer, size_t bufsize, size_t pos, png_uint_32 id)
/* The following defines the number of different palettes to generate for
* each log bit depth of a colour type 3 standard image.
*/
-#define PALETTE_COUNT(bit_depth) ((bit_depth) > 4 ? 1 : 16)
+#define PALETTE_COUNT(bit_depth) ((bit_depth) > 4 ? 1U : 16U)
static int
-next_format(png_bytep colour_type, png_bytep bit_depth, int* palette_number)
+next_format(png_bytep colour_type, png_bytep bit_depth,
+ unsigned int* palette_number)
{
if (*bit_depth == 0)
{
@@ -3256,8 +3257,8 @@ transform_row(png_structp pp, png_byte buffer[TRANSFORM_ROWMAX],
*/
static void
make_transform_image(png_store* PNG_CONST ps, png_byte PNG_CONST colour_type,
- png_byte PNG_CONST bit_depth, int palette_number, int interlace_type,
- png_const_charp name)
+ png_byte PNG_CONST bit_depth, unsigned int palette_number,
+ int interlace_type, png_const_charp name)
{
context(ps, fault);
@@ -3384,7 +3385,7 @@ make_transform_images(png_store *ps)
{
png_byte colour_type = 0;
png_byte bit_depth = 0;
- int palette_number = 0;
+ unsigned int palette_number = 0;
/* This is in case of errors. */
safecat(ps->test, sizeof ps->test, 0, "make standard images");
@@ -7069,7 +7070,7 @@ perform_transform_test(png_modifier *pm)
{
png_byte colour_type = 0;
png_byte bit_depth = 0;
- int palette_number = 0;
+ unsigned int palette_number = 0;
while (next_format(&colour_type, &bit_depth, &palette_number))
{
@@ -8428,7 +8429,7 @@ perform_gamma_threshold_tests(png_modifier *pm)
{
png_byte colour_type = 0;
png_byte bit_depth = 0;
- int palette_number = 0;
+ unsigned int palette_number = 0;
/* Don't test more than one instance of each palette - it's pointless, in
* fact this test is somewhat excessive since libpng doesn't make this
@@ -8493,7 +8494,7 @@ static void perform_gamma_transform_tests(png_modifier *pm)
{
png_byte colour_type = 0;
png_byte bit_depth = 0;
- int palette_number = 0;
+ unsigned int palette_number = 0;
while (next_format(&colour_type, &bit_depth, &palette_number))
{
@@ -8522,11 +8523,8 @@ static void perform_gamma_sbit_tests(png_modifier *pm)
*/
for (sbit=pm->sbitlow; sbit<(1<<READ_BDHI); ++sbit)
{
- png_byte colour_type, bit_depth;
- int npalette;
-
- colour_type = bit_depth = 0;
- npalette = 0;
+ png_byte colour_type = 0, bit_depth = 0;
+ unsigned int npalette = 0;
while (next_format(&colour_type, &bit_depth, &npalette))
if ((colour_type & PNG_COLOR_MASK_ALPHA) == 0 &&
@@ -8742,7 +8740,7 @@ perform_gamma_composition_tests(png_modifier *pm, int do_background,
{
png_byte colour_type = 0;
png_byte bit_depth = 0;
- int palette_number = 0;
+ unsigned int palette_number = 0;
/* Skip the non-alpha cases - there is no setting of a transparency colour at
* present.
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/README b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/README
index 51d5a3c2305..51d5a3c2305 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/README
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/README
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/README b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/decoder/README
index fa979fcb727..fa979fcb727 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/README
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/decoder/README
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/makefile b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/decoder/makefile
index e10e1225d65..e10e1225d65 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/makefile
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/decoder/makefile
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/pngusr.dfa b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/decoder/pngusr.dfa
index 70d528bc9f9..70d528bc9f9 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/pngusr.dfa
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/decoder/pngusr.dfa
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/pngusr.h b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/decoder/pngusr.h
index 9d9c50c4078..9d9c50c4078 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/pngusr.h
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/decoder/pngusr.h
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/README b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/encoder/README
index ff9aa4597a9..ff9aa4597a9 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/README
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/encoder/README
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/makefile b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/encoder/makefile
index d6f39e2ea06..d6f39e2ea06 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/makefile
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/encoder/makefile
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/pngusr.dfa b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/encoder/pngusr.dfa
index ee88443c9dd..ee88443c9dd 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/pngusr.dfa
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/encoder/pngusr.dfa
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/pngusr.h b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/encoder/pngusr.h
index 2033aadb200..2033aadb200 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/pngusr.h
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/encoder/pngusr.h
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/README b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/preader/README
index faa83560a72..faa83560a72 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/README
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/preader/README
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/makefile b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/preader/makefile
index f4b0ccdc8a9..f4b0ccdc8a9 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/makefile
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/preader/makefile
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/pngusr.dfa b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/preader/pngusr.dfa
index 216c421ca66..216c421ca66 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/pngusr.dfa
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/preader/pngusr.dfa
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/pngusr.h b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/preader/pngusr.h
index 73cfecfbf06..73cfecfbf06 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/pngusr.h
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminim/preader/pngusr.h
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/README b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/README
index bbe7407ecce..bbe7407ecce 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/README
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/README
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makefile.std b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/makefile.std
index fa7b5909fcc..fa7b5909fcc 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makefile.std
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/makefile.std
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makefile.tc3 b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/makefile.tc3
index 404f18d5b15..404f18d5b15 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makefile.tc3
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/makefile.tc3
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makevms.com b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/makevms.com
index 00561bcd0d7..00561bcd0d7 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makevms.com
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/makevms.com
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.bat b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/png2pnm.bat
index 449cf36750b..449cf36750b 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.bat
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/png2pnm.bat
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.c b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/png2pnm.c
index 2281429435d..2281429435d 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/png2pnm.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.sh b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/png2pnm.sh
index b1c05370dff..b1c05370dff 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.sh
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/png2pnm.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pngminus.bat b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/pngminus.bat
index 911bb8dff9e..911bb8dff9e 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pngminus.bat
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/pngminus.bat
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pngminus.sh b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/pngminus.sh
index 2a0a9d8fbba..2a0a9d8fbba 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pngminus.sh
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/pngminus.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.bat b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/pnm2png.bat
index f756cb84de4..f756cb84de4 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.bat
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/pnm2png.bat
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.c b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/pnm2png.c
index 4cdfad83132..4cdfad83132 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/pnm2png.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.sh b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/pnm2png.sh
index d79df2fae08..d79df2fae08 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.sh
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngminus/pnm2png.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/README b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/README
index b2b1537db8e..ec4af9473f1 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/README
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/README
@@ -1,7 +1,8 @@
pngsuite
--------
-(c) Willem van Schaik, 1999, 2011
+(c) Willem van Schaik, 1999, 2011, 2012
+Two images are by Glenn Randers-Pehrson, 2012
Permission to use, copy, modify, and distribute these images for any
purpose and without fee is hereby granted.
@@ -38,6 +39,8 @@ can use them to test the proper functioning of PNG software.
basn6a08.png 8-bit RGBA
basn6a16.png 16-bit RGBA
+ ftbbn0g01.png 1-bit grayscale, black bKGD
+ ftbbn0g02.png 2-bit grayscale, black bKGD
ftbbn0g04.png 4-bit grayscale, black bKGD
ftbbn2c16.png 16-bit truecolor, black bKGD
ftbbn3p08.png 8-bit paletted, black bKGD
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g01.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn0g01.png
index e31e1c7a635..e31e1c7a635 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g01.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn0g01.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g02.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn0g02.png
index 68809dd8fc0..68809dd8fc0 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g02.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn0g02.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g04.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn0g04.png
index 6fa089cb8a4..6fa089cb8a4 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g04.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn0g04.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g08.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn0g08.png
index bf522eef001..bf522eef001 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g08.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn0g08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g16.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn0g16.png
index 318ebcadf4f..318ebcadf4f 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g16.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn0g16.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn2c08.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn2c08.png
index 21d2f91a868..21d2f91a868 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn2c08.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn2c08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn2c16.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn2c16.png
index 1bd4a4d0e2c..1bd4a4d0e2c 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn2c16.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn2c16.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p01.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn3p01.png
index a21db597746..a21db597746 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p01.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn3p01.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p02.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn3p02.png
index 1d0ab6197cc..1d0ab6197cc 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p02.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn3p02.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p04.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn3p04.png
index 6dc6eac83f3..6dc6eac83f3 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p04.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn3p04.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p08.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn3p08.png
index 0e07f483c0e..0e07f483c0e 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn3p08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn4a08.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn4a08.png
index 3bb0dd06b51..3bb0dd06b51 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn4a08.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn4a08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn4a16.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn4a16.png
index 6dbee9fbdb9..6dbee9fbdb9 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn4a16.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn4a16.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn6a08.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn6a08.png
index 61062308548..61062308548 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn6a08.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn6a08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn6a16.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn6a16.png
index a9bf3cb4612..a9bf3cb4612 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn6a16.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/basn6a16.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbbn0g01.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbbn0g01.png
new file mode 100644
index 00000000000..ba746ffb2f5
--- /dev/null
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbbn0g01.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbbn0g02.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbbn0g02.png
new file mode 100644
index 00000000000..3d83bd6900b
--- /dev/null
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbbn0g02.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn1g04.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbbn0g04.png
index 39a7050d27a..39a7050d27a 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn1g04.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbbn0g04.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn2c16.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbbn2c16.png
index dd3168e5c86..dd3168e5c86 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn2c16.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbbn2c16.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn3p08.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbbn3p08.png
index 0ede3574db0..0ede3574db0 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbbn3p08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbgn2c16.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbgn2c16.png
index 85cec395c01..85cec395c01 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbgn2c16.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbgn2c16.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbgn3p08.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbgn3p08.png
index 8cf2e6fb6aa..8cf2e6fb6aa 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbgn3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbgn3p08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbrn2c08.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbrn2c08.png
index 5cca0d62104..5cca0d62104 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbrn2c08.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbrn2c08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbwn1g16.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbwn0g16.png
index 99bdeed2b3b..99bdeed2b3b 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbwn1g16.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbwn0g16.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbwn3p08.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbwn3p08.png
index eacab7a144c..eacab7a144c 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbwn3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbwn3p08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbyn3p08.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbyn3p08.png
index 656db0989ad..656db0989ad 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbyn3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftbyn3p08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n1g08.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftp0n0g08.png
index 333465fcdc9..333465fcdc9 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n1g08.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftp0n0g08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n2c08.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftp0n2c08.png
index fc6e42cb420..fc6e42cb420 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n2c08.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftp0n2c08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n3p08.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftp0n3p08.png
index 69a69e58722..69a69e58722 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftp0n3p08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp1n3p08.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftp1n3p08.png
index a6c9f35a862..a6c9f35a862 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp1n3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/pngsuite/ftp1n3p08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/PngFile.c b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/PngFile.c
index ef0984e4dfc..dcde18a3af4 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/PngFile.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/PngFile.c
@@ -13,6 +13,7 @@
#include <commdlg.h>
#include <stdio.h>
#include <stdlib.h>
+#include <zlib.h>
#include "png.h"
#include "pngfile.h"
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/PngFile.h b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/PngFile.h
index 32181a4eacc..32181a4eacc 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/PngFile.h
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/PngFile.h
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/README.txt b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/README.txt
index 72c5cba1790..72c5cba1790 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/README.txt
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/README.txt
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.c b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.c
index 009f120e356..236525a59fe 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.c
@@ -27,6 +27,7 @@
#include <stdlib.h>
#include <string.h>
#include <windows.h>
+#include <zlib.h>
/* application includes */
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.dsp b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.dsp
index 741ef6ce76f..741ef6ce76f 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.dsp
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.dsp
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.dsw b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.dsw
index a30e1cc1cdb..a30e1cc1cdb 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.dsw
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.dsw
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.ico b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.ico
index 68aa3719fb5..68aa3719fb5 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.ico
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.ico
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.png b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.png
index c6aa80a9bfa..c6aa80a9bfa 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.rc b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.rc
index 6e0623a73cf..6e0623a73cf 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.rc
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/VisualPng.rc
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/cexcept.h b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/cexcept.h
index 5f45d769758..5f45d769758 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/cexcept.h
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/cexcept.h
diff --git a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/resource.h b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/resource.h
index b62176d1dca..b62176d1dca 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/resource.h
+++ b/Build/source/libs/libpng/libpng-1.5.12/contrib/visupng/resource.h
diff --git a/Build/source/libs/libpng/libpng-1.5.10/example.c b/Build/source/libs/libpng/libpng-1.5.12/example.c
index c20d86b1547..c20d86b1547 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/example.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/example.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/libpng-config.in b/Build/source/libs/libpng/libpng-1.5.12/libpng-config.in
index 69bf8e33f0b..69bf8e33f0b 100755
--- a/Build/source/libs/libpng/libpng-1.5.10/libpng-config.in
+++ b/Build/source/libs/libpng/libpng-1.5.12/libpng-config.in
diff --git a/Build/source/libs/libpng/libpng-1.5.10/libpng-manual.txt b/Build/source/libs/libpng/libpng-1.5.12/libpng-manual.txt
index d55e80a009c..1f960125e2e 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/libpng-manual.txt
+++ b/Build/source/libs/libpng/libpng-1.5.12/libpng-manual.txt
@@ -1,6 +1,6 @@
-libpng-manual.txt - A description on how to use and modify libpng
+Libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.5.10 - March 29, 2012
+ libpng version 1.5.12 - July 11, 2012
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2011 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.10 - March 29, 2012
+ libpng versions 0.97, January 1998, through 1.5.12 - July 11, 2012
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -141,8 +141,8 @@ APIs. Most of these are fairly obvious; for example types corresponding
to integers of particular sizes and types for passing color values.
One exception is how non-integral numbers are handled. For application
-convenience most APIs that take such numbers have C (double) arguments,
-however internally PNG, and libpng, use 32 bit signed integers and encode
+convenience most APIs that take such numbers have C (double) arguments;
+however, internally PNG, and libpng, use 32 bit signed integers and encode
the value by multiplying by 100,000. As of libpng 1.5.0 a convenience
macro PNG_FP_1 is defined in png.h along with a type (png_fixed_point)
which is simply (png_int_32).
@@ -799,7 +799,7 @@ the screen_gamma value. Pixels with alpha less than 1.0
will still have linear components.
Use this format if you have control over your
-compositing software and do don't do other arithmetic
+compositing software and so don't do other arithmetic
(such as scaling) on the data you get from libpng. Your
compositing software can simply copy opaque pixels to
the output but still has linear values for the
@@ -1130,6 +1130,11 @@ data has been read, or zero if it is missing. The parameters to the
png_get_<chunk> are set directly if they are simple data types, or a
pointer into the info_ptr is returned for any complex types.
+The colorspace data from gAMA, cHRM, sRGB, iCCP, and sBIT chunks
+is simply returned to give the application information about how the
+image was encoded. Libpng itself only does transformations using the file
+gamma when combining semitransparent pixels with the background color.
+
png_get_PLTE(png_ptr, info_ptr, &palette,
&num_palette);
@@ -1141,7 +1146,7 @@ pointer into the info_ptr is returned for any complex types.
png_get_gAMA(png_ptr, info_ptr, &file_gamma);
png_get_gAMA_fixed(png_ptr, info_ptr, &int_file_gamma);
- file_gamma - the gamma at which the file is
+ file_gamma - the gamma at which the file was
written (PNG_INFO_gAMA)
int_file_gamma - 100,000 times the gamma at which the
@@ -1733,7 +1738,7 @@ the current display (e.g., the background color from a web page). You
need to tell libpng how the color is represented, both the format of the
component values in the color (the number of bits) and the gamma encoding of the
color. The function takes two arguments, background_gamma_mode and need_expand
-to convey this information, however only two combinations are likely to be
+to convey this information; however, only two combinations are likely to be
useful:
png_color_16 my_background;
@@ -2027,7 +2032,7 @@ the second parameter NULL.
If you don't want libpng to handle the interlacing details, just call
png_read_rows() PNG_INTERLACE_ADAM7_PASSES times to read in all the images.
-Each of the images is a valid image by itself, however you will almost
+Each of the images is a valid image by itself; however, you will almost
certainly need to distribute the pixels from each sub-image to the
correct place. This is where everything gets very tricky.
@@ -3685,7 +3690,7 @@ available to set these separately for non-IDAT
compressed chunks such as zTXt, iTXt, and iCCP:
#include zlib.h
- #if PNG_LIBPNG_VER <= 10504
+ #if PNG_LIBPNG_VER >= 10504
png_set_text_compression_level(png_ptr, level);
png_set_text_compression_mem_level(png_ptr, level);
@@ -4155,7 +4160,7 @@ This is enabled by default but can be disabled in each png_ptr with
A. Changes that affect users of libpng
There are no substantial API changes between the non-deprecated parts of
-the 1.4.5 API and the 1.5.0 API, however the ability to directly access
+the 1.4.5 API and the 1.5.0 API; however, the ability to directly access
the main libpng control structures, png_struct and png_info, deprecated
in earlier versions of libpng, has been completely removed from
libpng 1.5.
@@ -4288,12 +4293,12 @@ B. Changes to the build and configuration of libpng
Details of internal changes to the library code can be found in the CHANGES
file and in the GIT repository logs. These will be of no concern to the vast
-majority of library users or builders, however the few who configure libpng
+majority of library users or builders; however, the few who configure libpng
to a non-default feature set may need to change how this is done.
There should be no need for library builders to alter build scripts if
these use the distributed build support - configure or the makefiles -
-however users of the makefiles may care to update their build scripts
+however, users of the makefiles may care to update their build scripts
to build pnglibconf.h where the corresponding makefile does not do so.
Building libpng with a non-default configuration has changed completely.
@@ -4399,7 +4404,7 @@ merely stops the function from being exported.
PNG_FLOATING_ARITHMETIC_SUPPORTED chooses between the internal floating
point implementation or the fixed point one. Typically the fixed point
implementation is larger and slower than the floating point implementation
-on a system that supports floating point, however it may be faster on a
+on a system that supports floating point; however, it may be faster on a
system which lacks floating point hardware and therefore uses a software
emulation.
@@ -4428,7 +4433,7 @@ pngconf.h no longer includes pngusr.h, therefore pngusr.h is ignored after the
build of pnglibconf.h and it is never included in an application build.
The rarely used alternative of adding a list of feature macros to the
-CFLAGS setting in the build also still works, however the macros will be
+CFLAGS setting in the build also still works; however, the macros will be
copied to pnglibconf.h and this may produce macro redefinition warnings
when the individual C files are compiled.
@@ -4597,25 +4602,25 @@ Other rules can be inferred by inspecting the libpng source.
XIV. Y2K Compliance in libpng
-March 29, 2012
+July 11, 2012
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.10 are Y2K compliant. It is my belief that earlier
+upward through 1.5.12 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.
-Libpng only has three year fields. One is a 2-byte unsigned integer that
-will hold years up to 65535. The other two hold the date in text
+Libpng only has two year fields. One is a 2-byte unsigned integer that
+will hold years up to 65535. The other holds the date in text
format, and will hold years up to 9999.
The integer is
"png_uint_16 year" in png_time_struct.
-The strings are
- "png_charp time_buffer" in png_struct and
- "near_time_buffer", which is a local character string in png.c.
+The string is
+ "char time_buffer[29]" in png_struct. This will no
+longer be used in libpng-1.6.x and will be removed from libpng-1.7.0.
There are seven time-related functions:
diff --git a/Build/source/libs/libpng/libpng-1.5.10/libpng.3 b/Build/source/libs/libpng/libpng-1.5.12/libpng.3
index bba25afa78c..91afdbef9a6 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/libpng.3
+++ b/Build/source/libs/libpng/libpng-1.5.12/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "March 29, 2012"
+.TH LIBPNG 3 "July 11, 2012"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.5.10
+libpng \- Portable Network Graphics (PNG) Reference Library 1.5.12
.SH SYNOPSIS
\fI\fB
@@ -979,9 +979,9 @@ the Portable Network Graphics (PNG) format image files. It uses the
compression library.
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-manual.txt - A description on how to use and modify libpng
- libpng version 1.5.10 - March 29, 2012
+ libpng version 1.5.12 - July 11, 2012
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -992,7 +992,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
- libpng versions 0.97, January 1998, through 1.5.10 - March 29, 2012
+ libpng versions 0.97, January 1998, through 1.5.12 - July 11, 2012
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -1122,8 +1122,8 @@ APIs. Most of these are fairly obvious; for example types corresponding
to integers of particular sizes and types for passing color values.
One exception is how non-integral numbers are handled. For application
-convenience most APIs that take such numbers have C (double) arguments,
-however internally PNG, and libpng, use 32 bit signed integers and encode
+convenience most APIs that take such numbers have C (double) arguments;
+however, internally PNG, and libpng, use 32 bit signed integers and encode
the value by multiplying by 100,000. As of libpng 1.5.0 a convenience
macro PNG_FP_1 is defined in png.h along with a type (png_fixed_point)
which is simply (png_int_32).
@@ -1780,7 +1780,7 @@ the screen_gamma value. Pixels with alpha less than 1.0
will still have linear components.
Use this format if you have control over your
-compositing software and do don't do other arithmetic
+compositing software and so don't do other arithmetic
(such as scaling) on the data you get from libpng. Your
compositing software can simply copy opaque pixels to
the output but still has linear values for the
@@ -2111,6 +2111,11 @@ data has been read, or zero if it is missing. The parameters to the
png_get_<chunk> are set directly if they are simple data types, or a
pointer into the info_ptr is returned for any complex types.
+The colorspace data from gAMA, cHRM, sRGB, iCCP, and sBIT chunks
+is simply returned to give the application information about how the
+image was encoded. Libpng itself only does transformations using the file
+gamma when combining semitransparent pixels with the background color.
+
png_get_PLTE(png_ptr, info_ptr, &palette,
&num_palette);
@@ -2122,7 +2127,7 @@ pointer into the info_ptr is returned for any complex types.
png_get_gAMA(png_ptr, info_ptr, &file_gamma);
png_get_gAMA_fixed(png_ptr, info_ptr, &int_file_gamma);
- file_gamma - the gamma at which the file is
+ file_gamma - the gamma at which the file was
written (PNG_INFO_gAMA)
int_file_gamma - 100,000 times the gamma at which the
@@ -2714,7 +2719,7 @@ the current display (e.g., the background color from a web page). You
need to tell libpng how the color is represented, both the format of the
component values in the color (the number of bits) and the gamma encoding of the
color. The function takes two arguments, background_gamma_mode and need_expand
-to convey this information, however only two combinations are likely to be
+to convey this information; however, only two combinations are likely to be
useful:
png_color_16 my_background;
@@ -3008,7 +3013,7 @@ the second parameter NULL.
If you don't want libpng to handle the interlacing details, just call
png_read_rows() PNG_INTERLACE_ADAM7_PASSES times to read in all the images.
-Each of the images is a valid image by itself, however you will almost
+Each of the images is a valid image by itself; however, you will almost
certainly need to distribute the pixels from each sub-image to the
correct place. This is where everything gets very tricky.
@@ -4667,7 +4672,7 @@ available to set these separately for non-IDAT
compressed chunks such as zTXt, iTXt, and iCCP:
#include zlib.h
- #if PNG_LIBPNG_VER <= 10504
+ #if PNG_LIBPNG_VER >= 10504
png_set_text_compression_level(png_ptr, level);
png_set_text_compression_mem_level(png_ptr, level);
@@ -5137,7 +5142,7 @@ This is enabled by default but can be disabled in each png_ptr with
A. Changes that affect users of libpng
There are no substantial API changes between the non-deprecated parts of
-the 1.4.5 API and the 1.5.0 API, however the ability to directly access
+the 1.4.5 API and the 1.5.0 API; however, the ability to directly access
the main libpng control structures, png_struct and png_info, deprecated
in earlier versions of libpng, has been completely removed from
libpng 1.5.
@@ -5270,12 +5275,12 @@ B. Changes to the build and configuration of libpng
Details of internal changes to the library code can be found in the CHANGES
file and in the GIT repository logs. These will be of no concern to the vast
-majority of library users or builders, however the few who configure libpng
+majority of library users or builders; however, the few who configure libpng
to a non-default feature set may need to change how this is done.
There should be no need for library builders to alter build scripts if
these use the distributed build support - configure or the makefiles -
-however users of the makefiles may care to update their build scripts
+however, users of the makefiles may care to update their build scripts
to build pnglibconf.h where the corresponding makefile does not do so.
Building libpng with a non-default configuration has changed completely.
@@ -5381,7 +5386,7 @@ merely stops the function from being exported.
PNG_FLOATING_ARITHMETIC_SUPPORTED chooses between the internal floating
point implementation or the fixed point one. Typically the fixed point
implementation is larger and slower than the floating point implementation
-on a system that supports floating point, however it may be faster on a
+on a system that supports floating point; however, it may be faster on a
system which lacks floating point hardware and therefore uses a software
emulation.
@@ -5410,7 +5415,7 @@ pngconf.h no longer includes pngusr.h, therefore pngusr.h is ignored after the
build of pnglibconf.h and it is never included in an application build.
The rarely used alternative of adding a list of feature macros to the
-CFLAGS setting in the build also still works, however the macros will be
+CFLAGS setting in the build also still works; however, the macros will be
copied to pnglibconf.h and this may produce macro redefinition warnings
when the individual C files are compiled.
@@ -5579,25 +5584,25 @@ Other rules can be inferred by inspecting the libpng source.
.SH XIV. Y2K Compliance in libpng
-March 29, 2012
+July 11, 2012
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.10 are Y2K compliant. It is my belief that earlier
+upward through 1.5.12 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.
-Libpng only has three year fields. One is a 2-byte unsigned integer that
-will hold years up to 65535. The other two hold the date in text
+Libpng only has two year fields. One is a 2-byte unsigned integer that
+will hold years up to 65535. The other holds the date in text
format, and will hold years up to 9999.
The integer is
"png_uint_16 year" in png_time_struct.
-The strings are
- "png_charp time_buffer" in png_struct and
- "near_time_buffer", which is a local character string in png.c.
+The string is
+ "char time_buffer[29]" in png_struct. This will no
+longer be used in libpng-1.6.x and will be removed from libpng-1.7.0.
There are seven time-related functions:
@@ -5798,6 +5803,10 @@ the first widely used release:
1.5.9 15 10509 15.so.15.9[.0]
1.5.10beta01-05 15 10510 15.so.15.10[.0]
1.5.10 15 10510 15.so.15.10[.0]
+ 1.5.11beta01 15 10511 15.so.15.11[.0]
+ 1.5.11rc01-05 15 10511 15.so.15.11[.0]
+ 1.5.11 15 10511 15.so.15.11[.0]
+ 1.5.12 15 10512 15.so.15.12[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -5854,7 +5863,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.5.10 - March 29, 2012:
+Libpng version 1.5.12 - July 11, 2012:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -5877,7 +5886,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.5.10, March 29, 2012, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.12, July 11, 2012, 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
@@ -5976,7 +5985,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-March 29, 2012
+July 11, 2012
.\" end of man page
diff --git a/Build/source/libs/libpng/libpng-1.5.10/libpng.pc.in b/Build/source/libs/libpng/libpng-1.5.12/libpng.pc.in
index 3e7e2c58a7e..3e7e2c58a7e 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/libpng.pc.in
+++ b/Build/source/libs/libpng/libpng-1.5.12/libpng.pc.in
diff --git a/Build/source/libs/libpng/libpng-1.5.10/libpngpf.3 b/Build/source/libs/libpng/libpng-1.5.12/libpngpf.3
index 8449f173f97..4b07ce3d493 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/libpngpf.3
+++ b/Build/source/libs/libpng/libpng-1.5.12/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "March 29, 2012"
+.TH LIBPNGPF 3 "July 11, 2012"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.5.10
+libpng \- Portable Network Graphics (PNG) Reference Library 1.5.12
(private functions)
.SH SYNOPSIS
\fB#include \fI"pngpriv.h"
diff --git a/Build/source/libs/libpng/libpng-1.5.10/png.5 b/Build/source/libs/libpng/libpng-1.5.12/png.5
index 34f0e590831..36edd2ef507 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/png.5
+++ b/Build/source/libs/libpng/libpng-1.5.12/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "March 29, 2012"
+.TH PNG 5 "July 11, 2012"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/Build/source/libs/libpng/libpng-1.5.10/png.c b/Build/source/libs/libpng/libpng-1.5.12/png.c
index cba18ba915e..6808c5cb902 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/png.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/png.c
@@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
- * Last changed in libpng 1.5.10 [March 8, 2012]
+ * Last changed in libpng 1.5.11 [June 14, 2012]
* Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -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_10 Your_png_h_is_not_version_1_5_10;
+typedef png_libpng_version_1_5_12 Your_png_h_is_not_version_1_5_12;
/* 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
@@ -655,14 +655,14 @@ png_get_copyright(png_const_structp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.5.10 - March 29, 2012" PNG_STRING_NEWLINE \
- "Copyright (c) 1998-2011 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
+ "libpng version 1.5.12 - July 11, 2012" PNG_STRING_NEWLINE \
+ "Copyright (c) 1998-2012 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.10 - March 29, 2012\
- Copyright (c) 1998-2011 Glenn Randers-Pehrson\
+ return "libpng version 1.5.12 - July 11, 2012\
+ Copyright (c) 1998-2012 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
# endif
@@ -969,8 +969,8 @@ int png_XYZ_from_xy(png_XYZ *XYZ, png_xy xy)
* and it is certain that it becomes unstable where the end points are close
* together.
*
- * So this code uses the perhaps slighly less optimal but more understandable
- * and totally obvious approach of calculating color-scale.
+ * So this code uses the perhaps slightly less optimal but more
+ * understandable and totally obvious approach of calculating color-scale.
*
* This algorithm depends on the precision in white-scale and that is
* (1/white-y), so we can immediately see that as white-y approaches 0 the
@@ -2044,7 +2044,7 @@ png_muldiv_warn(png_structp png_ptr, png_fixed_point a, png_int_32 times,
}
#endif
-#ifdef PNG_READ_GAMMA_SUPPORTED /* more fixed point functions for gammma */
+#ifdef PNG_READ_GAMMA_SUPPORTED /* more fixed point functions for gamma */
/* Calculate a reciprocal, return 0 on div-by-zero or overflow. */
png_fixed_point
png_reciprocal(png_fixed_point a)
diff --git a/Build/source/libs/libpng/libpng-1.5.10/png.h b/Build/source/libs/libpng/libpng-1.5.12/png.h
index 4e0dee1793a..4c37e58a4c1 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/png.h
+++ b/Build/source/libs/libpng/libpng-1.5.12/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.5.10 - March 29, 2012
+ * libpng version 1.5.12 - July 11, 2012
* Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -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.10 - March 29, 2012: Glenn
+ * libpng versions 0.97, January 1998, through 1.5.12 - July 11, 2012: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -174,6 +174,10 @@
* 1.5.9 15 10509 15.so.15.9[.0]
* 1.5.10beta01-05 15 10510 15.so.15.10[.0]
* 1.5.10 15 10510 15.so.15.10[.0]
+ * 1.5.11beta01 15 10511 15.so.15.11[.0]
+ * 1.5.11rc01-05 15 10511 15.so.15.11[.0]
+ * 1.5.11 15 10511 15.so.15.11[.0]
+ * 1.5.12 15 10512 15.so.15.12[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -205,7 +209,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.5.10, March 29, 2012, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.5.12, July 11, 2012, 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:
@@ -317,13 +321,13 @@
* Y2K compliance in libpng:
* =========================
*
- * March 29, 2012
+ * July 11, 2012
*
* 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.10 are Y2K compliant. It is my belief that
+ * upward through 1.5.12 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
@@ -334,7 +338,8 @@
* "png_uint_16 year" in png_time_struct.
*
* The string is
- * "png_char time_buffer" in png_struct
+ * "char time_buffer[29]" in png_struct. This will be no
+ * longer used in libpng-1.6.0 and will be removed from libpng-1.7.0.
*
* There are seven time-related functions:
* png.c: png_convert_to_rfc_1123() in png.c
@@ -381,9 +386,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.5.10"
+#define PNG_LIBPNG_VER_STRING "1.5.12"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.5.10 - March 29, 2012\n"
+ " libpng version 1.5.12 - July 11, 2012\n"
#define PNG_LIBPNG_VER_SONUM 15
#define PNG_LIBPNG_VER_DLLNUM 15
@@ -391,7 +396,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 10
+#define PNG_LIBPNG_VER_RELEASE 12
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
@@ -422,7 +427,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 10510 /* 1.5.10 */
+#define PNG_LIBPNG_VER 10512 /* 1.5.12 */
/* Library configuration: these options cannot be changed after
* the library has been built.
@@ -544,7 +549,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_10;
+typedef char* png_libpng_version_1_5_12;
/* 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.10/pngbar.jpg b/Build/source/libs/libpng/libpng-1.5.12/pngbar.jpg
index 70ba8d817ce..70ba8d817ce 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngbar.jpg
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngbar.jpg
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngbar.png b/Build/source/libs/libpng/libpng-1.5.12/pngbar.png
index 49798c8ed95..49798c8ed95 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngbar.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngbar.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngconf.h b/Build/source/libs/libpng/libpng-1.5.12/pngconf.h
index bbb547f8eb9..5c3eb1454df 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngconf.h
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.5.10 - March 29, 2012
+ * libpng version 1.5.12 - July 11, 2012
*
* Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -25,7 +25,7 @@
#ifndef PNG_BUILDING_SYMBOL_TABLE
/* PNG_NO_LIMITS_H may be used to turn off the use of the standard C
* definition file for machine specific limits, this may impact the
- * correctness of the definitons below (see uses of INT_MAX).
+ * correctness of the definitions below (see uses of INT_MAX).
*/
# ifndef PNG_NO_LIMITS_H
# include <limits.h>
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngdebug.h b/Build/source/libs/libpng/libpng-1.5.12/pngdebug.h
index 16f81fdd141..16f81fdd141 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngdebug.h
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngdebug.h
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngerror.c b/Build/source/libs/libpng/libpng-1.5.12/pngerror.c
index 95002f84f70..e0585a856eb 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngerror.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngerror.c
@@ -2,7 +2,7 @@
/* pngerror.c - stub functions for i/o and memory allocation
*
* Last changed in libpng 1.5.8 [February 1, 2011]
- * Copyright (c) 1998-2012 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngget.c b/Build/source/libs/libpng/libpng-1.5.12/pngget.c
index 43400cda7e8..43400cda7e8 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngget.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngget.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pnginfo.h b/Build/source/libs/libpng/libpng-1.5.12/pnginfo.h
index a33bfab06de..a33bfab06de 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pnginfo.h
+++ b/Build/source/libs/libpng/libpng-1.5.12/pnginfo.h
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pnglibconf.h b/Build/source/libs/libpng/libpng-1.5.12/pnglibconf.h
index 6facf39aabf..d93adabaa6c 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pnglibconf.h
+++ b/Build/source/libs/libpng/libpng-1.5.12/pnglibconf.h
@@ -3,7 +3,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng 1.5.10 - March 29, 2012 */
+/* Libpng 1.5.12 - July 11, 2012 */
/* Copyright (c) 1998-2012 Glenn Randers-Pehrson */
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngmem.c b/Build/source/libs/libpng/libpng-1.5.12/pngmem.c
index bf5ff037dad..bf5ff037dad 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngmem.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngmem.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngnow.png b/Build/source/libs/libpng/libpng-1.5.12/pngnow.png
index 82793ebddb7..82793ebddb7 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngnow.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngnow.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngpread.c b/Build/source/libs/libpng/libpng-1.5.12/pngpread.c
index 8a5aa29ec8d..6b65ba8f4eb 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngpread.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngpread.c
@@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode
*
- * Last changed in libpng 1.5.9 [February 18, 2012]
+ * Last changed in libpng 1.5.11 [June 14, 2012]
* Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -282,8 +282,8 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
png_error(png_ptr, "Missing PLTE before IDAT");
}
}
-
#endif
+
else if (chunk_name == png_PLTE)
{
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
@@ -550,6 +550,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
}
#endif
+
else
{
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngpriv.h b/Build/source/libs/libpng/libpng-1.5.12/pngpriv.h
index e76a57975fe..9b69f8c145d 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngpriv.h
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngpriv.h
@@ -1259,10 +1259,8 @@ PNG_EXTERN void png_handle_zTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
png_uint_32 length));
#endif
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
png_infop info_ptr, png_uint_32 length));
-#endif
PNG_EXTERN void png_check_chunk_name PNGARG((png_structp png_ptr,
png_uint_32 chunk_name));
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngread.c b/Build/source/libs/libpng/libpng-1.5.12/pngread.c
index 1d8c6b33469..1d8c6b33469 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngread.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngread.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngrio.c b/Build/source/libs/libpng/libpng-1.5.12/pngrio.c
index e9c381c5ba4..e9c381c5ba4 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngrio.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngrio.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngrtran.c b/Build/source/libs/libpng/libpng-1.5.12/pngrtran.c
index 55618528602..96732b55c55 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngrtran.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngrtran.c
@@ -1,7 +1,7 @@
/* pngrtran.c - transforms the data in a row for PNG readers
*
- * Last changed in libpng 1.5.10 [March 8, 2012]
+ * Last changed in libpng 1.5.11 [June 14, 2012]
* Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -1770,8 +1770,8 @@ png_init_read_transformations(png_structp png_ptr)
int num_palette = png_ptr->num_palette;
int i;
- /*NOTE: there are other transformations that should probably be in here
- * too.
+ /* NOTE: there are other transformations that should probably be in
+ * here too.
*/
for (i = 0; i < num_palette; i++)
{
@@ -2277,7 +2277,7 @@ png_do_read_transformations(png_structp png_ptr, png_row_infop row_info)
#endif
#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
- /*NOTE: moved here in 1.5.4 (from much later in this list.) */
+ /* NOTE: moved here in 1.5.4 (from much later in this list.) */
if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
(png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1);
@@ -2301,7 +2301,8 @@ png_do_read_transformations(png_structp png_ptr, png_row_infop row_info)
#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
/* Added at libpng-1.5.10 */
- if (row_info->color_type == PNG_COLOR_TYPE_PALETTE)
+ if (row_info->color_type == PNG_COLOR_TYPE_PALETTE &&
+ png_ptr->num_palette_max >= 0)
png_do_check_palette_indexes(png_ptr, row_info);
#endif
@@ -3302,7 +3303,7 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
if (red != green || red != blue)
{
rgb_error |= 1;
- /*NOTE: this is the historical approach which simply
+ /* NOTE: this is the historical approach which simply
* truncates the results.
*/
*(dp++) = (png_byte)((rc*red + gc*green + bc*blue)>>15);
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngrutil.c b/Build/source/libs/libpng/libpng-1.5.12/pngrutil.c
index aa592ccfbd2..aa592ccfbd2 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngrutil.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngrutil.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngset.c b/Build/source/libs/libpng/libpng-1.5.12/pngset.c
index e0118fa8c21..8c07eec3e86 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngset.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngset.c
@@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct
*
- * Last changed in libpng 1.5.10 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.11 [June 14, 2012]
* Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -149,7 +149,7 @@ png_set_gAMA_fixed(png_structp png_ptr, png_infop info_ptr, png_fixed_point
* possible for 1/gamma to overflow the limit of 21474 and this means the
* gamma value must be at least 5/100000 and hence at most 20000.0. For
* safety the limits here are a little narrower. The values are 0.00016 to
- * 6250.0, which are truly ridiculous gammma values (and will produce
+ * 6250.0, which are truly ridiculous gamma values (and will produce
* displays that are all black or all white.)
*/
if (file_gamma < 16 || file_gamma > 625000000)
@@ -1291,8 +1291,10 @@ png_set_benign_errors(png_structp png_ptr, int allowed)
}
#endif /* PNG_BENIGN_ERRORS_SUPPORTED */
-#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
- /* Do not report invalid palette index; added at libng-1.5.10 */
+#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
+/* Whether to report invalid palette index; added at libng-1.5.10
+ * allowed - one of 0: disable; 1: enable
+ */
void PNGAPI
png_set_check_for_invalid_index(png_structp png_ptr, int allowed)
{
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngstruct.h b/Build/source/libs/libpng/libpng-1.5.12/pngstruct.h
index 43a45cdec6a..db0d4e49485 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngstruct.h
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngstruct.h
@@ -1,11 +1,11 @@
/* pngstruct.h - header file for PNG reference library
*
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
- * Last changed in libpng 1.5.9 [March 29, 2012]
+ * Last changed in libpng 1.5.9 [February 18, 2012]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -248,6 +248,7 @@ struct png_struct_def
#endif
#ifdef PNG_TIME_RFC1123_SUPPORTED
+ /* This is going to be unused in libpng16 and removed from libpng17 */
char time_buffer[29]; /* String to hold RFC 1123 time text */
#endif
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngtest.c b/Build/source/libs/libpng/libpng-1.5.12/pngtest.c
index 0295840baa9..3de363cdce9 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngtest.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngtest.c
@@ -1817,4 +1817,4 @@ main(int argc, char *argv[])
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_5_10 Your_png_h_is_not_version_1_5_10;
+typedef png_libpng_version_1_5_12 Your_png_h_is_not_version_1_5_12;
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngtest.png b/Build/source/libs/libpng/libpng-1.5.12/pngtest.png
index 81f5f8438a9..81f5f8438a9 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngtest.png
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngtest.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngtrans.c b/Build/source/libs/libpng/libpng-1.5.12/pngtrans.c
index fef12f1851b..ee60957fc19 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngtrans.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngtrans.c
@@ -1,7 +1,7 @@
/* pngtrans.c - transforms the data in a row (used by both readers and writers)
*
- * Last changed in libpng 1.5.10 [March 8, 2012]
+ * Last changed in libpng 1.5.11 [June 14, 2012]
* Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -626,7 +626,7 @@ void /* PRIVATE */
png_do_check_palette_indexes(png_structp png_ptr, png_row_infop row_info)
{
if (png_ptr->num_palette < (1 << row_info->bit_depth) &&
- png_ptr->num_palette_max >= 0)
+ png_ptr->num_palette > 0) /* num_palette can be 0 in MNG files */
{
/* Calculations moved outside switch in an attempt to stop different
* compiler warnings. 'padding' is in *bits* within the last byte, it is
@@ -708,7 +708,7 @@ png_do_check_palette_indexes(png_structp png_ptr, png_row_infop row_info)
{
for (; rp > png_ptr->row_buf; rp--)
{
- if (*rp >= png_ptr->num_palette_max)
+ if (*rp > png_ptr->num_palette_max)
png_ptr->num_palette_max = (int) *rp;
}
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngusr.dfa b/Build/source/libs/libpng/libpng-1.5.12/pngusr.dfa
index 9d39564b51d..9d39564b51d 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngusr.dfa
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngusr.dfa
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngwio.c b/Build/source/libs/libpng/libpng-1.5.12/pngwio.c
index 95ffb3429f1..95ffb3429f1 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngwio.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngwio.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngwrite.c b/Build/source/libs/libpng/libpng-1.5.12/pngwrite.c
index b587f1b9995..2a72ad33f48 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngwrite.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngwrite.c
@@ -1,7 +1,7 @@
/* pngwrite.c - general routines to write a PNG file
*
- * Last changed in libpng 1.5.10 [March 8, 2012]
+ * Last changed in libpng 1.5.11 [June 14, 2012]
* Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -806,7 +806,8 @@ png_write_row(png_structp png_ptr, png_const_bytep row)
/* Added at libpng-1.5.10 */
#ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
/* Check for out-of-range palette index */
- if(row_info.color_type == PNG_COLOR_TYPE_PALETTE)
+ if (row_info.color_type == PNG_COLOR_TYPE_PALETTE &&
+ png_ptr->num_palette_max >= 0)
png_do_check_palette_indexes(png_ptr, &row_info);
#endif
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngwtran.c b/Build/source/libs/libpng/libpng-1.5.12/pngwtran.c
index 96608efcb4a..96608efcb4a 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngwtran.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngwtran.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngwutil.c b/Build/source/libs/libpng/libpng-1.5.12/pngwutil.c
index b49704f1a54..b49704f1a54 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/pngwutil.c
+++ b/Build/source/libs/libpng/libpng-1.5.12/pngwutil.c
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/libpng.tgt b/Build/source/libs/libpng/libpng-1.5.12/projects/owatcom/libpng.tgt
index 4a9622e68cf..4a9622e68cf 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/libpng.tgt
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/owatcom/libpng.tgt
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/libpng.wpj b/Build/source/libs/libpng/libpng-1.5.12/projects/owatcom/libpng.wpj
index cddf9f1f10e..cddf9f1f10e 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/libpng.wpj
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/owatcom/libpng.wpj
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngconfig.mak b/Build/source/libs/libpng/libpng-1.5.12/projects/owatcom/pngconfig.mak
index 0f988780513..0f988780513 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngconfig.mak
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/owatcom/pngconfig.mak
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngtest.tgt b/Build/source/libs/libpng/libpng-1.5.12/projects/owatcom/pngtest.tgt
index 211f1a74886..211f1a74886 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngtest.tgt
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/owatcom/pngtest.tgt
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngvalid.tgt b/Build/source/libs/libpng/libpng-1.5.12/projects/owatcom/pngvalid.tgt
index 1e78e75cb6c..1e78e75cb6c 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngvalid.tgt
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/owatcom/pngvalid.tgt
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/PRJ0041.mak b/Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/PRJ0041.mak
index c7a68b503e7..c7a68b503e7 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/PRJ0041.mak
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/PRJ0041.mak
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/README.txt b/Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/README.txt
index 625eefcab7f..625eefcab7f 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/README.txt
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/README.txt
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/README_zlib.txt b/Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/README_zlib.txt
index 81d11cbb577..81d11cbb577 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/README_zlib.txt
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/README_zlib.txt
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/libpng.sln b/Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/libpng.sln
index eeb101f2e31..eeb101f2e31 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/libpng.sln
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/libpng.sln
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/libpng.vcproj b/Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/libpng.vcproj
index 4c5acf94c8b..4c5acf94c8b 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/libpng.vcproj
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/libpng.vcproj
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/pngtest.vcproj b/Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/pngtest.vcproj
index ff330ae350f..ff330ae350f 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/pngtest.vcproj
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/pngtest.vcproj
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/zlib.vcproj b/Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/zlib.vcproj
index eb218488dcf..eb218488dcf 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/zlib.vcproj
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/visualc71/zlib.vcproj
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/libpng/libpng.vcxproj b/Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/libpng/libpng.vcxproj
index c4bf04184ee..c4bf04184ee 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/libpng/libpng.vcxproj
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/libpng/libpng.vcxproj
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/pnglibconf/pnglibconf.vcxproj
index 7c691c32d34..7c691c32d34 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pnglibconf/pnglibconf.vcxproj
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/pnglibconf/pnglibconf.vcxproj
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pngtest/pngtest.vcxproj b/Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/pngtest/pngtest.vcxproj
index a03dca565ff..a03dca565ff 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pngtest/pngtest.vcxproj
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/pngtest/pngtest.vcxproj
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pngvalid/pngvalid.vcxproj b/Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/pngvalid/pngvalid.vcxproj
index 6a0a6e4f312..6a0a6e4f312 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pngvalid/pngvalid.vcxproj
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/pngvalid/pngvalid.vcxproj
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/readme.txt b/Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/readme.txt
index 938e7dad0bc..f458c026bde 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/readme.txt
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.5.10 - March 29, 2012
+libpng version 1.5.12 - July 11, 2012
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/vstudio.sln b/Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/vstudio.sln
index 4ab66418ca3..4ab66418ca3 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/vstudio.sln
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/vstudio.sln
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/zlib.props b/Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/zlib.props
index 0060f127e60..801a2ae51d5 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/zlib.props
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
- * libpng version 1.5.10 - March 29, 2012
+ * libpng version 1.5.12 - July 11, 2012
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/zlib/zlib.vcxproj b/Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/zlib/zlib.vcxproj
index d627817969a..d627817969a 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/zlib/zlib.vcxproj
+++ b/Build/source/libs/libpng/libpng-1.5.12/projects/vstudio/zlib/zlib.vcxproj
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/README.txt b/Build/source/libs/libpng/libpng-1.5.12/scripts/README.txt
index 46611a57195..6d7f0e50639 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/README.txt
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/README.txt
@@ -1,9 +1,9 @@
-Makefiles for libpng version 1.5.10 - March 29, 2012
+Makefiles for libpng version 1.5.12 - July 11, 2012
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng15.so.15.1.5.10)
+ (gcc, creates libpng15.so.15.1.5.12)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
@@ -15,12 +15,13 @@ pnglibconf.h.prebuilt => Stores configuration settings
makefile.bc32 => 32-bit Borland C++ (all modules compiled in C mode)
makefile.beos => beos makefile
makefile.bor => Borland makefile (uses bcc)
- makefile.cegcc => minge32ce for Windows CE makefile
+ makefile.cegcc => minge32ce for Windows CE makefile (only included in the
+ tar distributions, because it depends on "configure")
makefile.darwin => Darwin makefile, can use on MacosX
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.10)
+ (gcc, creates libpng15.so.15.1.5.12)
makefile.freebsd => FreeBSD makefile
makefile.gcc => Generic gcc makefile
makefile.hpgcc => HPUX makefile using gcc
@@ -35,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.10)
+ creates libpng15.so.15.1.5.12)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng15.so.15.1.5.10)
+ creates libpng15.so.15.1.5.12)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng15.so.15.1.5.10)
+ creates libpng15.so.15.1.5.12)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile
@@ -57,7 +58,7 @@ Other supporting scripts:
libpng-config-body.in => used by several makefiles to create libpng-config
libpng-config-head.in => used by several makefiles to create libpng-config
libpng.pc.in => Used by several makefiles to create libpng.pc
- pngwin.rc => Used by the visualc71 project.
+ pngwin.rc => Used by the visualc71 and vstudio projects.
pngwin.def => Used by makefile.os2
pngwin.dfn => Used to maintain pngwin.def
SCOPTIONS.ppc => Used with smakefile.ppc
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/SCOPTIONS.ppc b/Build/source/libs/libpng/libpng-1.5.12/scripts/SCOPTIONS.ppc
index 2c3503e9eb2..2c3503e9eb2 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/SCOPTIONS.ppc
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/SCOPTIONS.ppc
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/checksym.awk b/Build/source/libs/libpng/libpng-1.5.12/scripts/checksym.awk
index ba4c99b564d..ba4c99b564d 100755
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/checksym.awk
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/checksym.awk
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/chkfmt b/Build/source/libs/libpng/libpng-1.5.12/scripts/chkfmt
index 9da6475fd4e..9da6475fd4e 100755
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/chkfmt
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/chkfmt
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/def.dfn b/Build/source/libs/libpng/libpng-1.5.12/scripts/def.dfn
index f9918631dec..f9918631dec 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/def.dfn
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/def.dfn
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/descrip.mms b/Build/source/libs/libpng/libpng-1.5.12/scripts/descrip.mms
index 99ea1abccd1..99ea1abccd1 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/descrip.mms
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/descrip.mms
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/libpng-config-body.in b/Build/source/libs/libpng/libpng-1.5.12/scripts/libpng-config-body.in
index b466432d546..b466432d546 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/libpng-config-body.in
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/libpng-config-body.in
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/libpng-config-head.in b/Build/source/libs/libpng/libpng-1.5.12/scripts/libpng-config-head.in
index 4dda9cda905..4ac8a1511b9 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/libpng-config-head.in
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
-version=1.5.10
+version=1.5.12
prefix=""
libdir=""
libs=""
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/libpng.pc.in b/Build/source/libs/libpng/libpng-1.5.12/scripts/libpng.pc.in
index f96298ca8b7..dc5f21c5f75 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/libpng.pc.in
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng15
Name: libpng
Description: Loads and saves PNG files
-Version: 1.5.10
+Version: 1.5.12
Libs: -L${libdir} -lpng15
Cflags: -I${includedir}
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.32sunu b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.32sunu
index b5e5a33a06f..b5e5a33a06f 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.32sunu
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.32sunu
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.64sunu b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.64sunu
index a0331d670e0..a0331d670e0 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.64sunu
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.64sunu
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.acorn b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.acorn
index 00b8fb5b35c..00b8fb5b35c 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.acorn
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.acorn
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.aix b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.aix
index bb4c40d4b0d..bb4c40d4b0d 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.aix
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.aix
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.amiga b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.amiga
index 228b5c22a75..228b5c22a75 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.amiga
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.amiga
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.atari b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.atari
index 1aeb7d5b7dd..1aeb7d5b7dd 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.atari
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.atari
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.bc32 b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.bc32
index ebbd5ce3d27..ebbd5ce3d27 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.bc32
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.bc32
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.beos b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.beos
index 749db78ad32..749db78ad32 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.beos
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.beos
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.bor b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.bor
index 96d5e861a3a..96d5e861a3a 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.bor
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.bor
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.cegcc b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.cegcc
index fbc3d78bc45..0c3bfa8d900 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.cegcc
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.cegcc
@@ -23,7 +23,7 @@
VERMAJ = 1
VERMIN = 5
-VERMIC = 10
+VERMIC = 12
VER = $(VERMAJ).$(VERMIN).$(VERMIC)
NAME = libpng
PACKAGE = $(NAME)-$(VER)
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.darwin b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.darwin
index 337a8151eb5..48805d4a7df 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.darwin
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.darwin
@@ -15,10 +15,8 @@ prefix=/usr/local
exec_prefix=$(prefix)
# Where the zlib library and include files are located
-#ZLIBLIB=/usr/local/lib
-#ZLIBINC=/usr/local/include
-ZLIBLIB=../zlib
-ZLIBINC=../zlib
+ZLIBLIB=/usr/lib
+ZLIBINC=/usr/include
# Library name:
LIBNAME = libpng15
@@ -37,7 +35,7 @@ MKDIR_P=mkdir -p
LN_SF=ln -sf
RANLIB=ranlib
RM_F=/bin/rm -f
-ARCH="-arch i386 -arch x86_64"
+ARCH=-arch ppc -arch i386 -arch x86_64
# CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops
CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops $(ARCH)
@@ -107,7 +105,7 @@ $(LIBSOMAJ): $(OBJSDLL)
$(CC) -dynamiclib \
-install_name $(LIBPATH)/$(LIBSOMAJ) \
-current_version 15 -compatibility_version 15 \
- -o $(LIBSOMAJ) \
+ $(ARCH) -o $(LIBSOMAJ) \
$(OBJSDLL) -L$(ZLIBLIB) -lz
pngtest: pngtest.o $(LIBSO)
@@ -136,10 +134,10 @@ install-static: install-headers libpng.a
install-shared: install-headers $(LIBSOMAJ) libpng.pc
-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@$(RM_F) $(DL)/$(LIBSO)
- -@$(RM_F) $(DL)/$(LIBSOREL)
+ -@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(OLDSO)
- cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
- chmod 755 $(DL)/$(LIBSOREL)
+ cp $(LIBSOMAJ) $(DL)
+ chmod 755 $(DL)/$(LIBSOMAJ)
(cd $(DL); \
$(LN_SF) $(LIBSOREL) $(LIBSO); \
$(LN_SF) $(LIBSO) $(OLDSO))
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.dec b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.dec
index 5301d87d33e..5301d87d33e 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.dec
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.dec
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.dj2 b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.dj2
index 87a05a364ac..87a05a364ac 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.dj2
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.dj2
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.elf b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.elf
index 5af43b18452..5af43b18452 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.elf
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.elf
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.freebsd b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.freebsd
index 994608c993a..38cd9212143 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.freebsd
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.freebsd
@@ -11,8 +11,8 @@ SHLIB_VER?= 15
LIB= png
SHLIB_MAJOR= ${SHLIB_VER}
SHLIB_MINOR= 0
-NOPROFILE= YES
-NOOBJ= YES
+NO_PROFILE= YES
+NO_OBJ= YES
# where make install puts libpng.a and png.h
DESTDIR= ${PREFIX}
@@ -25,7 +25,10 @@ MANDIR= /man/man
SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \
libpng/pngconf.h ${INCSDIR}/../pngconf.h \
libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h
+
LDADD+= -lm -lz
+#LDADD+= -lm -lz -lssp_nonshared # for OSVERSION >= 800000 ?
+
DPADD+= ${LIBM} ${LIBZ}
CFLAGS+= -I.
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.gcc b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.gcc
index 2e5b611367f..2e5b611367f 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.gcc
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.gcc
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hp64 b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.hp64
index b5b631d11c7..b5b631d11c7 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hp64
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.hp64
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hpgcc b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.hpgcc
index 3fe21177a4c..3fe21177a4c 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hpgcc
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.hpgcc
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hpux b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.hpux
index 650ab4f6621..650ab4f6621 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hpux
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.hpux
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.ibmc b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.ibmc
index 209d513b1cb..209d513b1cb 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.ibmc
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.ibmc
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.intel b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.intel
index 1cb9ef37497..1cb9ef37497 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.intel
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.intel
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.knr b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.knr
index 18a39f53755..18a39f53755 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.knr
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.knr
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.linux b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.linux
index f1c75b654e2..53ee57812a5 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.linux
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.linux
@@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng15
PNGMAJ = 15
-RELEASE = 10
+RELEASE = 12
# Shared library names:
LIBSO=$(LIBNAME).so
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.mips b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.mips
index 179d3850b69..179d3850b69 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.mips
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.mips
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.msc b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.msc
index baa863dad99..baa863dad99 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.msc
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.msc
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.ne12bsd b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.ne12bsd
index c447f12034e..413fe426598 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.ne12bsd
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng15
LIB= png15
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.5.10
+SHLIB_MINOR= 1.5.12
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.10/scripts/makefile.netbsd b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.netbsd
index d154810640d..071752ff837 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.netbsd
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.netbsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB= png
SHLIB_MAJOR= 15
-SHLIB_MINOR= 1.5.10
+SHLIB_MINOR= 1.5.12
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.10/scripts/makefile.openbsd b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.openbsd
index 3a1b84ea319..baa4a1f0227 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.openbsd
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.openbsd
@@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 15
-SHLIB_MINOR= 1.5.10
+SHLIB_MINOR= 1.5.12
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sco b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.sco
index 0aad789a981..0aad789a981 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sco
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.sco
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sggcc b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.sggcc
index 1611638ba6c..1611638ba6c 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sggcc
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.sggcc
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sgi b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.sgi
index 83db59f817e..83db59f817e 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sgi
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.sgi
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.so9 b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.so9
index 615c2e34580..615c2e34580 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.so9
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.so9
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.solaris b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.solaris
index 24bd61033ce..24bd61033ce 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.solaris
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.solaris
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.solaris-x86 b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.solaris-x86
index 76467622a85..76467622a85 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.solaris-x86
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.solaris-x86
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.std b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.std
index a04dbb856b4..a04dbb856b4 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.std
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.std
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sunos b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.sunos
index 383954987ee..383954987ee 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sunos
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.sunos
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.tc3 b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.tc3
index 462c47fece9..462c47fece9 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.tc3
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.tc3
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.vcwin32 b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.vcwin32
index 6bfeac03f7e..6bfeac03f7e 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.vcwin32
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makefile.vcwin32
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/makevms.com b/Build/source/libs/libpng/libpng-1.5.12/scripts/makevms.com
index f6c326103c2..f6c326103c2 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/makevms.com
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/makevms.com
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/options.awk b/Build/source/libs/libpng/libpng-1.5.12/scripts/options.awk
index 9ef98bc8e5e..9ef98bc8e5e 100755
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/options.awk
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/options.awk
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.dfa b/Build/source/libs/libpng/libpng-1.5.12/scripts/pnglibconf.dfa
index f06eb668573..794c203ba44 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.dfa
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/pnglibconf.dfa
@@ -21,7 +21,7 @@ file pnglibconf.h scripts/pnglibconf.dfa PNGLCONF_H
# C compiler to generate 'pnglibconf.h' - a list of all the
# configuration options. The file lists the various options
# that can *only* be specified during the libpng build;
-# pnglibconf.h freezes the definitons selected for the specific
+# pnglibconf.h freezes the definitions selected for the specific
# build.
#
# The syntax is detailed in scripts/options.awk, this is a summary
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.h.prebuilt b/Build/source/libs/libpng/libpng-1.5.12/scripts/pnglibconf.h.prebuilt
index 6facf39aabf..d93adabaa6c 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.h.prebuilt
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/pnglibconf.h.prebuilt
@@ -3,7 +3,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng 1.5.10 - March 29, 2012 */
+/* Libpng 1.5.12 - July 11, 2012 */
/* Copyright (c) 1998-2012 Glenn Randers-Pehrson */
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.mak b/Build/source/libs/libpng/libpng-1.5.12/scripts/pnglibconf.mak
index c04578f31d9..c04578f31d9 100755
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.mak
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/pnglibconf.mak
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/pngwin.rc b/Build/source/libs/libpng/libpng-1.5.12/scripts/pngwin.rc
index 9335cbbe03b..9335cbbe03b 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/pngwin.rc
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/pngwin.rc
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/smakefile.ppc b/Build/source/libs/libpng/libpng-1.5.12/scripts/smakefile.ppc
index 2e7380b1f98..2e7380b1f98 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/smakefile.ppc
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/smakefile.ppc
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/sym.dfn b/Build/source/libs/libpng/libpng-1.5.12/scripts/sym.dfn
index f4f13df0831..f4f13df0831 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/sym.dfn
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/sym.dfn
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/symbols.def b/Build/source/libs/libpng/libpng-1.5.12/scripts/symbols.def
index bf958bc6065..874c83a7d27 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/symbols.def
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/symbols.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.5.10
+;Version 1.5.12
png_access_version_number @1
png_set_sig_bytes @2
png_sig_cmp @3
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/symbols.dfn b/Build/source/libs/libpng/libpng-1.5.12/scripts/symbols.dfn
index d790929e7e7..d790929e7e7 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/symbols.dfn
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/symbols.dfn
diff --git a/Build/source/libs/libpng/libpng-1.5.10/scripts/vers.dfn b/Build/source/libs/libpng/libpng-1.5.12/scripts/vers.dfn
index 89d5f3879e2..89d5f3879e2 100644
--- a/Build/source/libs/libpng/libpng-1.5.10/scripts/vers.dfn
+++ b/Build/source/libs/libpng/libpng-1.5.12/scripts/vers.dfn
diff --git a/Build/source/libs/libpng/libpng-1.5.10/test-pngtest.sh b/Build/source/libs/libpng/libpng-1.5.12/test-pngtest.sh
index bba128b6319..bba128b6319 100755
--- a/Build/source/libs/libpng/libpng-1.5.10/test-pngtest.sh
+++ b/Build/source/libs/libpng/libpng-1.5.12/test-pngtest.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.10/test-pngvalid-full.sh b/Build/source/libs/libpng/libpng-1.5.12/test-pngvalid-full.sh
index f7d1b2b5d58..f7d1b2b5d58 100755
--- a/Build/source/libs/libpng/libpng-1.5.10/test-pngvalid-full.sh
+++ b/Build/source/libs/libpng/libpng-1.5.12/test-pngvalid-full.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.10/test-pngvalid-simple.sh b/Build/source/libs/libpng/libpng-1.5.12/test-pngvalid-simple.sh
index 7d4d9d83c28..7d4d9d83c28 100755
--- a/Build/source/libs/libpng/libpng-1.5.10/test-pngvalid-simple.sh
+++ b/Build/source/libs/libpng/libpng-1.5.12/test-pngvalid-simple.sh
diff --git a/Build/source/libs/libpng/version.ac b/Build/source/libs/libpng/version.ac
index be9dc6517a7..80c4bae423d 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.10])
+m4_define([libpng_version], [1.5.12])