From f7f68f71601c767eb871b5789c8307cfb3d8a324 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 9 Dec 2008 06:16:34 -0600 Subject: [PATCH] Imported from libpng-1.2.34beta06.tar --- ANNOUNCE | 39 ++++++++++--------- CHANGES | 5 ++- INSTALL | 16 ++++---- KNOWNBUG | 2 +- LICENSE | 4 +- Makefile.am | 2 +- Makefile.in | 2 +- README | 14 +++---- Y2KINFO | 4 +- configure | 22 +++++------ configure.ac | 4 +- example.c | 2 +- ....2.34beta05.txt => libpng-1.2.34beta06.txt | 8 ++-- libpng.3 | 20 +++++----- libpngpf.3 | 4 +- png.5 | 2 +- png.c | 6 +-- png.h | 20 +++++----- pngconf.h | 2 +- pngerror.c | 2 +- pngrutil.c | 2 +- pngset.c | 2 +- pngtest.c | 2 +- pngwrite.c | 6 +-- pngwutil.c | 2 +- scripts/CMakeLists.txt | 2 +- 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.gcmmx | 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/makefile.solaris-x86 | 2 +- scripts/pngos2.def | 2 +- scripts/pngw32.def | 2 +- 54 files changed, 129 insertions(+), 123 deletions(-) rename libpng-1.2.34beta05.txt => libpng-1.2.34beta06.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index 3693b3ea..bd8b0f7f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.34beta05 - December 5, 2008 +Libpng 1.2.34beta06 - December 9, 2008 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,37 +9,37 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.34beta05.tar.gz - libpng-1.2.34beta05.tar.lzma + libpng-1.2.34beta06.tar.gz + libpng-1.2.34beta06.tar.lzma (Get the lzma codec from ). - libpng-1.2.34beta05.tar.bz2 + libpng-1.2.34beta06.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.34beta05-no-config.tar.gz - libpng-1.2.34beta05-no-config.tar.lzma - libpng-1.2.34beta05-no-config.tar.bz2 + libpng-1.2.34beta06-no-config.tar.gz + libpng-1.2.34beta06-no-config.tar.lzma + libpng-1.2.34beta06-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1234b05.zip - lp1234b05.7z - lp1234b05.tar.bz2 + lp1234b06.zip + lp1234b06.7z + lp1234b06.tar.bz2 Project files - libpng-1.2.34beta05-project-netware.zip - libpng-1.2.34beta05-project-wince.zip + libpng-1.2.34beta06-project-netware.zip + libpng-1.2.34beta06-project-wince.zip Other information: - libpng-1.2.34beta05-README.txt - libpng-1.2.34beta05-KNOWNBUGS.txt - libpng-1.2.34beta05-LICENSE.txt - libpng-1.2.34beta05-Y2K-compliance.txt - libpng-1.2.34beta05-[previous version]-diff.txt + libpng-1.2.34beta06-README.txt + libpng-1.2.34beta06-KNOWNBUGS.txt + libpng-1.2.34beta06-LICENSE.txt + libpng-1.2.34beta06-Y2K-compliance.txt + libpng-1.2.34beta06-[previous version]-diff.txt Changes since the last public release (1.2.32): @@ -74,7 +74,7 @@ version 1.2.34beta02 [November 28, 2008] Corrected off-by-one error in bKGD validity check in png_write_bKGD() and in png_handle_bKGD(). -version 1.2.34beta03 [December 5, 2008] +version 1.2.34beta03 [December 9, 2008] Revised bKGD validity check to use >= x instead of > x + 1 Merged with png_debug from libpng-1.4.0 to remove newlines. @@ -90,6 +90,9 @@ version 1.2.34beta05 [December 5, 2008] to ensure that new_key gets initialized and removed extra warning (Arvan Pritchard). +version 1.2.34beta06 [December 9, 2008] + In png_write_png(), respect the placement of the filler bytes in an earlier + call to png_set_filler() (Jim Barry). Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/CHANGES b/CHANGES index 239dd9b8..ecf3ca87 100644 --- a/CHANGES +++ b/CHANGES @@ -2186,7 +2186,7 @@ version 1.2.30beta03 [July 6, 2008] version 1.2.30beta04 [July 10, 2008] Merged more cosmetic whitespace changes from libpng-1.4.0beta19. -version 1.0.38rc01, 1.2.30rc01 [December 5, 2008] +version 1.0.38rc01, 1.2.30rc01 [December 9, 2008] No changes. version 1.0.38rc02, 1.2.30rc02 [July 21, 2008] @@ -2292,6 +2292,9 @@ version 1.2.34beta05 [December 5, 2008] to ensure that new_key gets initialized and removed extra warning (Arvan Pritchard). +version 1.2.34beta06 [December 9, 2008] + In png_write_png(), respect the placement of the filler bytes in an earlier + call to png_set_filler() (Jim Barry). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/INSTALL b/INSTALL index 3dd35753..fd0e4176 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.34beta05 - December 5, 2008 +Installing libpng version 1.2.34beta06 - December 9, 2008 On Unix/Linux and similar systems, you can simply type @@ -44,7 +44,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.2.34beta05" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.34beta06" 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: @@ -101,9 +101,9 @@ include CMakeLists.txt => "cmake" script makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.34beta05) + gcc, creates libpng12.so.0.1.2.34beta06) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.34beta05) + (gcc, creates libpng12.so.0.1.2.34beta06) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -125,14 +125,14 @@ include makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sggcc => Silicon Graphics (gcc, - creates libpng12.so.0.1.2.34beta05) + creates libpng12.so.0.1.2.34beta06) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.34beta05) + creates libpng12.so.0.1.2.34beta06) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.34beta05) + creates libpng12.so.0.1.2.34beta06) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.34beta05) + creates libpng12.so.0.1.2.34beta06) 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/KNOWNBUG b/KNOWNBUG index 8be409af..4f692358 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.34beta05 +Known bugs in libpng version 1.2.34beta06 1. February 23, 2006: The custom makefiles don't build libpng with -lz. diff --git a/LICENSE b/LICENSE index 3f60cfd5..c4cfec1f 100644 --- a/LICENSE +++ b/LICENSE @@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.34beta05, December 5, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.34beta06, December 9, 2008, are Copyright (c) 2004, 2006-2008 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 @@ -106,4 +106,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 5, 2008 +December 9, 2008 diff --git a/Makefile.am b/Makefile.am index d83669cd..ec25956f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,7 +86,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.2.34beta05.txt pngvcrd.c + example.c libpng-1.2.34beta06.txt pngvcrd.c CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index b983b80b..28e05b60 100644 --- a/Makefile.in +++ b/Makefile.in @@ -331,7 +331,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.2.34beta05.txt pngvcrd.c + example.c libpng-1.2.34beta06.txt pngvcrd.c CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym diff --git a/README b/README index a279e811..336bab3f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.34beta05 - December 5, 2008 (shared library 12.0) +README for libpng version 1.2.34beta06 - December 9, 2008 (shared library 12.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -194,11 +194,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 libpng12.so.0.1.2.34beta05) + gcc, creates libpng12.so.0.1.2.34beta06) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.34beta05) + (gcc, creates libpng12.so.0.1.2.34beta06) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.34beta05, + (gcc, creates libpng12.so.0.1.2.34beta06, 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 @@ -220,12 +220,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng12.so.0.1.2.34beta05) + (gcc, creates libpng12.so.0.1.2.34beta06) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.34beta05) + (gcc, creates libpng12.so.0.1.2.34beta06) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.34beta05) + (gcc, creates libpng12.so.0.1.2.34beta06) 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/Y2KINFO b/Y2KINFO index b6ea9c4c..1fe47afc 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - December 5, 2008 + December 9, 2008 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.2.34beta05 are Y2K compliant. It is my belief that earlier + upward through 1.2.34beta06 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 diff --git a/configure b/configure index 53f71326..ade8e8b3 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.62 for libpng 1.2.34beta05. +# Generated by GNU Autoconf 2.62 for libpng 1.2.34beta06. # # Report bugs to . # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.34beta05' -PACKAGE_STRING='libpng 1.2.34beta05' +PACKAGE_VERSION='1.2.34beta06' +PACKAGE_STRING='libpng 1.2.34beta06' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' ac_unique_file="pngget.c" @@ -1484,7 +1484,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.2.34beta05 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.34beta06 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1554,7 +1554,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.2.34beta05:";; + short | recursive ) echo "Configuration of libpng 1.2.34beta06:";; esac cat <<\_ACEOF @@ -1661,7 +1661,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.2.34beta05 +libpng configure 1.2.34beta06 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1675,7 +1675,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.2.34beta05, which was +It was created by libpng $as_me 1.2.34beta06, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -2389,7 +2389,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.2.34beta05' + VERSION='1.2.34beta06' cat >>confdefs.h <<_ACEOF @@ -2558,7 +2558,7 @@ fi -PNGLIB_VERSION=1.2.34beta05 +PNGLIB_VERSION=1.2.34beta06 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=34 @@ -13125,7 +13125,7 @@ exec 6>&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.2.34beta05, which was +This file was extended by libpng $as_me 1.2.34beta06, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13178,7 +13178,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libpng config.status 1.2.34beta05 +libpng config.status 1.2.34beta06 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 398acd71..01284b6e 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.2.34beta05], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.34beta06], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.34beta05 +PNGLIB_VERSION=1.2.34beta06 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=34 diff --git a/example.c b/example.c index a279ac28..799eb6ac 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.2.33 [December 5, 2008] + * Last changed in libpng 1.2.33 [December 9, 2008] * This file has been placed in the public domain by the authors. * Maintained 1998-2008 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) diff --git a/libpng-1.2.34beta05.txt b/libpng-1.2.34beta06.txt similarity index 99% rename from libpng-1.2.34beta05.txt rename to libpng-1.2.34beta06.txt index 64870dcf..935cfba9 100644 --- a/libpng-1.2.34beta05.txt +++ b/libpng-1.2.34beta06.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.34beta05 - December 5, 2008 + libpng version 1.2.34beta06 - December 9, 2008 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -9,7 +9,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.34beta05 - December 5, 2008 + libpng versions 0.97, January 1998, through 1.2.34beta06 - December 9, 2008 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -2852,13 +2852,13 @@ application: IX. Y2K Compliance in libpng -December 5, 2008 +December 9, 2008 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.2.34beta05 are Y2K compliant. It is my belief that earlier +upward through 1.2.34beta06 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 a5450678..a9e3fa34 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "December 5, 2008" +.TH LIBPNG 3 "December 9, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.34beta05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.34beta06 .SH SYNOPSIS \fI\fB @@ -821,7 +821,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.2.34beta05 - December 5, 2008 + libpng version 1.2.34beta06 - December 9, 2008 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -830,7 +830,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.34beta05 - December 5, 2008 + libpng versions 0.97, January 1998, through 1.2.34beta06 - December 9, 2008 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -3673,13 +3673,13 @@ application: .SH IX. Y2K Compliance in libpng -December 5, 2008 +December 9, 2008 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.2.34beta05 are Y2K compliant. It is my belief that earlier +upward through 1.2.34beta06 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 @@ -3931,7 +3931,7 @@ the first widely used release: 1.0.41rc01 10 10041 10.so.0.41[.0] 1.2.33 13 10233 12.so.0.33[.0] 1.0.41 10 10041 10.so.0.41[.0] - 1.2.34beta01-05 13 10234 12.so.0.34[.0] + 1.2.34beta01-06 13 10234 12.so.0.34[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3987,7 +3987,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.34beta05 - December 5, 2008: +Libpng version 1.2.34beta06 - December 9, 2008: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4008,7 +4008,7 @@ included in the libpng distribution, the latter shall prevail.) If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.34beta05, December 5, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.34beta06, December 9, 2008, are Copyright (c) 2004,2006-2008 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 @@ -4107,7 +4107,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 5, 2008 +December 9, 2008 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 84ad8802..eb84a438 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "December 5, 2008" +.TH LIBPNGPF 3 "December 9, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.34beta05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.34beta06 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index c15d1adc..bc90859a 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "December 5, 2008" +.TH PNG 5 "December 9, 2008" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 380cec6c..5e33735a 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.2.34 [December 5, 2008] + * Last changed in libpng 1.2.34 [December 9, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -13,7 +13,7 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_34beta05 Your_png_h_is_not_version_1_2_34beta05; +typedef version_1_2_34beta06 Your_png_h_is_not_version_1_2_34beta06; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -694,7 +694,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { png_ptr = png_ptr; /* silence compiler warning about unused png_ptr */ - return ((png_charp) "\n libpng version 1.2.34beta05 - December 5, 2008\n\ + return ((png_charp) "\n libpng version 1.2.34beta06 - December 9, 2008\n\ Copyright (c) 1998-2008 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); diff --git a/png.h b/png.h index 6e847b72..3254ab79 100644 --- a/png.h +++ b/png.h @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.34beta05 - December 5, 2008 + * libpng version 1.2.34beta06 - December 9, 2008 * Copyright (c) 1998-2008 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.) @@ -8,7 +8,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.2.34beta05 - December 5, 2008: Glenn + * libpng versions 0.97, January 1998, through 1.2.34beta06 - December 9, 2008: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -212,7 +212,7 @@ * 1.0.41rc01 10 10041 10.so.0.41[.0] * 1.2.33 13 10233 12.so.0.33[.0] * 1.0.41 10 10041 10.so.0.41[.0] - * 1.2.34beta01-05 13 10234 12.so.0.34[.0] + * 1.2.34beta01-06 13 10234 12.so.0.34[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -242,7 +242,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.34beta05, December 5, 2008, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.34beta06, December 9, 2008, are * Copyright (c) 2004, 2006-2008 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: @@ -354,13 +354,13 @@ * Y2K compliance in libpng: * ========================= * - * December 5, 2008 + * December 9, 2008 * * 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.2.34beta05 are Y2K compliant. It is my belief that earlier + * upward through 1.2.34beta06 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 @@ -416,9 +416,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.34beta05" +#define PNG_LIBPNG_VER_STRING "1.2.34beta06" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.34beta05 - December 5, 2008\n" + " libpng version 1.2.34beta06 - December 9, 2008\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -430,7 +430,7 @@ /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 05 +#define PNG_LIBPNG_VER_BUILD 06 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1475,7 +1475,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_2_34beta05; +typedef png_structp version_1_2_34beta06; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index c9f404b0..3b54083e 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.34beta05 - December 5, 2008 + * libpng version 1.2.34beta06 - December 9, 2008 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index 2f697974..b658e50b 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.2.34 [December 5, 2008] + * Last changed in libpng 1.2.34 [December 9, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index 8dc2542a..9d1e2300 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.34 [December 5, 2008] + * Last changed in libpng 1.2.34 [December 9, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngset.c b/pngset.c index 37323620..947aae0b 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.2.34 [December 5, 2008] + * Last changed in libpng 1.2.34 [December 9, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 1fbcd807..4f9b7fb6 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1685,4 +1685,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_34beta05 your_png_h_is_not_version_1_2_34beta05; +typedef version_1_2_34beta06 your_png_h_is_not_version_1_2_34beta06; diff --git a/pngwrite.c b/pngwrite.c index d39cfea3..74be70ca 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1506,11 +1506,11 @@ png_write_png(png_structp png_ptr, png_infop info_ptr, #endif #if defined(PNG_WRITE_FILLER_SUPPORTED) - /* Get rid of filler (OR ALPHA) bytes, pack XRGB/RGBX/ARGB/RGBA into - * RGB (4 channels -> 3 channels). The second parameter is not used. + /* Pack XRGB/RGBX/ARGB/RGBA into * RGB (4 channels -> 3 channels). */ if (transforms & PNG_TRANSFORM_STRIP_FILLER) - png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE); + if (!(png_ptr->transformations & PNG_TRANSFORM_STRIP_FILLER)) + png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE); #endif #if defined(PNG_WRITE_BGR_SUPPORTED) diff --git a/pngwutil.c b/pngwutil.c index 4c6cd47e..56436745 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.2.34 [December 5, 2008] + * Last changed in libpng 1.2.34 [December 9, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index d7a77770..edf61bbe 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -169,7 +169,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in # SET UP LINKS set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 0.${PNGLIB_RELEASE}.1.2.34beta05 +# VERSION 0.${PNGLIB_RELEASE}.1.2.34beta06 VERSION 0.${PNGLIB_RELEASE}.0 SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index b7b99faf..adc10978 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.34beta05 +version=1.2.34beta06 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index efd03ca0..c8707888 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng12 Name: libpng Description: Loads and saves PNG files -Version: 1.2.34beta05 +Version: 1.2.34beta06 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index eaf0993d..ec952569 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 02c07ce9..49c8073b 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index ed1a31d1..c70d2c30 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -20,7 +20,7 @@ LN_SF = ln -f -s LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index bd1b6905..a78fef89 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 46b6c114..761a83e0 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 026896db..9b1d014f 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 12 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 903cd40d..7608001a 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 9e43c819..b7689679 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -13,7 +13,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 53e22b10..dcbe1085 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -14,7 +14,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index c7da08b1..29b75b16 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 87e037ab..f5d8f52c 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 6d467abd..5b535eb0 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index eaccefbb..63098272 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 37bafb10..39631f4d 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 4203fd02..9aff9fde 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.34beta05 +SHLIB_MINOR= 1.2.34beta06 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 c3264dbc..c439391a 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.34beta05 +SHLIB_MINOR= 1.2.34beta06 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 10d36c58..9c6765bb 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 3d280224..bfa3be50 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -8,7 +8,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.34beta05 +SHLIB_MINOR= 1.2.34beta06 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 490d6c00..7a9474aa 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index ce4e637b..17de0fe4 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 35f5a5fe..6ff2c345 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 9764726a..ed9bebf0 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index d5166bd3..e5916bbb 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 84288d6a..7c322980 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta05 +PNGMIN = 1.2.34beta06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 1cf92828..a4e3a266 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.34beta05 +; Version 1.2.34beta06 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 66aeea34..4f0a825a 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.34beta05 +;Version 1.2.34beta06 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3