]> git.saurik.com Git - wxWidgets.git/commit
Merge libpng 1.6.2 into the trunk.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sun, 7 Jul 2013 17:44:15 +0000 (17:44 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sun, 7 Jul 2013 17:44:15 +0000 (17:44 +0000)
commitfff5f7d5d83fbd20638f119237b699e38a73c539
tree1ee94715550f3abb2cdf5a8fd3ae084fb3225171
parent01588a9e314d136222e9aaede0082b40506611bf
Merge libpng 1.6.2 into the trunk.

Add pngprefix.h file generated by libpng configure/make process (which we
don't run during wxWidgets build, so this is something that will need to be
redone manually whenever libpng is upgraded, the procedure for doing this is
documented in docs/tech/tn0025.txt) in order to use "wx_" prefix for all
libpng public symbols. This should avoid at least some problems due to the
conflicts between the built-in libpng and shared libpng loaded into the
process as GTK+ libraries dependency under Unix.

Also rename wx_png_{warning,error} to use upper case PNG for consistency with
wx_PNG_stream_{reader,writer} and to avoid conflict with png_{warning,error}()
which we now rename to have "wx_" prefix.

Closes #14157.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
172 files changed:
docs/tech/tn0025.txt
src/common/imagpng.cpp
src/png/ANNOUNCE
src/png/CHANGES
src/png/CMakeLists.txt
src/png/INSTALL
src/png/LICENSE
src/png/Makefile.am
src/png/Makefile.in
src/png/README
src/png/aclocal.m4
src/png/arm/arm_init.c [new file with mode: 0644]
src/png/arm/filter_neon.S
src/png/autogen.sh
src/png/config.guess
src/png/config.h.in
src/png/config.sub
src/png/configure
src/png/configure.ac
src/png/depcomp
src/png/example.c
src/png/install-sh
src/png/libpng-manual.txt
src/png/libpng.3
src/png/libpngpf.3
src/png/ltmain.sh
src/png/missing
src/png/png.5
src/png/png.c
src/png/png.h
src/png/pngconf.h
src/png/pngerror.c
src/png/pngget.c
src/png/pnginfo.h
src/png/pnglibconf.h
src/png/pngmem.c
src/png/pngpread.c
src/png/pngprefix.h [new file with mode: 0644]
src/png/pngpriv.h
src/png/pngread.c
src/png/pngrio.c
src/png/pngrtran.c
src/png/pngrutil.c
src/png/pngset.c
src/png/pngstruct.h
src/png/pngtest.c
src/png/pngtest.png
src/png/pngtrans.c
src/png/pngusr.dfa [new file with mode: 0644]
src/png/pngwio.c
src/png/pngwrite.c
src/png/pngwtran.c
src/png/pngwutil.c
src/png/projects/owatcom/libpng.wpj
src/png/projects/owatcom/pngstest.tgt [new file with mode: 0644]
src/png/projects/visualc71/README.txt
src/png/projects/visualc71/libpng.vcproj
src/png/projects/visualc71/pngtest.vcproj
src/png/projects/vstudio/WARNING [new file with mode: 0644]
src/png/projects/vstudio/libpng/libpng.vcxproj
src/png/projects/vstudio/pnglibconf/pnglibconf.vcxproj
src/png/projects/vstudio/pngstest/pngstest.vcxproj [new file with mode: 0644]
src/png/projects/vstudio/pngtest/pngtest.vcxproj
src/png/projects/vstudio/pngunknown/pngunknown.vcxproj [new file with mode: 0644]
src/png/projects/vstudio/pngvalid/pngvalid.vcxproj
src/png/projects/vstudio/readme.txt
src/png/projects/vstudio/vstudio.sln
src/png/projects/vstudio/zlib.props
src/png/projects/vstudio/zlib/zlib.vcxproj
src/png/scripts/README.txt
src/png/scripts/checksym.awk
src/png/scripts/def.dfn
src/png/scripts/descrip.mms
src/png/scripts/dfn.awk [new file with mode: 0644]
src/png/scripts/intprefix.dfn [new file with mode: 0644]
src/png/scripts/libpng-config-head.in
src/png/scripts/libpng.pc.in
src/png/scripts/libtool.m4 [new file with mode: 0644]
src/png/scripts/ltoptions.m4 [new file with mode: 0644]
src/png/scripts/ltsugar.m4 [new file with mode: 0644]
src/png/scripts/ltversion.m4 [new file with mode: 0644]
src/png/scripts/lt~obsolete.m4 [new file with mode: 0644]
src/png/scripts/macro.lst [new file with mode: 0644]
src/png/scripts/makefile.32sunu
src/png/scripts/makefile.64sunu
src/png/scripts/makefile.aix
src/png/scripts/makefile.bc32
src/png/scripts/makefile.beos
src/png/scripts/makefile.bor
src/png/scripts/makefile.cegcc
src/png/scripts/makefile.darwin
src/png/scripts/makefile.dec
src/png/scripts/makefile.dj2
src/png/scripts/makefile.elf
src/png/scripts/makefile.freebsd
src/png/scripts/makefile.gcc
src/png/scripts/makefile.hp64
src/png/scripts/makefile.hpgcc
src/png/scripts/makefile.hpux
src/png/scripts/makefile.ibmc
src/png/scripts/makefile.intel
src/png/scripts/makefile.knr
src/png/scripts/makefile.linux
src/png/scripts/makefile.mips
src/png/scripts/makefile.msc
src/png/scripts/makefile.msys [new file with mode: 0644]
src/png/scripts/makefile.ne12bsd
src/png/scripts/makefile.netbsd
src/png/scripts/makefile.openbsd
src/png/scripts/makefile.sco
src/png/scripts/makefile.sggcc
src/png/scripts/makefile.sgi
src/png/scripts/makefile.so9
src/png/scripts/makefile.solaris
src/png/scripts/makefile.solaris-x86
src/png/scripts/makefile.std
src/png/scripts/makefile.sunos
src/png/scripts/makefile.tc3
src/png/scripts/makefile.vcwin32
src/png/scripts/makevms.com
src/png/scripts/options.awk
src/png/scripts/pnglibconf.dfa
src/png/scripts/pnglibconf.h.prebuilt
src/png/scripts/pnglibconf.mak
src/png/scripts/prefix.dfn [new file with mode: 0644]
src/png/scripts/sym.dfn
src/png/scripts/symbols.def
src/png/scripts/symbols.dfn
src/png/scripts/vers.dfn
src/png/test-driver [new file with mode: 0755]
src/png/test-pngtest.sh [deleted file]
src/png/test-pngvalid-full.sh [deleted file]
src/png/test-pngvalid-simple.sh [deleted file]
src/png/tests/pngstest [new file with mode: 0755]
src/png/tests/pngstest-0g01 [new file with mode: 0755]
src/png/tests/pngstest-0g02 [new file with mode: 0755]
src/png/tests/pngstest-0g04 [new file with mode: 0755]
src/png/tests/pngstest-0g08 [new file with mode: 0755]
src/png/tests/pngstest-0g16 [new file with mode: 0755]
src/png/tests/pngstest-2c08 [new file with mode: 0755]
src/png/tests/pngstest-2c16 [new file with mode: 0755]
src/png/tests/pngstest-3p01 [new file with mode: 0755]
src/png/tests/pngstest-3p02 [new file with mode: 0755]
src/png/tests/pngstest-3p04 [new file with mode: 0755]
src/png/tests/pngstest-3p08 [new file with mode: 0755]
src/png/tests/pngstest-4a08 [new file with mode: 0755]
src/png/tests/pngstest-4a16 [new file with mode: 0755]
src/png/tests/pngstest-6a08 [new file with mode: 0755]
src/png/tests/pngstest-6a16 [new file with mode: 0755]
src/png/tests/pngstest-error [new file with mode: 0755]
src/png/tests/pngtest [new file with mode: 0755]
src/png/tests/pngunknown-IDAT [new file with mode: 0755]
src/png/tests/pngunknown-discard [new file with mode: 0755]
src/png/tests/pngunknown-if-safe [new file with mode: 0755]
src/png/tests/pngunknown-sAPI [new file with mode: 0755]
src/png/tests/pngunknown-sTER [new file with mode: 0755]
src/png/tests/pngunknown-save [new file with mode: 0755]
src/png/tests/pngunknown-vpAg [new file with mode: 0755]
src/png/tests/pngvalid-gamma-16-to-8 [new file with mode: 0755]
src/png/tests/pngvalid-gamma-alpha-mode [new file with mode: 0755]
src/png/tests/pngvalid-gamma-background [new file with mode: 0755]
src/png/tests/pngvalid-gamma-expand16-alpha-mode [new file with mode: 0755]
src/png/tests/pngvalid-gamma-expand16-background [new file with mode: 0755]
src/png/tests/pngvalid-gamma-expand16-transform [new file with mode: 0755]
src/png/tests/pngvalid-gamma-sbit [new file with mode: 0755]
src/png/tests/pngvalid-gamma-threshold [new file with mode: 0755]
src/png/tests/pngvalid-gamma-transform [new file with mode: 0755]
src/png/tests/pngvalid-progressive-interlace-size [new file with mode: 0755]
src/png/tests/pngvalid-progressive-interlace-standard [new file with mode: 0755]
src/png/tests/pngvalid-progressive-interlace-transform [new file with mode: 0755]
src/png/tests/pngvalid-progressive-standard [new file with mode: 0755]
src/png/tests/pngvalid-standard [new file with mode: 0755]