Imported from libpng-1.2.11beta2.tar
diff --git a/ANNOUNCE b/ANNOUNCE index a902b00..9da7c6f 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 @@ 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 @@ 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 368789b..f51e30c 100644 --- a/CHANGES +++ b/CHANGES
@@ -1562,7 +1562,7 @@ 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 @@ 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 4b84b2d..a4b8cb3 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 @@ 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 @@ 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 @@ 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 fe74cd5..1833700 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 ca27731..0ca25ba 100644 --- a/LICENSE +++ b/LICENSE
@@ -8,7 +8,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 @@ -106,4 +106,4 @@ Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 31, 2006 +June 2, 2006
diff --git a/README b/README index f8b7a4d..3f5729e 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 @@ 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 @@ 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 2235887..431a34f 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 a5ca3d9..638ddb1 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 <png-mng-implement@lists.sourceforge.net>. # @@ -423,8 +423,8 @@ # 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 @@ # 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 @@ 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 @@ 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 @@ 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 @@ # Define the identity of the package. PACKAGE='libpng' - VERSION='1.2.11beta1' + VERSION='1.2.11beta2' cat >>confdefs.h <<_ACEOF @@ -1979,7 +1979,7 @@ -PNGLIB_VERSION=1.2.11beta1 +PNGLIB_VERSION=1.2.11beta2 PNGLIB_MAJOR=12 PNGLIB_MINOR=11 @@ -20681,7 +20681,7 @@ } >&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 @@ 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 fd6b14c..6ccaf49 100644 --- a/configure.ac +++ b/configure.ac
@@ -18,12 +18,12 @@ 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 6d4ee81..fd7096e 100644 --- a/example.c +++ b/example.c
@@ -200,7 +200,7 @@ /* 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 a9c3482..2827160 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 @@ .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 <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -3738,13 +3738,13 @@ .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 @@ 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 @@ 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 @@ 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 d01e986..2761dc0 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 <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -2917,13 +2917,13 @@ 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 f8ed1d4..f31ec28 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 <png.h>\fP
diff --git a/png.5 b/png.5 index 149f224..2784e0f 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 3b3e3e5..586709d 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_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 9b5caf7..6c362a0 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 @@ /* 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 ee2a766..89f14a2 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 a436d43..b5286e4 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 2afe8cd..de78087 100644 --- a/pngtest.c +++ b/pngtest.c
@@ -1549,4 +1549,4 @@ } /* 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 9f3b296..f20205c 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 753eec5..b7750a9 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ 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 995c257..786d386 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 1923b80..bac0b29 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 ac41e91..a019294 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@ 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 f3a54fb..82dbfb1 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 101851d..59e1a53 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin
@@ -80,7 +80,7 @@ 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 12b7d91..56d9862 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin
@@ -19,7 +19,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.dec b/scripts/makefile.dec index f1d22c4..b746df2 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 f7b4bea..280286c 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 ba6ab5e..fc59c67 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 1b146fd..f63874e 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64
@@ -18,7 +18,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.hpgcc b/scripts/makefile.hpgcc index 41994d3..43153b7 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 24720b7..0df7565 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux
@@ -18,7 +18,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.linux b/scripts/makefile.linux index 4c9425b..8efbbfd 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 acfb367..ace63b8 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw
@@ -76,7 +76,7 @@ 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 f7e075e..65605e7 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@ 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 487c3cc..2288406 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@ 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 54ab020..2b15d52 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd
@@ -7,7 +7,7 @@ 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 6d17587..d00d0db 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 1926234..ec4a290 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 630e0f4..d18264f 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 113b001..0bcea2a 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 0ce2ba6..76479b4 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 fcaba70..228b18c 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 9811bde..c0569c6 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