diff --git a/ANNOUNCE b/ANNOUNCE index a902b0094612f479fb6060291dde3b10157da80d..9da7c6f6112886d7e6c89be60a3679c8b54c13af 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.11beta1 - May 31, 2006 +Libpng 1.2.11beta2 - June 2, 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,77 +9,34 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.11beta1.tar.gz - libpng-1.2.11beta1.tar.bz2 + libpng-1.2.11beta2.tar.gz + libpng-1.2.11beta2.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.11beta1-no-config.tar.gz - libpng-1.2.11beta1-no-config.tar.bz2 + libpng-1.2.11beta2-no-config.tar.gz + libpng-1.2.11beta2-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1211b01.zip - lp1211b01.tar.bz2 + lp1211b02.zip + lp1211b02.tar.bz2 Project files - libpng-1.2.11beta1-project-netware.zip - libpng-1.2.11beta1-project-wince.zip + libpng-1.2.11beta2-project-netware.zip + libpng-1.2.11beta2-project-wince.zip Other information: - libpng-1.2.11beta1-README.txt - libpng-1.2.11beta1-KNOWNBUGS.txt - libpng-1.2.11beta1-LICENSE.txt - libpng-1.2.11beta1-Y2K-compliance.txt + 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 -Changes since the last public release (1.2.9): - -version 1.2.10beta1 [April 15, 2006] - Renamed "config.h" to "png_conf.h" and revised Makefile.am to add - -DPNG_BUILDING_LIBPNG to compile directive, and modified pngconf.h - to include png_conf.h only when PNG_BUILDING_LIBPNG is defined. - -version 1.2.10beta2 [April 15, 2006] - Manually updated Makefile.in and configure. Changed png_conf.h.in - back to config.h. - -version 1.2.10beta3 [April 15, 2006] - Change png_conf.h back to config.h in pngconf.h. - -version 1.2.10beta4 [April 16, 2006] - Change PNG_BUILDING_LIBPNG to PNG_CONFIGURE_LIBPNG in config/Makefile*. - -version 1.2.10beta5 [April 16, 2006] - Added a configure check for compiling assembler code in pnggccrd.c - -version 1.2.10beta6 [April 17, 2006] - Revised the configure check for pnggccrd.c - Moved -DPNG_CONFIGURE_LIBPNG into @LIBPNG_DEFINES@ - Added @LIBPNG_DEFINES@ to arguments when building libpng.sym - -version 1.2.10beta7 [April 18, 2006] - Change "exec_prefix=$prefix" to "exec_prefix=$(prefix)" in makefiles. - -version 1.2.10rc1 [April 19, 2006] - Ensure pngconf.h doesn't define both PNG_USE_PNGGCCRD and PNG_USE_PNGVCRD - Fixed "LN_FS" typo in makefile.sco and makefile.solaris. - -version 1.2.10rc2 [April 20, 2006] - Added a backslash between -DPNG_CONFIGURE_LIBPNG and -DPNG_NO_ASSEMBLER_CODE - in configure.ac - Made the configure warning about versioned symbols less arrogant. - -version 1.2.10rc3 [April 21, 2006] - Added a note in libpng.txt that png_set_sig_bytes(8) can be used when - writing an embedded PNG without the 8-byte signature. - Revised makefiles and configure to avoid making links to libpng.so.* - -version 1.2.10 [May 31, 2006] - Reverted configure to "rc2" state. +Changes since the last public release (1.2.10): version 1.2.11beta1 [May 31, 2006] scripts/libpng.pc.in contained "configure" style version info and would @@ -87,6 +44,13 @@ 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] + 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] + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CHANGES b/CHANGES index 368789b4c8ff37a8436069d7d8b3cf7b35457a88..f51e30c059e02c223fb9b1678ee959e8004e4fa7 100644 --- a/CHANGES +++ b/CHANGES @@ -1562,7 +1562,7 @@ version 1.2.10rc3 [April 21, 2006] writing an embedded PNG without the 8-byte signature. Revised makefiles and configure to avoid making links to libpng.so.* -version 1.2.10 [May 31, 2006] +version 1.2.10 [April 23, 2006] Reverted configure to "rc2" state. version 1.2.11beta1 [May 31, 2006] @@ -1571,14 +1571,10 @@ 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.4.0beta1 [future] - Enabled iTXt support (changes png_struct, thus requires so-number change). - Removed deprecated functions png_read_init, png_write_init, png_info_init, - png_permit_empty_plte, png_set_gray_1_2_4_to_8, and removed the - deprecated macro PNG_MAX_UINT. - Cleaned up PNG_ASSEMBLER_CODE_SUPPORTED vs PNG_MMX_CODE_SUPPORTED - Cleaned up WINCE project. - Moved "PNG_INTERNAL" parts of png.h into a new private header, pngintrn.h +version 1.2.11beta2 [June 2, 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)) Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/INSTALL b/INSTALL index 4b84b2d43cb33fcf0fe07479f1982285a59ee425..a4b8cb3256fa5bdbacb9b00d37d420c0d1d406c2 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.11beta1 - May 31, 2006 +Installing libpng version 1.2.11beta2 - June 2, 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.11beta1" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.11beta2" 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.11beta1) + gcc, creates libpng12.so.0.1.2.11beta2) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.11beta1) + (gcc, creates libpng12.so.0.1.2.11beta2) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.11beta1, + (gcc, creates libpng12.so.0.1.2.11beta2, 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.11beta1) + creates libpng12.so.0.1.2.11beta2) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.11beta1) + creates libpng12.so.0.1.2.11beta2) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.11beta1) + creates libpng12.so.0.1.2.11beta2) 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 fe74cd5dd40269d85c9503a7ba651570c8e6289b..1833700adbfa5865ed9a834ab6873a7e8f1dd786 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.11beta1 +Known bugs in libpng version 1.2.11beta2 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 diff --git a/LICENSE b/LICENSE index ca27731f8d236c5df66165b03edbef75b3077180..0ca25babb46656fbfa1cf4be5303af61b28668eb 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.11beta1, May 31, 2006, are +libpng versions 1.2.6, August 15, 2004, through 1.2.11beta2, June 2, 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 -May 31, 2006 +June 2, 2006 diff --git a/README b/README index f8b7a4d3a19d20572d03fdf74f116c102c6258a8..3f5729e740701d363566a2578ede1267b5e00a8b 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.11beta1 - May 31, 2006 (shared library 12.0) +README for libpng version 1.2.11beta2 - June 2, 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.11beta1) + gcc, creates libpng12.so.0.1.2.11beta2) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.11beta1) + (gcc, creates libpng12.so.0.1.2.11beta2) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.11beta1, + (gcc, creates libpng12.so.0.1.2.11beta2, 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.11beta1) + (gcc, creates libpng12.so.0.1.2.11beta2) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.11beta1) + (gcc, creates libpng12.so.0.1.2.11beta2) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.11beta1) + (gcc, creates libpng12.so.0.1.2.11beta2) 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 2235887837bbed3ae33ab87d4fbe39f14f71426f..431a34fc90369e98bff06d9921b5457a909ce091 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - May 31, 2006 + June 2, 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.11beta1 are Y2K compliant. It is my belief that earlier + upward through 1.2.11beta2 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 a5ca3d9a84195e28e5eec436c0ba1350cf73c872..638ddb11287a4d6ed35cb7ba98cfb4b04787f27c 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.59 for libpng 1.2.11beta1. +# Generated by GNU Autoconf 2.59 for libpng 1.2.11beta2. # # Report bugs to . # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.11beta1' -PACKAGE_STRING='libpng 1.2.11beta1' +PACKAGE_VERSION='1.2.11beta2' +PACKAGE_STRING='libpng 1.2.11beta2' 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.11beta1 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.11beta2 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.11beta1:";; + short | recursive ) echo "Configuration of libpng 1.2.11beta2:";; 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.11beta1 +libpng configure 1.2.11beta2 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.11beta1, which was +It was created by libpng $as_me 1.2.11beta2, 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.11beta1' + VERSION='1.2.11beta2' cat >>confdefs.h <<_ACEOF @@ -1979,7 +1979,7 @@ fi -PNGLIB_VERSION=1.2.11beta1 +PNGLIB_VERSION=1.2.11beta2 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.11beta1, which was +This file was extended by libpng $as_me 1.2.11beta2, 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.11beta1 +libpng config.status 1.2.11beta2 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 fd6b14c8d9cfa88808980884264d2528c3fe8a3e..6ccaf49fed53d0af6289a2bc1ea7331785c15c85 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.11beta1], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.11beta2], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.11beta1 +PNGLIB_VERSION=1.2.11beta2 PNGLIB_MAJOR=12 PNGLIB_MINOR=11 diff --git a/example.c b/example.c index 6d4ee8131deaa62362c571b5236d1b54b0b8b026..fd7096e4d4651e83dc15b5293c82744ed1a2be86 100644 --- a/example.c +++ b/example.c @@ -200,7 +200,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */ /* Expand paletted colors into true RGB triplets */ if (color_type == PNG_COLOR_TYPE_PALETTE) - png_set_palette_rgb(png_ptr); + png_set_palette_to_rgb(png_ptr); /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) diff --git a/libpng.3 b/libpng.3 index a9c3482c5cd1fabf90c762bb7db03da9c5e3289c..282716075591cb3dd32ee9170630edb47f69c076 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "May 31, 2006" +.TH LIBPNG 3 "June 2, 2006" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11beta1 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11beta2 .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.11beta1 - May 31, 2006 + libpng version 1.2.11beta2 - June 2, 2006 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -3738,13 +3738,13 @@ application: .SH IX. Y2K Compliance in libpng -May 31, 2006 +June 2, 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.11beta1 are Y2K compliant. It is my belief that earlier +upward through 1.2.11beta2 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 @@ -3960,7 +3960,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.11beta1 - May 31, 2006: +Libpng version 1.2.11beta2 - June 2, 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). @@ -3981,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.11beta1, May 31, 2006, are +libpng versions 1.2.6, August 15, 2004, through 1.2.11beta2, June 2, 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 @@ -4080,7 +4080,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 31, 2006 +June 2, 2006 .\" end of man page diff --git a/libpng.txt b/libpng.txt index d01e986868b0e3cf4621d6d3768a035f711b2a59..2761dc0a05bbb76c3b8539d8537af777e8382043 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.11beta1 - May 31, 2006 + libpng version 1.2.11beta2 - June 2, 2006 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -2917,13 +2917,13 @@ application: IX. Y2K Compliance in libpng -May 31, 2006 +June 2, 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.11beta1 are Y2K compliant. It is my belief that earlier +upward through 1.2.11beta2 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 f8ed1d4d0c2c12c23df57d092e493a53cacc70c0..f31ec28aef9266e0dd3722c9caa798b841fefe3a 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "May 31, 2006" +.TH LIBPNGPF 3 "June 2, 2006" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11beta1 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11beta2 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index 149f224a2de0e22255e6e8b599a8efc245514c85..2784e0f60fa3258c16398bc6eb17680dda455010 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "May 31, 2006" +.TH PNG 5 "June 2, 2006" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 3b3e3e52eef4ed7cb49d79c1403f430653fe13ea..586709d2f3e22ca791cc14e5db199c12f1ce5dc0 100644 --- a/png.c +++ b/png.c @@ -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_11beta1 Your_png_h_is_not_version_1_2_11beta1; +typedef version_1_2_11beta2 Your_png_h_is_not_version_1_2_11beta2; /* 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.11beta1 - May 31, 2006\n\ + return ((png_charp) "\n libpng version 1.2.11beta2 - June 2, 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"); diff --git a/png.h b/png.h index 9b5caf7321ef153a4959a894f0cc4b3a6c4e38a4..6c362a03baae25b34d76547f53b6a0ac72bdc9b4 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.11beta1 - May 31, 2006 + * libpng version 1.2.11beta2 - June 2, 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.11beta1 - May 31, 2006: Glenn + * libpng versions 0.97, January 1998, through 1.2.11beta2 - June 2, 2006: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -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.11beta1, May 31, 2006, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.11beta2, June 2, 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: * ========================= * - * May 31, 2006 + * June 2, 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.11beta1 are Y2K compliant. It is my belief that earlier + * upward through 1.2.11beta2 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.11beta1" +#define PNG_LIBPNG_VER_STRING "1.2.11beta2" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.11beta1 - May 31, 2006 (header)\n" + " libpng version 1.2.11beta2 - June 2, 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 1 +#define PNG_LIBPNG_VER_BUILD 2 /* 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_11beta1; +typedef png_structp version_1_2_11beta2; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index ee2a766e4a0a40d8b4ef1b4b39dc86974f358b72..89f14a26c75724f78fb48d7d7d6af2ca3efa91de 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.11beta1 - May 31, 2006 + * libpng version 1.2.11beta2 - June 2, 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 a436d435e3320f59bc56da2e5d104c0477f87ce0..b5286e41c5482835e741b9dae382e20e2774d91d 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.9 April 14, 2006 + * Last changed in libpng 1.2.11 June 1, 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) diff --git a/pngtest.c b/pngtest.c index 2afe8cd661184746325f67dcbc6622dd2b9d0673..de78087850b27ce3ab003a142661af6c7ebf77c5 100644 --- a/pngtest.c +++ b/pngtest.c @@ -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_11beta1 your_png_h_is_not_version_1_2_11beta1; +typedef version_1_2_11beta2 your_png_h_is_not_version_1_2_11beta2; diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 9f3b296eb7095cebcbf2edbf9cb67c465137874c..f20205c6bbf9a6ba6cb8d20effa9975678580103 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.11beta1 +version=1.2.11beta2 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 753eec51491fb10d783c3c16eb3900ae38c1cb9b..b7750a9b25cabab87e84feacdcc26ad066ec3c03 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.11beta1 +Version: 1.2.11beta2 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 995c2575116af315d51878b21ce6e9dde9052e67..786d3865ec78f1dffd079ea28bb9e32b16a51092 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 1923b805452f8bbb65242228637cb98cd3befd82..bac0b29d4bf767d4663b6d5e27054f126e073eb0 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index ac41e915a51d30a46ede9da9f9279bbaac22131c..a0192949236bb17c5a1ed841bc58b95d7705dcc8 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.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index f3a54fb58d4251b09e9a4ea14f2a887834bb3c60..82dbfb1ae05cb2f8a011500cb80b0c541b923098 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 101851dfccd63090a8f2d8a8df26223daa499348..59e1a537eb1bced5fa4112f32b29c46a19df5b90 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.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 12b7d91b5052b19db6472114605da95d122ee8f2..56d98621ec935bd552d4849fa496c113267302f0 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index f1d22c4911195ad7481e89473dfe85a298be8e51..b746df20b070e4ee73dc7e8a4eadfdc6d7824b02 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index f7b4bea71c31147d0564859f54fd75887a164f76..280286c9aeeb103e67e270b056254ddce069542f 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index ba6ab5e6f6436d1a680eb756237d1365b0d9c29a..fc59c67cc2bdfc7270889a64980f73e75b2c7fb4 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 1b146fdc42379886351a0e450db2540b0e32882b..f63874eadb1245ce4e729e47a82438ffe2c5961b 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.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 41994d36006d6ac0fd2f0d2ef97e90af09b59563..43153b7a06f61169eda5b5b64e8e5b77b41a058d 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 24720b73d69d775ea5d7423124174f128ca8b768..0df7565d5698c517281a1d27b69d635848cb657d 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.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 4c9425bf53c27ef3eb676d6087f7952545a3fee7..8efbbfd5d3e8bf57b421e59d8a6fb2d851e564be 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index acfb367788781af71d28310af3f34e8bbfa11d7e..ace63b86fb96a4b5d8f7cc0aad1d900873443a80 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.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index f7e075ecced7127b58be5d8ed3dbe3df1e387eb9..65605e7c1ac1786176a3e3e35f44aba4dabd7605 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.11beta1 +SHLIB_MINOR= 1.2.11beta2 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 487c3cc4a8bb8f3e25047821405a474b4079bdde..2288406af557660008b73a3dd360445e62b81dff 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.11beta1 +SHLIB_MINOR= 1.2.11beta2 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 54ab020bda303eb4770827e09f73080dcc2b6b72..2b15d52ba4d179fa2118be7f8bfa1dbc2169a009 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.11beta1 +SHLIB_MINOR= 1.2.11beta2 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 6d17587bce09d8ba29eb18964681a42d4238b66b..d00d0db4b930e22f043e600403e105fe518f62a4 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 1926234be673d2a208ff75cdeb3bebc10f826f8c..ec4a290138bb1de8392f575869e1b823aecd58d5 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 630e0f46a394f557188fc8846b6f2617d5396376..d18264fc909eaa7b77470258d5a4f30f4ff346a6 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 113b00164d2c062b909c23a99e40ae90212ac0f4..0bcea2a75a49e46c3c65766f4d42b8755fba22e2 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 0ce2ba68fca59759d5dd9ce2d21d556319250219..76479b4f301ab4e617e2e668c1b155a9daebb1f5 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.11beta1 +PNGMIN = 1.2.11beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index fcaba70b683bcd819c75c7540162ee2238a6a72c..228b18c2180f72876696bd61753963c4df8df877 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.11beta1 +; Version 1.2.11beta2 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 9811bde22c021f1678230a1c75725200c6b3781b..c0569c686b4dbc4049433f5cb0d3727870634ea3 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.11beta1 +;Version 1.2.11beta2 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3