diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2008-12-05 11:38:53 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:18:10 -0500 |
| commit | 31f744a8c0e73c68eb5d717741386d935a5f1529 (patch) | |
| tree | d9bb75527ce95b6e6ef115c07dd4c69dd66a2e00 | |
| parent | bc66c96275cf159633e66927775748634924b627 (diff) | |
| download | libpng-31f744a8c0e73c68eb5d717741386d935a5f1529.tar.gz | |
Imported from libpng-1.2.34beta05.tarv1.2.34beta05
53 files changed, 151 insertions, 140 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.34beta04 - December 1, 2008 +Libpng 1.2.34beta05 - December 5, 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.34beta04.tar.gz - libpng-1.2.34beta04.tar.lzma + libpng-1.2.34beta05.tar.gz + libpng-1.2.34beta05.tar.lzma (Get the lzma codec from <http://tukaani.org/lzma>). - libpng-1.2.34beta04.tar.bz2 + libpng-1.2.34beta05.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.34beta04-no-config.tar.gz - libpng-1.2.34beta04-no-config.tar.lzma - libpng-1.2.34beta04-no-config.tar.bz2 + libpng-1.2.34beta05-no-config.tar.gz + libpng-1.2.34beta05-no-config.tar.lzma + libpng-1.2.34beta05-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1234b04.zip - lp1234b04.7z - lp1234b04.tar.bz2 + lp1234b05.zip + lp1234b05.7z + lp1234b05.tar.bz2 Project files - libpng-1.2.34beta04-project-netware.zip - libpng-1.2.34beta04-project-wince.zip + libpng-1.2.34beta05-project-netware.zip + libpng-1.2.34beta05-project-wince.zip Other information: - libpng-1.2.34beta04-README.txt - libpng-1.2.34beta04-KNOWNBUGS.txt - libpng-1.2.34beta04-LICENSE.txt - libpng-1.2.34beta04-Y2K-compliance.txt - libpng-1.2.34beta04-[previous version]-diff.txt + 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 Changes since the last public release (1.2.32): @@ -74,10 +74,23 @@ 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] + Revised bKGD validity check to use >= x instead of > x + 1 + Merged with png_debug from libpng-1.4.0 to remove newlines. + version 1.2.34beta03 [December 1, 2008] Revised bKGD validity check to use >= x instead of > x + 1 Merged with png_debug from libpng-1.4.0 to remove newlines. +version 1.2.34beta04 [December 2, 2008] + More merging with png_debug from libpng-1.4.0 to remove newlines. + +version 1.2.34beta05 [December 5, 2008] + Removed redundant check for key==NULL before calling png_check_keyword() + to ensure that new_key gets initialized and removed extra warning + (Arvan Pritchard). + + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -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 1, 2008] +version 1.0.38rc01, 1.2.30rc01 [December 5, 2008] No changes. version 1.0.38rc02, 1.2.30rc02 [July 21, 2008] @@ -2284,6 +2284,15 @@ version 1.2.34beta03 [December 1, 2008] Revised bKGD validity check to use >= x instead of > x + 1 Merged with png_debug from libpng-1.4.0 to remove newlines. +version 1.2.34beta04 [December 2, 2008] + More merging with png_debug from libpng-1.4.0 to remove newlines. + +version 1.2.34beta05 [December 5, 2008] + Removed redundant check for key==NULL before calling png_check_keyword() + to ensure that new_key gets initialized and removed extra warning + (Arvan Pritchard). + + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement @@ -1,5 +1,5 @@ -Installing libpng version 1.2.34beta04 - December 1, 2008 +Installing libpng version 1.2.34beta05 - December 5, 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.34beta04" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.34beta05" 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.34beta04) + gcc, creates libpng12.so.0.1.2.34beta05) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.34beta04) + (gcc, creates libpng12.so.0.1.2.34beta05) 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.34beta04) + creates libpng12.so.0.1.2.34beta05) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.34beta04) + creates libpng12.so.0.1.2.34beta05) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.34beta04) + creates libpng12.so.0.1.2.34beta05) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.34beta04) + creates libpng12.so.0.1.2.34beta05) 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 @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.34beta04 +Known bugs in libpng version 1.2.34beta05 1. February 23, 2006: The custom makefiles don't build libpng with -lz. @@ -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.34beta04, December 1, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.34beta05, December 5, 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 1, 2008 +December 5, 2008 diff --git a/Makefile.am b/Makefile.am index 61fe58899..d83669cde 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.34beta04.txt pngvcrd.c + example.c libpng-1.2.34beta05.txt pngvcrd.c CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index 4d639ca81..b983b80bf 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.34beta04.txt pngvcrd.c + example.c libpng-1.2.34beta05.txt pngvcrd.c CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym @@ -1,4 +1,4 @@ -README for libpng version 1.2.34beta04 - December 1, 2008 (shared library 12.0) +README for libpng version 1.2.34beta05 - December 5, 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.34beta04) + gcc, creates libpng12.so.0.1.2.34beta05) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.34beta04) + (gcc, creates libpng12.so.0.1.2.34beta05) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.34beta04, + (gcc, creates libpng12.so.0.1.2.34beta05, 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.34beta04) + (gcc, creates libpng12.so.0.1.2.34beta05) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.34beta04) + (gcc, creates libpng12.so.0.1.2.34beta05) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.34beta04) + (gcc, creates libpng12.so.0.1.2.34beta05) 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 @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - December 1, 2008 + December 5, 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.34beta04 are Y2K compliant. It is my belief that earlier + upward through 1.2.34beta05 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 @@ -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.34beta04. +# Generated by GNU Autoconf 2.62 for libpng 1.2.34beta05. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.34beta04' -PACKAGE_STRING='libpng 1.2.34beta04' +PACKAGE_VERSION='1.2.34beta05' +PACKAGE_STRING='libpng 1.2.34beta05' 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.34beta04 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.34beta05 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.34beta04:";; + short | recursive ) echo "Configuration of libpng 1.2.34beta05:";; 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.34beta04 +libpng configure 1.2.34beta05 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.34beta04, which was +It was created by libpng $as_me 1.2.34beta05, 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.34beta04' + VERSION='1.2.34beta05' cat >>confdefs.h <<_ACEOF @@ -2558,7 +2558,7 @@ fi -PNGLIB_VERSION=1.2.34beta04 +PNGLIB_VERSION=1.2.34beta05 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.34beta04, which was +This file was extended by libpng $as_me 1.2.34beta05, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13178,7 +13178,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libpng config.status 1.2.34beta04 +libpng config.status 1.2.34beta05 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 3773a61ff..398acd712 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.34beta04], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.34beta05], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.34beta04 +PNGLIB_VERSION=1.2.34beta05 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=34 @@ -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 1, 2008] + * Last changed in libpng 1.2.33 [December 5, 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.34beta04.txt b/libpng-1.2.34beta05.txt index 234b64145..64870dcfd 100644 --- a/libpng-1.2.34beta04.txt +++ b/libpng-1.2.34beta05.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.34beta04 - December 1, 2008 + libpng version 1.2.34beta05 - December 5, 2008 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.34beta04 - December 1, 2008 + libpng versions 0.97, January 1998, through 1.2.34beta05 - December 5, 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 1, 2008 +December 5, 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.34beta04 are Y2K compliant. It is my belief that earlier +upward through 1.2.34beta05 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 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "December 1, 2008" +.TH LIBPNG 3 "December 5, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.34beta04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.34beta05 .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.34beta04 - December 1, 2008 + libpng version 1.2.34beta05 - December 5, 2008 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.34beta04 - December 1, 2008 + libpng versions 0.97, January 1998, through 1.2.34beta05 - December 5, 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 1, 2008 +December 5, 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.34beta04 are Y2K compliant. It is my belief that earlier +upward through 1.2.34beta05 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-04 13 10234 12.so.0.34[.0] + 1.2.34beta01-05 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.34beta04 - December 1, 2008: +Libpng version 1.2.34beta05 - December 5, 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.34beta04, December 1, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.34beta05, December 5, 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 1, 2008 +December 5, 2008 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index f2c5f8e41..84ad88028 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "December 1, 2008" +.TH LIBPNGPF 3 "December 5, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.34beta04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.34beta05 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "December 1, 2008" +.TH PNG 5 "December 5, 2008" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.2.30 [August 15, 2008] + * Last changed in libpng 1.2.34 [December 5, 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_34beta04 Your_png_h_is_not_version_1_2_34beta04; +typedef version_1_2_34beta05 Your_png_h_is_not_version_1_2_34beta05; /* 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.34beta04 - December 1, 2008\n\ + return ((png_charp) "\n libpng version 1.2.34beta05 - December 5, 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"); @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.34beta04 - December 1, 2008 + * libpng version 1.2.34beta05 - December 5, 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.34beta04 - December 1, 2008: Glenn + * libpng versions 0.97, January 1998, through 1.2.34beta05 - December 5, 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-04 13 10234 12.so.0.34[.0] + * 1.2.34beta01-05 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.34beta04, December 1, 2008, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.34beta05, December 5, 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 1, 2008 + * December 5, 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.34beta04 are Y2K compliant. It is my belief that earlier + * upward through 1.2.34beta05 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.34beta04" +#define PNG_LIBPNG_VER_STRING "1.2.34beta05" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.34beta04 - December 1, 2008\n" + " libpng version 1.2.34beta05 - December 5, 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 04 +#define PNG_LIBPNG_VER_BUILD 05 /* 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_34beta04; +typedef png_structp version_1_2_34beta05; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.34beta04 - December 1, 2008 + * libpng version 1.2.34beta05 - December 5, 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 fbceeb384..2f697974c 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 1, 2008] + * Last changed in libpng 1.2.34 [December 5, 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 c221f1f5b..8dc2542a2 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 1, 2008] + * Last changed in libpng 1.2.34 [December 5, 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) @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.2.34 [December 1, 2008] + * Last changed in libpng 1.2.34 [December 5, 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) @@ -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_34beta04 your_png_h_is_not_version_1_2_34beta04; +typedef version_1_2_34beta05 your_png_h_is_not_version_1_2_34beta05; diff --git a/pngwutil.c b/pngwutil.c index 7e214adf7..4c6cd47e0 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 1, 2008] + * Last changed in libpng 1.2.34 [December 5, 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) @@ -764,12 +764,9 @@ png_write_iCCP(png_structp png_ptr, png_charp name, int compression_type, comp.input = NULL; comp.input_len = 0; - if (name == NULL || (name_len = png_check_keyword(png_ptr, name, + if ((name_len = png_check_keyword(png_ptr, name, &new_name)) == 0) - { - png_warning(png_ptr, "Empty keyword in iCCP chunk"); return; - } if (compression_type != PNG_COMPRESSION_TYPE_BASE) png_warning(png_ptr, "Unknown compression type in iCCP chunk"); @@ -836,12 +833,9 @@ png_write_sPLT(png_structp png_ptr, png_sPLT_tp spalette) #endif png_debug(1, "in png_write_sPLT"); - if (spalette->name == NULL || (name_len = png_check_keyword(png_ptr, + if ((name_len = png_check_keyword(png_ptr, spalette->name, &new_name))==0) - { - png_warning(png_ptr, "Empty keyword in sPLT chunk"); - return; - } + return; /* make sure we include the NULL after the name */ png_write_chunk_start(png_ptr, (png_bytep)png_sPLT, @@ -1328,11 +1322,8 @@ png_write_tEXt(png_structp png_ptr, png_charp key, png_charp text, png_charp new_key; png_debug(1, "in png_write_tEXt"); - if (key == NULL || (key_len = png_check_keyword(png_ptr, key, &new_key))==0) - { - png_warning(png_ptr, "Empty keyword in tEXt chunk"); + if ((key_len = png_check_keyword(png_ptr, key, &new_key))==0) return; - } if (text == NULL || *text == '\0') text_len = 0; @@ -1380,9 +1371,8 @@ png_write_zTXt(png_structp png_ptr, png_charp key, png_charp text, comp.input = NULL; comp.input_len = 0; - if (key == NULL || (key_len = png_check_keyword(png_ptr, key, &new_key))==0) + if ((key_len = png_check_keyword(png_ptr, key, &new_key))==0) { - png_warning(png_ptr, "Empty keyword in zTXt chunk"); png_free(png_ptr, new_key); return; } @@ -1429,7 +1419,8 @@ png_write_iTXt(png_structp png_ptr, int compression, png_charp key, PNG_iTXt; #endif png_size_t lang_len, key_len, lang_key_len, text_len; - png_charp new_lang, new_key; + png_charp new_lang; + png_charp new_key = NULL; png_byte cbuf[2]; compression_state comp; @@ -1440,12 +1431,10 @@ png_write_iTXt(png_structp png_ptr, int compression, png_charp key, comp.output_ptr = NULL; comp.input = NULL; - if (key == NULL || (key_len = png_check_keyword(png_ptr, key, &new_key))==0) - { - png_warning(png_ptr, "Empty keyword in iTXt chunk"); + if ((key_len = png_check_keyword(png_ptr, key, &new_key))==0) return; - } - if (lang == NULL || (lang_len = png_check_keyword(png_ptr, lang, &new_lang))==0) + + if ((lang_len = png_check_keyword(png_ptr, lang, &new_lang))==0) { png_warning(png_ptr, "Empty language field in iTXt chunk"); new_lang = NULL; diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 96ac76c4a..d7a77770b 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.34beta04 +# VERSION 0.${PNGLIB_RELEASE}.1.2.34beta05 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 9f8b8b5c4..b7b99faff 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.34beta04 +version=1.2.34beta05 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 6174e234a..efd03ca07 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.34beta04 +Version: 1.2.34beta05 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 3874b8924..eaf0993da 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 9ddc70098..02c07ce93 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 9170f8212..ed1a31d1e 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.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 0a4375a4d..bd1b69054 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 1b5af94bd..46b6c114b 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.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index cc6df9922..026896db0 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 12 -PNGMIN = 1.2.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 0e8f97f3a..903cd40db 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 13b3cd9f3..9e43c8194 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -13,7 +13,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 260bb5d12..53e22b100 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -14,7 +14,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 90d6daeb5..c7da08b1a 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.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 4d65f982d..87e037abf 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 4f647b027..6d467abd9 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.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 362666504..eaccefbbd 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index d2c1457f9..37bafb105 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.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 7709fd604..4203fd02c 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.34beta04 +SHLIB_MINOR= 1.2.34beta05 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 33fd6d113..c3264dbc7 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.34beta04 +SHLIB_MINOR= 1.2.34beta05 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 8098fee5c..10d36c585 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 207afc84a..3d2802242 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.34beta04 +SHLIB_MINOR= 1.2.34beta05 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 4c4ae7d3e..490d6c00f 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index b921ce321..ce4e637b4 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 030e7de45..35f5a5fe8 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index ee48311e0..9764726a9 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 39a43e491..d5166bd3d 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index e4b3bfae3..84288d6ab 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.34beta04 +PNGMIN = 1.2.34beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 88e65b416..1cf928286 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.34beta04 +; Version 1.2.34beta05 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 06dd1694e..66aeea348 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.34beta04 +;Version 1.2.34beta05 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |