Author: korli Date: 2010-09-18 13:06:45 +0200 (Sat, 18 Sep 2010) New Revision: 38697 Changeset: http://dev.haiku-os.org/changeset/38697 Added: haiku/vendor/libpng/current/contrib/pngsuite/ftbbn1g04.png haiku/vendor/libpng/current/contrib/pngsuite/ftbbn2c16.png haiku/vendor/libpng/current/contrib/pngsuite/ftbbn3p08.png haiku/vendor/libpng/current/contrib/pngsuite/ftbgn2c16.png haiku/vendor/libpng/current/contrib/pngsuite/ftbgn3p08.png haiku/vendor/libpng/current/contrib/pngsuite/ftbrn2c08.png haiku/vendor/libpng/current/contrib/pngsuite/ftbwn1g16.png haiku/vendor/libpng/current/contrib/pngsuite/ftbwn3p08.png haiku/vendor/libpng/current/contrib/pngsuite/ftbyn3p08.png haiku/vendor/libpng/current/contrib/pngsuite/ftp0n1g08.png haiku/vendor/libpng/current/contrib/pngsuite/ftp0n2c08.png haiku/vendor/libpng/current/contrib/pngsuite/ftp0n3p08.png haiku/vendor/libpng/current/contrib/pngsuite/ftp1n3p08.png haiku/vendor/libpng/current/libpng-1.4.3.txt haiku/vendor/libpng/current/new_push_process_row.c haiku/vendor/libpng/current/projects/vstudio/ haiku/vendor/libpng/current/projects/vstudio/libpng/ haiku/vendor/libpng/current/projects/vstudio/libpng/libpng.vcxproj haiku/vendor/libpng/current/projects/vstudio/pngtest/ haiku/vendor/libpng/current/projects/vstudio/pngtest/pngtest.vcxproj haiku/vendor/libpng/current/projects/vstudio/readme.txt haiku/vendor/libpng/current/projects/vstudio/vstudio.sln haiku/vendor/libpng/current/projects/vstudio/zlib.props haiku/vendor/libpng/current/projects/vstudio/zlib/ haiku/vendor/libpng/current/projects/vstudio/zlib/zlib.vcxproj Removed: haiku/vendor/libpng/current/contrib/pngminim/encoder/dummy_inflate.c haiku/vendor/libpng/current/libpng-1.4.1.txt Modified: haiku/vendor/libpng/current/ANNOUNCE haiku/vendor/libpng/current/CHANGES haiku/vendor/libpng/current/CMakeLists.txt haiku/vendor/libpng/current/INSTALL haiku/vendor/libpng/current/LICENSE haiku/vendor/libpng/current/Makefile.am haiku/vendor/libpng/current/Makefile.in haiku/vendor/libpng/current/README haiku/vendor/libpng/current/TODO haiku/vendor/libpng/current/configure haiku/vendor/libpng/current/configure.ac haiku/vendor/libpng/current/contrib/gregbook/readpng2.c haiku/vendor/libpng/current/contrib/pngminim/decoder/pngusr.h haiku/vendor/libpng/current/contrib/pngminim/encoder/gather.sh haiku/vendor/libpng/current/contrib/pngminim/encoder/makefile haiku/vendor/libpng/current/contrib/pngminim/encoder/pngusr.h haiku/vendor/libpng/current/contrib/pngminim/preader/pngusr.h haiku/vendor/libpng/current/example.c haiku/vendor/libpng/current/libpng.3 haiku/vendor/libpng/current/libpngpf.3 haiku/vendor/libpng/current/png.5 haiku/vendor/libpng/current/png.c haiku/vendor/libpng/current/png.h haiku/vendor/libpng/current/pngconf.h haiku/vendor/libpng/current/pngget.c haiku/vendor/libpng/current/pngmem.c haiku/vendor/libpng/current/pngpread.c haiku/vendor/libpng/current/pngpriv.h haiku/vendor/libpng/current/pngread.c haiku/vendor/libpng/current/pngrtran.c haiku/vendor/libpng/current/pngrutil.c haiku/vendor/libpng/current/pngtest.c haiku/vendor/libpng/current/pngtrans.c haiku/vendor/libpng/current/pngwio.c haiku/vendor/libpng/current/pngwutil.c haiku/vendor/libpng/current/projects/visualc6/README.txt haiku/vendor/libpng/current/projects/visualc71/README.txt haiku/vendor/libpng/current/projects/visualc71/README_zlib.txt haiku/vendor/libpng/current/projects/xcode/libpng.xcodeproj/project.pbxproj haiku/vendor/libpng/current/scripts/README.txt haiku/vendor/libpng/current/scripts/libpng-config-head.in haiku/vendor/libpng/current/scripts/libpng.pc.in haiku/vendor/libpng/current/scripts/makefile.cegcc haiku/vendor/libpng/current/scripts/makefile.linux haiku/vendor/libpng/current/scripts/makefile.ne12bsd haiku/vendor/libpng/current/scripts/makefile.netbsd haiku/vendor/libpng/current/scripts/makefile.openbsd haiku/vendor/libpng/current/scripts/png32ce.def haiku/vendor/libpng/current/scripts/pngos2.def haiku/vendor/libpng/current/scripts/pngwin.def Log: updating libpng to 1.4.3 Modified: haiku/vendor/libpng/current/ANNOUNCE =================================================================== --- haiku/vendor/libpng/current/ANNOUNCE 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/ANNOUNCE 2010-09-18 11:06:45 UTC (rev 38697) @@ -1,5 +1,5 @@ -Libpng 1.4.1 - February 25, 2010 +Libpng 1.4.3 - June 26, 2010 This is a public release of libpng, intended for use in production codes. @@ -8,57 +8,32 @@ Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.4.1.tar.xz (LZMA-compressed, recommended) - libpng-1.4.1.tar.gz - libpng-1.4.1.tar.bz2 + libpng-1.4.3.tar.xz (LZMA-compressed, recommended) + libpng-1.4.3.tar.gz + libpng-1.4.3.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng141.zip - lpng141.7z + lpng143.zip + lpng143.7z Other information: - libpng-1.4.1-README.txt - libpng-1.4.1-LICENSE.txt + libpng-1.4.3-README.txt + libpng-1.4.3-LICENSE.txt -Changes since the last public release (1.4.0): +Changes since the last public release (1.4.2): + Added missing quotation marks in the aix block of configure.ac + The new "vstudio" project was missing from the zip and 7z distributions. + Rewrote png_process_IDAT_data to consistently treat extra data as warnings + and handle end conditions more cleanly. + Removed the now-redundant check for out-of-bounds new_row from example.c + Changed char *msg to PNG_CONST char *msg in pngrutil.c + Stop memory leak when reading a malformed sCAL chunk. -version 1.4.1 [February 25, 2010] +Send comments/corrections/commendations to glennrp at users.sourceforge.net +or to png-mng-implement at lists.sf.net (subscription required; visit +https://lists.sourceforge.net/lists/listinfo/png-mng-implement). - Updated CMakeLists.txt for consistent indentation and to avoid an - unclosed if-statement warning (Philip Lowman). - Revised Makefile.am and Makefile.in to remove references to Y2KINFO, - KNOWNBUG, and libpng.la (Robert Schwebel). - Revised the makefiles to install the same files and symbolic - except for libpng.la and libpng14.la. - Make png_set|get_compression_buffer_size() available even when - PNG_WRITE_SUPPORTED is not enabled. - Revised Makefile.am and Makefile.in to simplify their maintenance. - Revised the makefiles to install a link to libpng14.so.14.1 - Removed png_set_premultiply_alpha() from scripts/*.def - Revised png_decompress_chunk() to improve speed and memory usage when - decoding large chunks, using a two-pass method suggested by John Bowler. - Added png_set|get_chunk_malloc_max() functions. - Relocated "int k" declaration in pngtest.c to minimize its scope. - Folded some long lines in the source files. - Added defineable PNG_USER_CHUNK_CACHE_MAX and PNG_USER_CHUNK_MALLOC_MAX - Eliminated use of png_ptr->irowbytes and reused the slot in png_ptr as - png_ptr->png_user_chunk_malloc_max. - Return allocated "old_buffer" in png_push_save_buffer() before calling - png_error(), to avoid a potential memory leak. - Removed the cbuilder5 project, which has not been updated to 1.4.0. - Complete rewrite of two-pass png_decompress_chunk() by John Bowler. - Removed obsolete unused MMX-querying support from contrib/gregbook - Removed the AIX redefinition of jmpbuf in png.h - Define _ALL_SOURCE in configure.ac, makefile.aix, and CMakeLists.txt - when using AIX compiler. - Removed unused gzio.c from contrib/pngminim gather and makefile scripts - -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 Modified: haiku/vendor/libpng/current/CHANGES =================================================================== --- haiku/vendor/libpng/current/CHANGES 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/CHANGES 2010-09-18 11:06:45 UTC (rev 38697) @@ -1672,7 +1672,7 @@ Added scripts/makefile.nommx version 1.2.15rc3 [December 25, 2006] - Fixed shared library numbering error that was intruduced in 1.2.15beta6. + Fixed shared library numbering error that was introduced in 1.2.15beta6. version 1.2.15rc4 [December 27, 2006] Fixed handling of rgb_to_gray when png_ptr->color.gray isn't set. @@ -2054,7 +2054,10 @@ PNG_TRANSFORM_STRIP_FILLER (Jim Barry). version 1.4.0beta47 [December 15, 2008] - Turned off PNG_READ_DITHER_SUPPORTED by default. + Support for dithering was disabled by default, because it has never + been well tested and doesn't work very well. The code has not + been removed, however, and can be enabled by building libpng with + PNG_READ_DITHER_SUPPORTED defined. version 1.4.0beta48 [February 14, 2009] Added new exported function png_calloc(). @@ -2122,7 +2125,7 @@ Removed pngprefs.h and MMX from makefiles version 1.4.0beta58 [May 14, 2009] - Changed pngw32.def to pngwin.def in makefile.mingw (typo was intruduced + Changed pngw32.def to pngwin.def in makefile.mingw (typo was introduced in beta57). Clarified usage of sig_bit versus sig_bit_p in example.c (Vincent Torri) @@ -2534,12 +2537,83 @@ version 1.4.1 [February 25, 2010] -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 +version 1.4.2beta01 [April 1, 2010] + Conditionally compile an "else" statement in png_decompress_chunk(). + Restored the macro definition of png_check_sig(). +version 1.4.2rc01 [April 10, 2010] + No changes. + +version 1.4.2rc02 [April 16, 2010] + Documented the fact that png_set_dither() was disabled since libpng-1.4.0. + Reenabled png_set_dither() but renamed it to png_set_quantize() to reflect + more accurately what it actually does. At the same time, renamed + the PNG_DITHER_[RED,GREEN_BLUE]_BITS macros to + PNG_QUANTIZE_[RED,GREEN,BLUE]_BITS. + +version 1.4.2rc03 [April 24, 2010] + Added some "(long)" typecasts to printf calls in png_handle_cHRM(). + Relaxed the overly-restrictive permissions of some files. + +version 1.4.2rc04 [April 28, 2010] + Added the "vstudio" project to replace "visualc6" and "visualc71" which + will be removed from libpng-1.5.0. + Demonstrate in example.c that lang_key should be initialized. + Set PNG_NO_READ_BGR, PNG_NO_IO_STATE, and PNG_NO_TIME_RFC1123 in + contrib/pngminim/decoder/pngusr.h to make a smaller decoder application. + +version 1.4.2rc05 [April 29, 2010] + Include png_reset_zstream() in png.c only when PNG_READ_SUPPORTED is defined. + Removed dummy_inflate.c and uncompr.c from contrib/pngminim/encoder + Corrected PNG_UNKNOWN_CHUNKS_SUPPORTED to PNG_HANDLE_AS_UNKNOWN_SUPPORTED + in gregbook/readpng2.c + Corrected protection of png_get_user_transform_ptr. The API declaration in + png.h is removed if both READ and WRITE USER_TRANSFORM are turned off + but was left defined in pngtrans.c + +version 1.4.2rc06 [May 3, 2010] + Moved declarations of umsg[] inside the proper #ifdef blocks in pngrutil.c + +version 1.4.2 [May 6, 2010] + +version 1.4.3beta01 [June 18, 2010] + Added missing quotation marks in the aix block of configure.ac + The new "vstudio" project was missing from the zip and 7z distributions. + In pngpread.c: png_push_have_row() add check for new_row > height + +version 1.4.3beta02 [June 18, 2010] + Removed the now-redundant check for out-of-bounds new_row from example.c + +version 1.4.3beta03 [June 18, 2010] + In pngpread.c: png_push_finish_row() add check for too many rows. + +version 1.4.3beta04 [June 19, 2010] + In pngpread.c: png_push_process_row() add check for too many rows. + Removed the checks added in beta01 and beta03, as they are now redundant. + +version 1.4.3beta05 [June 20, 2010] + Rewrote png_process_IDAT_data to consistently treat extra data as warnings + and handle end conditions more cleanly. + Removed the new (beta04) check in png_push_process_row(). + +version 1.4.3rc01 [June 21, 2010] + Revised some comments in png_process_IDAT_data(). + +version 1.4.3rc02 [June 22, 2010] + Changed char *msg to PNG_CONST char *msg in pngrutil.c + Stop memory leak when reading a malformed sCAL chunk. + Removed some trailing blanks. + +version 1.4.3rc03 [June 23, 2010] + Revised pngpread.c patch of beta05 to avoid an endless loop. + +version 1.4.3 [June 26, 2010] + Updated some of the "last changed" dates. + +Send comments/corrections/commendations to glennrp at users.sourceforge.net +or to png-mng-implement at lists.sf.net (subscription required; visit +https://lists.sourceforge.net/lists/listinfo/png-mng-implement). + Glenn R-P */ } #endif Modified: haiku/vendor/libpng/current/CMakeLists.txt =================================================================== --- haiku/vendor/libpng/current/CMakeLists.txt 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/CMakeLists.txt 2010-09-18 11:06:45 UTC (rev 38697) @@ -22,7 +22,7 @@ set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 4) -set(PNGLIB_RELEASE 1) +set(PNGLIB_RELEASE 3) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -213,7 +213,7 @@ # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 14.${PNGLIB_RELEASE}.1.4.1 +# VERSION 14.${PNGLIB_RELEASE}.1.4.3 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) Modified: haiku/vendor/libpng/current/INSTALL =================================================================== --- haiku/vendor/libpng/current/INSTALL 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/INSTALL 2010-09-18 11:06:45 UTC (rev 38697) @@ -1,5 +1,5 @@ -Installing libpng version 1.4.1 - February 25, 2010 +Installing libpng version 1.4.3 - June 26, 2010 On Unix/Linux and similar systems, you can simply type @@ -46,7 +46,7 @@ correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.4.1" or "libpng14" and "zlib-1.2.3" +might be called "libpng-1.4.3" or "libpng14" and "zlib-1.2.3" or "zlib123") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: Modified: haiku/vendor/libpng/current/LICENSE =================================================================== --- haiku/vendor/libpng/current/LICENSE 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/LICENSE 2010-09-18 11:06:45 UTC (rev 38697) @@ -10,7 +10,7 @@ This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.1, February 25, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.4.3, June 26, 2010, 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 @@ -108,4 +108,4 @@ Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 25, 2010 +June 26, 2010 Modified: haiku/vendor/libpng/current/Makefile.am =================================================================== --- haiku/vendor/libpng/current/Makefile.am 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/Makefile.am 2010-09-18 11:06:45 UTC (rev 38697) @@ -73,7 +73,7 @@ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.1.txt + example.c libpng-1.4.3.txt CLEANFILES= pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \ libpng.sym Modified: haiku/vendor/libpng/current/Makefile.in =================================================================== --- haiku/vendor/libpng/current/Makefile.in 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/Makefile.in 2010-09-18 11:06:45 UTC (rev 38697) @@ -333,7 +333,7 @@ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.1.txt + example.c libpng-1.4.3.txt CLEANFILES = pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \ libpng.sym Modified: haiku/vendor/libpng/current/README =================================================================== --- haiku/vendor/libpng/current/README 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/README 2010-09-18 11:06:45 UTC (rev 38697) @@ -1,4 +1,4 @@ -README for libpng version 1.4.1 - February 25, 2010 (shared library 14.0) +README for libpng version 1.4.3 - June 26, 2010 (shared library 14.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -185,9 +185,9 @@ makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng14.so.14.1.4.1) + gcc, creates libpng14.so.14.1.4.3) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.1) + (gcc, creates libpng14.so.14.1.4.3) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -209,12 +209,12 @@ makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng14.so.14.1.4.1) + (gcc, creates libpng14.so.14.1.4.3) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.1) + (gcc, creates libpng14.so.14.1.4.3) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.1) + (gcc, creates libpng14.so.14.1.4.3) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc Modified: haiku/vendor/libpng/current/TODO =================================================================== --- haiku/vendor/libpng/current/TODO 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/TODO 2010-09-18 11:06:45 UTC (rev 38697) @@ -9,7 +9,7 @@ cHRM transformation. Improve setjmp/longjmp usage or remove it in favor of returning error codes. Add "grayscale->palette" transformation and "palette->grayscale" detection. -Improved dithering. +Improved quantizing and dithering. Multi-lingual error and warning message support. Complete sRGB transformation (presently it simply uses gamma=0.45455). Man pages for function calls. Modified: haiku/vendor/libpng/current/configure =================================================================== --- haiku/vendor/libpng/current/configure 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/configure 2010-09-18 11:06:45 UTC (rev 38697) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for libpng 1.4.1. +# Generated by GNU Autoconf 2.65 for libpng 1.4.3. # # Report bugs to <png-mng-implement@xxxxxxxxxxxxxxxxxxxxx>. # @@ -701,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.4.1' -PACKAGE_STRING='libpng 1.4.1' +PACKAGE_VERSION='1.4.3' +PACKAGE_STRING='libpng 1.4.3' PACKAGE_BUGREPORT='png-mng-implement@xxxxxxxxxxxxxxxxxxxxx' PACKAGE_URL='' @@ -1432,7 +1432,7 @@ # 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.4.1 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1502,7 +1502,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.4.1:";; + short | recursive ) echo "Configuration of libpng 1.4.3:";; esac cat <<\_ACEOF @@ -1607,7 +1607,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.4.1 +libpng configure 1.4.3 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2032,7 +2032,7 @@ 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.4.1, which was +It was created by libpng $as_me 1.4.3, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2840,7 +2840,7 @@ # Define the identity of the package. PACKAGE='libpng' - VERSION='1.4.1' + VERSION='1.4.3' cat >>confdefs.h <<_ACEOF @@ -2904,10 +2904,10 @@ -PNGLIB_VERSION=1.4.1 +PNGLIB_VERSION=1.4.3 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 -PNGLIB_RELEASE=1 +PNGLIB_RELEASE=3 @@ -11417,7 +11417,7 @@ case $host_os in aix*) - LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG -D_ALL_SOURCE;; + LIBPNG_DEFINES="-DPNG_CONFIGURE_LIBPNG -D_ALL_SOURCE";; *) LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG;; esac @@ -12032,7 +12032,7 @@ # 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.4.1, which was +This file was extended by libpng $as_me 1.4.3, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12098,7 +12098,7 @@ 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.4.1 +libpng config.status 1.4.3 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" Modified: haiku/vendor/libpng/current/configure.ac =================================================================== --- haiku/vendor/libpng/current/configure.ac 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/configure.ac 2010-09-18 11:06:45 UTC (rev 38697) @@ -18,15 +18,15 @@ dnl Version number stuff here: -AC_INIT([libpng], [1.4.1], [png-mng-implement@xxxxxxxxxxxxxxxxxxxxx]) +AC_INIT([libpng], [1.4.3], [png-mng-implement@xxxxxxxxxxxxxxxxxxxxx]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.4.1 +PNGLIB_VERSION=1.4.3 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 -PNGLIB_RELEASE=1 +PNGLIB_RELEASE=3 dnl End of version number stuff @@ -61,7 +61,7 @@ case $host_os in aix*) - LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG -D_ALL_SOURCE;; + LIBPNG_DEFINES="-DPNG_CONFIGURE_LIBPNG -D_ALL_SOURCE";; *) LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG;; esac Modified: haiku/vendor/libpng/current/contrib/gregbook/readpng2.c =================================================================== --- haiku/vendor/libpng/current/contrib/gregbook/readpng2.c 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/contrib/gregbook/readpng2.c 2010-09-18 11:06:45 UTC (rev 38697) @@ -129,7 +129,7 @@ } -#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED +#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED /* prepare the reader to ignore all recognized chunks whose data won't be * used, i.e., all chunks recognized by libpng except for IHDR, PLTE, IDAT, * IEND, tRNS, bKGD, gAMA, and sRGB (small performance improvement) */ @@ -158,7 +158,7 @@ png_set_keep_unknown_chunks(png_ptr, 1 /* PNG_HANDLE_CHUNK_NEVER */, chunks_to_ignore, sizeof(chunks_to_ignore)/5); } -#endif /* PNG_UNKNOWN_CHUNKS_SUPPORTED */ +#endif /* PNG_HANDLE_AS_UNKNOWN_SUPPORTED */ /* instead of doing png_init_io() here, now we set up our callback Modified: haiku/vendor/libpng/current/contrib/pngminim/decoder/pngusr.h =================================================================== --- haiku/vendor/libpng/current/contrib/pngminim/decoder/pngusr.h 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/contrib/pngminim/decoder/pngusr.h 2010-09-18 11:06:45 UTC (rev 38697) @@ -23,9 +23,10 @@ #define png_error(s1,s2) png_err(s1) #define png_chunk_error(s1,s2) png_err(s1) +#define PNG_NO_READ_BGR #define PNG_NO_READ_GAMMA #define PNG_NO_READ_BACKGROUND -#define PNG_NO_READ_DITHER +#define PNG_NO_READ_QUANTIZE #define PNG_NO_READ_INVERT #define PNG_NO_READ_SHIFT #define PNG_NO_READ_PACK @@ -59,6 +60,7 @@ #define PNG_NO_WRITE_SUPPORTED #define PNG_NO_INFO_IMAGE +#define PNG_NO_IO_STATE #define PNG_NO_USER_MEM #define PNG_NO_FIXED_POINT_SUPPORTED #define PNG_NO_MNG_FEATURES @@ -71,5 +73,7 @@ #define PNG_NO_PROGRESSIVE_READ #define PNG_NO_USER_LIMITS #define PNG_NO_SET_USER_LIMITS +#define PNG_NO_TIME_RFC1123 #endif /* MINRDPNGCONF_H */ + Modified: haiku/vendor/libpng/current/contrib/pngminim/encoder/gather.sh =================================================================== --- haiku/vendor/libpng/current/contrib/pngminim/encoder/gather.sh 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/contrib/pngminim/encoder/gather.sh 2010-09-18 11:06:45 UTC (rev 38697) @@ -6,4 +6,4 @@ cp ../../../../zlib/*.h . cp ../../../../zlib/*.c . rm inf*.[ch] -rm minigzip.c example.c gz* +rm uncompr.c minigzip.c example.c gz* Modified: haiku/vendor/libpng/current/contrib/pngminim/encoder/makefile =================================================================== --- haiku/vendor/libpng/current/contrib/pngminim/encoder/makefile 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/contrib/pngminim/encoder/makefile 2010-09-18 11:06:45 UTC (rev 38697) @@ -15,8 +15,7 @@ E= ZOBJS = adler32$(O) compress$(O) crc32$(O) deflate$(O) \ - dummy_inflate$(O) \ - trees$(O) uncompr$(O) zutil$(O) + trees$(O) zutil$(O) OBJS = pnm2pngm$(O) png$(O) pngerror$(O) pngget$(O) pngmem$(O) \ pngset$(O) pngtrans$(O) pngwio$(O) pngwrite$(O) \ Modified: haiku/vendor/libpng/current/contrib/pngminim/encoder/pngusr.h =================================================================== --- haiku/vendor/libpng/current/contrib/pngminim/encoder/pngusr.h 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/contrib/pngminim/encoder/pngusr.h 2010-09-18 11:06:45 UTC (rev 38697) @@ -22,8 +22,9 @@ #define png_chunk_error(s1,s2) png_err(s1) #define PNG_NO_WRITE_BACKGROUND +#define PNG_NO_WRITE_BGR #define PNG_NO_WRITE_GAMMA -#define PNG_NO_WRITE_DITHER +#define PNG_NO_WRITE_QUANTIZE #define PNG_NO_WRITE_INVERT #define PNG_NO_WRITE_SHIFT #define PNG_NO_WRITE_PACK @@ -58,6 +59,7 @@ #define PNG_NO_WRITE_FLUSH #define PNG_NO_INFO_IMAGE +#define PNG_NO_IO_STATE #define PNG_NO_USER_MEM #define PNG_NO_FIXED_POINT_SUPPORTED #define PNG_NO_MNG_FEATURES @@ -69,5 +71,6 @@ #define PNG_NO_EASY_ACCESS #define PNG_NO_USER_LIMITS #define PNG_NO_SET_USER_LIMITS +#define PNG_NO_TIME_RFC1143 #endif /* MINWRPNGCONF_H */ Modified: haiku/vendor/libpng/current/contrib/pngminim/preader/pngusr.h =================================================================== --- haiku/vendor/libpng/current/contrib/pngminim/preader/pngusr.h 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/contrib/pngminim/preader/pngusr.h 2010-09-18 11:06:45 UTC (rev 38697) @@ -19,6 +19,7 @@ #define png_error(s1,s2) png_err(s1) #define png_chunk_error(s1,s2) png_err(s1) +#define PNG_NO_READ_BGR #define PNG_NO_READ_DITHER #define PNG_NO_READ_INVERT #define PNG_NO_READ_SHIFT @@ -50,6 +51,7 @@ #define PNG_NO_WRITE_SUPPORTED #define PNG_NO_INFO_IMAGE +#define PNG_NO_IO_STATE #define PNG_NO_USER_MEM #define PNG_NO_FIXED_POINT_SUPPORTED #define PNG_NO_MNG_FEATURES @@ -61,5 +63,6 @@ #define PNG_NO_EASY_ACCESS #define PNG_NO_USER_LIMITS #define PNG_NO_SET_USER_LIMITS +#define PNG_NO_TIME_RFC1143 #endif /* MINPRDPNGCONF_H */ Added: haiku/vendor/libpng/current/contrib/pngsuite/ftbbn1g04.png =================================================================== (Binary files differ) Property changes on: haiku/vendor/libpng/current/contrib/pngsuite/ftbbn1g04.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: haiku/vendor/libpng/current/contrib/pngsuite/ftbbn2c16.png =================================================================== (Binary files differ) Property changes on: haiku/vendor/libpng/current/contrib/pngsuite/ftbbn2c16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: haiku/vendor/libpng/current/contrib/pngsuite/ftbbn3p08.png =================================================================== (Binary files differ) Property changes on: haiku/vendor/libpng/current/contrib/pngsuite/ftbbn3p08.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: haiku/vendor/libpng/current/contrib/pngsuite/ftbgn2c16.png =================================================================== (Binary files differ) Property changes on: haiku/vendor/libpng/current/contrib/pngsuite/ftbgn2c16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: haiku/vendor/libpng/current/contrib/pngsuite/ftbgn3p08.png =================================================================== (Binary files differ) Property changes on: haiku/vendor/libpng/current/contrib/pngsuite/ftbgn3p08.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: haiku/vendor/libpng/current/contrib/pngsuite/ftbrn2c08.png =================================================================== (Binary files differ) Property changes on: haiku/vendor/libpng/current/contrib/pngsuite/ftbrn2c08.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: haiku/vendor/libpng/current/contrib/pngsuite/ftbwn1g16.png =================================================================== (Binary files differ) Property changes on: haiku/vendor/libpng/current/contrib/pngsuite/ftbwn1g16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: haiku/vendor/libpng/current/contrib/pngsuite/ftbwn3p08.png =================================================================== (Binary files differ) Property changes on: haiku/vendor/libpng/current/contrib/pngsuite/ftbwn3p08.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: haiku/vendor/libpng/current/contrib/pngsuite/ftbyn3p08.png =================================================================== (Binary files differ) Property changes on: haiku/vendor/libpng/current/contrib/pngsuite/ftbyn3p08.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: haiku/vendor/libpng/current/contrib/pngsuite/ftp0n1g08.png =================================================================== (Binary files differ) Property changes on: haiku/vendor/libpng/current/contrib/pngsuite/ftp0n1g08.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: haiku/vendor/libpng/current/contrib/pngsuite/ftp0n2c08.png =================================================================== (Binary files differ) Property changes on: haiku/vendor/libpng/current/contrib/pngsuite/ftp0n2c08.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: haiku/vendor/libpng/current/contrib/pngsuite/ftp0n3p08.png =================================================================== (Binary files differ) Property changes on: haiku/vendor/libpng/current/contrib/pngsuite/ftp0n3p08.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: haiku/vendor/libpng/current/contrib/pngsuite/ftp1n3p08.png =================================================================== (Binary files differ) Property changes on: haiku/vendor/libpng/current/contrib/pngsuite/ftp1n3p08.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: haiku/vendor/libpng/current/example.c =================================================================== --- haiku/vendor/libpng/current/example.c 2010-09-18 10:07:08 UTC (rev 38696) +++ haiku/vendor/libpng/current/example.c 2010-09-18 11:06:45 UTC (rev 38697) @@ -2,7 +2,7 @@ #if 0 /* in case someone actually tries to compile this */ /* example.c - an example of using libpng - * Last changed in libpng 1.4.0 [January 3, 2010] + * Last changed in libpng 1.4.2 [May 6, 2010] * This file has been placed in the public domain by the authors. * Maintained 1998-2010 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) @@ -160,7 +160,7 @@ * If you have enough memory to read in the entire image at once, * and you need to specify only transforms that can be controlled * with one of the PNG_TRANSFORM_* bits (this presently excludes - * dithering, filling, setting background, and doing gamma + * quantizing, filling, setting background, and doing gamma * adjustment), then you can read the entire image (including * pixels) into the info structure with this call: */ @@ -271,7 +271,8 @@ png_set_gamma(png_ptr, screen_gamma, 0.45455); } - /* Dither RGB files down to 8 bit palette or reduce palettes +#ifdef PNG_READ_QUANTIZE_SUPPORTED + /* Quantize RGB files down to 8 bit palette or reduce palettes * to the number of colors available on your screen. */ if (color_type & PNG_COLOR_MASK_COLOR) @@ -282,10 +283,11 @@ /* This reduces the image to the application supplied palette */ if (/* We have our own palette */) { - /* An array of colors to which the image should be dithered */ + /* An array of colors to which the image should be quantized */ png_color std_color_cube[MAX_SCREEN_COLORS]; - png_set_dither(png_ptr, std_color_cube, MAX_SCREEN_COLORS, + /* Prior to libpng-1.4.2, this was png_set_dither(). */ + png_set_quantize(png_ptr, std_color_cube, MAX_SCREEN_COLORS, MAX_SCREEN_COLORS, NULL, 0); } /* This reduces the image to the palette supplied in the file */ @@ -295,10 +297,11 @@ png_get_hIST(png_ptr, info_ptr, &histogram); - png_set_dither(png_ptr, palette, num_palette, + png_set_quantize(png_ptr, palette, num_palette, max_screen_colors, histogram, 0); } } +#endif /* PNG_READ_QUANTIZE_SUPPORTED */ /* Invert monochrome files to have 0 as white and 1 as black */ png_set_invert_mono(png_ptr); @@ -509,20 +512,17 @@ * shown below: */ - /* Check if row_num is in bounds. */ - if ((row_num >= 0) && (row_num < height)) - { - /* Get pointer to corresponding row in our - * PNG read buffer. - */ - png_bytep old_row = ((png_bytep *)our_data)[row_num]; + /* Get pointer to corresponding row in our + * PNG read buffer. + */ + png_bytep old_row = ((png_bytep *)our_data)[row_num]; - /* If both rows are allocated then copy the new row - * data to the corresponding row data. - */ - if ((old_row != NULL) && (new_row != NULL)) - png_progressive_combine_row(png_ptr, old_row, new_row); - } + /* If both rows are allocated then copy the new row + * data to the corresponding row data. + */ + if ((old_row != NULL) && (new_row != NULL)) + png_progressive_combine_row(png_ptr, old_row, new_row); + /* * The rows and passes are called in order, so you don't really * need the row_num and pass, but I'm supplying them because it @@ -684,8 +684,11 @@ text_ptr[2].compression = PNG_TEXT_COMPRESSION_zTXt; #ifdef PNG_iTXt_SUPPORTED text_ptr[0].lang = NULL; + text_ptr[0].lang_key = NULL; text_ptr[1].lang = NULL; + text_ptr[1].lang_key = NULL; text_ptr[2].lang = NULL; + text_ptr[2].lang_key = NULL; #endif png_set_text(png_ptr, info_ptr, text_ptr, 3); Added: haiku/vendor/libpng/current/libpng-1.4.3.txt =================================================================== --- haiku/vendor/libpng/current/libpng-1.4.3.txt (rev 0) +++ haiku/vendor/libpng/current/libpng-1.4.3.txt 2010-09-18 11:06:45 UTC (rev 38697) @@ -0,0 +1,3352 @@ +libpng.txt - A description on how to use and modify libpng + + libpng version 1.4.3 - June 26, 2010 + Updated and distributed by Glenn Randers-Pehrson + <glennrp at users.sourceforge.net> + Copyright (c) 1998-2009 Glenn Randers-Pehrson + + This document is released under the libpng license. + For conditions of distribution and use, see the disclaimer + and license in png.h + + Based on: + + libpng versions 0.97, January 1998, through 1.4.3 - June 26, 2010 + Updated and distributed by Glenn Randers-Pehrson + Copyright (c) 1998-2009 Glenn Randers-Pehrson + + libpng 1.0 beta 6 version 0.96 May 28, 1997 + Updated and distributed by Andreas Dilger + Copyright (c) 1996, 1997 Andreas Dilger + + libpng 1.0 beta 2 - version 0.88 January 26, 1996 + For conditions of distribution and use, see copyright + notice in png.h. Copyright (c) 1995, 1996 Guy Eric + Schalnat, Group 42, Inc. + + Updated/rewritten per request in the libpng FAQ + Copyright (c) 1995, 1996 Frank J. T. Wojcik + December 18, 1995 & January 20, 1996 + +I. Introduction + +This file describes how to use and modify the PNG reference library +(known as libpng) for your own use. There are five sections to this +file: introduction, structures, reading, writing, and modification and +configuration notes for various special platforms. In addition to this +file, example.c is a good starting point for using the library, as +it is heavily commented and should include everything most people +will need. We assume that libpng is already installed; see the +INSTALL file for instructions on how to install libpng. + +For examples of libpng usage, see the files "example.c", "pngtest.c", +and the files in the "contrib" directory, all of which are included in +the libpng distribution. + +Libpng was written as a companion to the PNG specification, as a way +of reducing the amount of time and effort it takes to support the PNG +file format in application programs. + +The PNG specification (second edition), November 2003, is available as +a W3C Recommendation and as an ISO Standard (ISO/IEC 15948:2003 (E)) at +<http://www.w3.org/TR/2003/REC-PNG-20031110/ +The W3C and ISO documents have identical technical content. + +The PNG-1.2 specification is available at +<http://www.libpng.org/pub/png/documents/>. It is technically equivalent +to the PNG specification (second edition) but has some additional material. + +The PNG-1.0 specification is available +as RFC 2083 <http://www.libpng.org/pub/png/documents/> and as a +W3C Recommendation <http://www.w3.org/TR/REC.png.html>. + +Some additional chunks are described in the special-purpose public chunks +documents at <http://www.libpng.org/pub/png/documents/>. + +Other information +about PNG, and the latest version of libpng, can be found at the PNG home +page, <http://www.libpng.org/pub/png/>. + +Most users will not have to modify the library significantly; advanced +users may want to modify it more. All attempts were made to make it as +complete as possible, while keeping the code easy to understand. +Currently, this library only supports C. Support for other languages +is being considered. + +Libpng has been designed to handle multiple sessions at one time, +to be easily modifiable, to be portable to the vast majority of +machines (ANSI, K&R, 16-, 32-, and 64-bit) available, and to be easy +to use. The ultimate goal of libpng is to promote the acceptance of +the PNG file format in whatever way possible. While there is still +work to be done (see the TODO file), libpng should cover the +majority of the needs of its users. + +Libpng uses zlib for its compression and decompression of PNG files. +Further information about zlib, and the latest version of zlib, can +be found at the zlib home page, <http://www.info-zip.org/pub/infozip/zlib/>. +The zlib compression utility is a general purpose utility that is +useful for more than PNG files, and can be used without libpng. +See the documentation delivered with zlib for more details. +You can usually find the source files for the zlib utility wherever you +find the libpng source files. + +Libpng is thread safe, provided the threads are using different +instances of the structures. Each thread should have its own +png_struct and png_info instances, and thus its own image. +Libpng does not protect itself against two threads using the +same instance of a structure. + +II. Structures + +There are two main structures that are important to libpng, png_struct +and png_info. The first, png_struct, is an internal structure that +will not, for the most part, be used by a user except as the first +variable passed to every libpng function call. + +The png_info structure is designed to provide information about the +PNG file. At one time, the fields of png_info were intended to be +directly accessible to the user. However, this tended to cause problems +with applications using dynamically loaded libraries, and as a result +a set of interface functions for png_info (the png_get_*() and png_set_*() +functions) was developed. The fields of png_info are still available for +older applications, but it is suggested that applications use the new +interfaces if at all possible. + +Applications that do make direct access to the members of png_struct (except +for png_ptr->jmpbuf) must be recompiled whenever the library is updated, +and applications that make direct access to the members of png_info must +be recompiled if they were compiled or loaded with libpng version 1.0.6, +in which the members were in a different order. In version 1.0.7, the +members of the png_info structure reverted to the old order, as they were +in versions 0.97c through 1.0.5. Starting with version 2.0.0, both +structures are going to be hidden, and the contents of the structures will [... truncated: 6216 lines follow ...]