diff --git a/ANNOUNCE b/ANNOUNCE index cf971beaf97d0d58896ce922ce7956535bc24c1c..5957fb7dabf39157c2aedec1a9cb56ddbcd9a1ff 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.0beta88 - October 30, 2009 +Libpng 1.4.0beta89 - October 30, 2009 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -9,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.4.0beta88.tar.xz (LZMA-compressed, recommended) - 1.4.0beta88.tar.gz - 1.4.0beta88.tar.bz2 + 1.4.0beta89.tar.xz (LZMA-compressed, recommended) + 1.4.0beta89.tar.gz + 1.4.0beta89.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp140b88.zip - lp140b88.7z + lp140b89.zip + lp140b89.7z Other information: - 1.4.0beta88-README.txt - 1.4.0beta88-LICENSE.txt + 1.4.0beta89-README.txt + 1.4.0beta89-LICENSE.txt Changes since the last public release (1.2.10): @@ -584,7 +584,11 @@ version 1.4.0rc01 [October 19, 2009] version 1.4.0beta87 [October 30, 2009] Moved version 1.4.0 back into beta. -version 1.4.0beta87 [October 30, 2009] +version 1.4.0beta88 [October 30, 2009] + Revised libpng*.txt section about differences between 1.2.x and 1.4.0 + because most of the new features have now been ported back to 1.2.41 + +version 1.4.0beta89 [October 30, 2009] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 2ea22a27c456741209ebd5fe7058f61f24648751..9dd87052c9832384ad9ed98ac5132fd56950c605 100644 --- a/CHANGES +++ b/CHANGES @@ -2270,7 +2270,11 @@ version 1.4.0rc01 [October 19, 2009] version 1.4.0beta87 [October 30, 2009] Moved version 1.4.0 back into beta. -version 1.4.0beta87 [October 30, 2009] +version 1.4.0beta88 [October 30, 2009] + Revised libpng*.txt section about differences between 1.2.x and 1.4.0 + because most of the new features have now been ported back to 1.2.41 + +version 1.4.0beta89 [October 30, 2009] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bca715dc81e232a22cdaaa1df0939acc1af524e..b80ffe9e8a024e1e12395a5ec2fb4551e0958c48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,7 +193,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 14.${PNGLIB_RELEASE}.1.4.0beta88 +# VERSION 14.${PNGLIB_RELEASE}.1.4.0beta89 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index 48427ca3805419bcc6c6c3a63478b988878a616f..6177260c943a4e425e8d64aa8aeb29c6eb231bbb 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.0beta88 - October 30, 2009 +Installing libpng version 1.4.0beta89 - October 30, 2009 On Unix/Linux and similar systems, you can simply type @@ -43,7 +43,7 @@ to have access to the zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.4.0beta88" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.4.0beta89" or "lpng109" and "zlib-1.2.1" or "zlib121") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -94,14 +94,14 @@ include CMakeLists.txt => "cmake" script makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng14.so.14.1.4.0beta88) + gcc, creates libpng14.so.14.1.4.0beta89) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.0beta88) + (gcc, creates libpng14.so.14.1.4.0beta89) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.0beta88, + (gcc, creates libpng14.so.14.1.4.0beta89, uses assembler code tuned for Intel MMX platform) makefile.nommx => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.0beta88 + (gcc, creates libpng14.so.14.1.4.0beta89 does not use Intel MMX assembler code) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -123,12 +123,12 @@ include makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sggcc => Silicon Graphics (gcc, - creates libpng14.so.14.1.4.0beta88) + creates libpng14.so.14.1.4.0beta89) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng14.so.14.1.4.0beta88) + creates libpng14.so.14.1.4.0beta89) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng14.so.14.1.4.0beta88) + creates libpng14.so.14.1.4.0beta89) 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 diff --git a/LICENSE b/LICENSE index 6658eaf0f827b04752049cffc11c913c9d8e60e4..72a9f14ceda59f0d7e21e193d778dc3138480a4d 100644 --- a/LICENSE +++ b/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.4.0beta88, October 30, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta89, October 30, 2009, 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 diff --git a/Makefile.am b/Makefile.am index 8e1abe728f0d57365f402b56cde87d332ff2c619..914b4268a4266f17b5d05c2b62a35bac98857745 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,7 +86,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.0beta88.txt pngvcrd.c + example.c libpng-1.4.0beta89.txt pngvcrd.c CLEANFILES= pngout.png libpng14.pc libpng14-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index 04ee488752a4b6bc38763b8f0d8124164b18847f..87df25d19690997d64ed5673330abc53684b1266 100644 --- a/Makefile.in +++ b/Makefile.in @@ -351,7 +351,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.0beta88.txt pngvcrd.c + example.c libpng-1.4.0beta89.txt pngvcrd.c CLEANFILES = pngout.png libpng14.pc libpng14-config libpng.vers \ libpng.sym diff --git a/README b/README index 662f47bea504bf1aad3d70941e5498f1ab5b680c..46bb4d2b3b46d305e80197e5a8ce48908513e122 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.0beta88 - October 30, 2009 (shared library 14.0) +README for libpng version 1.4.0beta89 - October 30, 2009 (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. @@ -184,11 +184,11 @@ Files in this distribution: descrip.mms => VMS makefile for MMS or MMK makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng14.so.14.1.4.0beta88) + gcc, creates libpng14.so.14.1.4.0beta89) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.0beta88) + (gcc, creates libpng14.so.14.1.4.0beta89) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.0beta88, + (gcc, creates libpng14.so.14.1.4.0beta89, uses assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -209,12 +209,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng14.so.14.1.4.0beta88) + (gcc, creates libpng14.so.14.1.4.0beta89) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.0beta88) + (gcc, creates libpng14.so.14.1.4.0beta89) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.0beta88) + (gcc, creates libpng14.so.14.1.4.0beta89) 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 diff --git a/configure b/configure index 658bcd43ab8867febb3f7af8185ac94f1ad5a56f..bde1a07636ac132b1399f5da0955fbd6732dd9ce 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for libpng 1.4.0beta88. +# Generated by GNU Autoconf 2.64 for libpng 1.4.0beta89. # # Report bugs to . # @@ -698,8 +698,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.4.0beta88' -PACKAGE_STRING='libpng 1.4.0beta88' +PACKAGE_VERSION='1.4.0beta89' +PACKAGE_STRING='libpng 1.4.0beta89' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1431,7 +1431,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.4.0beta88 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.0beta89 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1501,7 +1501,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.4.0beta88:";; + short | recursive ) echo "Configuration of libpng 1.4.0beta89:";; esac cat <<\_ACEOF @@ -1608,7 +1608,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.4.0beta88 +libpng configure 1.4.0beta89 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2033,7 +2033,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.4.0beta88, which was +It was created by libpng $as_me 1.4.0beta89, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -2841,7 +2841,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.4.0beta88' + VERSION='1.4.0beta89' cat >>confdefs.h <<_ACEOF @@ -2905,7 +2905,7 @@ fi -PNGLIB_VERSION=1.4.0beta88 +PNGLIB_VERSION=1.4.0beta89 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=0 @@ -12022,7 +12022,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.4.0beta88, which was +This file was extended by libpng $as_me 1.4.0beta89, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12086,7 +12086,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libpng config.status 1.4.0beta88 +libpng config.status 1.4.0beta89 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index b503a6571aee56c4e5444b983a1ccaaf2ac894ea..52079d6995c77f2c69c885290d9635df360f13d8 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.4.0beta88], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.0beta89], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.4.0beta88 +PNGLIB_VERSION=1.4.0beta89 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=0 diff --git a/libpng-1.4.0beta88.txt b/libpng-1.4.0beta89.txt similarity index 99% rename from libpng-1.4.0beta88.txt rename to libpng-1.4.0beta89.txt index 4413f7fd721cecd9071b6a454bafde276e444497..1e6ab6a7381d2f5a2372ced1b5334b77781d235b 100644 --- a/libpng-1.4.0beta88.txt +++ b/libpng-1.4.0beta89.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.0beta88 - October 30, 2009 + libpng version 1.4.0beta89 - October 30, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.0beta88 - October 30, 2009 + libpng versions 0.97, January 1998, through 1.4.0beta89 - October 30, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -871,7 +871,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.4.0beta88, not all possible expansions are supported. +As of libpng version 1.4.0beta89, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -3220,7 +3220,7 @@ 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.4.0beta88 are Y2K compliant. It is my belief that earlier +upward through 1.4.0beta89 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/libpng.3 b/libpng.3 index 4cd27fb79af31b6cf4e8c26a6b2baf0fab45b4c3..28274723a326a0dcd35d324addc48e3585daf8db 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "October 30, 2009" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta88 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta89 .SH SYNOPSIS \fI\fB @@ -809,7 +809,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.4.0beta88 - October 30, 2009 + libpng version 1.4.0beta89 - October 30, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -820,7 +820,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.0beta88 - October 30, 2009 + libpng versions 0.97, January 1998, through 1.4.0beta89 - October 30, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -1680,7 +1680,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.4.0beta88, not all possible expansions are supported. +As of libpng version 1.4.0beta89, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -4029,7 +4029,7 @@ 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.4.0beta88 are Y2K compliant. It is my belief that earlier +upward through 1.4.0beta89 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 @@ -4255,7 +4255,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.0beta88 - October 30, 2009: +Libpng version 1.4.0beta89 - October 30, 2009: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4278,7 +4278,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.0beta88, October 30, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta89, October 30, 2009, 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 diff --git a/libpngpf.3 b/libpngpf.3 index 6a093b82f81538b627c7f73f2fd934e9294af666..4bf5dc00bde3e44c276f956998c05f3de7ffab78 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "October 30, 2009" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta88 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta89 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.c b/png.c index 5170a00319046c17fbcfe684d8cb68628371c67b..9553156783ae1e854c3be38763bdf9e278bd6b61 100644 --- a/png.c +++ b/png.c @@ -16,7 +16,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_0beta88 Your_png_h_is_not_version_1_4_0beta88; +typedef version_1_4_0beta89 Your_png_h_is_not_version_1_4_0beta89; /* Version information for C files. This had better match the version * string defined in png.h. @@ -547,13 +547,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version x 1.4.0beta88 - October 30, 2009" PNG_STRING_NEWLINE \ + "libpng version x 1.4.0beta89 - October 30, 2009" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2009 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 ((png_charp) "libpng version 1.4.0beta88 - October 30, 2009\ + return ((png_charp) "libpng version 1.4.0beta89 - October 30, 2009\ Copyright (c) 1998-2009 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); diff --git a/png.h b/png.h index 147041d8ac6dfde86c9263d79df522c1366b054c..c8b4445978607786cb245d79f11d6d9a4f399046 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.0beta88 - October 30, 2009 + * libpng version 1.4.0beta89 - October 30, 2009 * Copyright (c) 1998-2009 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.4.0beta88 - October 30, 2009: Glenn + * libpng versions 0.97, January 1998, through 1.4.0beta89 - October 30, 2009: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -163,7 +163,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta88, October 30, 2009, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta89, October 30, 2009, 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: @@ -281,7 +281,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.4.0beta88 are Y2K compliant. It is my belief that earlier + * upward through 1.4.0beta89 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 @@ -337,9 +337,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.0beta88" +#define PNG_LIBPNG_VER_STRING "1.4.0beta89" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.0beta88 - October 30, 2009\n" + " libpng version 1.4.0beta89 - October 30, 2009\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -352,7 +352,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 88 +#define PNG_LIBPNG_VER_BUILD 89 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1332,7 +1332,7 @@ struct png_struct_def /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef png_structp version_1_4_0beta88; +typedef png_structp version_1_4_0beta89; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index ab1708e403a6ba24ac738983877359f17e6b56b9..1a1131a8dc1a5e330f09efd1e899b59b69244806 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.0beta88 - October 30, 2009 + * libpng version 1.4.0beta89 - October 30, 2009 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index 86d151a227bc5aab77386164cf2b2fc4702cfe15..e4b0327c3bf4327cc924944f92c1483942b088d1 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.0beta88 - October 30, 2009 + * libpng version 1.4.0beta89 - October 30, 2009 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 6e05db24dcf5cc4dd0400a4534715327ecf06d01..87088860190b764bc59e080ab2bd96f952bd72a3 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1619,4 +1619,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_0beta88 your_png_h_is_not_version_1_4_0beta88; +typedef version_1_4_0beta89 your_png_h_is_not_version_1_4_0beta89; diff --git a/projects/xcode/libpng.xcodeproj/project.pbxproj b/projects/xcode/libpng.xcodeproj/project.pbxproj index 4056edd7296884e8ce75db06d661ff60331613aa..179b128350cff39cf0d39b4dea3b3d713c141b27 100644 --- a/projects/xcode/libpng.xcodeproj/project.pbxproj +++ b/projects/xcode/libpng.xcodeproj/project.pbxproj @@ -226,7 +226,7 @@ COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 14; DYLIB_CURRENT_VERSION = 14; - FRAMEWORK_VERSION = 1.4.0beta88; + FRAMEWORK_VERSION = 1.4.0beta89; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; @@ -244,7 +244,7 @@ buildSettings = { DYLIB_COMPATIBILITY_VERSION = 14; DYLIB_CURRENT_VERSION = 14; - FRAMEWORK_VERSION = 1.4.0beta88; + FRAMEWORK_VERSION = 1.4.0beta89; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 31b27a92697e0df714928d5326009bcd02065221..d889f1368dad1002bfc7282332e7ab3fa14ef6f9 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.4.0beta88 +version=1.4.0beta89 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index bbd191ba6836a6c54424e9d8df948d26a6f22502..ce7901fe9669b7fac5ee346b6114119144025e38 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng14 Name: libpng Description: Loads and saves PNG files -Version: 1.4.0beta88 +Version: 1.4.0beta89 Libs: -L${libdir} -lpng14 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 2a32eec8bd0fcd48140b174e555b24190c245bc5..6b006ddafa7febeab2be7f4942f2bff89e08c2a3 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index c4cb3712a0d2e3d3fdfd3e0f26c532ed50c79ee6..4fc673695b7d2e4d1e4569a14743604130932ce3 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index dbdc112fe0ebf16b959bf8bcc01d3663b8ae8fbf..6174ba2da865d912ce98ee58fcebae5114fa0128 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -23,7 +23,7 @@ LN_SF = ln -f -s LIBNAME=libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index ae1a6235422077b017f5664ebda8ee03601c7b92..8ecdb8a2349bbec57bc8642c53e782667b85e727 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 63f1fc5361295af033696d7cc4460c5dd4270896..7b617d08abb9ef3782a1ec0fc366f415f53a200c 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -68,7 +68,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng14 PNGMAJ = 14 CYGDLL = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 074c05b0ea5df7567a49e2853a9afe68208d5548..4f52609299db42caa70d5da3f5ab08e8d889050c 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -22,7 +22,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index d430af143850f8516ad9098630765f970b1ff944..824c20ee17e9cce702e1edb0f419c448b175543b 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng14 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 83d16e5436af14d766ef6a210c43acb4b573c135..7fbe6a4a4ac20b42022f3a4e4822dc4cff361910 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 1517161e58b4636714af84bef982d444bee2b829..dfe5a02341a20a19b9e349fa7e8048571e8bf77f 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index ae4324cd83fc3479b05aa1470697f6c01e51e504..b986bed0f8bdf1452041be548dcfb76121a84985 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index a2fd67ec9e6c11b2cb5652885aa3f9b5313a4f1d..e5d3abb1882f7f844018e5342fbdb14acfeabecf 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 5269ab359fcee7f7b044e8ba995902507b5f710a..2b8ae9e8ea3ed1263ca431ba0046e8732204d804 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index f443e0261f2349f2b90ef36f386f046d3fbb37db..1c6f8f1c811f07329ae4546767ab4533028f4c45 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -68,7 +68,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng14 PNGMAJ = 14 MINGDLL = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 3f94c635d79da7a8892c96d0a12f3fa4ade9d095..8342033ec18a886617dac8dae6e997ac77e705ad 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng14 LIB= png14 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.4.0beta88 +SHLIB_MINOR= 1.4.0beta89 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/scripts/makefile.netbsd b/scripts/makefile.netbsd index 239c70810416e3639d67eec8145c08b71f799217..28124b99403640b1ac5b892e2a77c2191deb41e3 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.4.0beta88 +SHLIB_MINOR= 1.4.0beta89 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/scripts/makefile.nommx b/scripts/makefile.nommx index 49192f1a2d8ee19658096476338f81aeae943bfb..5160b7d0541ca5644a66fa7aec6b4bb9f930d7f4 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 458c579ac680e1d998c60368ca34f2102e6404c1..1120385efc2f58ac8cf397f1eeba15cae54ef30a 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.4.0beta88 +SHLIB_MINOR= 1.4.0beta89 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 0148427c9f3008423bc13b0be955a272a8a7bd3f..6f5884de421ac4f63d433ce116390d613c840808 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 3e85bb34748edba695e0c885274fdffeae54f5a8..ae9298a1337b443bb92a4756e32944ca92e24628 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index b55feb79277dc4070049871d8ebfa239fa63d407..8759f94f75e0c21303d2869565b6d7034ab00287 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 0cb1401dd3f37e30836e9ce8d3d2492ccd44921f..558465f741ec767ccbc38864142f5ad67cd9d107 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -11,7 +11,7 @@ # Library name: PNGMAJ = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng14 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 286a053f27ea0a5b391815fafa01c9e00ce1b847..cc108634556a0b032d1a5ff926fa555678a23987 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0beta88 +PNGMIN = 1.4.0beta89 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index a9a00c8fe779697a1ad83df959d4e499dc4a85a3..4ed9e166d0d4500ee2db48b0fa0d4c03468cd78c 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.4.0beta88 +; Version 1.4.0beta89 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngwin.def b/scripts/pngwin.def index 45c45ec6f9eb6bb7d5e0cfc571251adb767241f0..4b746fe15f2658fce87eefb20ee0073b155899c4 100644 --- a/scripts/pngwin.def +++ b/scripts/pngwin.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.4.0beta88 +;Version 1.4.0beta89 png_build_grayscale_palette png_chunk_error png_chunk_warning