diff options
57 files changed, 179 insertions, 153 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.11beta2 - June 2, 2006 +Libpng 1.2.11beta3 - June 5, 2006 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,32 +9,32 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.11beta2.tar.gz - libpng-1.2.11beta2.tar.bz2 + libpng-1.2.11beta3.tar.gz + libpng-1.2.11beta3.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.11beta2-no-config.tar.gz - libpng-1.2.11beta2-no-config.tar.bz2 + libpng-1.2.11beta3-no-config.tar.gz + libpng-1.2.11beta3-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1211b02.zip - lp1211b02.tar.bz2 + lp1211b03.zip + lp1211b03.tar.bz2 Project files - libpng-1.2.11beta2-project-netware.zip - libpng-1.2.11beta2-project-wince.zip + libpng-1.2.11beta3-project-netware.zip + libpng-1.2.11beta3-project-wince.zip Other information: - libpng-1.2.11beta2-README.txt - libpng-1.2.11beta2-KNOWNBUGS.txt - libpng-1.2.11beta2-LICENSE.txt - libpng-1.2.11beta2-Y2K-compliance.txt + libpng-1.2.11beta3-README.txt + libpng-1.2.11beta3-KNOWNBUGS.txt + libpng-1.2.11beta3-LICENSE.txt + libpng-1.2.11beta3-Y2K-compliance.txt Changes since the last public release (1.2.10): @@ -44,12 +44,18 @@ version 1.2.11beta1 [May 31, 2006] The shared-library makefiles were linking to libpng.so.0 instead of libpng.so.3 compatibility as the library. -version 1.2.11beta2 [June 2, 2006] +version 1.2.11beta2 [June 5, 2006] Increased sprintf buffer from 50 to 52 chars in pngrutil.c to avoid buffer overflow. Fixed bug in example.c (png_set_palette_rgb -> png_set_palette_to_rgb)) -version 1.2.11beta1 [June 2, 2006] +version 1.2.11beta3 [June 5, 2006] + Prepended "#! /bin/sh" to ltmail.sh and contrib/pngminus/*.sh (Cosmin). + Removed the accidental leftover Makefile.in~ (Cosmin). + Avoided potential buffer overflow and optimized buffer in + png_write_sCAL(), png_write_sCAL_s() (Cosmin). + Removed the include directories and libraries from CFLAGS and LDFLAGS + in scripts/makefile.gcc (Nelson A. de Oliveira, Cosmin). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -1576,14 +1576,18 @@ version 1.2.11beta2 [June 2, 2006] buffer overflow. Fixed bug in example.c (png_set_palette_rgb -> png_set_palette_to_rgb)) -version 1.2.11beta2-cos [June 4, 2006] +version 1.2.11beta3 [June 5, 2006] Prepended "#! /bin/sh" to ltmail.sh and contrib/pngminus/*.sh (Cosmin). Removed the accidental leftover Makefile.in~ (Cosmin). - Removed the include directories and libraries from CFLAGS and LDFLAGS - in scripts/makefile.gcc (Nelson A. de Oliveira, Cosmin). - Exported png_write_sig (Cosmin). - Optimized buffer in png_handle_cHRM() (Cosmin). Avoided potential buffer overflow and optimized buffer in png_write_sCAL(), png_write_sCAL_s() (Cosmin). - Set pHYs = 2835 x 2835 pixels per meter, and added - sCAL = 0.352778e-3 x 0.352778e-3 meters, in pngtest.png (Cosmin). + Removed the include directories and libraries from CFLAGS and LDFLAGS + in scripts/makefile.gcc (Nelson A. de Oliveira, Cosmin). + +Send comments/corrections/commendations to png-mng-implement at lists.sf.net +(subscription required; visit +https://lists.sourceforge.net/lists/listinfo/png-mng-implement +to subscribe) +or to glennrp at users.sourceforge.net + +Glenn R-P @@ -1,5 +1,5 @@ -Installing libpng version 1.2.11beta2 - June 2, 2006 +Installing libpng version 1.2.11beta3 - June 5, 2006 On Unix/Linux and similar systems, you can simply type @@ -29,7 +29,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.11beta2" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.11beta3" 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: @@ -85,11 +85,11 @@ include makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.11beta2) + gcc, creates libpng12.so.0.1.2.11beta3) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.11beta2) + (gcc, creates libpng12.so.0.1.2.11beta3) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.11beta2, + (gcc, creates libpng12.so.0.1.2.11beta3, 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 @@ -112,12 +112,12 @@ 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.11beta2) + creates libpng12.so.0.1.2.11beta3) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.11beta2) + creates libpng12.so.0.1.2.11beta3) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.11beta2) + creates libpng12.so.0.1.2.11beta3) 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.11beta2 +Known bugs in libpng version 1.2.11beta3 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when reading interlaced PNG files, when assembler code is enabled but running @@ -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.11beta2, June 2, 2006, are +libpng versions 1.2.6, August 15, 2004, through 1.2.11beta3, June 5, 2006, are Copyright (c) 2004, 2006 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 -June 2, 2006 +June 5, 2006 @@ -1,4 +1,4 @@ -README for libpng version 1.2.11beta2 - June 2, 2006 (shared library 12.0) +README for libpng version 1.2.11beta3 - June 5, 2006 (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. @@ -190,11 +190,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.11beta2) + gcc, creates libpng12.so.0.1.2.11beta3) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.11beta2) + (gcc, creates libpng12.so.0.1.2.11beta3) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.11beta2, + (gcc, creates libpng12.so.0.1.2.11beta3, 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 @@ -216,12 +216,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.11beta2) + (gcc, creates libpng12.so.0.1.2.11beta3) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.11beta2) + (gcc, creates libpng12.so.0.1.2.11beta3) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.11beta2) + (gcc, creates libpng12.so.0.1.2.11beta3) 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: ========================= - June 2, 2006 + June 5, 2006 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.11beta2 are Y2K compliant. It is my belief that earlier + upward through 1.2.11beta3 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.59 for libpng 1.2.11beta2. +# Generated by GNU Autoconf 2.59 for libpng 1.2.11beta3. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.11beta2' -PACKAGE_STRING='libpng 1.2.11beta2' +PACKAGE_VERSION='1.2.11beta3' +PACKAGE_STRING='libpng 1.2.11beta3' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' ac_unique_file="pngget.c" @@ -954,7 +954,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.11beta2 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.11beta3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1020,7 +1020,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.2.11beta2:";; + short | recursive ) echo "Configuration of libpng 1.2.11beta3:";; esac cat <<\_ACEOF @@ -1167,7 +1167,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.2.11beta2 +libpng configure 1.2.11beta3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1181,7 +1181,7 @@ cat >&5 <<_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.11beta2, which was +It was created by libpng $as_me 1.2.11beta3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1824,7 +1824,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.2.11beta2' + VERSION='1.2.11beta3' cat >>confdefs.h <<_ACEOF @@ -1979,7 +1979,7 @@ fi -PNGLIB_VERSION=1.2.11beta2 +PNGLIB_VERSION=1.2.11beta3 PNGLIB_MAJOR=12 PNGLIB_MINOR=11 @@ -20681,7 +20681,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by libpng $as_me 1.2.11beta2, which was +This file was extended by libpng $as_me 1.2.11beta3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20744,7 +20744,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpng config.status 1.2.11beta2 +libpng config.status 1.2.11beta3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 6ccaf49fe..9aae93a1d 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.11beta2], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.11beta3], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.11beta2 +PNGLIB_VERSION=1.2.11beta3 PNGLIB_MAJOR=12 PNGLIB_MINOR=11 diff --git a/contrib/gregbook/makevms.com b/contrib/gregbook/makevms.com index bd37dc0d7..bd37dc0d7 100755..100644 --- a/contrib/gregbook/makevms.com +++ b/contrib/gregbook/makevms.com diff --git a/contrib/pngminus/makevms.com b/contrib/pngminus/makevms.com index 00561bcd0..00561bcd0 100755..100644 --- a/contrib/pngminus/makevms.com +++ b/contrib/pngminus/makevms.com diff --git a/contrib/pngminus/png2pnm.bat b/contrib/pngminus/png2pnm.bat index 449cf3675..449cf3675 100755..100644 --- a/contrib/pngminus/png2pnm.bat +++ b/contrib/pngminus/png2pnm.bat diff --git a/contrib/pngminus/png2pnm.sh b/contrib/pngminus/png2pnm.sh index b1c05370d..b1c05370d 100755..100644 --- a/contrib/pngminus/png2pnm.sh +++ b/contrib/pngminus/png2pnm.sh diff --git a/contrib/pngminus/pngminus.bat b/contrib/pngminus/pngminus.bat index 911bb8dff..911bb8dff 100755..100644 --- a/contrib/pngminus/pngminus.bat +++ b/contrib/pngminus/pngminus.bat diff --git a/contrib/pngminus/pngminus.sh b/contrib/pngminus/pngminus.sh index 2a0a9d8fb..2a0a9d8fb 100755..100644 --- a/contrib/pngminus/pngminus.sh +++ b/contrib/pngminus/pngminus.sh diff --git a/contrib/pngminus/pnm2png.bat b/contrib/pngminus/pnm2png.bat index f756cb84d..f756cb84d 100755..100644 --- a/contrib/pngminus/pnm2png.bat +++ b/contrib/pngminus/pnm2png.bat diff --git a/contrib/pngminus/pnm2png.sh b/contrib/pngminus/pnm2png.sh index d79df2fae..d79df2fae 100755..100644 --- a/contrib/pngminus/pnm2png.sh +++ b/contrib/pngminus/pnm2png.sh @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "June 2, 2006" +.TH LIBPNG 3 "June 5, 2006" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11beta2 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11beta3 .SH SYNOPSIS \fI\fB @@ -802,10 +802,6 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11beta2 \fI\fB -\fBvoid png_write_sig (png_structp \fIpng_ptr\fP\fB);\fP - -\fI\fB - \fBvoidpf png_zalloc (voidpf \fP\fIpng_ptr\fP\fB, uInt \fP\fIitems\fP\fB, uInt \fIsize\fP\fB);\fP \fI\fB @@ -825,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.11beta2 - June 2, 2006 + libpng version 1.2.11beta3 - June 5, 2006 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -3742,13 +3738,13 @@ application: .SH IX. Y2K Compliance in libpng -June 2, 2006 +June 5, 2006 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.11beta2 are Y2K compliant. It is my belief that earlier +upward through 1.2.11beta3 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 @@ -3908,7 +3904,7 @@ the first widely used release: 1.2.10beta1-8 13 10210 12.so.0.10[.0] 1.2.10rc1-3 13 10210 12.so.0.10[.0] 1.2.10 13 10210 12.so.0.10[.0] - 1.2.11beta1 13 10211 12.so.0.11[.0] + 1.2.11beta1-3 13 10211 12.so.0.11[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3964,7 +3960,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.11beta2 - June 2, 2006: +Libpng version 1.2.11beta3 - June 5, 2006: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -3985,7 +3981,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.11beta2, June 2, 2006, are +libpng versions 1.2.6, August 15, 2004, through 1.2.11beta3, June 5, 2006, are Copyright (c) 2004-2006 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 @@ -4084,7 +4080,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 2, 2006 +June 5, 2006 .\" end of man page diff --git a/libpng.txt b/libpng.txt index 2761dc0a0..aa23635a2 100644 --- a/libpng.txt +++ b/libpng.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.11beta2 - June 2, 2006 + libpng version 1.2.11beta3 - June 5, 2006 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -2917,13 +2917,13 @@ application: IX. Y2K Compliance in libpng -June 2, 2006 +June 5, 2006 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.11beta2 are Y2K compliant. It is my belief that earlier +upward through 1.2.11beta3 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/libpngpf.3 b/libpngpf.3 index 0618cc7b8..b9a235990 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "June 2, 2006" +.TH LIBPNGPF 3 "June 5, 2006" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11beta2 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11beta3 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -711,6 +711,12 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11beta2 \fI\fB +\fBvoid png_write_sig (png_structp \fIpng_ptr\fP\fB);\fP + +\fI\fB + +\fI\fB + \fBvoid png_write_sRGB (png_structp \fP\fIpng_ptr\fP\fB, int \fIintent\fP\fB);\fP \fI\fB diff --git a/ltmain.sh b/ltmain.sh index 3ff0776a8..3ff0776a8 100755..100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -1,4 +1,4 @@ -.TH PNG 5 "June 2, 2006" +.TH PNG 5 "June 5, 2006" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -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_11beta2 Your_png_h_is_not_version_1_2_11beta2; +typedef version_1_2_11beta3 Your_png_h_is_not_version_1_2_11beta3; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -693,7 +693,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */ - return ((png_charp) "\n libpng version 1.2.11beta2 - June 2, 2006\n\ + return ((png_charp) "\n libpng version 1.2.11beta3 - June 5, 2006\n\ Copyright (c) 1998-2006 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.11beta2 - June 2, 2006 + * libpng version 1.2.11beta3 - June 5, 2006 * Copyright (c) 1998-2006 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.) @@ -9,7 +9,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.11beta2 - June 2, 2006: Glenn + * libpng versions 0.97, January 1998, through 1.2.11beta3 - June 5, 2006: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -119,7 +119,7 @@ * 1.2.10beta1-8 13 10210 12.so.0.10[.0] * 1.2.10rc1-3 13 10210 12.so.0.10[.0] * 1.2.10 13 10210 12.so.0.10[.0] - * 1.2.11beta1 13 10211 12.so.0.11[.0] + * 1.2.11beta1-3 13 10211 12.so.0.11[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -149,7 +149,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.11beta2, June 2, 2006, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.11beta3, June 5, 2006, are * Copyright (c) 2004, 2006 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: @@ -261,13 +261,13 @@ * Y2K compliance in libpng: * ========================= * - * June 2, 2006 + * June 5, 2006 * * 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.11beta2 are Y2K compliant. It is my belief that earlier + * upward through 1.2.11beta3 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 @@ -323,9 +323,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.11beta2" +#define PNG_LIBPNG_VER_STRING "1.2.11beta3" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.11beta2 - June 2, 2006 (header)\n" + " libpng version 1.2.11beta3 - June 5, 2006 (header)\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -337,7 +337,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 2 +#define PNG_LIBPNG_VER_BUILD 3 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1367,7 +1367,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_11beta2; +typedef png_structp version_1_2_11beta3; typedef png_struct FAR * FAR * png_structpp; @@ -1434,9 +1434,6 @@ extern PNG_EXPORT(png_structp,png_create_write_struct_2) png_malloc_ptr malloc_fn, png_free_ptr free_fn)); #endif -/* Write the PNG file signature. */ -extern PNG_EXPORT(void,png_write_sig) PNGARG((png_structp png_ptr)); - /* Write a PNG chunk - size, type, (optional) data, CRC. */ extern PNG_EXPORT(void,png_write_chunk) PNGARG((png_structp png_ptr, png_bytep chunk_name, png_bytep data, png_size_t length)); @@ -2958,6 +2955,9 @@ PNG_EXTERN void png_calculate_crc PNGARG((png_structp png_ptr, png_bytep ptr, PNG_EXTERN void png_flush PNGARG((png_structp png_ptr)); #endif +/* simple function to write the signature */ +PNG_EXTERN void png_write_sig PNGARG((png_structp png_ptr)); + /* write various chunks */ /* Write the IHDR chunk, and update the png_struct with the necessary @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.11beta2 - June 2, 2006 + * libpng version 1.2.11beta3 - June 5, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2005 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index b486ad278..2bde4b416 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.11 June 1, 2006 + * Last changed in libpng 1.2.11 June 4, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -715,7 +715,7 @@ png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) void /* PRIVATE */ png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) { - png_byte buf[32]; + png_byte buf[4]; #ifdef PNG_FLOATING_POINT_SUPPORTED float white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y; #endif @@ -756,46 +756,62 @@ png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) return; } - png_crc_read(png_ptr, buf, 32); - if (png_crc_finish(png_ptr, 0)) - return; - + png_crc_read(png_ptr, buf, 4); uint_x = png_get_uint_32(buf); - uint_y = png_get_uint_32(buf + 4); + + png_crc_read(png_ptr, buf, 4); + uint_y = png_get_uint_32(buf); + if (uint_x > 80000L || uint_y > 80000L || uint_x + uint_y > 100000L) { png_warning(png_ptr, "Invalid cHRM white point"); + png_crc_finish(png_ptr, 24); return; } int_x_white = (png_fixed_point)uint_x; int_y_white = (png_fixed_point)uint_y; - uint_x = png_get_uint_32(buf + 8); - uint_y = png_get_uint_32(buf + 12); + png_crc_read(png_ptr, buf, 4); + uint_x = png_get_uint_32(buf); + + png_crc_read(png_ptr, buf, 4); + uint_y = png_get_uint_32(buf); + if (uint_x + uint_y > 100000L) { png_warning(png_ptr, "Invalid cHRM red point"); + png_crc_finish(png_ptr, 16); return; } int_x_red = (png_fixed_point)uint_x; int_y_red = (png_fixed_point)uint_y; - uint_x = png_get_uint_32(buf + 16); - uint_y = png_get_uint_32(buf + 20); + png_crc_read(png_ptr, buf, 4); + uint_x = png_get_uint_32(buf); + + png_crc_read(png_ptr, buf, 4); + uint_y = png_get_uint_32(buf); + if (uint_x + uint_y > 100000L) { png_warning(png_ptr, "Invalid cHRM green point"); + png_crc_finish(png_ptr, 8); return; } int_x_green = (png_fixed_point)uint_x; int_y_green = (png_fixed_point)uint_y; - uint_x = png_get_uint_32(buf + 24); - uint_y = png_get_uint_32(buf + 28); + png_crc_read(png_ptr, buf, 4); + uint_x = png_get_uint_32(buf); + + png_crc_read(png_ptr, buf, 4); + uint_y = png_get_uint_32(buf); + if (uint_x + uint_y > 100000L) { png_warning(png_ptr, "Invalid cHRM blue point"); + png_crc_finish(png_ptr, 0); return; } int_x_blue = (png_fixed_point)uint_x; @@ -840,6 +856,7 @@ png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) #endif #endif /* PNG_NO_CONSOLE_IO */ } + png_crc_finish(png_ptr, 0); return; } #endif /* PNG_READ_sRGB_SUPPORTED */ @@ -853,6 +870,8 @@ png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) int_x_white, int_y_white, int_x_red, int_y_red, int_x_green, int_y_green, int_x_blue, int_y_blue); #endif + if (png_crc_finish(png_ptr, 0)) + return; } #endif @@ -1549,4 +1549,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_11beta2 your_png_h_is_not_version_1_2_11beta2; +typedef version_1_2_11beta3 your_png_h_is_not_version_1_2_11beta3; diff --git a/pngtest.png b/pngtest.png Binary files differindex 3776e6c1e..f3a6df448 100644 --- a/pngtest.png +++ b/pngtest.png diff --git a/pngwutil.c b/pngwutil.c index d989aa830..4a9c52b93 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.9 April 14, 2006 + * Last changed in libpng 1.2.11 June 4, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -49,23 +49,6 @@ png_save_uint_16(png_bytep buf, unsigned int i) buf[1] = (png_byte)(i & 0xff); } -/* Simple function to write the signature. If we have already written - * the magic bytes of the signature, or more likely, the PNG stream is - * being embedded into another stream and doesn't need its own signature, - * we should call png_set_sig_bytes() to tell libpng how many of the - * bytes have already been written. - */ -void PNGAPI -png_write_sig(png_structp png_ptr) -{ - png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10}; - /* write the rest of the 8 byte signature */ - png_write_data(png_ptr, &png_signature[png_ptr->sig_bytes], - (png_size_t)8 - png_ptr->sig_bytes); - if(png_ptr->sig_bytes < 3) - png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE; -} - /* Write a PNG chunk all at once. The type is an array of ASCII characters * representing the chunk name. The array must be at least 4 bytes in * length, and does not need to be null terminated. To be safe, pass the @@ -134,6 +117,23 @@ png_write_chunk_end(png_structp png_ptr) png_write_data(png_ptr, buf, (png_size_t)4); } +/* Simple function to write the signature. If we have already written + * the magic bytes of the signature, or more likely, the PNG stream is + * being embedded into another stream and doesn't need its own signature, + * we should call png_set_sig_bytes() to tell libpng how many of the + * bytes have already been written. + */ +void /* PRIVATE */ +png_write_sig(png_structp png_ptr) +{ + png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10}; + /* write the rest of the 8 byte signature */ + png_write_data(png_ptr, &png_signature[png_ptr->sig_bytes], + (png_size_t)8 - png_ptr->sig_bytes); + if(png_ptr->sig_bytes < 3) + png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE; +} + #if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_iCCP_SUPPORTED) /* * This pair of functions encapsulates the operation of (a) compressing a diff --git a/scripts/libpng-config-body.in b/scripts/libpng-config-body.in index b466432d5..b466432d5 100644..100755 --- a/scripts/libpng-config-body.in +++ b/scripts/libpng-config-body.in diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index f20205c6b..6eb7c3cd1 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.11beta2 +version=1.2.11beta3 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index b7750a9b2..5ef9de167 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.11beta2 +Version: 1.2.11beta3 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 786d3865e..977423c2a 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index bac0b29d4..5e4602990 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index a01929492..9371eb035 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.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 82dbfb1ae..8cbebbfe1 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 59e1a537e..86b3ebca5 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -80,7 +80,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 56d98621e..7f6f8a090 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index b746df20b..2caa5a39b 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 280286c9a..34e3734a1 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index fc59c67cc..1aec99634 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index f63874ead..c19860a2e 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.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 43153b7a0..ee74fa5b8 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 0df7565d5..17c775896 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.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 8efbbfd5d..3b02317aa 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index ace63b86f..d61d6ed8b 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -76,7 +76,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 65605e7c1..5c52557e4 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.11beta2 +SHLIB_MINOR= 1.2.11beta3 SRCS= pnggccrd.c 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 2288406af..c74d975cf 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.11beta2 +SHLIB_MINOR= 1.2.11beta3 SRCS= pnggccrd.c 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.openbsd b/scripts/makefile.openbsd index 2b15d52ba..7da11af75 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -7,7 +7,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.11beta2 +SHLIB_MINOR= 1.2.11beta3 LIB= png SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index d00d0db4b..694ca8dde 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index ec4a29013..6fa01da06 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index d18264fc9..d3dd9095b 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 0bcea2a75..3553a8bd0 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 76479b4f3..a0c21f4de 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta2 +PNGMIN = 1.2.11beta3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makevms.com b/scripts/makevms.com index b9e389555..b9e389555 100755..100644 --- a/scripts/makevms.com +++ b/scripts/makevms.com diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 69af50783..07b823504 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.11beta2 +; Version 1.2.11beta3 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" @@ -223,9 +223,6 @@ EXPORTS png_get_uint_31 png_set_expand_gray_1_2_4_to_8 -; Added at version 1.2.11 - png_write_sig - ; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS png_libpng_ver png_pass_start diff --git a/scripts/pngw32.def b/scripts/pngw32.def index f999d3bec..4834d8513 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.11beta2 +;Version 1.2.11beta3 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 @@ -234,5 +234,3 @@ EXPORTS png_save_int_32 @205 png_get_uint_31 @206 png_set_expand_gray_1_2_4_to_8 @207 -; Added at version 1.2.11 - png_write_sig @208 |
