summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-03-30 08:19:39 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-03-30 08:19:39 +0000
commit89e75c6282854756042de04dcab5971af1ab8ee4 (patch)
treecd0200b6c061c1aa8125069a1e227739e72c5cd4
parent14936bd01945e9cec5ece66cb158ffd3c393e20b (diff)
libpng 1.5.10
git-svn-id: svn://tug.org/texlive/trunk@25785 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/libs/README2
-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-PATCHES/ChangeLog (renamed from Build/source/libs/libpng/libpng-1.5.9-PATCHES/ChangeLog)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10-PATCHES/TL-Changes (renamed from Build/source/libs/libpng/libpng-1.5.9-PATCHES/TL-Changes)7
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/ANNOUNCE64
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/CHANGES (renamed from Build/source/libs/libpng/libpng-1.5.9/CHANGES)50
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/CMakeLists.txt (renamed from Build/source/libs/libpng/libpng-1.5.9/CMakeLists.txt)10
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/INSTALL (renamed from Build/source/libs/libpng/libpng-1.5.9/INSTALL)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/LICENSE (renamed from Build/source/libs/libpng/libpng-1.5.9/LICENSE)4
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/Makefile.am (renamed from Build/source/libs/libpng/libpng-1.5.9/Makefile.am)6
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/Makefile.in (renamed from Build/source/libs/libpng/libpng-1.5.9/Makefile.in)8
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/README (renamed from Build/source/libs/libpng/libpng-1.5.9/README)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/TODO (renamed from Build/source/libs/libpng/libpng-1.5.9/TODO)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/aclocal.m4 (renamed from Build/source/libs/libpng/libpng-1.5.9/aclocal.m4)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/arm/filter_neon.S (renamed from Build/source/libs/libpng/libpng-1.5.9/arm/filter_neon.S)0
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.10/autogen.sh (renamed from Build/source/libs/libpng/libpng-1.5.9/autogen.sh)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/config.h.in (renamed from Build/source/libs/libpng/libpng-1.5.9/config.h.in)0
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.10/configure (renamed from Build/source/libs/libpng/libpng-1.5.9/configure)24
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/configure.ac (renamed from Build/source/libs/libpng/libpng-1.5.9/configure.ac)6
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/README.txt (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/README.txt)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/COPYING (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/COPYING)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/LICENSE (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/LICENSE)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.mingw32 (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/Makefile.mingw32)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.sgi (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/Makefile.sgi)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.unx (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/Makefile.unx)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.w32 (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/Makefile.w32)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/README (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/README)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/makevms.com (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/makevms.com)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng.c (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/readpng.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng.h (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/readpng.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng2.c (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/readpng2.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng2.h (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/readpng2.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readppm.c (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/readppm.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng-win.c (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/rpng-win.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng-x.c (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/rpng-x.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng2-win.c (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/rpng2-win.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng2-x.c (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/rpng2-x.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/toucan.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/toucan.png)bin12901 -> 12901 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/wpng.c (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/wpng.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/writepng.c (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/writepng.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/writepng.h (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/writepng.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/libtests/pngvalid.c (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/libtests/pngvalid.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/README (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/README)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/README (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/decoder/README)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/makefile (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/decoder/makefile)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/pngusr.dfa (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/decoder/pngusr.dfa)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/pngusr.h (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/decoder/pngusr.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/README (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/encoder/README)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/makefile (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/encoder/makefile)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/pngusr.dfa (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/encoder/pngusr.dfa)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/pngusr.h (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/encoder/pngusr.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/README (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/preader/README)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/makefile (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/preader/makefile)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/pngusr.dfa (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/preader/pngusr.dfa)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/pngusr.h (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/preader/pngusr.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/README (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/README)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makefile.std (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/makefile.std)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makefile.tc3 (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/makefile.tc3)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makevms.com (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/makevms.com)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.bat (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/png2pnm.bat)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.c (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/png2pnm.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.sh (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/png2pnm.sh)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pngminus.bat (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/pngminus.bat)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pngminus.sh (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/pngminus.sh)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.bat (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/pnm2png.bat)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.c (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/pnm2png.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.sh (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/pnm2png.sh)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/README (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/README)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g01.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn0g01.png)bin164 -> 164 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g02.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn0g02.png)bin104 -> 104 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g04.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn0g04.png)bin145 -> 145 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g08.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn0g08.png)bin138 -> 138 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g16.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn0g16.png)bin167 -> 167 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn2c08.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn2c08.png)bin145 -> 145 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn2c16.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn2c16.png)bin302 -> 302 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p01.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn3p01.png)bin112 -> 112 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p02.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn3p02.png)bin146 -> 146 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p04.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn3p04.png)bin216 -> 216 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p08.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn3p08.png)bin1286 -> 1286 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn4a08.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn4a08.png)bin126 -> 126 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn4a16.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn4a16.png)bin2206 -> 2206 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn6a08.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn6a08.png)bin184 -> 184 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn6a16.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn6a16.png)bin3435 -> 3435 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn1g04.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbbn1g04.png)bin429 -> 429 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn2c16.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbbn2c16.png)bin2041 -> 2041 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn3p08.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbbn3p08.png)bin1499 -> 1499 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbgn2c16.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbgn2c16.png)bin2041 -> 2041 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbgn3p08.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbgn3p08.png)bin1499 -> 1499 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbrn2c08.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbrn2c08.png)bin1633 -> 1633 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbwn1g16.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbwn1g16.png)bin1313 -> 1313 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbwn3p08.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbwn3p08.png)bin1496 -> 1496 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbyn3p08.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbyn3p08.png)bin1499 -> 1499 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n1g08.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftp0n1g08.png)bin719 -> 719 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n2c08.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftp0n2c08.png)bin1594 -> 1594 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n3p08.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftp0n3p08.png)bin1476 -> 1476 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp1n3p08.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftp1n3p08.png)bin1483 -> 1483 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/PngFile.c (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/PngFile.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/PngFile.h (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/PngFile.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/README.txt (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/README.txt)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.c (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.dsp (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.dsp)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.dsw (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.dsw)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.ico (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.ico)bin766 -> 766 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.png (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.png)bin208 -> 208 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.rc (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.rc)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/cexcept.h (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/cexcept.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/resource.h (renamed from Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/resource.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/example.c (renamed from Build/source/libs/libpng/libpng-1.5.9/example.c)55
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.10/libpng-config.in (renamed from Build/source/libs/libpng/libpng-1.5.9/libpng-config.in)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/libpng-manual.txt (renamed from Build/source/libs/libpng/libpng-1.5.9/libpng-manual.txt)36
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/libpng.3 (renamed from Build/source/libs/libpng/libpng-1.5.9/libpng.3)52
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/libpng.pc.in (renamed from Build/source/libs/libpng/libpng-1.5.9/libpng.pc.in)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/libpngpf.3 (renamed from Build/source/libs/libpng/libpng-1.5.9/libpngpf.3)4
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/png.5 (renamed from Build/source/libs/libpng/libpng-1.5.9/png.5)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/png.c (renamed from Build/source/libs/libpng/libpng-1.5.9/png.c)30
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/png.h (renamed from Build/source/libs/libpng/libpng-1.5.9/png.h)34
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngbar.jpg (renamed from Build/source/libs/libpng/libpng-1.5.9/pngbar.jpg)bin2498 -> 2498 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngbar.png (renamed from Build/source/libs/libpng/libpng-1.5.9/pngbar.png)bin2399 -> 2399 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngconf.h (renamed from Build/source/libs/libpng/libpng-1.5.9/pngconf.h)6
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngdebug.h (renamed from Build/source/libs/libpng/libpng-1.5.9/pngdebug.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngerror.c (renamed from Build/source/libs/libpng/libpng-1.5.9/pngerror.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngget.c (renamed from Build/source/libs/libpng/libpng-1.5.9/pngget.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pnginfo.h (renamed from Build/source/libs/libpng/libpng-1.5.9/pnginfo.h)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pnglibconf.h (renamed from Build/source/libs/libpng/libpng-1.5.9/pnglibconf.h)11
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngmem.c (renamed from Build/source/libs/libpng/libpng-1.5.9/pngmem.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngnow.png (renamed from Build/source/libs/libpng/libpng-1.5.9/pngnow.png)bin2069 -> 2069 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngpread.c (renamed from Build/source/libs/libpng/libpng-1.5.9/pngpread.c)561
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngpriv.h (renamed from Build/source/libs/libpng/libpng-1.5.9/pngpriv.h)52
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngread.c (renamed from Build/source/libs/libpng/libpng-1.5.9/pngread.c)21
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngrio.c (renamed from Build/source/libs/libpng/libpng-1.5.9/pngrio.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngrtran.c (renamed from Build/source/libs/libpng/libpng-1.5.9/pngrtran.c)13
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngrutil.c (renamed from Build/source/libs/libpng/libpng-1.5.9/pngrutil.c)19
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngset.c (renamed from Build/source/libs/libpng/libpng-1.5.9/pngset.c)37
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngstruct.h (renamed from Build/source/libs/libpng/libpng-1.5.9/pngstruct.h)15
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngtest.c (renamed from Build/source/libs/libpng/libpng-1.5.9/pngtest.c)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngtest.png (renamed from Build/source/libs/libpng/libpng-1.5.9/pngtest.png)bin8695 -> 8695 bytes
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngtrans.c (renamed from Build/source/libs/libpng/libpng-1.5.9/pngtrans.c)107
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngusr.dfa14
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngwio.c (renamed from Build/source/libs/libpng/libpng-1.5.9/pngwio.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngwrite.c (renamed from Build/source/libs/libpng/libpng-1.5.9/pngwrite.c)16
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngwtran.c (renamed from Build/source/libs/libpng/libpng-1.5.9/pngwtran.c)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/pngwutil.c (renamed from Build/source/libs/libpng/libpng-1.5.9/pngwutil.c)19
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/libpng.tgt (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/owatcom/libpng.tgt)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/libpng.wpj (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/owatcom/libpng.wpj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngconfig.mak (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/owatcom/pngconfig.mak)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngtest.tgt (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/owatcom/pngtest.tgt)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngvalid.tgt (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/owatcom/pngvalid.tgt)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/PRJ0041.mak (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/PRJ0041.mak)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/README.txt (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/README.txt)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/README_zlib.txt (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/README_zlib.txt)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/libpng.sln (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/libpng.sln)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/libpng.vcproj (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/libpng.vcproj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/pngtest.vcproj (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/pngtest.vcproj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/zlib.vcproj (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/zlib.vcproj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/libpng/libpng.vcxproj (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/libpng/libpng.vcxproj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pnglibconf/pnglibconf.vcxproj (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/pnglibconf/pnglibconf.vcxproj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pngtest/pngtest.vcxproj (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/pngtest/pngtest.vcxproj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pngvalid/pngvalid.vcxproj (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/pngvalid/pngvalid.vcxproj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/readme.txt (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/readme.txt)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/vstudio.sln (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/vstudio.sln)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/zlib.props (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/zlib.props)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/zlib/zlib.vcxproj (renamed from Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/zlib/zlib.vcxproj)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/README.txt (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/README.txt)12
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/SCOPTIONS.ppc (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/SCOPTIONS.ppc)0
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.10/scripts/checksym.awk (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/checksym.awk)0
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.10/scripts/chkfmt (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/chkfmt)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/def.dfn (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/def.dfn)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/descrip.mms (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/descrip.mms)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/libpng-config-body.in (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/libpng-config-body.in)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/libpng-config-head.in (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/libpng-config-head.in)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/libpng.pc.in (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/libpng.pc.in)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.32sunu (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.32sunu)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.64sunu (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.64sunu)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.acorn (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.acorn)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.aix (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.aix)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.amiga (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.amiga)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.atari (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.atari)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.bc32 (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.bc32)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.beos (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.beos)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.bor (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.bor)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.cegcc (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.cegcc)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.darwin (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.darwin)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.dec (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.dec)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.dj2 (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.dj2)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.elf (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.elf)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.freebsd (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.freebsd)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.gcc (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.gcc)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hp64 (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.hp64)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hpgcc (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.hpgcc)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hpux (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.hpux)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.ibmc (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.ibmc)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.intel (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.intel)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.knr (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.knr)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.linux (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.linux)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.mips (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.mips)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.msc (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.msc)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.ne12bsd (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.ne12bsd)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.netbsd (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.netbsd)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.openbsd (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.openbsd)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sco (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.sco)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sggcc (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.sggcc)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sgi (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.sgi)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.so9 (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.so9)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.solaris (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.solaris)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.solaris-x86 (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.solaris-x86)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.std (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.std)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sunos (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.sunos)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.tc3 (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.tc3)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.vcwin32 (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.vcwin32)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/makevms.com (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/makevms.com)0
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.10/scripts/options.awk (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/options.awk)2
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.dfa (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/pnglibconf.dfa)42
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.h.prebuilt (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/pnglibconf.h.prebuilt)11
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.mak (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/pnglibconf.mak)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/pngwin.rc (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/pngwin.rc)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/smakefile.ppc (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/smakefile.ppc)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/sym.dfn (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/sym.dfn)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/symbols.def (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/symbols.def)3
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/symbols.dfn (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/symbols.dfn)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.10/scripts/vers.dfn (renamed from Build/source/libs/libpng/libpng-1.5.9/scripts/vers.dfn)0
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.10/test-pngtest.sh (renamed from Build/source/libs/libpng/libpng-1.5.9/test-pngtest.sh)0
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.10/test-pngvalid-full.sh (renamed from Build/source/libs/libpng/libpng-1.5.9/test-pngvalid-full.sh)0
-rwxr-xr-xBuild/source/libs/libpng/libpng-1.5.10/test-pngvalid-simple.sh (renamed from Build/source/libs/libpng/libpng-1.5.9/test-pngvalid-simple.sh)0
-rw-r--r--Build/source/libs/libpng/libpng-1.5.9/ANNOUNCE42
-rw-r--r--Build/source/libs/libpng/version.ac2
226 files changed, 641 insertions, 809 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README
index e86a98317a1..1edac3594eb 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -27,7 +27,7 @@ graphite 2.4 - checked 16mar12
icu 49.1 (49.1 release) - http://download.icu-project.org/files/icu4c/
with modifications required for xetex, also used by bibtexu
-libpng 1.5.9 - checked 23feb12
+libpng 1.5.10 - checked 30mar12
http://www.libpng.org/ - used by many
http://www.libpng.org/pub/png/pngcode.html
diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog
index 9988ba57db6..182dda902a1 100644
--- a/Build/source/libs/libpng/ChangeLog
+++ b/Build/source/libs/libpng/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-30 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import libpng-1.5.10.
+ * version.ac: Adjust.
+
2012-02-24 Peter Breitenlohner <peb@mppmu.mpg.de>
* include/Makefile.am: Use ../am/hdr_links.am.
diff --git a/Build/source/libs/libpng/configure b/Build/source/libs/libpng/configure
index 29463f43998..f0148138f15 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.68 for libpng for TeX Live 1.5.9.
+# Generated by GNU Autoconf 2.68 for libpng for TeX Live 1.5.10.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -560,12 +560,12 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libpng for TeX Live'
PACKAGE_TARNAME='libpng-for-tex-live'
-PACKAGE_VERSION='1.5.9'
-PACKAGE_STRING='libpng for TeX Live 1.5.9'
+PACKAGE_VERSION='1.5.10'
+PACKAGE_STRING='libpng for TeX Live 1.5.10'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="libpng-1.5.9/pngget.c"
+ac_unique_file="libpng-1.5.10/pngget.c"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1263,7 +1263,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.9 to adapt to many kinds of systems.
+\`configure' configures libpng for TeX Live 1.5.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1330,7 +1330,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.9:";;
+ short | recursive ) echo "Configuration of libpng for TeX Live 1.5.10:";;
esac
cat <<\_ACEOF
@@ -1430,7 +1430,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng for TeX Live configure 1.5.9
+libpng for TeX Live configure 1.5.10
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1853,7 +1853,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.9, which was
+It was created by libpng for TeX Live $as_me 1.5.10, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2672,7 +2672,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng-for-tex-live'
- VERSION='1.5.9'
+ VERSION='1.5.10'
cat >>confdefs.h <<_ACEOF
@@ -4743,7 +4743,7 @@ LIBS=$kpse_save_LIBS
echo timestamp >config.force
fi
-LIBPNG_TREE=libpng-1.5.9
+LIBPNG_TREE=libpng-1.5.10
LIBPNG_DEFINES='-DPNG_CONFIGURE_LIBPNG -DPNG_NO_MMX_CODE'
@@ -5294,7 +5294,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.9, which was
+This file was extended by libpng for TeX Live $as_me 1.5.10, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5360,7 +5360,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.9
+libpng for TeX Live config.status 1.5.10
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/libs/libpng/libpng-1.5.9-PATCHES/ChangeLog b/Build/source/libs/libpng/libpng-1.5.10-PATCHES/ChangeLog
index 26311ea5079..26311ea5079 100644
--- a/Build/source/libs/libpng/libpng-1.5.9-PATCHES/ChangeLog
+++ b/Build/source/libs/libpng/libpng-1.5.10-PATCHES/ChangeLog
diff --git a/Build/source/libs/libpng/libpng-1.5.9-PATCHES/TL-Changes b/Build/source/libs/libpng/libpng-1.5.10-PATCHES/TL-Changes
index 3f0758dcddc..ae4c2f26739 100644
--- a/Build/source/libs/libpng/libpng-1.5.9-PATCHES/TL-Changes
+++ b/Build/source/libs/libpng/libpng-1.5.10-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
-Changes applied to the libpng-1.5.9/ tree as obtained from:
- http://www.libpng.org/ libpng-1.5.9.tar.xz
+Changes applied to the libpng-1.5.10/ tree as obtained from:
+ http://www.libpng.org/ libpng-1.5.10.tar.xz
Copied:
scripts/pnglibconf.h.prebuilt -> pnglibconf.h
@@ -12,9 +12,6 @@ Removed:
ltmain.sh
missing
-Removed empty dir:
- projects/vstudio/pngstest
-
Converted Dos/Win line ends to native:
projects/owatcom/pngconfig.mak
diff --git a/Build/source/libs/libpng/libpng-1.5.10/ANNOUNCE b/Build/source/libs/libpng/libpng-1.5.10/ANNOUNCE
new file mode 100644
index 00000000000..dbc2ed17300
--- /dev/null
+++ b/Build/source/libs/libpng/libpng-1.5.10/ANNOUNCE
@@ -0,0 +1,64 @@
+
+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.9/CHANGES b/Build/source/libs/libpng/libpng-1.5.10/CHANGES
index 301b80c7182..70af8273e71 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/CHANGES
+++ b/Build/source/libs/libpng/libpng-1.5.10/CHANGES
@@ -3803,13 +3803,57 @@ Version 1.5.9beta02 [February 16, 2012]
Removed tests for no-longer-used *_EMPTY_PLTE_SUPPORTED from pngstruct.h
Version 1.5.9rc01 [February 17, 2012]
- Fixed CVE-2011-3026 buffer overrun bug. Deal more correctly with the test
- on iCCP chunk length. Also removed spurious casts that may hide problems
- on 16-bit systems.
+ Fixed CVE-2011-3026 buffer overrun bug. This bug was introduced when
+ iCCP chunk support was added at libpng-1.0.6. Deal more correctly with the
+ test on iCCP chunk length. Also removed spurious casts that may hide
+ problems on 16-bit systems.
Version 1.5.9 [February 18, 2012]
No changes.
+Version 1.5.10beta01 [February 24, 2012]
+ 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.
+
+Version 1.5.10beta02 [February 27, 2012]
+ Updated Makefile.in
+
+Version 1.5.10beta03 [March 6, 2012]
+ Removed unused "current_text" members of png_struct and the png_free()
+ of png_ptr->current_text from pngread.c
+ Added palette-index checking. Issue a png_warning() if an invalid index is
+ found.
+
+Version 1.5.10beta04 [March 10, 2012]
+ 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.
+
+Version 1.5.10beta05 [March 10, 2012]
+ Reject all iCCP chunks after the first, even if the first one is invalid.
+ Issue a png_benign_error() instead of png_warning() about bad palette index.
+ Fixed an off-by-one error in the palette index checking function.
+ 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.
+
+Version 1.5.10 [March 29, 2012]
+ 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
diff --git a/Build/source/libs/libpng/libpng-1.5.9/CMakeLists.txt b/Build/source/libs/libpng/libpng-1.5.10/CMakeLists.txt
index f0f3e858584..b5117891d64 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/CMakeLists.txt
+++ b/Build/source/libs/libpng/libpng-1.5.10/CMakeLists.txt
@@ -35,7 +35,7 @@ enable_testing()
set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 5)
-set(PNGLIB_RELEASE 9)
+set(PNGLIB_RELEASE 10)
set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
@@ -176,11 +176,7 @@ endif()
# Ensure the CMAKE_LIBRARY_OUTPUT_DIRECTORY is set
IF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
- IF(WIN32)
- SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "bin")
- ELSE(WIN32)
- SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "lib")
- ENDIF(WIN32)
+ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "lib")
ENDIF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
# Set a variable with CMake code which:
@@ -229,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.9
+# VERSION 15.${PNGLIB_RELEASE}.1.5.10
VERSION 15.${PNGLIB_RELEASE}.0
SOVERSION 15
CLEAN_DIRECT_OUTPUT 1)
diff --git a/Build/source/libs/libpng/libpng-1.5.9/INSTALL b/Build/source/libs/libpng/libpng-1.5.10/INSTALL
index e6979c6fb01..e6979c6fb01 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/INSTALL
+++ b/Build/source/libs/libpng/libpng-1.5.10/INSTALL
diff --git a/Build/source/libs/libpng/libpng-1.5.9/LICENSE b/Build/source/libs/libpng/libpng-1.5.10/LICENSE
index dd43d3bf2c4..b72d1258e3a 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/LICENSE
+++ b/Build/source/libs/libpng/libpng-1.5.10/LICENSE
@@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.5.9, February 18, 2012, are
+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
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
-February 18, 2012
+March 29, 2012
diff --git a/Build/source/libs/libpng/libpng-1.5.9/Makefile.am b/Build/source/libs/libpng/libpng-1.5.10/Makefile.am
index 822811576f5..19652c4bdad 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/Makefile.am
+++ b/Build/source/libs/libpng/libpng-1.5.10/Makefile.am
@@ -38,7 +38,7 @@ lib_LTLIBRARIES=libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngerror.c\
pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c pngrutil.c\
pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c\
- png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h
+ png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h pngusr.dfa
if PNG_ARM_NEON
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += arm/filter_neon.S
@@ -153,11 +153,11 @@ SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\
mv dfn3.out $@
# The .dfn file for pnglibconf.h is machine generated
-pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h
+pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA)
rm -f $@ dfn?.out
$(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out version=search\
${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
- $(DFA_XTRA) 1>&2
+ ${srcdir}/pngusr.dfa $(DFA_XTRA) 1>&2
$(AWK) -f ${srcdir}/scripts/options.awk out=dfn2.out dfn1.out 1>&2
rm dfn1.out
mv dfn2.out $@
diff --git a/Build/source/libs/libpng/libpng-1.5.9/Makefile.in b/Build/source/libs/libpng/libpng-1.5.10/Makefile.in
index ebc8bc61c01..2ff35f74ab0 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/Makefile.in
+++ b/Build/source/libs/libpng/libpng-1.5.10/Makefile.in
@@ -102,7 +102,7 @@ am__libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES_DIST = png.c \
pngerror.c pngget.c pngmem.c pngpread.c pngread.c pngrio.c \
pngrtran.c pngrutil.c pngset.c pngtrans.c pngwio.c pngwrite.c \
pngwtran.c pngwutil.c png.h pngconf.h pngdebug.h pnginfo.h \
- pngpriv.h pngstruct.h arm/filter_neon.S
+ pngpriv.h pngstruct.h arm/filter_neon.S pngusr.dfa
@PNG_ARM_NEON_TRUE@am__objects_1 = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la-filter_neon.lo
am_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS = \
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la-png.lo \
@@ -356,7 +356,7 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngerror.c \
pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c \
pngrutil.c pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c \
pngwutil.c png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h \
- pngstruct.h $(am__append_1)
+ pngstruct.h pngusr.dfa $(am__append_1)
nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_CPPFLAGS = @LIBPNG_DEFINES@
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined \
@@ -1373,11 +1373,11 @@ contrib/libtests/pngvalid.o pngtest.o: pnglibconf.h
mv dfn3.out $@
# The .dfn file for pnglibconf.h is machine generated
-pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h
+pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA)
rm -f $@ dfn?.out
$(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out version=search\
${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
- $(DFA_XTRA) 1>&2
+ ${srcdir}/pngusr.dfa $(DFA_XTRA) 1>&2
$(AWK) -f ${srcdir}/scripts/options.awk out=dfn2.out dfn1.out 1>&2
rm dfn1.out
mv dfn2.out $@
diff --git a/Build/source/libs/libpng/libpng-1.5.9/README b/Build/source/libs/libpng/libpng-1.5.10/README
index ac682fecc55..e821ee4c878 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/README
+++ b/Build/source/libs/libpng/libpng-1.5.10/README
@@ -1,4 +1,4 @@
-README for libpng version 1.5.9 - February 18, 2012 (shared library 15.0)
+README for libpng version 1.5.10 - March 29, 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.9/TODO b/Build/source/libs/libpng/libpng-1.5.10/TODO
index 6e1f028bd75..6e1f028bd75 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/TODO
+++ b/Build/source/libs/libpng/libpng-1.5.10/TODO
diff --git a/Build/source/libs/libpng/libpng-1.5.9/aclocal.m4 b/Build/source/libs/libpng/libpng-1.5.10/aclocal.m4
index 004cd559f14..004cd559f14 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/aclocal.m4
+++ b/Build/source/libs/libpng/libpng-1.5.10/aclocal.m4
diff --git a/Build/source/libs/libpng/libpng-1.5.9/arm/filter_neon.S b/Build/source/libs/libpng/libpng-1.5.10/arm/filter_neon.S
index 63a5d8c17ff..63a5d8c17ff 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/arm/filter_neon.S
+++ b/Build/source/libs/libpng/libpng-1.5.10/arm/filter_neon.S
diff --git a/Build/source/libs/libpng/libpng-1.5.9/autogen.sh b/Build/source/libs/libpng/libpng-1.5.10/autogen.sh
index 5be104eb1d9..5be104eb1d9 100755
--- a/Build/source/libs/libpng/libpng-1.5.9/autogen.sh
+++ b/Build/source/libs/libpng/libpng-1.5.10/autogen.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.9/config.h.in b/Build/source/libs/libpng/libpng-1.5.10/config.h.in
index d1547427384..d1547427384 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/config.h.in
+++ b/Build/source/libs/libpng/libpng-1.5.10/config.h.in
diff --git a/Build/source/libs/libpng/libpng-1.5.9/configure b/Build/source/libs/libpng/libpng-1.5.10/configure
index 8b4822232e8..df2d1734c2c 100755
--- a/Build/source/libs/libpng/libpng-1.5.9/configure
+++ b/Build/source/libs/libpng/libpng-1.5.10/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.9.
+# Generated by GNU Autoconf 2.68 for libpng 1.5.10.
#
# 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.9'
-PACKAGE_STRING='libpng 1.5.9'
+PACKAGE_VERSION='1.5.10'
+PACKAGE_STRING='libpng 1.5.10'
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.9 to adapt to many kinds of systems.
+\`configure' configures libpng 1.5.10 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.9:";;
+ short | recursive ) echo "Configuration of libpng 1.5.10:";;
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.9
+libpng configure 1.5.10
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.9, which was
+It was created by libpng $as_me 1.5.10, 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.9'
+ VERSION='1.5.10'
cat >>confdefs.h <<_ACEOF
@@ -2804,10 +2804,10 @@ fi
-PNGLIB_VERSION=1.5.9
+PNGLIB_VERSION=1.5.10
PNGLIB_MAJOR=1
PNGLIB_MINOR=5
-PNGLIB_RELEASE=9
+PNGLIB_RELEASE=10
@@ -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.9, which was
+This file was extended by libpng $as_me 1.5.10, 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.9
+libpng config.status 1.5.10
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/libs/libpng/libpng-1.5.9/configure.ac b/Build/source/libs/libpng/libpng-1.5.10/configure.ac
index 2befaf786a8..023aba43b3d 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/configure.ac
+++ b/Build/source/libs/libpng/libpng-1.5.10/configure.ac
@@ -18,15 +18,15 @@ AC_PREREQ(2.59)
dnl Version number stuff here:
-AC_INIT([libpng], [1.5.9], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.5.10], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.5.9
+PNGLIB_VERSION=1.5.10
PNGLIB_MAJOR=1
PNGLIB_MINOR=5
-PNGLIB_RELEASE=9
+PNGLIB_RELEASE=10
dnl End of version number stuff
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/README.txt b/Build/source/libs/libpng/libpng-1.5.10/contrib/README.txt
index bcd433d3523..bcd433d3523 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/README.txt
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/README.txt
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/COPYING b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/COPYING
index a3e97747969..a3e97747969 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/COPYING
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/COPYING
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/LICENSE b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/LICENSE
index d9567178cb6..d9567178cb6 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/LICENSE
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/LICENSE
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/Makefile.mingw32 b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.mingw32
index e70a59aef2b..e70a59aef2b 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/Makefile.mingw32
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.mingw32
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/Makefile.sgi b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.sgi
index 91623acf068..91623acf068 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/Makefile.sgi
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.sgi
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/Makefile.unx b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.unx
index b52d8b6aa65..b52d8b6aa65 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/Makefile.unx
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.unx
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/Makefile.w32 b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.w32
index 41cfb231a2c..41cfb231a2c 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/Makefile.w32
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/Makefile.w32
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/README b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/README
index 7b1f6a3ea62..7b1f6a3ea62 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/README
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/README
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/makevms.com b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/makevms.com
index f32bcaba7f9..f32bcaba7f9 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/makevms.com
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/makevms.com
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/readpng.c b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng.c
index df42c301b3c..df42c301b3c 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/readpng.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/readpng.h b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng.h
index fad9fe3b4c5..fad9fe3b4c5 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/readpng.h
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng.h
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/readpng2.c b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng2.c
index b9746b75608..b9746b75608 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/readpng2.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng2.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/readpng2.h b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng2.h
index 6b3660d7c17..6b3660d7c17 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/readpng2.h
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readpng2.h
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/readppm.c b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readppm.c
index be9a56d95fd..be9a56d95fd 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/readppm.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/readppm.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/rpng-win.c b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng-win.c
index f53ddc8ece6..f53ddc8ece6 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/rpng-win.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng-win.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/rpng-x.c b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng-x.c
index 6d10e1b84ed..6d10e1b84ed 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/rpng-x.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng-x.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/rpng2-win.c b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng2-win.c
index 223e737409a..223e737409a 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/rpng2-win.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng2-win.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/rpng2-x.c b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng2-x.c
index 7f24b632be0..7f24b632be0 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/rpng2-x.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/rpng2-x.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/toucan.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/toucan.png
index 03960d49399..03960d49399 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/toucan.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/toucan.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/wpng.c b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/wpng.c
index a06e3529ecb..a06e3529ecb 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/wpng.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/wpng.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/writepng.c b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/writepng.c
index f07f4a8a02d..f07f4a8a02d 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/writepng.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/writepng.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/writepng.h b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/writepng.h
index 78b966b5874..78b966b5874 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/gregbook/writepng.h
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/gregbook/writepng.h
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/libtests/pngvalid.c b/Build/source/libs/libpng/libpng-1.5.10/contrib/libtests/pngvalid.c
index 3dd6f2133ca..3dd6f2133ca 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/libtests/pngvalid.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/libtests/pngvalid.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/README b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/README
index 51d5a3c2305..51d5a3c2305 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/README
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/README
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/decoder/README b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/README
index fa979fcb727..fa979fcb727 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/decoder/README
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/README
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/decoder/makefile b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/makefile
index e10e1225d65..e10e1225d65 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/decoder/makefile
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/makefile
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/decoder/pngusr.dfa b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/pngusr.dfa
index 70d528bc9f9..70d528bc9f9 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/decoder/pngusr.dfa
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/pngusr.dfa
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/decoder/pngusr.h b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/pngusr.h
index 9d9c50c4078..9d9c50c4078 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/decoder/pngusr.h
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/decoder/pngusr.h
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/encoder/README b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/README
index ff9aa4597a9..ff9aa4597a9 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/encoder/README
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/README
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/encoder/makefile b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/makefile
index d6f39e2ea06..d6f39e2ea06 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/encoder/makefile
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/makefile
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/encoder/pngusr.dfa b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/pngusr.dfa
index ee88443c9dd..ee88443c9dd 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/encoder/pngusr.dfa
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/pngusr.dfa
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/encoder/pngusr.h b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/pngusr.h
index 2033aadb200..2033aadb200 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/encoder/pngusr.h
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/encoder/pngusr.h
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/preader/README b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/README
index faa83560a72..faa83560a72 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/preader/README
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/README
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/preader/makefile b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/makefile
index f4b0ccdc8a9..f4b0ccdc8a9 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/preader/makefile
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/makefile
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/preader/pngusr.dfa b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/pngusr.dfa
index 216c421ca66..216c421ca66 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/preader/pngusr.dfa
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/pngusr.dfa
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/preader/pngusr.h b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/pngusr.h
index 73cfecfbf06..73cfecfbf06 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminim/preader/pngusr.h
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminim/preader/pngusr.h
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/README b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/README
index bbe7407ecce..bbe7407ecce 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/README
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/README
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/makefile.std b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makefile.std
index fa7b5909fcc..fa7b5909fcc 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/makefile.std
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makefile.std
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/makefile.tc3 b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makefile.tc3
index 404f18d5b15..404f18d5b15 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/makefile.tc3
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makefile.tc3
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/makevms.com b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makevms.com
index 00561bcd0d7..00561bcd0d7 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/makevms.com
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/makevms.com
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/png2pnm.bat b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.bat
index 449cf36750b..449cf36750b 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/png2pnm.bat
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.bat
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/png2pnm.c b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.c
index 2281429435d..2281429435d 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/png2pnm.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/png2pnm.sh b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.sh
index b1c05370dff..b1c05370dff 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/png2pnm.sh
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/png2pnm.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/pngminus.bat b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pngminus.bat
index 911bb8dff9e..911bb8dff9e 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/pngminus.bat
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pngminus.bat
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/pngminus.sh b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pngminus.sh
index 2a0a9d8fbba..2a0a9d8fbba 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/pngminus.sh
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pngminus.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/pnm2png.bat b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.bat
index f756cb84de4..f756cb84de4 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/pnm2png.bat
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.bat
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/pnm2png.c b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.c
index 4cdfad83132..4cdfad83132 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/pnm2png.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/pnm2png.sh b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.sh
index d79df2fae08..d79df2fae08 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngminus/pnm2png.sh
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngminus/pnm2png.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/README b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/README
index b2b1537db8e..b2b1537db8e 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/README
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/README
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn0g01.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g01.png
index e31e1c7a635..e31e1c7a635 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn0g01.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g01.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn0g02.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g02.png
index 68809dd8fc0..68809dd8fc0 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn0g02.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g02.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn0g04.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g04.png
index 6fa089cb8a4..6fa089cb8a4 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn0g04.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g04.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn0g08.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g08.png
index bf522eef001..bf522eef001 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn0g08.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn0g16.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g16.png
index 318ebcadf4f..318ebcadf4f 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn0g16.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn0g16.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn2c08.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn2c08.png
index 21d2f91a868..21d2f91a868 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn2c08.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn2c08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn2c16.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn2c16.png
index 1bd4a4d0e2c..1bd4a4d0e2c 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn2c16.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn2c16.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn3p01.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p01.png
index a21db597746..a21db597746 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn3p01.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p01.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn3p02.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p02.png
index 1d0ab6197cc..1d0ab6197cc 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn3p02.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p02.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn3p04.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p04.png
index 6dc6eac83f3..6dc6eac83f3 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn3p04.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p04.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn3p08.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p08.png
index 0e07f483c0e..0e07f483c0e 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn3p08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn4a08.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn4a08.png
index 3bb0dd06b51..3bb0dd06b51 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn4a08.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn4a08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn4a16.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn4a16.png
index 6dbee9fbdb9..6dbee9fbdb9 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn4a16.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn4a16.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn6a08.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn6a08.png
index 61062308548..61062308548 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn6a08.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn6a08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn6a16.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn6a16.png
index a9bf3cb4612..a9bf3cb4612 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/basn6a16.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/basn6a16.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbbn1g04.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn1g04.png
index 39a7050d27a..39a7050d27a 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbbn1g04.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn1g04.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbbn2c16.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn2c16.png
index dd3168e5c86..dd3168e5c86 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbbn2c16.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn2c16.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbbn3p08.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn3p08.png
index 0ede3574db0..0ede3574db0 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbbn3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbbn3p08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbgn2c16.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbgn2c16.png
index 85cec395c01..85cec395c01 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbgn2c16.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbgn2c16.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbgn3p08.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbgn3p08.png
index 8cf2e6fb6aa..8cf2e6fb6aa 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbgn3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbgn3p08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbrn2c08.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbrn2c08.png
index 5cca0d62104..5cca0d62104 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbrn2c08.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbrn2c08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbwn1g16.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbwn1g16.png
index 99bdeed2b3b..99bdeed2b3b 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbwn1g16.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbwn1g16.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbwn3p08.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbwn3p08.png
index eacab7a144c..eacab7a144c 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbwn3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbwn3p08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbyn3p08.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbyn3p08.png
index 656db0989ad..656db0989ad 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftbyn3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftbyn3p08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftp0n1g08.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n1g08.png
index 333465fcdc9..333465fcdc9 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftp0n1g08.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n1g08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftp0n2c08.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n2c08.png
index fc6e42cb420..fc6e42cb420 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftp0n2c08.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n2c08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftp0n3p08.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n3p08.png
index 69a69e58722..69a69e58722 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftp0n3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp0n3p08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftp1n3p08.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp1n3p08.png
index a6c9f35a862..a6c9f35a862 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/pngsuite/ftp1n3p08.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/pngsuite/ftp1n3p08.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/PngFile.c b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/PngFile.c
index ef0984e4dfc..ef0984e4dfc 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/PngFile.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/PngFile.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/PngFile.h b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/PngFile.h
index 32181a4eacc..32181a4eacc 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/PngFile.h
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/PngFile.h
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/README.txt b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/README.txt
index 72c5cba1790..72c5cba1790 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/README.txt
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/README.txt
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.c b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.c
index 009f120e356..009f120e356 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.dsp b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.dsp
index 741ef6ce76f..741ef6ce76f 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.dsp
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.dsp
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.dsw b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.dsw
index a30e1cc1cdb..a30e1cc1cdb 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.dsw
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.dsw
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.ico b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.ico
index 68aa3719fb5..68aa3719fb5 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.ico
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.ico
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.png b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.png
index c6aa80a9bfa..c6aa80a9bfa 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.rc b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.rc
index 6e0623a73cf..6e0623a73cf 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/VisualPng.rc
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/VisualPng.rc
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/cexcept.h b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/cexcept.h
index 5f45d769758..5f45d769758 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/cexcept.h
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/cexcept.h
diff --git a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/resource.h b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/resource.h
index b62176d1dca..b62176d1dca 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/contrib/visupng/resource.h
+++ b/Build/source/libs/libpng/libpng-1.5.10/contrib/visupng/resource.h
diff --git a/Build/source/libs/libpng/libpng-1.5.9/example.c b/Build/source/libs/libpng/libpng-1.5.10/example.c
index ec53a8cdee3..c20d86b1547 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/example.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/example.c
@@ -2,8 +2,8 @@
#if 0 /* in case someone actually tries to compile this */
/* example.c - an example of using libpng
- * Last changed in libpng 1.5.7 [December 15, 2011]
- * Maintained 1998-2011 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.10 [March 8, 2012]
+ * Maintained 1998-2012 Glenn Randers-Pehrson
* Maintained 1996, 1997 Andreas Dilger
* Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
*/
@@ -695,25 +695,38 @@ void write_png(char *file_name /* , ... other image information ... */)
png_set_gAMA(png_ptr, info_ptr, gamma);
/* Optionally write comments into the image */
- text_ptr[0].key = "Title";
- text_ptr[0].text = "Mona Lisa";
- text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE;
- text_ptr[0].itxt_length = 0;
- text_ptr[0].lang = NULL;
- text_ptr[0].lang_key = NULL;
- text_ptr[1].key = "Author";
- text_ptr[1].text = "Leonardo DaVinci";
- text_ptr[1].compression = PNG_TEXT_COMPRESSION_NONE;
- text_ptr[1].itxt_length = 0;
- text_ptr[1].lang = NULL;
- text_ptr[1].lang_key = NULL;
- text_ptr[2].key = "Description";
- text_ptr[2].text = "<long text>";
- text_ptr[2].compression = PNG_TEXT_COMPRESSION_zTXt;
- text_ptr[2].itxt_length = 0;
- text_ptr[2].lang = NULL;
- text_ptr[2].lang_key = NULL;
- png_set_text(png_ptr, info_ptr, text_ptr, 3);
+ {
+ png_text text_ptr[3];
+
+ char key0[]="Title";
+ char text0[]="Mona Lisa";
+ text_ptr[0].key = key0;
+ text_ptr[0].text = text0;
+ text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE;
+ text_ptr[0].itxt_length = 0;
+ text_ptr[0].lang = NULL;
+ text_ptr[0].lang_key = NULL;
+
+ char key1[]="Author";
+ char text1[]="Leonardo DaVinci";
+ text_ptr[1].key = key1;
+ text_ptr[1].text = text1;
+ text_ptr[1].compression = PNG_TEXT_COMPRESSION_NONE;
+ text_ptr[1].itxt_length = 0;
+ text_ptr[1].lang = NULL;
+ text_ptr[1].lang_key = NULL;
+
+ char key2[]="Description";
+ char text2[]="<long text>";
+ text_ptr[2].key = key2;
+ text_ptr[2].text = text2;
+ text_ptr[2].compression = PNG_TEXT_COMPRESSION_zTXt;
+ text_ptr[2].itxt_length = 0;
+ text_ptr[2].lang = NULL;
+ text_ptr[2].lang_key = NULL;
+
+ png_set_text(write_ptr, write_info_ptr, text_ptr, 3);
+ }
/* Other optional chunks like cHRM, bKGD, tRNS, tIME, oFFs, pHYs */
diff --git a/Build/source/libs/libpng/libpng-1.5.9/libpng-config.in b/Build/source/libs/libpng/libpng-1.5.10/libpng-config.in
index 69bf8e33f0b..69bf8e33f0b 100755
--- a/Build/source/libs/libpng/libpng-1.5.9/libpng-config.in
+++ b/Build/source/libs/libpng/libpng-1.5.10/libpng-config.in
diff --git a/Build/source/libs/libpng/libpng-1.5.9/libpng-manual.txt b/Build/source/libs/libpng/libpng-1.5.10/libpng-manual.txt
index 7a66f1d5c28..d55e80a009c 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/libpng-manual.txt
+++ b/Build/source/libs/libpng/libpng-1.5.10/libpng-manual.txt
@@ -1,6 +1,6 @@
libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.5.9 - February 18, 2012
+ libpng version 1.5.10 - March 29, 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.9 - February 18, 2012
+ libpng versions 0.97, January 1998, through 1.5.10 - March 29, 2012
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -4142,6 +4142,16 @@ X. Changes to Libpng from version 1.4.x to 1.5.x
From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the
function) incorrectly returned a value of type png_uint_32.
+Checking for invalid palette index on read or write was added at libpng
+1.5.10. When an invalid index is found, libpng issues a benign error.
+This is enabled by default but can be disabled in each png_ptr with
+
+ png_set_check_for_invalid_index(png_ptr, allowed);
+
+ allowed - one of
+ 0: disable
+ 1: enable
+
A. Changes that affect users of libpng
There are no substantial API changes between the non-deprecated parts of
@@ -4260,6 +4270,20 @@ PNG_USER_WIDTH_MAX and PNG_USER_HEIGHT_MAX, although this document said
that it could be used to override them. Now this function will reduce or
increase the limits.
+Starting in libpng-1.5.10, the user limits can be set en masse with the
+configuration option PNG_SAFE_LIMITS_SUPPORTED. If this option is enabled,
+a set of "safe" limits is applied in pngpriv.h. These can be overridden by
+application calls to png_set_user_limits(), png_set_user_chunk_cache_max(),
+and/or png_set_user_malloc_max() that increase or decrease the limits. Also,
+in libpng-1.5.10 the default width and height limits were increased
+from 1,000,000 to 0x7ffffff (i.e., made unlimited). Therefore, the
+limits are now
+ default safe
+ png_user_width_max 0x7fffffff 1,000,000
+ png_user_height_max 0x7fffffff 1,000,000
+ png_user_chunk_cache_max 0 (unlimited) 128
+ png_user_chunk_malloc_max 0 (unlimited) 8,000,000
+
B. Changes to the build and configuration of libpng
Details of internal changes to the library code can be found in the CHANGES
@@ -4545,8 +4569,8 @@ above the comment that says
/* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */
To avoid polluting the global namespace, the names of all exported
-functions and variables begin with "png_", and all publicly visible C
-preprocessor macros begin with "PNG_". We request that applications that
+functions and variables begin with "png_", and all publicly visible C
+preprocessor macros begin with "PNG". We request that applications that
use libpng *not* begin any of their own symbols with either of these strings.
We put a space after each comma and after each semicolon
@@ -4573,13 +4597,13 @@ Other rules can be inferred by inspecting the libpng source.
XIV. Y2K Compliance in libpng
-February 18, 2012
+March 29, 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.9 are Y2K compliant. It is my belief that earlier
+upward through 1.5.10 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
diff --git a/Build/source/libs/libpng/libpng-1.5.9/libpng.3 b/Build/source/libs/libpng/libpng-1.5.10/libpng.3
index 14b15677064..bba25afa78c 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/libpng.3
+++ b/Build/source/libs/libpng/libpng-1.5.10/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "February 18, 2012"
+.TH LIBPNG 3 "March 29, 2012"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.5.9
+libpng \- Portable Network Graphics (PNG) Reference Library 1.5.10
.SH SYNOPSIS
\fI\fB
@@ -552,6 +552,10 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.5.9
\fI\fB
+\fBvoid png_set_check_for_invalid_index(png_structrp \fP\fIpng_ptr\fP\fB, int \fIallowed\fP\fB);\fP
+
+\fI\fB
+
\fBvoid png_set_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fP\fIwhite_x\fP\fB, double \fP\fIwhite_y\fP\fB, double \fP\fIred_x\fP\fB, double \fP\fIred_y\fP\fB, double \fP\fIgreen_x\fP\fB, double \fP\fIgreen_y\fP\fB, double \fP\fIblue_x\fP\fB, double \fIblue_y\fP\fB);\fP
\fI\fB
@@ -977,7 +981,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.5.9 - February 18, 2012
+ libpng version 1.5.10 - March 29, 2012
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -988,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.9 - February 18, 2012
+ libpng versions 0.97, January 1998, through 1.5.10 - March 29, 2012
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -5120,6 +5124,16 @@ We removed the trailing '.' from the warning and error messages.
From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the
function) incorrectly returned a value of type png_uint_32.
+Checking for invalid palette index on read or write was added at libpng
+1.5.10. When an invalid index is found, libpng issues a benign error.
+This is enabled by default but can be disabled in each png_ptr with
+
+ png_set_check_for_invalid_index(png_ptr, allowed);
+
+ allowed - one of
+ 0: disable
+ 1: enable
+
A. Changes that affect users of libpng
There are no substantial API changes between the non-deprecated parts of
@@ -5238,6 +5252,20 @@ PNG_USER_WIDTH_MAX and PNG_USER_HEIGHT_MAX, although this document said
that it could be used to override them. Now this function will reduce or
increase the limits.
+Starting in libpng-1.5.10, the user limits can be set en masse with the
+configuration option PNG_SAFE_LIMITS_SUPPORTED. If this option is enabled,
+a set of "safe" limits is applied in pngpriv.h. These can be overridden by
+application calls to png_set_user_limits(), png_set_user_chunk_cache_max(),
+and/or png_set_user_malloc_max() that increase or decrease the limits. Also,
+in libpng-1.5.10 the default width and height limits were increased
+from 1,000,000 to 0x7ffffff (i.e., made unlimited). Therefore, the
+limits are now
+ default safe
+ png_user_width_max 0x7fffffff 1,000,000
+ png_user_height_max 0x7fffffff 1,000,000
+ png_user_chunk_cache_max 0 (unlimited) 128
+ png_user_chunk_malloc_max 0 (unlimited) 8,000,000
+
B. Changes to the build and configuration of libpng
Details of internal changes to the library code can be found in the CHANGES
@@ -5523,8 +5551,8 @@ above the comment that says
/* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */
To avoid polluting the global namespace, the names of all exported
-functions and variables begin with "png_", and all publicly visible C
-preprocessor macros begin with "PNG_". We request that applications that
+functions and variables begin with "png_", and all publicly visible C
+preprocessor macros begin with "PNG". We request that applications that
use libpng *not* begin any of their own symbols with either of these strings.
We put a space after each comma and after each semicolon
@@ -5551,13 +5579,13 @@ Other rules can be inferred by inspecting the libpng source.
.SH XIV. Y2K Compliance in libpng
-February 18, 2012
+March 29, 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.9 are Y2K compliant. It is my belief that earlier
+upward through 1.5.10 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
@@ -5768,6 +5796,8 @@ the first widely used release:
1.5.9beta01-02 15 10509 15.so.15.9[.0]
1.5.9rc01 15 10509 15.so.15.9[.0]
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]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -5824,7 +5854,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.5.9 - February 18, 2012:
+Libpng version 1.5.10 - March 29, 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).
@@ -5847,7 +5877,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.5.9, February 18, 2012, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.10, March 29, 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
@@ -5946,7 +5976,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-February 18, 2012
+March 29, 2012
.\" end of man page
diff --git a/Build/source/libs/libpng/libpng-1.5.9/libpng.pc.in b/Build/source/libs/libpng/libpng-1.5.10/libpng.pc.in
index 3e7e2c58a7e..3e7e2c58a7e 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/libpng.pc.in
+++ b/Build/source/libs/libpng/libpng-1.5.10/libpng.pc.in
diff --git a/Build/source/libs/libpng/libpng-1.5.9/libpngpf.3 b/Build/source/libs/libpng/libpng-1.5.10/libpngpf.3
index 13464e240a8..8449f173f97 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/libpngpf.3
+++ b/Build/source/libs/libpng/libpng-1.5.10/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "February 18, 2012"
+.TH LIBPNGPF 3 "March 29, 2012"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.5.9
+libpng \- Portable Network Graphics (PNG) Reference Library 1.5.10
(private functions)
.SH SYNOPSIS
\fB#include \fI"pngpriv.h"
diff --git a/Build/source/libs/libpng/libpng-1.5.9/png.5 b/Build/source/libs/libpng/libpng-1.5.10/png.5
index 795a0f5bc0b..34f0e590831 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/png.5
+++ b/Build/source/libs/libpng/libpng-1.5.10/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "February 18, 2012"
+.TH PNG 5 "March 29, 2012"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/Build/source/libs/libpng/libpng-1.5.9/png.c b/Build/source/libs/libpng/libpng-1.5.10/png.c
index ca1de48664e..cba18ba915e 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/png.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/png.c
@@ -1,8 +1,8 @@
/* png.c - location for general purpose libpng functions
*
- * Last changed in libpng 1.5.7 [December 15, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.10 [March 8, 2012]
+ * Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -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_9 Your_png_h_is_not_version_1_5_9;
+typedef png_libpng_version_1_5_10 Your_png_h_is_not_version_1_5_10;
/* 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,13 +655,13 @@ png_get_copyright(png_const_structp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.5.9 - February 18, 2012" PNG_STRING_NEWLINE \
+ "libpng version 1.5.10 - March 29, 2012" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2011 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.9 - February 18, 2012\
+ return "libpng version 1.5.10 - March 29, 2012\
Copyright (c) 1998-2011 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@@ -1467,7 +1467,7 @@ static double
png_pow10(int power)
{
int recip = 0;
- double d = 1;
+ double d = 1.0;
/* Handle negative exponent with a reciprocal at the end because
* 10 is exact whereas .1 is inexact in base 2
@@ -1481,7 +1481,7 @@ png_pow10(int power)
if (power > 0)
{
/* Decompose power bitwise. */
- double mult = 10;
+ double mult = 10.0;
do
{
if (power & 1) d *= mult;
@@ -1600,7 +1600,8 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
{
double d;
- fp *= 10;
+ fp *= 10.0;
+
/* Use modf here, not floor and subtract, so that
* the separation is done in one step. At the end
* of the loop don't break the number into parts so
@@ -1613,7 +1614,7 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
{
d = floor(fp + .5);
- if (d > 9)
+ if (d > 9.0)
{
/* Rounding up to 10, handle that here. */
if (czero > 0)
@@ -1621,9 +1622,10 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
--czero, d = 1;
if (cdigits == 0) --clead;
}
+
else
{
- while (cdigits > 0 && d > 9)
+ while (cdigits > 0 && d > 9.0)
{
int ch = *--ascii;
@@ -1648,7 +1650,7 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
* exponent but take into account the leading
* decimal point.
*/
- if (d > 9) /* cdigits == 0 */
+ if (d > 9.0) /* cdigits == 0 */
{
if (exp_b10 == (-1))
{
@@ -1669,18 +1671,19 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
++exp_b10;
/* In all cases we output a '1' */
- d = 1;
+ d = 1.0;
}
}
}
fp = 0; /* Guarantees termination below. */
}
- if (d == 0)
+ if (d == 0.0)
{
++czero;
if (cdigits == 0) ++clead;
}
+
else
{
/* Included embedded zeros in the digit count. */
@@ -1708,6 +1711,7 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
above */
--exp_b10;
}
+
*ascii++ = (char)(48 + (int)d), ++cdigits;
}
}
diff --git a/Build/source/libs/libpng/libpng-1.5.9/png.h b/Build/source/libs/libpng/libpng-1.5.10/png.h
index 5617c9720e2..4e0dee1793a 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/png.h
+++ b/Build/source/libs/libpng/libpng-1.5.10/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.5.9 - February 18, 2012
+ * libpng version 1.5.10 - March 29, 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.9 - February 18, 2012: Glenn
+ * libpng versions 0.97, January 1998, through 1.5.10 - March 29, 2012: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -172,6 +172,8 @@
* 1.5.9beta01-02 15 10509 15.so.15.9[.0]
* 1.5.9rc01 15 10509 15.so.15.9[.0]
* 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]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -181,7 +183,7 @@
* to the source version x.y.z (leading zeros in y and z). Beta versions
* were given the previous public release number plus a letter, until
* version 1.0.6j; from then on they were given the upcoming public
- * release number plus "betaNN" or "rcN".
+ * release number plus "betaNN" or "rcNN".
*
* Binary incompatibility exists only when applications make direct access
* to the info_ptr or png_ptr members through png.h, and the compiled
@@ -203,7 +205,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.5.9, February 18, 2012, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.5.10, March 29, 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:
@@ -315,13 +317,13 @@
* Y2K compliance in libpng:
* =========================
*
- * February 18, 2012
+ * March 29, 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.9 are Y2K compliant. It is my belief that
+ * upward through 1.5.10 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
@@ -379,9 +381,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.5.9"
+#define PNG_LIBPNG_VER_STRING "1.5.10"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.5.9 - February 18, 2012\n"
+ " libpng version 1.5.10 - March 29, 2012\n"
#define PNG_LIBPNG_VER_SONUM 15
#define PNG_LIBPNG_VER_DLLNUM 15
@@ -389,7 +391,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 9
+#define PNG_LIBPNG_VER_RELEASE 10
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
@@ -412,7 +414,7 @@
#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
PNG_LIBPNG_BUILD_PRIVATE */
-#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA
+#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
/* Careful here. At one time, Guy wanted to use 082, but that would be octal.
* We must not include leading zeros.
@@ -420,7 +422,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 10509 /* 1.5.9 */
+#define PNG_LIBPNG_VER 10510 /* 1.5.10 */
/* Library configuration: these options cannot be changed after
* the library has been built.
@@ -542,7 +544,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_9;
+typedef char* png_libpng_version_1_5_10;
/* 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
@@ -2637,6 +2639,12 @@ PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
: (png_int_32)png_get_uint_32(buf)))
#endif
+#if defined(PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \
+ defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)
+PNG_EXPORT(234, void, png_set_check_for_invalid_index, (png_structp png_ptr,
+ int allowed));
+#endif
+
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project
* defs
*/
@@ -2646,7 +2654,7 @@ PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
* scripts/symbols.def as well.
*/
#ifdef PNG_EXPORT_LAST_ORDINAL
- PNG_EXPORT_LAST_ORDINAL(233);
+ PNG_EXPORT_LAST_ORDINAL(234);
#endif
#ifdef __cplusplus
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngbar.jpg b/Build/source/libs/libpng/libpng-1.5.10/pngbar.jpg
index 70ba8d817ce..70ba8d817ce 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngbar.jpg
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngbar.jpg
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngbar.png b/Build/source/libs/libpng/libpng-1.5.10/pngbar.png
index 49798c8ed95..49798c8ed95 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngbar.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngbar.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngconf.h b/Build/source/libs/libpng/libpng-1.5.10/pngconf.h
index 1aa268beef5..bbb547f8eb9 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngconf.h
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.5.9 - February 18, 2012
+ * libpng version 1.5.10 - March 29, 2012
*
* Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -51,8 +51,8 @@
/* This controls optimization of the reading of 16 and 32 bit values
* from PNG files. It can be set on a per-app-file basis - it
- * just changes whether a macro is used to the function is called.
- * The library builder sets the default, if read functions are not
+ * just changes whether a macro is used when the function is called.
+ * The library builder sets the default; if read functions are not
* built into the library the macro implementation is forced on.
*/
#ifndef PNG_READ_INT_FUNCTIONS_SUPPORTED
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngdebug.h b/Build/source/libs/libpng/libpng-1.5.10/pngdebug.h
index 16f81fdd141..16f81fdd141 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngdebug.h
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngdebug.h
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngerror.c b/Build/source/libs/libpng/libpng-1.5.10/pngerror.c
index 95002f84f70..95002f84f70 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngerror.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngerror.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngget.c b/Build/source/libs/libpng/libpng-1.5.10/pngget.c
index 43400cda7e8..43400cda7e8 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngget.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngget.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pnginfo.h b/Build/source/libs/libpng/libpng-1.5.10/pnginfo.h
index a33bfab06de..a33bfab06de 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pnginfo.h
+++ b/Build/source/libs/libpng/libpng-1.5.10/pnginfo.h
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pnglibconf.h b/Build/source/libs/libpng/libpng-1.5.10/pnglibconf.h
index 49fcc8cb4dd..6facf39aabf 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pnglibconf.h
+++ b/Build/source/libs/libpng/libpng-1.5.10/pnglibconf.h
@@ -3,9 +3,9 @@
/* pnglibconf.h - library build configuration */
-/* Libpng 1.5.9 - February 18, 2012 */
+/* Libpng 1.5.10 - March 29, 2012 */
-/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */
+/* Copyright (c) 1998-2012 Glenn Randers-Pehrson */
/* This code is released under the libpng license. */
/* For conditions of distribution and use, see the disclaimer */
@@ -31,10 +31,6 @@
#define PNG_QUANTIZE_GREEN_BITS 5
#define PNG_QUANTIZE_RED_BITS 5
#define PNG_sCAL_PRECISION 5
-#define PNG_USER_CHUNK_CACHE_MAX 0
-#define PNG_USER_CHUNK_MALLOC_MAX 0
-#define PNG_USER_HEIGHT_MAX 1000000
-#define PNG_USER_WIDTH_MAX 1000000
#define PNG_WEIGHT_SHIFT 8
#define PNG_ZBUF_SIZE 8192
/* end of settings */
@@ -45,6 +41,7 @@
#define PNG_bKGD_SUPPORTED
#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
#define PNG_CHECK_cHRM_SUPPORTED
+#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
#define PNG_cHRM_SUPPORTED
#define PNG_CONSOLE_IO_SUPPORTED
#define PNG_CONVERT_tIME_SUPPORTED
@@ -74,6 +71,7 @@
#define PNG_READ_BACKGROUND_SUPPORTED
#define PNG_READ_BGR_SUPPORTED
#define PNG_READ_bKGD_SUPPORTED
+#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
#define PNG_READ_cHRM_SUPPORTED
#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
#define PNG_READ_COMPRESSED_TEXT_SUPPORTED
@@ -145,6 +143,7 @@
#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
#define PNG_WRITE_BGR_SUPPORTED
#define PNG_WRITE_bKGD_SUPPORTED
+#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
#define PNG_WRITE_cHRM_SUPPORTED
#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngmem.c b/Build/source/libs/libpng/libpng-1.5.10/pngmem.c
index bf5ff037dad..bf5ff037dad 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngmem.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngmem.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngnow.png b/Build/source/libs/libpng/libpng-1.5.10/pngnow.png
index 82793ebddb7..82793ebddb7 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngnow.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngnow.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngpread.c b/Build/source/libs/libpng/libpng-1.5.10/pngpread.c
index 95a2082e40c..8a5aa29ec8d 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngpread.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngpread.c
@@ -2,7 +2,7 @@
/* pngpread.c - read a png file in push mode
*
* Last changed in libpng 1.5.9 [February 18, 2012]
- * 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.)
*
@@ -128,30 +128,6 @@ png_process_some_data(png_structp png_ptr, png_infop info_ptr)
break;
}
-#ifdef PNG_READ_tEXt_SUPPORTED
- case PNG_READ_tEXt_MODE:
- {
- png_push_read_tEXt(png_ptr, info_ptr);
- break;
- }
-
-#endif
-#ifdef PNG_READ_zTXt_SUPPORTED
- case PNG_READ_zTXt_MODE:
- {
- png_push_read_zTXt(png_ptr, info_ptr);
- break;
- }
-
-#endif
-#ifdef PNG_READ_iTXt_SUPPORTED
- case PNG_READ_iTXt_MODE:
- {
- png_push_read_iTXt(png_ptr, info_ptr);
- break;
- }
-
-#endif
case PNG_SKIP_MODE:
{
png_push_crc_finish(png_ptr);
@@ -176,7 +152,7 @@ void /* PRIVATE */
png_push_read_sig(png_structp png_ptr, png_infop info_ptr)
{
png_size_t num_checked = png_ptr->sig_bytes,
- num_to_check = 8 - num_checked;
+ num_to_check = 8 - num_checked;
if (png_ptr->buffer_size < num_to_check)
{
@@ -196,6 +172,7 @@ png_push_read_sig(png_structp png_ptr, png_infop info_ptr)
else
png_error(png_ptr, "PNG file corrupted by ASCII conversion");
}
+
else
{
if (png_ptr->sig_bytes >= 8)
@@ -543,7 +520,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
return;
}
- png_push_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
+ png_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
@@ -556,7 +533,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
return;
}
- png_push_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
+ png_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
@@ -569,7 +546,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
return;
}
- png_push_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
+ png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
@@ -580,7 +557,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
png_push_save_buffer(png_ptr);
return;
}
- png_push_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
+ png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
}
png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
@@ -620,6 +597,7 @@ png_push_crc_finish(png_structp png_ptr)
png_ptr->save_buffer_size -= save_size;
png_ptr->save_buffer_ptr += save_size;
}
+
if (png_ptr->skip_length && png_ptr->current_buffer_size)
{
png_size_t save_size = png_ptr->current_buffer_size;
@@ -641,6 +619,7 @@ png_push_crc_finish(png_structp png_ptr)
png_ptr->current_buffer_size -= save_size;
png_ptr->current_buffer_ptr += save_size;
}
+
if (!png_ptr->skip_length)
{
if (png_ptr->buffer_size < 4)
@@ -663,6 +642,7 @@ png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
return;
ptr = buffer;
+
if (png_ptr->save_buffer_size)
{
png_size_t save_size;
@@ -680,6 +660,7 @@ png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
png_ptr->save_buffer_size -= save_size;
png_ptr->save_buffer_ptr += save_size;
}
+
if (length && png_ptr->current_buffer_size)
{
png_size_t save_size;
@@ -709,6 +690,7 @@ png_push_save_buffer(png_structp png_ptr)
png_bytep dp;
istop = png_ptr->save_buffer_size;
+
for (i = 0, sp = png_ptr->save_buffer_ptr, dp = png_ptr->save_buffer;
i < istop; i++, sp++, dp++)
{
@@ -716,6 +698,7 @@ png_push_save_buffer(png_structp png_ptr)
}
}
}
+
if (png_ptr->save_buffer_size + png_ptr->current_buffer_size >
png_ptr->save_buffer_max)
{
@@ -742,6 +725,7 @@ png_push_save_buffer(png_structp png_ptr)
png_free(png_ptr, old_buffer);
png_ptr->save_buffer_max = new_max;
}
+
if (png_ptr->current_buffer_size)
{
png_memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
@@ -749,6 +733,7 @@ png_push_save_buffer(png_structp png_ptr)
png_ptr->save_buffer_size += png_ptr->current_buffer_size;
png_ptr->current_buffer_size = 0;
}
+
png_ptr->save_buffer_ptr = png_ptr->save_buffer;
png_ptr->buffer_size = 0;
}
@@ -850,6 +835,7 @@ png_push_read_IDAT(png_structp png_ptr)
png_ptr->current_buffer_size -= save_size;
png_ptr->current_buffer_ptr += save_size;
}
+
if (!png_ptr->idat_size)
{
if (png_ptr->buffer_size < 4)
@@ -1263,521 +1249,6 @@ png_read_push_finish_row(png_structp png_ptr)
#endif /* PNG_READ_INTERLACING_SUPPORTED */
}
-#ifdef PNG_READ_tEXt_SUPPORTED
-void /* PRIVATE */
-png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
- length)
-{
- if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
- {
- PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
- png_error(png_ptr, "Out of place tEXt");
- /* NOT REACHED */
- }
-
-#ifdef PNG_MAX_MALLOC_64K
- png_ptr->skip_length = 0; /* This may not be necessary */
-
- if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
- {
- png_warning(png_ptr, "tEXt chunk too large to fit in memory");
- png_ptr->skip_length = length - (png_uint_32)65535L;
- length = (png_uint_32)65535L;
- }
-#endif
-
- png_ptr->current_text = (png_charp)png_malloc(png_ptr, length + 1);
- png_ptr->current_text[length] = '\0';
- png_ptr->current_text_ptr = png_ptr->current_text;
- png_ptr->current_text_size = (png_size_t)length;
- png_ptr->current_text_left = (png_size_t)length;
- png_ptr->process_mode = PNG_READ_tEXt_MODE;
-}
-
-void /* PRIVATE */
-png_push_read_tEXt(png_structp png_ptr, png_infop info_ptr)
-{
- if (png_ptr->buffer_size && png_ptr->current_text_left)
- {
- png_size_t text_size;
-
- if (png_ptr->buffer_size < png_ptr->current_text_left)
- text_size = png_ptr->buffer_size;
-
- else
- text_size = png_ptr->current_text_left;
-
- png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
- png_ptr->current_text_left -= text_size;
- png_ptr->current_text_ptr += text_size;
- }
- if (!(png_ptr->current_text_left))
- {
- png_textp text_ptr;
- png_charp text;
- png_charp key;
- int ret;
-
- if (png_ptr->buffer_size < 4)
- {
- png_push_save_buffer(png_ptr);
- return;
- }
-
- png_push_crc_finish(png_ptr);
-
-#ifdef PNG_MAX_MALLOC_64K
- if (png_ptr->skip_length)
- return;
-#endif
-
- key = png_ptr->current_text;
-
- for (text = key; *text; text++)
- /* Empty loop */ ;
-
- if (text < key + png_ptr->current_text_size)
- text++;
-
- text_ptr = (png_textp)png_malloc(png_ptr, png_sizeof(png_text));
- text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
- text_ptr->key = key;
- text_ptr->itxt_length = 0;
- text_ptr->lang = NULL;
- text_ptr->lang_key = NULL;
- text_ptr->text = text;
-
- ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
-
- png_free(png_ptr, key);
- png_free(png_ptr, text_ptr);
- png_ptr->current_text = NULL;
-
- if (ret)
- png_warning(png_ptr, "Insufficient memory to store text chunk");
- }
-}
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-void /* PRIVATE */
-png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
- length)
-{
- if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
- {
- PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
- png_error(png_ptr, "Out of place zTXt");
- /* NOT REACHED */
- }
-
-#ifdef PNG_MAX_MALLOC_64K
- /* We can't handle zTXt chunks > 64K, since we don't have enough space
- * to be able to store the uncompressed data. Actually, the threshold
- * is probably around 32K, but it isn't as definite as 64K is.
- */
- if (length > (png_uint_32)65535L)
- {
- png_warning(png_ptr, "zTXt chunk too large to fit in memory");
- png_push_crc_skip(png_ptr, length);
- return;
- }
-#endif
-
- png_ptr->current_text = (png_charp)png_malloc(png_ptr, length + 1);
- png_ptr->current_text[length] = '\0';
- png_ptr->current_text_ptr = png_ptr->current_text;
- png_ptr->current_text_size = (png_size_t)length;
- png_ptr->current_text_left = (png_size_t)length;
- png_ptr->process_mode = PNG_READ_zTXt_MODE;
-}
-
-void /* PRIVATE */
-png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)
-{
- if (png_ptr->buffer_size && png_ptr->current_text_left)
- {
- png_size_t text_size;
-
- if (png_ptr->buffer_size < (png_uint_32)png_ptr->current_text_left)
- text_size = png_ptr->buffer_size;
-
- else
- text_size = png_ptr->current_text_left;
-
- png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
- png_ptr->current_text_left -= text_size;
- png_ptr->current_text_ptr += text_size;
- }
- if (!(png_ptr->current_text_left))
- {
- png_textp text_ptr;
- png_charp text;
- png_charp key;
- int ret;
- png_size_t text_size, key_size;
-
- if (png_ptr->buffer_size < 4)
- {
- png_push_save_buffer(png_ptr);
- return;
- }
-
- png_push_crc_finish(png_ptr);
-
- key = png_ptr->current_text;
-
- for (text = key; *text; text++)
- /* Empty loop */ ;
-
- /* zTXt can't have zero text */
- if (text >= key + png_ptr->current_text_size)
- {
- png_ptr->current_text = NULL;
- png_free(png_ptr, key);
- return;
- }
-
- text++;
-
- if (*text != PNG_TEXT_COMPRESSION_zTXt) /* Check compression byte */
- {
- png_ptr->current_text = NULL;
- png_free(png_ptr, key);
- return;
- }
-
- text++;
-
- png_ptr->zstream.next_in = (png_bytep)text;
- png_ptr->zstream.avail_in = (uInt)(png_ptr->current_text_size -
- (text - key));
- png_ptr->zstream.next_out = png_ptr->zbuf;
- png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-
- key_size = text - key;
- text_size = 0;
- text = NULL;
- ret = Z_STREAM_END;
-
- while (png_ptr->zstream.avail_in)
- {
- ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
- if (ret != Z_OK && ret != Z_STREAM_END)
- {
- inflateReset(&png_ptr->zstream);
- png_ptr->zstream.avail_in = 0;
- png_ptr->current_text = NULL;
- png_free(png_ptr, key);
- png_free(png_ptr, text);
- return;
- }
-
- if (!(png_ptr->zstream.avail_out) || ret == Z_STREAM_END)
- {
- if (text == NULL)
- {
- text = (png_charp)png_malloc(png_ptr,
- (png_ptr->zbuf_size
- - png_ptr->zstream.avail_out + key_size + 1));
-
- png_memcpy(text + key_size, png_ptr->zbuf,
- png_ptr->zbuf_size - png_ptr->zstream.avail_out);
-
- png_memcpy(text, key, key_size);
-
- text_size = key_size + png_ptr->zbuf_size -
- png_ptr->zstream.avail_out;
-
- *(text + text_size) = '\0';
- }
-
- else
- {
- png_charp tmp;
-
- tmp = text;
- text = (png_charp)png_malloc(png_ptr, text_size +
- (png_ptr->zbuf_size
- - png_ptr->zstream.avail_out + 1));
-
- png_memcpy(text, tmp, text_size);
- png_free(png_ptr, tmp);
-
- png_memcpy(text + text_size, png_ptr->zbuf,
- png_ptr->zbuf_size - png_ptr->zstream.avail_out);
-
- text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
- *(text + text_size) = '\0';
- }
-
- if (ret != Z_STREAM_END)
- {
- png_ptr->zstream.next_out = png_ptr->zbuf;
- png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
- }
- }
- else
- {
- break;
- }
-
- if (ret == Z_STREAM_END)
- break;
- }
-
- inflateReset(&png_ptr->zstream);
- png_ptr->zstream.avail_in = 0;
-
- if (ret != Z_STREAM_END)
- {
- png_ptr->current_text = NULL;
- png_free(png_ptr, key);
- png_free(png_ptr, text);
- return;
- }
-
- png_ptr->current_text = NULL;
- png_free(png_ptr, key);
- key = text;
- text += key_size;
-
- text_ptr = (png_textp)png_malloc(png_ptr,
- png_sizeof(png_text));
- text_ptr->compression = PNG_TEXT_COMPRESSION_zTXt;
- text_ptr->key = key;
- text_ptr->itxt_length = 0;
- text_ptr->lang = NULL;
- text_ptr->lang_key = NULL;
- text_ptr->text = text;
-
- ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
-
- png_free(png_ptr, key);
- png_free(png_ptr, text_ptr);
-
- if (ret)
- png_warning(png_ptr, "Insufficient memory to store text chunk");
- }
-}
-#endif
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-void /* PRIVATE */
-png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
- length)
-{
- if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
- {
- PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
- png_error(png_ptr, "Out of place iTXt");
- /* NOT REACHED */
- }
-
-#ifdef PNG_MAX_MALLOC_64K
- png_ptr->skip_length = 0; /* This may not be necessary */
-
- if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
- {
- png_warning(png_ptr, "iTXt chunk too large to fit in memory");
- png_ptr->skip_length = length - (png_uint_32)65535L;
- length = (png_uint_32)65535L;
- }
-#endif
-
- png_ptr->current_text = (png_charp)png_malloc(png_ptr, length + 1);
- png_ptr->current_text[length] = '\0';
- png_ptr->current_text_ptr = png_ptr->current_text;
- png_ptr->current_text_size = (png_size_t)length;
- png_ptr->current_text_left = (png_size_t)length;
- png_ptr->process_mode = PNG_READ_iTXt_MODE;
-}
-
-void /* PRIVATE */
-png_push_read_iTXt(png_structp png_ptr, png_infop info_ptr)
-{
-
- if (png_ptr->buffer_size && png_ptr->current_text_left)
- {
- png_size_t text_size;
-
- if (png_ptr->buffer_size < png_ptr->current_text_left)
- text_size = png_ptr->buffer_size;
-
- else
- text_size = png_ptr->current_text_left;
-
- png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
- png_ptr->current_text_left -= text_size;
- png_ptr->current_text_ptr += text_size;
- }
-
- if (!(png_ptr->current_text_left))
- {
- png_textp text_ptr;
- png_charp key;
- int comp_flag;
- png_charp lang;
- png_charp lang_key;
- png_charp text;
- int ret;
-
- if (png_ptr->buffer_size < 4)
- {
- png_push_save_buffer(png_ptr);
- return;
- }
-
- png_push_crc_finish(png_ptr);
-
-#ifdef PNG_MAX_MALLOC_64K
- if (png_ptr->skip_length)
- return;
-#endif
-
- key = png_ptr->current_text;
-
- for (lang = key; *lang; lang++)
- /* Empty loop */ ;
-
- if (lang < key + png_ptr->current_text_size - 3)
- lang++;
-
- comp_flag = *lang++;
- lang++; /* Skip comp_type, always zero */
-
- for (lang_key = lang; *lang_key; lang_key++)
- /* Empty loop */ ;
-
- lang_key++; /* Skip NUL separator */
-
- text=lang_key;
-
- if (lang_key < key + png_ptr->current_text_size - 1)
- {
- for (; *text; text++)
- /* Empty loop */ ;
- }
-
- if (text < key + png_ptr->current_text_size)
- text++;
-
- text_ptr = (png_textp)png_malloc(png_ptr,
- png_sizeof(png_text));
-
- text_ptr->compression = comp_flag + 2;
- text_ptr->key = key;
- text_ptr->lang = lang;
- text_ptr->lang_key = lang_key;
- text_ptr->text = text;
- text_ptr->text_length = 0;
- text_ptr->itxt_length = png_strlen(text);
-
- ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
-
- png_ptr->current_text = NULL;
-
- png_free(png_ptr, text_ptr);
- if (ret)
- png_warning(png_ptr, "Insufficient memory to store iTXt chunk");
- }
-}
-#endif
-
-/* This function is called when we haven't found a handler for this
- * chunk. If there isn't a problem with the chunk itself (ie a bad chunk
- * name or a critical chunk), the chunk is (currently) silently ignored.
- */
-void /* PRIVATE */
-png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
- length)
-{
- png_uint_32 skip = 0;
- png_uint_32 chunk_name = png_ptr->chunk_name;
-
- if (PNG_CHUNK_CRITICAL(chunk_name))
- {
-#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
- if (png_chunk_unknown_handling(png_ptr, chunk_name) !=
- PNG_HANDLE_CHUNK_ALWAYS
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
- && png_ptr->read_user_chunk_fn == NULL
-#endif
- )
-#endif
- png_chunk_error(png_ptr, "unknown critical chunk");
-
- PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
- }
-
-#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
- /* TODO: the code below is apparently just using the
- * png_struct::unknown_chunk member as a temporarily variable, it should be
- * possible to eliminate both it and the temporary buffer.
- */
- if (png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
- {
-#ifdef PNG_MAX_MALLOC_64K
- if (length > 65535)
- {
- png_warning(png_ptr, "unknown chunk too large to fit in memory");
- skip = length - 65535;
- length = 65535;
- }
-#endif
- /* This is just a record for the user; libpng doesn't use the character
- * form of the name.
- */
- PNG_CSTRING_FROM_CHUNK(png_ptr->unknown_chunk.name, png_ptr->chunk_name);
-
- png_ptr->unknown_chunk.size = length;
-
- if (length == 0)
- png_ptr->unknown_chunk.data = NULL;
-
- else
- {
- png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr,
- png_ptr->unknown_chunk.size);
- png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data,
- png_ptr->unknown_chunk.size);
- }
-
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
- if (png_ptr->read_user_chunk_fn != NULL)
- {
- /* Callback to user unknown chunk handler */
- int ret;
- ret = (*(png_ptr->read_user_chunk_fn))
- (png_ptr, &png_ptr->unknown_chunk);
-
- if (ret < 0)
- png_chunk_error(png_ptr, "error in user chunk");
-
- if (ret == 0)
- {
- if (PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
- if (png_chunk_unknown_handling(png_ptr, chunk_name) !=
- PNG_HANDLE_CHUNK_ALWAYS)
- png_chunk_error(png_ptr, "unknown critical chunk");
- png_set_unknown_chunks(png_ptr, info_ptr,
- &png_ptr->unknown_chunk, 1);
- }
- }
-
- else
-#endif
- png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
- png_free(png_ptr, png_ptr->unknown_chunk.data);
- png_ptr->unknown_chunk.data = NULL;
- }
-
- else
-#endif
- skip=length;
- png_push_crc_skip(png_ptr, skip);
-}
-
void /* PRIVATE */
png_push_have_info(png_structp png_ptr, png_infop info_ptr)
{
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngpriv.h b/Build/source/libs/libpng/libpng-1.5.10/pngpriv.h
index 67e486c577f..e76a57975fe 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngpriv.h
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngpriv.h
@@ -2,11 +2,11 @@
/* pngpriv.h - private declarations for use inside libpng
*
* For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-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.7 [December 15, 2011]
+ * Last changed in libpng 1.5.10 [March 29, 2012]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -133,6 +133,46 @@
# define PNG_DLL_EXPORT
#endif
+/* SECURITY and SAFETY:
+ *
+ * By default libpng is built without any internal limits on image size,
+ * individual heap (png_malloc) allocations or the total amount of memory used.
+ * If PNG_SAFE_LIMITS_SUPPORTED is defined, however, the limits below are used
+ * (unless individually overridden). These limits are believed to be fairly
+ * safe, but builders of secure systems should verify the values against the
+ * real system capabilities.
+ */
+
+#ifdef PNG_SAFE_LIMITS_SUPPORTED
+ /* 'safe' limits */
+# ifndef PNG_USER_WIDTH_MAX
+# define PNG_USER_WIDTH_MAX 1000000
+# endif
+# ifndef PNG_USER_HEIGHT_MAX
+# define PNG_USER_HEIGHT_MAX 1000000
+# endif
+# ifndef PNG_USER_CHUNK_CACHE_MAX
+# define PNG_USER_CHUNK_CACHE_MAX 128
+# endif
+# ifndef PNG_USER_CHUNK_MALLOC_MAX
+# define PNG_USER_CHUNK_MALLOC_MAX 8000000
+# endif
+#else
+ /* values for no limits */
+# ifndef PNG_USER_WIDTH_MAX
+# define PNG_USER_WIDTH_MAX 0x7fffffff
+# endif
+# ifndef PNG_USER_HEIGHT_MAX
+# define PNG_USER_HEIGHT_MAX 0x7fffffff
+# endif
+# ifndef PNG_USER_CHUNK_CACHE_MAX
+# define PNG_USER_CHUNK_CACHE_MAX 0
+# endif
+# ifndef PNG_USER_CHUNK_MALLOC_MAX
+# define PNG_USER_CHUNK_MALLOC_MAX 0
+# endif
+#endif
+
/* This is used for 16 bit gamma tables - only the top level pointers are const,
* this could be changed:
*/
@@ -426,6 +466,7 @@ typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp;
#define PNG_BACKGROUND_IS_GRAY 0x800
#define PNG_HAVE_PNG_SIGNATURE 0x1000
#define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
+#define PNG_HAVE_iCCP 0x4000
/* Flags for the transformations the PNG library does on the image data */
#define PNG_BGR 0x0001
@@ -1355,6 +1396,13 @@ PNG_EXTERN void png_check_IHDR PNGARG((png_structp png_ptr,
int color_type, int interlace_type, int compression_type,
int filter_type));
+/* Added at libpng version 1.5.10 */
+#if defined(PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \
+ defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)
+PNG_EXTERN void png_do_check_palette_indexes PNGARG((png_structp png_ptr,
+ png_row_infop row_info));
+#endif
+
/* Free all memory used by the read (old method - NOT DLL EXPORTED) */
PNG_EXTERN void png_read_destroy PNGARG((png_structp png_ptr,
png_infop info_ptr, png_infop end_info_ptr));
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngread.c b/Build/source/libs/libpng/libpng-1.5.10/pngread.c
index 0643754dad0..1d8c6b33469 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngread.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngread.c
@@ -1,8 +1,8 @@
/* pngread.c - read a PNG file
*
- * Last changed in libpng 1.5.7 [December 15, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.10 [March 8, 2012]
+ * Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -67,15 +67,11 @@ png_create_read_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
png_ptr->user_width_max = PNG_USER_WIDTH_MAX;
png_ptr->user_height_max = PNG_USER_HEIGHT_MAX;
-# ifdef PNG_USER_CHUNK_CACHE_MAX
/* Added at libpng-1.2.43 and 1.4.0 */
png_ptr->user_chunk_cache_max = PNG_USER_CHUNK_CACHE_MAX;
-# endif
-# ifdef PNG_SET_USER_CHUNK_MALLOC_MAX
/* Added at libpng-1.2.43 and 1.4.1 */
png_ptr->user_chunk_malloc_max = PNG_USER_CHUNK_MALLOC_MAX;
-# endif
#endif
#ifdef PNG_SETJMP_SUPPORTED
@@ -805,6 +801,13 @@ png_read_end(png_structp png_ptr, png_infop info_ptr)
png_crc_finish(png_ptr, 0); /* Finish off CRC from last IDAT chunk */
+#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
+ /* Report invalid palette index; added at libng-1.5.10 */
+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+ png_ptr->num_palette_max > png_ptr->num_palette)
+ png_benign_error(png_ptr, "Read palette index exceeding num_palette");
+#endif
+
do
{
png_uint_32 length = png_read_chunk_header(png_ptr);
@@ -1070,12 +1073,6 @@ png_read_destroy(png_structp png_ptr, png_infop info_ptr,
png_free(png_ptr, png_ptr->save_buffer);
#endif
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-#ifdef PNG_TEXT_SUPPORTED
- png_free(png_ptr, png_ptr->current_text);
-#endif /* PNG_TEXT_SUPPORTED */
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
-
/* Save the important info out of the png_struct, in case it is
* being used again.
*/
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngrio.c b/Build/source/libs/libpng/libpng-1.5.10/pngrio.c
index e9c381c5ba4..e9c381c5ba4 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngrio.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngrio.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngrtran.c b/Build/source/libs/libpng/libpng-1.5.10/pngrtran.c
index 1079595f0af..55618528602 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngrtran.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngrtran.c
@@ -1,8 +1,8 @@
/* pngrtran.c - transforms the data in a row for PNG readers
*
- * Last changed in libpng 1.5.7 [December 15, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.10 [March 8, 2012]
+ * Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -1830,12 +1830,15 @@ png_init_read_transformations(png_structp png_ptr)
#ifdef PNG_READ_SHIFT_SUPPORTED
if ((png_ptr->transformations & PNG_SHIFT) &&
+ !(png_ptr->transformations & PNG_EXPAND) &&
(png_ptr->color_type == PNG_COLOR_TYPE_PALETTE))
{
int i;
int istop = png_ptr->num_palette;
int shift = 8 - png_ptr->sig_bit.red;
+ png_ptr->transformations &= ~PNG_SHIFT;
+
/* significant bits can be in the range 1 to 7 for a meaninful result, if
* the number of significant bits is 0 then no shift is done (this is an
* error condition which is silently ignored.)
@@ -2296,6 +2299,12 @@ png_do_read_transformations(png_structp png_ptr, png_row_infop row_info)
png_do_unpack(row_info, png_ptr->row_buf + 1);
#endif
+#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
+ /* Added at libpng-1.5.10 */
+ if (row_info->color_type == PNG_COLOR_TYPE_PALETTE)
+ png_do_check_palette_indexes(png_ptr, row_info);
+#endif
+
#ifdef PNG_READ_BGR_SUPPORTED
if (png_ptr->transformations & PNG_BGR)
png_do_bgr(row_info, png_ptr->row_buf + 1);
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngrutil.c b/Build/source/libs/libpng/libpng-1.5.10/pngrutil.c
index d6c0e0350f3..aa592ccfbd2 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngrutil.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngrutil.c
@@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
- * Last changed in libpng 1.5.9 [February 18, 2012]
+ * Last changed in libpng 1.5.10 [March 8, 2012]
* Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -434,14 +434,12 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
*/
if (prefix_size >= (~(png_size_t)0) - 1 ||
expanded_size >= (~(png_size_t)0) - 1 - prefix_size
-#ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
+#ifdef PNG_USER_LIMITS_SUPPORTED
|| (png_ptr->user_chunk_malloc_max &&
(prefix_size + expanded_size >= png_ptr->user_chunk_malloc_max - 1))
#else
-# ifdef PNG_USER_CHUNK_MALLOC_MAX
|| ((PNG_USER_CHUNK_MALLOC_MAX > 0) &&
prefix_size + expanded_size >= PNG_USER_CHUNK_MALLOC_MAX - 1)
-# endif
#endif
)
png_warning(png_ptr, "Exceeded size limit while expanding chunk");
@@ -1259,13 +1257,16 @@ png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
/* Should be an error, but we can cope with it */
png_warning(png_ptr, "Out of place iCCP chunk");
- if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP))
+ if ((png_ptr->mode & PNG_HAVE_iCCP) || (info_ptr != NULL &&
+ (info_ptr->valid & (PNG_INFO_iCCP|PNG_INFO_sRGB))))
{
png_warning(png_ptr, "Duplicate iCCP chunk");
png_crc_finish(png_ptr, length);
return;
}
+ png_ptr->mode |= PNG_HAVE_iCCP;
+
#ifdef PNG_MAX_MALLOC_64K
if (length > (png_uint_32)65535L)
{
@@ -1795,16 +1796,16 @@ png_handle_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
return;
}
- num = length / 2 ;
-
- if (num != (unsigned int)png_ptr->num_palette || num >
- (unsigned int)PNG_MAX_PALETTE_LENGTH)
+ if (length > 2*PNG_MAX_PALETTE_LENGTH ||
+ length != (unsigned int) (2*png_ptr->num_palette))
{
png_warning(png_ptr, "Incorrect hIST chunk length");
png_crc_finish(png_ptr, length);
return;
}
+ num = length / 2 ;
+
for (i = 0; i < num; i++)
{
png_byte buf[2];
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngset.c b/Build/source/libs/libpng/libpng-1.5.10/pngset.c
index 92db3890a89..e0118fa8c21 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngset.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngset.c
@@ -1,8 +1,8 @@
/* pngset.c - storage of image information into info struct
*
- * Last changed in libpng 1.5.7 [December 15, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.10 [(PENDING RELEASE)]
+ * 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.)
*
@@ -692,24 +692,28 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr,
*/
if (info_ptr->num_text + num_text > info_ptr->max_text)
{
+ int old_max_text = info_ptr->max_text;
+ int old_num_text = info_ptr->num_text;
+
if (info_ptr->text != NULL)
{
png_textp old_text;
- int old_max;
- old_max = info_ptr->max_text;
info_ptr->max_text = info_ptr->num_text + num_text + 8;
old_text = info_ptr->text;
+
info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
(png_size_t)(info_ptr->max_text * png_sizeof(png_text)));
if (info_ptr->text == NULL)
{
- png_free(png_ptr, old_text);
+ /* Restore to previous condition */
+ info_ptr->max_text = old_max_text;
+ info_ptr->text = old_text;
return(1);
}
- png_memcpy(info_ptr->text, old_text, (png_size_t)(old_max *
+ png_memcpy(info_ptr->text, old_text, (png_size_t)(old_max_text *
png_sizeof(png_text)));
png_free(png_ptr, old_text);
}
@@ -721,7 +725,12 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr,
info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
(png_size_t)(info_ptr->max_text * png_sizeof(png_text)));
if (info_ptr->text == NULL)
+ {
+ /* Restore to previous condition */
+ info_ptr->num_text = old_num_text;
+ info_ptr->max_text = old_max_text;
return(1);
+ }
info_ptr->free_me |= PNG_FREE_TEXT;
}
@@ -1281,4 +1290,20 @@ png_set_benign_errors(png_structp png_ptr, int allowed)
png_ptr->flags &= ~PNG_FLAG_BENIGN_ERRORS_WARN;
}
#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 */
+void PNGAPI
+png_set_check_for_invalid_index(png_structp png_ptr, int allowed)
+{
+ png_debug(1, "in png_set_check_for_invalid_index");
+
+ if (allowed)
+ png_ptr->num_palette_max = 0;
+
+ else
+ png_ptr->num_palette_max = -1;
+}
+#endif
+
#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngstruct.h b/Build/source/libs/libpng/libpng-1.5.10/pngstruct.h
index 860b8bff8f3..43a45cdec6a 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngstruct.h
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngstruct.h
@@ -5,7 +5,7 @@
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
- * Last changed in libpng 1.5.9 [February 18, 2012]
+ * Last changed in libpng 1.5.9 [March 29, 2012]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -121,6 +121,12 @@ struct png_struct_def
png_uint_32 crc; /* current chunk CRC value */
png_colorp palette; /* palette from the input file */
png_uint_16 num_palette; /* number of color entries in palette */
+
+/* Added at libpng-1.5.10 */
+#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
+ int num_palette_max; /* maximum palette index found in IDAT */
+#endif
+
png_uint_16 num_trans; /* number of transparency values */
png_byte compression; /* file compression type (always 0) */
png_byte filter; /* file filter type (always 0) */
@@ -211,13 +217,6 @@ struct png_struct_def
int process_mode; /* what push library is currently doing */
int cur_palette; /* current push library palette index */
-# ifdef PNG_TEXT_SUPPORTED
- png_size_t current_text_size; /* current size of text input data */
- png_size_t current_text_left; /* how much text left to read in input */
- png_charp current_text; /* current text chunk buffer */
- png_charp current_text_ptr; /* current location in current_text */
-# endif /* PNG_PROGRESSIVE_READ_SUPPORTED && PNG_TEXT_SUPPORTED */
-
#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngtest.c b/Build/source/libs/libpng/libpng-1.5.10/pngtest.c
index 8d10af4ace2..0295840baa9 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngtest.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/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_9 Your_png_h_is_not_version_1_5_9;
+typedef png_libpng_version_1_5_10 Your_png_h_is_not_version_1_5_10;
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngtest.png b/Build/source/libs/libpng/libpng-1.5.10/pngtest.png
index 81f5f8438a9..81f5f8438a9 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngtest.png
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngtest.png
Binary files differ
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngtrans.c b/Build/source/libs/libpng/libpng-1.5.10/pngtrans.c
index 6a6908dcd26..fef12f1851b 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngtrans.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngtrans.c
@@ -1,8 +1,8 @@
/* pngtrans.c - transforms the data in a row (used by both readers and writers)
*
- * Last changed in libpng 1.5.4 [July 7, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.10 [March 8, 2012]
+ * Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -619,6 +619,109 @@ png_do_bgr(png_row_infop row_info, png_bytep row)
}
#endif /* PNG_READ_BGR_SUPPORTED or PNG_WRITE_BGR_SUPPORTED */
+#if defined(PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \
+ defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)
+/* Added at libpng-1.5.10 */
+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)
+ {
+ /* Calculations moved outside switch in an attempt to stop different
+ * compiler warnings. 'padding' is in *bits* within the last byte, it is
+ * an 'int' because pixel_depth becomes an 'int' in the expression below,
+ * and this calculation is used because it avoids warnings that other
+ * forms produced on either GCC or MSVC.
+ */
+ int padding = (-row_info->pixel_depth * row_info->width) & 7;
+ png_bytep rp = png_ptr->row_buf + row_info->rowbytes;
+
+ switch (row_info->bit_depth)
+ {
+ case 1:
+ {
+ /* in this case, all bytes must be 0 so we don't need
+ * to unpack the pixels except for the rightmost one.
+ */
+ for (; rp > png_ptr->row_buf; rp--)
+ {
+ if (*rp >> padding != 0)
+ png_ptr->num_palette_max = 1;
+ padding = 0;
+ }
+
+ break;
+ }
+
+ case 2:
+ {
+ for (; rp > png_ptr->row_buf; rp--)
+ {
+ int i = ((*rp >> padding) & 0x03);
+
+ if (i > png_ptr->num_palette_max)
+ png_ptr->num_palette_max = i;
+
+ i = (((*rp >> padding) >> 2) & 0x03);
+
+ if (i > png_ptr->num_palette_max)
+ png_ptr->num_palette_max = i;
+
+ i = (((*rp >> padding) >> 4) & 0x03);
+
+ if (i > png_ptr->num_palette_max)
+ png_ptr->num_palette_max = i;
+
+ i = (((*rp >> padding) >> 6) & 0x03);
+
+ if (i > png_ptr->num_palette_max)
+ png_ptr->num_palette_max = i;
+
+ padding = 0;
+ }
+
+ break;
+ }
+
+ case 4:
+ {
+ for (; rp > png_ptr->row_buf; rp--)
+ {
+ int i = ((*rp >> padding) & 0x0f);
+
+ if (i > png_ptr->num_palette_max)
+ png_ptr->num_palette_max = i;
+
+ i = (((*rp >> padding) >> 4) & 0x0f);
+
+ if (i > png_ptr->num_palette_max)
+ png_ptr->num_palette_max = i;
+
+ padding = 0;
+ }
+
+ break;
+ }
+
+ case 8:
+ {
+ for (; rp > png_ptr->row_buf; rp--)
+ {
+ if (*rp >= png_ptr->num_palette_max)
+ png_ptr->num_palette_max = (int) *rp;
+ }
+
+ break;
+ }
+
+ default:
+ break;
+ }
+ }
+}
+#endif /* PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED */
+
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
diff --git a/Build/source/libs/libpng/libpng-1.5.10/pngusr.dfa b/Build/source/libs/libpng/libpng-1.5.10/pngusr.dfa
new file mode 100644
index 00000000000..9d39564b51d
--- /dev/null
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngusr.dfa
@@ -0,0 +1,14 @@
+# pngusr.dfa
+#
+# Build time configuration of libpng
+#
+# Enter build configuration options in this file
+#
+# Security settings: by default these limits are unset, you can change them
+# here by entering the appropriate values as #defines preceded by '@' (to cause,
+# them to be passed through to the build of pnglibconf.h), for example:
+#
+# @# define PNG_USER_WIDTH_MAX 1000000
+# @# define PNG_USER_HEIGHT_MAX 1000000
+# @# define PNG_USER_CHUNK_CACHE_MAX 128
+# @# define PNG_USER_CHUNK_MALLOC_MAX 8000000
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngwio.c b/Build/source/libs/libpng/libpng-1.5.10/pngwio.c
index 95ffb3429f1..95ffb3429f1 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngwio.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngwio.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngwrite.c b/Build/source/libs/libpng/libpng-1.5.10/pngwrite.c
index 6d3fd4c3861..b587f1b9995 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngwrite.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngwrite.c
@@ -1,8 +1,8 @@
/* pngwrite.c - general routines to write a PNG file
*
- * Last changed in libpng 1.5.7 [December 15, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.10 [March 8, 2012]
+ * Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -305,6 +305,11 @@ png_write_end(png_structp png_ptr, png_infop info_ptr)
if (!(png_ptr->mode & PNG_HAVE_IDAT))
png_error(png_ptr, "No IDATs written into file");
+#ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
+ if (png_ptr->num_palette_max > png_ptr->num_palette)
+ png_benign_error(png_ptr, "Wrote palette index exceeding num_palette");
+#endif
+
/* See if user wants us to write information chunks */
if (info_ptr != NULL)
{
@@ -798,6 +803,13 @@ png_write_row(png_structp png_ptr, png_const_bytep row)
}
#endif
+/* 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)
+ png_do_check_palette_indexes(png_ptr, &row_info);
+#endif
+
/* Find a filter if necessary, filter the row and write it out. */
png_write_find_filter(png_ptr, &row_info);
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngwtran.c b/Build/source/libs/libpng/libpng-1.5.10/pngwtran.c
index 96608efcb4a..96608efcb4a 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngwtran.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngwtran.c
diff --git a/Build/source/libs/libpng/libpng-1.5.9/pngwutil.c b/Build/source/libs/libpng/libpng-1.5.10/pngwutil.c
index da18e9502ef..b49704f1a54 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/pngwutil.c
+++ b/Build/source/libs/libpng/libpng-1.5.10/pngwutil.c
@@ -1,8 +1,8 @@
/* pngwutil.c - utilities to write a PNG file
*
- * Last changed in libpng 1.5.6 [November 3, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.10 [March 8, 2012]
+ * Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -569,14 +569,15 @@ png_text_compress(png_structp png_ptr,
/* Ship the compressed text out via chunk writes */
static void /* PRIVATE */
-png_write_compressed_data_out(png_structp png_ptr, compression_state *comp)
+png_write_compressed_data_out(png_structp png_ptr, compression_state *comp,
+ png_size_t data_len)
{
int i;
/* Handle the no-compression case */
if (comp->input)
{
- png_write_chunk_data(png_ptr, comp->input, comp->input_len);
+ png_write_chunk_data(png_ptr, comp->input, data_len);
return;
}
@@ -585,7 +586,7 @@ png_write_compressed_data_out(png_structp png_ptr, compression_state *comp)
/* The zbuf_size test is because the code below doesn't work if zbuf_size is
* '1'; simply skip it to avoid memory overwrite.
*/
- if (comp->input_len >= 2 && comp->input_len < 16384 && png_ptr->zbuf_size > 1)
+ if (data_len >= 2 && comp->input_len < 16384 && png_ptr->zbuf_size > 1)
{
unsigned int z_cmf; /* zlib compression method and flags */
@@ -1164,8 +1165,7 @@ png_write_iCCP(png_structp png_ptr, png_const_charp name, int compression_type,
if (profile_len)
{
- comp.input_len = profile_len;
- png_write_compressed_data_out(png_ptr, &comp);
+ png_write_compressed_data_out(png_ptr, &comp, profile_len);
}
png_write_chunk_end(png_ptr);
@@ -1735,8 +1735,7 @@ png_write_zTXt(png_structp png_ptr, png_const_charp key, png_const_charp text,
png_write_chunk_data(png_ptr, &buf, (png_size_t)1);
/* Write the compressed data */
- comp.input_len = text_len;
- png_write_compressed_data_out(png_ptr, &comp);
+ png_write_compressed_data_out(png_ptr, &comp, text_len);
/* Close the chunk */
png_write_chunk_end(png_ptr);
@@ -1827,7 +1826,7 @@ png_write_iTXt(png_structp png_ptr, int compression, png_const_charp key,
png_write_chunk_data(png_ptr, (lang_key ? (png_const_bytep)lang_key : cbuf),
(png_size_t)(lang_key_len + 1));
- png_write_compressed_data_out(png_ptr, &comp);
+ png_write_compressed_data_out(png_ptr, &comp, text_len);
png_write_chunk_end(png_ptr);
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/owatcom/libpng.tgt b/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/libpng.tgt
index 4a9622e68cf..4a9622e68cf 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/owatcom/libpng.tgt
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/libpng.tgt
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/owatcom/libpng.wpj b/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/libpng.wpj
index cddf9f1f10e..cddf9f1f10e 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/owatcom/libpng.wpj
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/libpng.wpj
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/owatcom/pngconfig.mak b/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngconfig.mak
index 0f988780513..0f988780513 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/owatcom/pngconfig.mak
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngconfig.mak
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/owatcom/pngtest.tgt b/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngtest.tgt
index 211f1a74886..211f1a74886 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/owatcom/pngtest.tgt
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngtest.tgt
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/owatcom/pngvalid.tgt b/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngvalid.tgt
index 1e78e75cb6c..1e78e75cb6c 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/owatcom/pngvalid.tgt
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/owatcom/pngvalid.tgt
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/PRJ0041.mak b/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/PRJ0041.mak
index c7a68b503e7..c7a68b503e7 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/PRJ0041.mak
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/PRJ0041.mak
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/README.txt b/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/README.txt
index 625eefcab7f..625eefcab7f 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/README.txt
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/README.txt
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/README_zlib.txt b/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/README_zlib.txt
index 81d11cbb577..81d11cbb577 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/README_zlib.txt
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/README_zlib.txt
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/libpng.sln b/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/libpng.sln
index eeb101f2e31..eeb101f2e31 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/libpng.sln
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/libpng.sln
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/libpng.vcproj b/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/libpng.vcproj
index 4c5acf94c8b..4c5acf94c8b 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/libpng.vcproj
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/libpng.vcproj
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/pngtest.vcproj b/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/pngtest.vcproj
index ff330ae350f..ff330ae350f 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/pngtest.vcproj
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/pngtest.vcproj
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/zlib.vcproj b/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/zlib.vcproj
index eb218488dcf..eb218488dcf 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/visualc71/zlib.vcproj
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/visualc71/zlib.vcproj
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/libpng/libpng.vcxproj b/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/libpng/libpng.vcxproj
index c4bf04184ee..c4bf04184ee 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/libpng/libpng.vcxproj
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/libpng/libpng.vcxproj
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pnglibconf/pnglibconf.vcxproj
index 7c691c32d34..7c691c32d34 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/pnglibconf/pnglibconf.vcxproj
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pnglibconf/pnglibconf.vcxproj
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/pngtest/pngtest.vcxproj b/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pngtest/pngtest.vcxproj
index a03dca565ff..a03dca565ff 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/pngtest/pngtest.vcxproj
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pngtest/pngtest.vcxproj
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/pngvalid/pngvalid.vcxproj b/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pngvalid/pngvalid.vcxproj
index 6a0a6e4f312..6a0a6e4f312 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/pngvalid/pngvalid.vcxproj
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/pngvalid/pngvalid.vcxproj
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/readme.txt b/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/readme.txt
index 99faac30528..938e7dad0bc 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/readme.txt
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.5.9 - February 18, 2012
+libpng version 1.5.10 - March 29, 2012
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/vstudio.sln b/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/vstudio.sln
index 4ab66418ca3..4ab66418ca3 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/vstudio.sln
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/vstudio.sln
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/zlib.props b/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/zlib.props
index ad953c1a7c8..0060f127e60 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/zlib.props
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
- * libpng version 1.5.9 - February 18, 2012
+ * libpng version 1.5.10 - March 29, 2012
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/zlib/zlib.vcxproj b/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/zlib/zlib.vcxproj
index d627817969a..d627817969a 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/projects/vstudio/zlib/zlib.vcxproj
+++ b/Build/source/libs/libpng/libpng-1.5.10/projects/vstudio/zlib/zlib.vcxproj
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/README.txt b/Build/source/libs/libpng/libpng-1.5.10/scripts/README.txt
index 836d8353d9a..46611a57195 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/README.txt
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/README.txt
@@ -1,9 +1,9 @@
-Makefiles for libpng version 1.5.9 - February 18, 2012
+Makefiles for libpng version 1.5.10 - March 29, 2012
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng15.so.15.1.5.9)
+ (gcc, creates libpng15.so.15.1.5.10)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
@@ -20,7 +20,7 @@ pnglibconf.h.prebuilt => Stores configuration settings
makefile.dec => DEC Alpha UNIX makefile
makefile.dj2 => DJGPP 2 makefile
makefile.elf => Linux/ELF makefile symbol versioning,
- (gcc, creates libpng15.so.15.1.5.9)
+ (gcc, creates libpng15.so.15.1.5.10)
makefile.freebsd => FreeBSD makefile
makefile.gcc => Generic gcc makefile
makefile.hpgcc => HPUX makefile using gcc
@@ -35,12 +35,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.9)
+ creates libpng15.so.15.1.5.10)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng15.so.15.1.5.9)
+ creates libpng15.so.15.1.5.10)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng15.so.15.1.5.9)
+ creates libpng15.so.15.1.5.10)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/SCOPTIONS.ppc b/Build/source/libs/libpng/libpng-1.5.10/scripts/SCOPTIONS.ppc
index 2c3503e9eb2..2c3503e9eb2 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/SCOPTIONS.ppc
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/SCOPTIONS.ppc
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/checksym.awk b/Build/source/libs/libpng/libpng-1.5.10/scripts/checksym.awk
index ba4c99b564d..ba4c99b564d 100755
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/checksym.awk
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/checksym.awk
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/chkfmt b/Build/source/libs/libpng/libpng-1.5.10/scripts/chkfmt
index 9da6475fd4e..9da6475fd4e 100755
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/chkfmt
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/chkfmt
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/def.dfn b/Build/source/libs/libpng/libpng-1.5.10/scripts/def.dfn
index f9918631dec..f9918631dec 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/def.dfn
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/def.dfn
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/descrip.mms b/Build/source/libs/libpng/libpng-1.5.10/scripts/descrip.mms
index 99ea1abccd1..99ea1abccd1 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/descrip.mms
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/descrip.mms
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/libpng-config-body.in b/Build/source/libs/libpng/libpng-1.5.10/scripts/libpng-config-body.in
index b466432d546..b466432d546 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/libpng-config-body.in
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/libpng-config-body.in
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/libpng-config-head.in b/Build/source/libs/libpng/libpng-1.5.10/scripts/libpng-config-head.in
index a8ba1948ccc..4dda9cda905 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/libpng-config-head.in
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
-version=1.5.9
+version=1.5.10
prefix=""
libdir=""
libs=""
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/libpng.pc.in b/Build/source/libs/libpng/libpng-1.5.10/scripts/libpng.pc.in
index a90e641fcb5..f96298ca8b7 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/libpng.pc.in
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng15
Name: libpng
Description: Loads and saves PNG files
-Version: 1.5.9
+Version: 1.5.10
Libs: -L${libdir} -lpng15
Cflags: -I${includedir}
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.32sunu b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.32sunu
index b5e5a33a06f..b5e5a33a06f 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.32sunu
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.32sunu
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.64sunu b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.64sunu
index a0331d670e0..a0331d670e0 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.64sunu
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.64sunu
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.acorn b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.acorn
index 00b8fb5b35c..00b8fb5b35c 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.acorn
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.acorn
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.aix b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.aix
index bb4c40d4b0d..bb4c40d4b0d 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.aix
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.aix
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.amiga b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.amiga
index 228b5c22a75..228b5c22a75 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.amiga
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.amiga
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.atari b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.atari
index 1aeb7d5b7dd..1aeb7d5b7dd 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.atari
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.atari
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.bc32 b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.bc32
index ebbd5ce3d27..ebbd5ce3d27 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.bc32
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.bc32
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.beos b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.beos
index 749db78ad32..749db78ad32 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.beos
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.beos
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.bor b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.bor
index 96d5e861a3a..96d5e861a3a 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.bor
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.bor
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.cegcc b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.cegcc
index 971cd01f626..fbc3d78bc45 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.cegcc
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.cegcc
@@ -23,7 +23,7 @@
VERMAJ = 1
VERMIN = 5
-VERMIC = 9
+VERMIC = 10
VER = $(VERMAJ).$(VERMIN).$(VERMIC)
NAME = libpng
PACKAGE = $(NAME)-$(VER)
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.darwin b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.darwin
index 337a8151eb5..337a8151eb5 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.darwin
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.darwin
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.dec b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.dec
index 5301d87d33e..5301d87d33e 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.dec
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.dec
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.dj2 b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.dj2
index 87a05a364ac..87a05a364ac 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.dj2
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.dj2
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.elf b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.elf
index 5af43b18452..5af43b18452 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.elf
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.elf
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.freebsd b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.freebsd
index 994608c993a..994608c993a 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.freebsd
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.freebsd
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.gcc b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.gcc
index 2e5b611367f..2e5b611367f 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.gcc
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.gcc
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.hp64 b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hp64
index b5b631d11c7..b5b631d11c7 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.hp64
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hp64
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.hpgcc b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hpgcc
index 3fe21177a4c..3fe21177a4c 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.hpgcc
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hpgcc
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.hpux b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hpux
index 650ab4f6621..650ab4f6621 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.hpux
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.hpux
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.ibmc b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.ibmc
index 209d513b1cb..209d513b1cb 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.ibmc
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.ibmc
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.intel b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.intel
index 1cb9ef37497..1cb9ef37497 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.intel
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.intel
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.knr b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.knr
index 18a39f53755..18a39f53755 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.knr
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.knr
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.linux b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.linux
index 2dd9a93edac..f1c75b654e2 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.linux
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.linux
@@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng15
PNGMAJ = 15
-RELEASE = 9
+RELEASE = 10
# Shared library names:
LIBSO=$(LIBNAME).so
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.mips b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.mips
index 179d3850b69..179d3850b69 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.mips
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.mips
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.msc b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.msc
index baa863dad99..baa863dad99 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.msc
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.msc
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.ne12bsd b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.ne12bsd
index 29b9924b267..c447f12034e 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.ne12bsd
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng15
LIB= png15
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.5.9
+SHLIB_MINOR= 1.5.10
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.9/scripts/makefile.netbsd b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.netbsd
index 43b4bda495d..d154810640d 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.netbsd
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.netbsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB= png
SHLIB_MAJOR= 15
-SHLIB_MINOR= 1.5.9
+SHLIB_MINOR= 1.5.10
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.9/scripts/makefile.openbsd b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.openbsd
index 3bb660b1161..3a1b84ea319 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.openbsd
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.openbsd
@@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 15
-SHLIB_MINOR= 1.5.9
+SHLIB_MINOR= 1.5.10
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.sco b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sco
index 0aad789a981..0aad789a981 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.sco
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sco
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.sggcc b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sggcc
index 1611638ba6c..1611638ba6c 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.sggcc
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sggcc
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.sgi b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sgi
index 83db59f817e..83db59f817e 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.sgi
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sgi
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.so9 b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.so9
index 615c2e34580..615c2e34580 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.so9
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.so9
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.solaris b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.solaris
index 24bd61033ce..24bd61033ce 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.solaris
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.solaris
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.solaris-x86 b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.solaris-x86
index 76467622a85..76467622a85 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.solaris-x86
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.solaris-x86
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.std b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.std
index a04dbb856b4..a04dbb856b4 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.std
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.std
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.sunos b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sunos
index 383954987ee..383954987ee 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.sunos
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.sunos
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.tc3 b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.tc3
index 462c47fece9..462c47fece9 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.tc3
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.tc3
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.vcwin32 b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.vcwin32
index 6bfeac03f7e..6bfeac03f7e 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makefile.vcwin32
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makefile.vcwin32
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/makevms.com b/Build/source/libs/libpng/libpng-1.5.10/scripts/makevms.com
index f6c326103c2..f6c326103c2 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/makevms.com
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/makevms.com
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/options.awk b/Build/source/libs/libpng/libpng-1.5.10/scripts/options.awk
index a8dff044a68..9ef98bc8e5e 100755
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/options.awk
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/options.awk
@@ -42,7 +42,7 @@ BEGIN{
comment=start cx # Comment start
cend="*/" end # Comment end
def=start "#define PNG_" ct # Arbitrary define
- sup=ct "_SUPPORTED" end # end supported option
+ sup=ct "_SUPPORTED 1" end # end supported option
und=comment "#undef PNG_" ct # Unsupported option
une=ct "_SUPPORTED" cend # end unsupported option
error=start "ERROR:" # error message
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/pnglibconf.dfa b/Build/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.dfa
index a740d6827bd..f06eb668573 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/pnglibconf.dfa
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.dfa
@@ -27,7 +27,7 @@ file pnglibconf.h scripts/pnglibconf.dfa PNGLCONF_H
# The syntax is detailed in scripts/options.awk, this is a summary
# only:
#
-# setting <name> [requires ...] [default]
+# setting <name> [default]
# #define PNG_<name> <value> /* value comes from current setting */
# option <name> [requires ...] [if ...] [enables ...] [disabled]
# #define PNG_<name>_SUPPORTED if the requirements are met and
@@ -266,20 +266,22 @@ option SET_USER_LIMITS enables SET_CHUNK_CACHE_LIMIT
option SET_USER_LIMITS enables SET_CHUNK_MALLOC_LIMIT
-# Added at libpng-1.0.16 and 1.2.6. To accept all valid PNGs no matter
-# how large, set these two limits to 0x7fffffff
-
-setting USER_WIDTH_MAX default 1000000
-setting USER_HEIGHT_MAX default 1000000
-
-# Added at libpng-1.2.43. To accept all valid PNGs no matter
-# how large, set these two limits to 0.
-
-setting USER_CHUNK_CACHE_MAX default 0
-
-# Added at libpng-1.2.43
-
-setting USER_CHUNK_MALLOC_MAX default 0
+# Libpng limits.
+#
+# If these settings are *not* set libpng will not limit the size of
+# images or the size of data in ancilliary chunks. This does lead to
+# security issues if PNG files come from untrusted sources.
+setting USER_WIDTH_MAX
+setting USER_HEIGHT_MAX
+setting USER_CHUNK_CACHE_MAX
+setting USER_CHUNK_MALLOC_MAX
+
+# To default all these settings to values that are large but probably
+# safe turn the SAFE_LIMITS option on; this will cause the value in
+# pngpriv.h to be used. Individual values can also be set, simply set
+# them in pngusr.dfa with '@#define PNG_setting value' lines.
+option SAFE_LIMITS enables USER_LIMITS disabled
+= SAFE_LIMITS SAFE_LIMITS
# All of the following options relate to code capabilities for
# processing image data before creating a PNG or after reading one.
@@ -576,3 +578,13 @@ option WRITE_COMPRESSED_TEXT enables WRITE_TEXT
# leave the row_pointers member out of the info structure.
option INFO_IMAGE
+
+# added at libpng-1.5.10
+# Turn this off to disable warning about invalid palette index and
+# leave the num_palette_max member out of the png structure.
+
+option CHECK_FOR_INVALID_INDEX enables READ_CHECK_FOR_INVALID_INDEX
+option CHECK_FOR_INVALID_INDEX enables WRITE_CHECK_FOR_INVALID_INDEX
+option READ_CHECK_FOR_INVALID_INDEX requires READ CHECK_FOR_INVALID_INDEX
+option WRITE_CHECK_FOR_INVALID_INDEX requires WRITE CHECK_FOR_INVALID_INDEX
+
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/pnglibconf.h.prebuilt b/Build/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.h.prebuilt
index 49fcc8cb4dd..6facf39aabf 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/pnglibconf.h.prebuilt
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.h.prebuilt
@@ -3,9 +3,9 @@
/* pnglibconf.h - library build configuration */
-/* Libpng 1.5.9 - February 18, 2012 */
+/* Libpng 1.5.10 - March 29, 2012 */
-/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */
+/* Copyright (c) 1998-2012 Glenn Randers-Pehrson */
/* This code is released under the libpng license. */
/* For conditions of distribution and use, see the disclaimer */
@@ -31,10 +31,6 @@
#define PNG_QUANTIZE_GREEN_BITS 5
#define PNG_QUANTIZE_RED_BITS 5
#define PNG_sCAL_PRECISION 5
-#define PNG_USER_CHUNK_CACHE_MAX 0
-#define PNG_USER_CHUNK_MALLOC_MAX 0
-#define PNG_USER_HEIGHT_MAX 1000000
-#define PNG_USER_WIDTH_MAX 1000000
#define PNG_WEIGHT_SHIFT 8
#define PNG_ZBUF_SIZE 8192
/* end of settings */
@@ -45,6 +41,7 @@
#define PNG_bKGD_SUPPORTED
#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
#define PNG_CHECK_cHRM_SUPPORTED
+#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
#define PNG_cHRM_SUPPORTED
#define PNG_CONSOLE_IO_SUPPORTED
#define PNG_CONVERT_tIME_SUPPORTED
@@ -74,6 +71,7 @@
#define PNG_READ_BACKGROUND_SUPPORTED
#define PNG_READ_BGR_SUPPORTED
#define PNG_READ_bKGD_SUPPORTED
+#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
#define PNG_READ_cHRM_SUPPORTED
#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
#define PNG_READ_COMPRESSED_TEXT_SUPPORTED
@@ -145,6 +143,7 @@
#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
#define PNG_WRITE_BGR_SUPPORTED
#define PNG_WRITE_bKGD_SUPPORTED
+#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
#define PNG_WRITE_cHRM_SUPPORTED
#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/pnglibconf.mak b/Build/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.mak
index c04578f31d9..c04578f31d9 100755
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/pnglibconf.mak
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/pnglibconf.mak
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/pngwin.rc b/Build/source/libs/libpng/libpng-1.5.10/scripts/pngwin.rc
index 9335cbbe03b..9335cbbe03b 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/pngwin.rc
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/pngwin.rc
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/smakefile.ppc b/Build/source/libs/libpng/libpng-1.5.10/scripts/smakefile.ppc
index 2e7380b1f98..2e7380b1f98 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/smakefile.ppc
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/smakefile.ppc
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/sym.dfn b/Build/source/libs/libpng/libpng-1.5.10/scripts/sym.dfn
index f4f13df0831..f4f13df0831 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/sym.dfn
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/sym.dfn
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/symbols.def b/Build/source/libs/libpng/libpng-1.5.10/scripts/symbols.def
index 782a7e7a3d8..bf958bc6065 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/symbols.def
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/symbols.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.5.9
+;Version 1.5.10
png_access_version_number @1
png_set_sig_bytes @2
png_sig_cmp @3
@@ -239,3 +239,4 @@ EXPORTS
png_get_cHRM_XYZ_fixed @231
png_set_cHRM_XYZ @232
png_set_cHRM_XYZ_fixed @233
+ png_set_check_for_invalid_index @234
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/symbols.dfn b/Build/source/libs/libpng/libpng-1.5.10/scripts/symbols.dfn
index d790929e7e7..d790929e7e7 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/symbols.dfn
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/symbols.dfn
diff --git a/Build/source/libs/libpng/libpng-1.5.9/scripts/vers.dfn b/Build/source/libs/libpng/libpng-1.5.10/scripts/vers.dfn
index 89d5f3879e2..89d5f3879e2 100644
--- a/Build/source/libs/libpng/libpng-1.5.9/scripts/vers.dfn
+++ b/Build/source/libs/libpng/libpng-1.5.10/scripts/vers.dfn
diff --git a/Build/source/libs/libpng/libpng-1.5.9/test-pngtest.sh b/Build/source/libs/libpng/libpng-1.5.10/test-pngtest.sh
index bba128b6319..bba128b6319 100755
--- a/Build/source/libs/libpng/libpng-1.5.9/test-pngtest.sh
+++ b/Build/source/libs/libpng/libpng-1.5.10/test-pngtest.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.9/test-pngvalid-full.sh b/Build/source/libs/libpng/libpng-1.5.10/test-pngvalid-full.sh
index f7d1b2b5d58..f7d1b2b5d58 100755
--- a/Build/source/libs/libpng/libpng-1.5.9/test-pngvalid-full.sh
+++ b/Build/source/libs/libpng/libpng-1.5.10/test-pngvalid-full.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.9/test-pngvalid-simple.sh b/Build/source/libs/libpng/libpng-1.5.10/test-pngvalid-simple.sh
index 7d4d9d83c28..7d4d9d83c28 100755
--- a/Build/source/libs/libpng/libpng-1.5.9/test-pngvalid-simple.sh
+++ b/Build/source/libs/libpng/libpng-1.5.10/test-pngvalid-simple.sh
diff --git a/Build/source/libs/libpng/libpng-1.5.9/ANNOUNCE b/Build/source/libs/libpng/libpng-1.5.9/ANNOUNCE
deleted file mode 100644
index 3bf7c73efa1..00000000000
--- a/Build/source/libs/libpng/libpng-1.5.9/ANNOUNCE
+++ /dev/null
@@ -1,42 +0,0 @@
-
-Libpng 1.5.9 - February 18, 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.9.tar.xz (LZMA-compressed, recommended)
- libpng-1.5.9.tar.gz
- libpng-1.5.9.tar.bz2
-
-Source files with CRLF line endings (for Windows), without the
-"configure" script
-
- lpng159.7z (LZMA-compressed, recommended)
- lpng159.zip
-
-Other information:
-
- libpng-1.5.9-README.txt
- libpng-1.5.9-LICENSE.txt
-
-Changes since the last public release (1.5.8):
-
- Rebuilt configure scripts in the tar distributions.
- Removed two unused definitions from scripts/pnglibconf.h.prebuilt
- Removed some unused arrays (with #ifdef) from png_read_push_finish_row().
- Removed tests for no-longer-used *_EMPTY_PLTE_SUPPORTED from pngstruct.h
- Fixed CVE-2011-3026 buffer overrun bug. Deal more correctly with the test
- on iCCP chunk length. Also removed spurious casts that may hide problems
- on 16-bit systems.
-
-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/version.ac b/Build/source/libs/libpng/version.ac
index c760663c9e7..be9dc6517a7 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.9])
+m4_define([libpng_version], [1.5.10])