From c1a4d64a7b430cca66496820371b3321c2c10a23 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 29 Oct 2009 23:29:24 -0500 Subject: [PATCH] [devel] Bump version to 1.4.0beta87 --- ANNOUNCE | 21 ++++++++++-------- CHANGES | 5 ++++- CMakeLists.txt | 2 +- INSTALL | 18 +++++++-------- LICENSE | 4 ++-- Makefile.am | 2 +- Makefile.in | 2 +- README | 14 ++++++------ configure | 22 +++++++++---------- configure.ac | 4 ++-- example.c | 2 +- ...ng-1.4.0rc01.txt => libpng-1.4.0beta87.txt | 10 ++++----- libpng.3 | 21 +++++++++--------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 8 +++---- png.h | 17 +++++++------- pngconf.h | 2 +- pngerror.c | 2 +- pngget.c | 4 ++-- pngmem.c | 2 +- pngpread.c | 2 +- pngpriv.h | 2 +- pngread.c | 4 +++- pngrio.c | 2 +- pngrtran.c | 2 +- pngrutil.c | 4 ++-- pngset.c | 4 ++-- pngtest.c | 4 ++-- pngtrans.c | 2 +- pngwio.c | 2 +- pngwrite.c | 2 +- pngwtran.c | 2 +- pngwutil.c | 2 +- .../xcode/libpng.xcodeproj/project.pbxproj | 4 ++-- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.32sunu | 2 +- scripts/makefile.64sunu | 2 +- scripts/makefile.aix | 2 +- scripts/makefile.beos | 2 +- scripts/makefile.cygwin | 2 +- scripts/makefile.darwin | 2 +- scripts/makefile.dec | 2 +- scripts/makefile.elf | 2 +- scripts/makefile.hp64 | 2 +- scripts/makefile.hpgcc | 2 +- scripts/makefile.hpux | 2 +- scripts/makefile.linux | 2 +- scripts/makefile.mingw | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.nommx | 2 +- scripts/makefile.openbsd | 2 +- scripts/makefile.sco | 2 +- scripts/makefile.sggcc | 2 +- scripts/makefile.sgi | 2 +- scripts/makefile.so9 | 2 +- scripts/makefile.solaris | 2 +- scripts/pngos2.def | 2 +- scripts/pngwin.def | 2 +- 61 files changed, 134 insertions(+), 124 deletions(-) rename libpng-1.4.0rc01.txt => libpng-1.4.0beta87.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index af9c6b65a..3146caa64 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.0rc01 - October 20, 2009 +Libpng 1.4.0beta87 - 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.0rc01.tar.xz (LZMA-compressed, recommended) - 1.4.0rc01.tar.gz - 1.4.0rc01.tar.bz2 + 1.4.0beta87.tar.xz (LZMA-compressed, recommended) + 1.4.0beta87.tar.gz + 1.4.0beta87.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp140r01.zip - lp140r01.7z + lp140b87.zip + lp140b87.7z Other information: - 1.4.0rc01-README.txt - 1.4.0rc01-LICENSE.txt + 1.4.0beta87-README.txt + 1.4.0beta87-LICENSE.txt Changes since the last public release (1.2.10): @@ -578,9 +578,12 @@ version 1.4.0beta86 [October 9, 2009] Updated the "xcode" project (Alam Arias). Eliminated a shadowed declaration of "pp" in png_handle_sPLT(). -version 1.4.0beta00 [October 20, 2009] +version 1.4.0rc01 [October 19, 2009] Trivial cosmetic changes. +version 1.4.0beta87 [October 30, 2009] + Moved version 1.4.0 back into beta. + 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/CHANGES b/CHANGES index 40bbef356..e20e57042 100644 --- a/CHANGES +++ b/CHANGES @@ -2264,9 +2264,12 @@ version 1.4.0beta86 [October 9, 2009] Updated the "xcode" project (Alam Arias). Eliminated a shadowed declaration of "pp" in png_handle_sPLT(). -version 1.4.0rc01 [October 20, 2009] +version 1.4.0rc01 [October 19, 2009] Trivial cosmetic changes. +version 1.4.0beta87 [October 30, 2009] + Moved version 1.4.0 back into beta. + 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/CMakeLists.txt b/CMakeLists.txt index 97c252eca..764c43897 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.0rc01 +# VERSION 14.${PNGLIB_RELEASE}.1.4.0beta87 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index 29fadbaef..289a0a64d 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.0rc01 - October 20, 2009 +Installing libpng version 1.4.0beta87 - 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.0rc01" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.4.0beta87" 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.0rc01) + gcc, creates libpng14.so.14.1.4.0beta87) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.0rc01) + (gcc, creates libpng14.so.14.1.4.0beta87) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.0rc01, + (gcc, creates libpng14.so.14.1.4.0beta87, uses assembler code tuned for Intel MMX platform) makefile.nommx => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.0rc01 + (gcc, creates libpng14.so.14.1.4.0beta87 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.0rc01) + creates libpng14.so.14.1.4.0beta87) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng14.so.14.1.4.0rc01) + creates libpng14.so.14.1.4.0beta87) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng14.so.14.1.4.0rc01) + creates libpng14.so.14.1.4.0beta87) 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 1a4d104b3..517b83749 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.0rc01, October 20, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta87, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -October 20, 2009 +October 30, 2009 diff --git a/Makefile.am b/Makefile.am index 9ab97185e..8b6996ccd 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.0rc01.txt pngvcrd.c + example.c libpng-1.4.0beta87.txt pngvcrd.c CLEANFILES= pngout.png libpng14.pc libpng14-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index 18e7a35f5..c4a355915 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.0rc01.txt pngvcrd.c + example.c libpng-1.4.0beta87.txt pngvcrd.c CLEANFILES = pngout.png libpng14.pc libpng14-config libpng.vers \ libpng.sym diff --git a/README b/README index 7d5181330..7459e3df0 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.0rc01 - October 20, 2009 (shared library 14.0) +README for libpng version 1.4.0beta87 - 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.0rc01) + gcc, creates libpng14.so.14.1.4.0beta87) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.0rc01) + (gcc, creates libpng14.so.14.1.4.0beta87) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.0rc01, + (gcc, creates libpng14.so.14.1.4.0beta87, 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.0rc01) + (gcc, creates libpng14.so.14.1.4.0beta87) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.0rc01) + (gcc, creates libpng14.so.14.1.4.0beta87) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.0rc01) + (gcc, creates libpng14.so.14.1.4.0beta87) 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 7ae0963b5..7abaf711a 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.0rc01. +# Generated by GNU Autoconf 2.64 for libpng 1.4.0beta87. # # Report bugs to . # @@ -698,8 +698,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.4.0rc01' -PACKAGE_STRING='libpng 1.4.0rc01' +PACKAGE_VERSION='1.4.0beta87' +PACKAGE_STRING='libpng 1.4.0beta87' 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.0rc01 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.0beta87 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.0rc01:";; + short | recursive ) echo "Configuration of libpng 1.4.0beta87:";; 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.0rc01 +libpng configure 1.4.0beta87 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.0rc01, which was +It was created by libpng $as_me 1.4.0beta87, 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.0rc01' + VERSION='1.4.0beta87' cat >>confdefs.h <<_ACEOF @@ -2905,7 +2905,7 @@ fi -PNGLIB_VERSION=1.4.0rc01 +PNGLIB_VERSION=1.4.0beta87 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.0rc01, which was +This file was extended by libpng $as_me 1.4.0beta87, 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.0rc01 +libpng config.status 1.4.0beta87 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 78b61f6c5..ac742a443 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.0rc01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.0beta87], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.4.0rc01 +PNGLIB_VERSION=1.4.0beta87 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=0 diff --git a/example.c b/example.c index dff1ff710..b0d7578a0 100644 --- a/example.c +++ b/example.c @@ -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 [October 20, 2009] + * Last changed in libpng 1.4.0 [October 30, 2009] * This file has been placed in the public domain by the authors. * Maintained 1998-2009 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) diff --git a/libpng-1.4.0rc01.txt b/libpng-1.4.0beta87.txt similarity index 99% rename from libpng-1.4.0rc01.txt rename to libpng-1.4.0beta87.txt index 82ebd93fb..0cbda9571 100644 --- a/libpng-1.4.0rc01.txt +++ b/libpng-1.4.0beta87.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.0rc01 - October 20, 2009 + libpng version 1.4.0beta87 - 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.0rc01 - October 20, 2009 + libpng versions 0.97, January 1998, through 1.4.0beta87 - 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.0rc01, not all possible expansions are supported. +As of libpng version 1.4.0beta87, 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 @@ -3210,13 +3210,13 @@ source. XIII. Y2K Compliance in libpng -October 20, 2009 +October 30, 2009 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.0rc01 are Y2K compliant. It is my belief that earlier +upward through 1.4.0beta87 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 58164de9e..837895b65 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "October 20, 2009" +.TH LIBPNG 3 "October 30, 2009" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta87 .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.0rc01 - October 20, 2009 + libpng version 1.4.0beta87 - 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.0rc01 - October 20, 2009 + libpng versions 0.97, January 1998, through 1.4.0beta87 - 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.0rc01, not all possible expansions are supported. +As of libpng version 1.4.0beta87, 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 @@ -4019,13 +4019,13 @@ source. .SH XIII. Y2K Compliance in libpng -October 20, 2009 +October 30, 2009 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.0rc01 are Y2K compliant. It is my belief that earlier +upward through 1.4.0beta87 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 @@ -4194,6 +4194,7 @@ the first widely used release: 1.2.13 13 10213 12.so.0.13[.0] 1.4.0beta15-36 14 10400 14.so.0.0[.0] 1.4.0beta37-87 14 10400 14.so.14.0[.0] + 1.4.0rc01-02 14 10400 14.so.14.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4249,7 +4250,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.0rc01 - October 20, 2009: +Libpng version 1.4.0beta87 - 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). @@ -4272,7 +4273,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.0rc01, October 20, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta87, 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 @@ -4371,7 +4372,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -October 20, 2009 +October 30, 2009 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 5d30c9466..8dcecc61d 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "October 20, 2009" +.TH LIBPNGPF 3 "October 30, 2009" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta87 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index bed96466a..fec8afc7c 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "October 20, 2009" +.TH PNG 5 "October 30, 2009" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 065d9a4eb..cc5430ee2 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.4.0 [October 20, 2009] + * Last changed in libpng 1.4.0 [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.) @@ -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_0rc01 Your_png_h_is_not_version_1_4_0rc01; +typedef version_1_4_0beta87 Your_png_h_is_not_version_1_4_0beta87; /* 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.0rc01 - October 20, 2009" PNG_STRING_NEWLINE \ + "libpng version x 1.4.0beta87 - 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.0rc01 - October 20, 2009\ + return ((png_charp) "libpng version 1.4.0beta87 - 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 3a98b6514..e9908f90e 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.0rc01 - October 20, 2009 + * libpng version 1.4.0beta87 - 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.0rc01 - October 20, 2009: Glenn + * libpng versions 0.97, January 1998, through 1.4.0beta87 - October 30, 2009: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -130,6 +130,7 @@ * 1.2.13 13 10213 12.so.0.13[.0] * 1.4.0beta15-36 14 10400 14.so.0.0[.0] * 1.4.0beta37-87 14 10400 14.so.14.0[.0] + * 1.4.0rc01-02 14 10400 14.so.14.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -161,7 +162,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.0rc01, October 20, 2009, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta87, 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: @@ -279,7 +280,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.4.0rc01 are Y2K compliant. It is my belief that earlier + * upward through 1.4.0beta87 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 @@ -335,9 +336,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.0rc01" +#define PNG_LIBPNG_VER_STRING "1.4.0beta87" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.0rc01 - October 20, 2009\n" + " libpng version 1.4.0beta87 - October 30, 2009\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -350,7 +351,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 01 +#define PNG_LIBPNG_VER_BUILD 87 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1330,7 +1331,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_0rc01; +typedef png_structp version_1_4_0beta87; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index 171e82e20..457e09947 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.0rc01 - October 20, 2009 + * libpng version 1.4.0beta87 - 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/pngerror.c b/pngerror.c index eea4d3f9c..5d239df98 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.4.0 [October 20, 2009] + * Last changed in libpng 1.4.0 [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.) diff --git a/pngget.c b/pngget.c index 90f444b30..97ad5101c 100644 --- a/pngget.c +++ b/pngget.c @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.4.0 [October 20, 2009] + * Last changed in libpng 1.4.0 [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.) @@ -892,7 +892,7 @@ png_get_user_height_max (png_structp png_ptr) { return (png_ptr? png_ptr->user_height_max : 0); } -/* This function was added to libpng 1.4.0 */ +/* This function was added to libpng 1.2.41 */ png_uint_32 PNGAPI png_get_chunk_cache_max (png_structp png_ptr) { diff --git a/pngmem.c b/pngmem.c index e9df564d4..7de4659f5 100644 --- a/pngmem.c +++ b/pngmem.c @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.4.0 [October 20, 2009] + * Last changed in libpng 1.4.0 [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.) diff --git a/pngpread.c b/pngpread.c index f34fad646..a0f14affb 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.4.0 [October 20, 2009] + * Last changed in libpng 1.4.0 [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.) diff --git a/pngpriv.h b/pngpriv.h index 868511c3f..2430a879f 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.0rc01 - October 20, 2009 + * libpng version 1.4.0beta87 - 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/pngread.c b/pngread.c index 3e6086767..522e68969 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.4.0 [October 20, 2009] + * Last changed in libpng 1.4.0 [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.) @@ -1284,6 +1284,7 @@ png_read_png(png_structp png_ptr, png_infop info_ptr, png_set_swap(png_ptr); #endif +/* Added at libpng-1.2.41 */ #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED /* Invert the alpha channel from opacity to transparency */ @@ -1291,6 +1292,7 @@ png_read_png(png_structp png_ptr, png_infop info_ptr, png_set_invert_alpha(png_ptr); #endif +/* Added at libpng-1.2.41 */ #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED /* Expand grayscale image to RGB */ diff --git a/pngrio.c b/pngrio.c index c2cb02a50..00a92fe0f 100644 --- a/pngrio.c +++ b/pngrio.c @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.4.0 [October 20, 2009] + * Last changed in libpng 1.4.0 [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.) diff --git a/pngrtran.c b/pngrtran.c index 7a8c06148..fbb9cb466 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.4.0 [October 20, 2009] + * Last changed in libpng 1.4.0 [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.) diff --git a/pngrutil.c b/pngrutil.c index bc0be71f5..0ed836d22 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.4.0 [October 20, 2009] + * Last changed in libpng 1.4.0 [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.) @@ -3273,7 +3273,7 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) if (png_ptr->interlaced) png_ptr->big_row_buf = (png_bytep)png_calloc(png_ptr, row_bytes + 64); else - png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes + 64); + png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes + 64); png_ptr->row_buf = png_ptr->big_row_buf + 32; png_ptr->old_big_row_buf_size = row_bytes + 64; } diff --git a/pngset.c b/pngset.c index 6b609157a..9782d679d 100644 --- a/pngset.c +++ b/pngset.c @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.4.0 [October 20, 2009] + * Last changed in libpng 1.4.0 [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.) @@ -1128,7 +1128,7 @@ png_set_user_limits (png_structp png_ptr, png_uint_32 user_width_max, png_ptr->user_width_max = user_width_max; png_ptr->user_height_max = user_height_max; } -/* This function was added to libpng 1.4.0 */ +/* This function was added to libpng 1.2.41 */ void PNGAPI png_set_chunk_cache_max (png_structp png_ptr, png_uint_32 user_chunk_cache_max) diff --git a/pngtest.c b/pngtest.c index c66d9d4e8..b75ec9827 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.4.0 [October 20, 2009] + * Last changed in libpng 1.4.0 [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.) @@ -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_0rc01 your_png_h_is_not_version_1_4_0rc01; +typedef version_1_4_0beta87 your_png_h_is_not_version_1_4_0beta87; diff --git a/pngtrans.c b/pngtrans.c index 43635bfd1..e6d141d90 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.4.0 [October 20, 2009] + * Last changed in libpng 1.4.0 [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.) diff --git a/pngwio.c b/pngwio.c index 50c95ca43..627079e02 100644 --- a/pngwio.c +++ b/pngwio.c @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.4.0 [October 20, 2009] + * Last changed in libpng 1.4.0 [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.) diff --git a/pngwrite.c b/pngwrite.c index b6ebb925e..961f476e8 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.4.0 [October 20, 2009] + * Last changed in libpng 1.4.0 [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.) diff --git a/pngwtran.c b/pngwtran.c index ca5062d4c..0c4fc45ed 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * Last changed in libpng 1.4.0 [October 20, 2009] + * Last changed in libpng 1.4.0 [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.) diff --git a/pngwutil.c b/pngwutil.c index 58ee9133f..37d60b587 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.4.0 [October 20, 2009] + * Last changed in libpng 1.4.0 [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.) diff --git a/projects/xcode/libpng.xcodeproj/project.pbxproj b/projects/xcode/libpng.xcodeproj/project.pbxproj index 358173fb3..0c85ad56d 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.0rc01; + FRAMEWORK_VERSION = 1.4.0beta87; 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.0rc01; + FRAMEWORK_VERSION = 1.4.0beta87; 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 773bd4002..d6526158e 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.4.0rc01 +version=1.4.0beta87 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 10c1e8d97..5cf6f2799 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.0rc01 +Version: 1.4.0beta87 Libs: -L${libdir} -lpng14 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 3fc40b59b..a3b59cbc0 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index b9cd8772c..570a1c3c9 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index b02b425ad..93b4673c8 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.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 360272437..cdae56129 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index a80864c8e..f92686446 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.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 5cf5649ee..f41c9edeb 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -22,7 +22,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index f24364a5b..4799c1c5e 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 14 -PNGMIN = 1.4.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng14 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index bb6b6d7b4..0bf214694 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 65ece9d52..d86e7183c 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.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index ce8126685..ec08bf6a5 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index b4a7054c6..1acc13ec4 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.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 121730c06..8bfb5144e 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 50811618b..277f41d98 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.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 6274aefb3..4e9a75a98 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.0rc01 +SHLIB_MINOR= 1.4.0beta87 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 bdbb44582..5f7d2d40c 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.0rc01 +SHLIB_MINOR= 1.4.0beta87 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 b5139dd05..73982755c 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 228a43f80..7cd67c96e 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.0rc01 +SHLIB_MINOR= 1.4.0beta87 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index d634b509a..602694f97 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 80c4bbe8e..d98863a89 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 6f2c2bd71..0d3a93cf6 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 91ce49fdf..81f4fa6dd 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -11,7 +11,7 @@ # Library name: PNGMAJ = 14 -PNGMIN = 1.4.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng14 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 106421dd7..d52016907 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc01 +PNGMIN = 1.4.0beta87 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 547f6618a..793bc371a 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.4.0rc01 +; Version 1.4.0beta87 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngwin.def b/scripts/pngwin.def index 547bf5863..dbbf622dc 100644 --- a/scripts/pngwin.def +++ b/scripts/pngwin.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.4.0rc01 +;Version 1.4.0beta87 png_build_grayscale_palette png_chunk_error png_chunk_warning