From 930be985983ca3f7b2821137bd03fa69f2e2baaf Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 16 Oct 2007 16:52:27 -0500 Subject: [PATCH] Imported from libpng-1.2.23beta03.tar --- ANNOUNCE | 30 +++++++++++-------- CHANGES | 4 +++ INSTALL | 16 +++++----- KNOWNBUG | 2 +- LICENSE | 2 +- README | 14 ++++----- Y2KINFO | 2 +- configure | 22 +++++++------- configure.ac | 4 +-- ....2.23beta02.txt => libpng-1.2.23beta03.txt | 4 +-- libpng.3 | 12 ++++---- libpngpf.3 | 2 +- png.c | 4 +-- png.h | 18 +++++------ pngconf.h | 2 +- pngerror.c | 1 + pngset.c | 2 +- pngtest.c | 2 +- scripts/CMakeLists.txt | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc-configure.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.32sunu | 2 +- scripts/makefile.64sunu | 2 +- scripts/makefile.aix | 2 +- scripts/makefile.beos | 2 +- scripts/makefile.cygwin | 2 +- scripts/makefile.darwin | 2 +- scripts/makefile.dec | 2 +- scripts/makefile.elf | 2 +- scripts/makefile.gcmmx | 2 +- scripts/makefile.hp64 | 2 +- scripts/makefile.hpgcc | 2 +- scripts/makefile.hpux | 2 +- scripts/makefile.linux | 2 +- scripts/makefile.mingw | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.nommx | 2 +- scripts/makefile.openbsd | 2 +- scripts/makefile.sco | 2 +- scripts/makefile.sggcc | 2 +- scripts/makefile.sgi | 2 +- scripts/makefile.so9 | 2 +- scripts/makefile.solaris | 2 +- scripts/makefile.solaris-x86 | 2 +- scripts/pngos2.def | 2 +- scripts/pngw32.def | 2 +- 48 files changed, 106 insertions(+), 97 deletions(-) rename libpng-1.2.23beta02.txt => libpng-1.2.23beta03.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index de8ffd53..a313d6ea 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.23beta02 - October 16, 2007 +Libpng 1.2.23beta03 - October 16, 2007 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.23beta02.tar.gz - libpng-1.2.23beta02.tar.bz2 + libpng-1.2.23beta03.tar.gz + libpng-1.2.23beta03.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.23beta02-no-config.tar.gz - libpng-1.2.23beta02-no-config.tar.bz2 + libpng-1.2.23beta03-no-config.tar.gz + libpng-1.2.23beta03-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1223b02.zip - lp1223b02.tar.bz2 + lp1223b03.zip + lp1223b03.tar.bz2 Project files - libpng-1.2.23beta02-project-netware.zip - libpng-1.2.23beta02-project-wince.zip + libpng-1.2.23beta03-project-netware.zip + libpng-1.2.23beta03-project-wince.zip Other information: - libpng-1.2.23beta02-README.txt - libpng-1.2.23beta02-KNOWNBUGS.txt - libpng-1.2.23beta02-LICENSE.txt - libpng-1.2.23beta02-Y2K-compliance.txt + libpng-1.2.23beta03-README.txt + libpng-1.2.23beta03-KNOWNBUGS.txt + libpng-1.2.23beta03-LICENSE.txt + libpng-1.2.23beta03-Y2K-compliance.txt Changes since the last public release (1.2.19): @@ -137,6 +137,10 @@ version 1.2.23beta02 [October 16, 2007] Eliminated png_strncpy() and png_strcpy() (Pierre Poissinger) Changed $AN to $(AN) in Makefile.am. +version 1.2.23beta03 [October 16, 2007] + Fixed off-by-one error in pngset.c + Restore statement to set last character of buffer to \0 in pngerror.c + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index ef764784..dbac8a56 100644 --- a/CHANGES +++ b/CHANGES @@ -1994,6 +1994,10 @@ version 1.2.23beta02 [October 16, 2007] Eliminated png_strncpy() and png_strcpy() (Pierre Poissinger) Changed $AN to $(AN) in Makefile.am. +version 1.2.23beta03 [October 16, 2007] + Fixed off-by-one error in pngset.c + Restore statement to set last character of buffer to \0 in pngerror.c + 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/INSTALL b/INSTALL index 984a8065..f5ec1b38 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.23beta02 - October 16, 2007 +Installing libpng version 1.2.23beta03 - October 16, 2007 On Unix/Linux and similar systems, you can simply type @@ -44,7 +44,7 @@ to have access to the zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.2.23beta02" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.23beta03" or "lpng109" and "zlib-1.2.1" or "zlib121") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -101,9 +101,9 @@ include CMakeLists.txt => "cmake" script makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.23beta02) + gcc, creates libpng12.so.0.1.2.23beta03) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.23beta02) + (gcc, creates libpng12.so.0.1.2.23beta03) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -125,14 +125,14 @@ include makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sggcc => Silicon Graphics (gcc, - creates libpng12.so.0.1.2.23beta02) + creates libpng12.so.0.1.2.23beta03) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.23beta02) + creates libpng12.so.0.1.2.23beta03) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.23beta02) + creates libpng12.so.0.1.2.23beta03) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.23beta02) + creates libpng12.so.0.1.2.23beta03) 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 be2e63f0..237b87ea 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.23beta02 +Known bugs in libpng version 1.2.23beta03 1. February 23, 2006: The custom makefiles don't build libpng with -lz. diff --git a/LICENSE b/LICENSE index 60be66f6..5ff016c1 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.23beta02, October 16, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.23beta03, October 16, 2007, are Copyright (c) 2004, 2006-2007 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 diff --git a/README b/README index fc6f1ef7..11675e0b 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.23beta02 - October 16, 2007 (shared library 12.0) +README for libpng version 1.2.23beta03 - October 16, 2007 (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.23beta02) + gcc, creates libpng12.so.0.1.2.23beta03) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.23beta02) + (gcc, creates libpng12.so.0.1.2.23beta03) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.23beta02, + (gcc, creates libpng12.so.0.1.2.23beta03, 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.23beta02) + (gcc, creates libpng12.so.0.1.2.23beta03) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.23beta02) + (gcc, creates libpng12.so.0.1.2.23beta03) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.23beta02) + (gcc, creates libpng12.so.0.1.2.23beta03) 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 a3b51865..47687b64 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -7,7 +7,7 @@ an official declaration. This is your unofficial assurance that libpng from version 0.71 and - upward through 1.2.23beta02 are Y2K compliant. It is my belief that earlier + upward through 1.2.23beta03 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 17a42424..1e56027b 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.61 for libpng 1.2.23beta02. +# Generated by GNU Autoconf 2.61 for libpng 1.2.23beta03. # # Report bugs to . # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.23beta02' -PACKAGE_STRING='libpng 1.2.23beta02' +PACKAGE_VERSION='1.2.23beta03' +PACKAGE_STRING='libpng 1.2.23beta03' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' ac_unique_file="pngget.c" @@ -1405,7 +1405,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.23beta02 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.23beta03 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1475,7 +1475,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.2.23beta02:";; + short | recursive ) echo "Configuration of libpng 1.2.23beta03:";; esac cat <<\_ACEOF @@ -1585,7 +1585,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.2.23beta02 +libpng configure 1.2.23beta03 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1599,7 +1599,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libpng $as_me 1.2.23beta02, which was +It was created by libpng $as_me 1.2.23beta03, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2269,7 +2269,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.2.23beta02' + VERSION='1.2.23beta03' cat >>confdefs.h <<_ACEOF @@ -2440,7 +2440,7 @@ fi -PNGLIB_VERSION=1.2.23beta02 +PNGLIB_VERSION=1.2.23beta03 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=23 @@ -21282,7 +21282,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpng $as_me 1.2.23beta02, which was +This file was extended by libpng $as_me 1.2.23beta03, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21335,7 +21335,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpng config.status 1.2.23beta02 +libpng config.status 1.2.23beta03 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 3d474b52..14a455ab 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.23beta02], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.23beta03], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.23beta02 +PNGLIB_VERSION=1.2.23beta03 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=23 diff --git a/libpng-1.2.23beta02.txt b/libpng-1.2.23beta03.txt similarity index 99% rename from libpng-1.2.23beta02.txt rename to libpng-1.2.23beta03.txt index 3200e2bc..bcbd5539 100644 --- a/libpng-1.2.23beta02.txt +++ b/libpng-1.2.23beta03.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.23beta02 - October 16, 2007 + libpng version 1.2.23beta03 - October 16, 2007 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -2802,7 +2802,7 @@ 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.23beta02 are Y2K compliant. It is my belief that earlier +upward through 1.2.23beta03 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpng.3 b/libpng.3 index becae73e..5b6081ac 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "October 16, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.23beta02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.23beta03 .SH SYNOPSIS \fB #include \fP @@ -410,7 +410,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.23beta02 - October 16, 2007 + libpng version 1.2.23beta03 - October 16, 2007 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -3212,7 +3212,7 @@ 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.23beta02 are Y2K compliant. It is my belief that earlier +upward through 1.2.23beta03 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 @@ -3420,7 +3420,7 @@ the first widely used release: 1.2.22rc1 13 10222 12.so.0.22[.0] 1.0.30 10 10030 10.so.0.30[.0] 1.2.22 13 10222 12.so.0.22[.0] - 1.2.23beta01 13 10223 12.so.0.23[.0] + 1.2.23beta01-03 13 10223 12.so.0.23[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3476,7 +3476,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.23beta02 - October 16, 2007: +Libpng version 1.2.23beta03 - October 16, 2007: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -3497,7 +3497,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.23beta02, October 16, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.23beta03, October 16, 2007, are Copyright (c) 2004,2006-2007 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 diff --git a/libpngpf.3 b/libpngpf.3 index 017b216d..2d09ebde 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "October 16, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.23beta02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.23beta03 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.c b/png.c index b0d3cbda..98a1ee4d 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_23beta02 Your_png_h_is_not_version_1_2_23beta02; +typedef version_1_2_23beta03 Your_png_h_is_not_version_1_2_23beta03; /* 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) { png_ptr = png_ptr; /* silence compiler warning about unused png_ptr */ - return ((png_charp) "\n libpng version 1.2.23beta02 - October 16, 2007\n\ + return ((png_charp) "\n libpng version 1.2.23beta03 - October 16, 2007\n\ Copyright (c) 1998-2007 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 9602c82d..2bae2fd7 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.23beta02 - October 16, 2007 + * libpng version 1.2.23beta03 - October 16, 2007 * Copyright (c) 1998-2007 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.23beta02 - October 16, 2007: Glenn + * libpng versions 0.97, January 1998, through 1.2.23beta03 - October 16, 2007: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -169,7 +169,7 @@ * 1.2.22rc1 13 10222 12.so.0.22[.0] * 1.0.30 10 10030 10.so.0.30[.0] * 1.2.22 13 10222 12.so.0.22[.0] - * 1.2.23beta01 13 10223 12.so.0.23[.0] + * 1.2.23beta01-03 13 10223 12.so.0.23[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -199,7 +199,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.23beta02, October 16, 2007, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.23beta03, October 16, 2007, are * Copyright (c) 2004, 2006-2007 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: @@ -317,7 +317,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.2.23beta02 are Y2K compliant. It is my belief that earlier + * upward through 1.2.23beta03 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 @@ -373,9 +373,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.23beta02" +#define PNG_LIBPNG_VER_STRING "1.2.23beta03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.23beta02 - October 16, 2007\n" + " libpng version 1.2.23beta03 - October 16, 2007\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -387,7 +387,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 02 +#define PNG_LIBPNG_VER_BUILD 03 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1423,7 +1423,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_23beta02; +typedef png_structp version_1_2_23beta03; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index 5b76782b..42212d9f 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.23beta02 - October 16, 2007 + * libpng version 1.2.23beta03 - October 16, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index f2da692c..df193d30 100644 --- a/pngerror.c +++ b/pngerror.c @@ -168,6 +168,7 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp buffer[iout++] = ':'; buffer[iout++] = ' '; png_memcpy(buffer+iout, error_message, PNG_MAX_ERROR_TEXT); + buffer[iout+PNG_MAX_ERROR_TEXT-1] = '\0'; } } diff --git a/pngset.c b/pngset.c index 0c275453..e99b6453 100644 --- a/pngset.c +++ b/pngset.c @@ -1043,7 +1043,7 @@ png_set_unknown_chunks(png_structp png_ptr, png_memcpy((png_charp)to->name, (png_charp)from->name, png_sizeof(from->name)); - to->name[png_sizeof(to->name)] = '\0'; + to->name[png_sizeof(to->name)-1] = '\0'; to->data = (png_bytep)png_malloc_warn(png_ptr, from->size); if (to->data == NULL) diff --git a/pngtest.c b/pngtest.c index fc1bf809..37efa7e5 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1553,4 +1553,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_23beta02 your_png_h_is_not_version_1_2_23beta02; +typedef version_1_2_23beta03 your_png_h_is_not_version_1_2_23beta03; diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 893b669d..dfe5bf4f 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -169,7 +169,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in # SET UP LINKS set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 0.${PNGLIB_RELEASE}.1.2.23beta02 +# VERSION 0.${PNGLIB_RELEASE}.1.2.23beta03 VERSION 0.${PNGLIB_RELEASE}.0 SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index ab1334d0..65599a9b 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.23beta02 +version=1.2.23beta03 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index e2570aaf..766508b5 100644 --- a/scripts/libpng.pc-configure.in +++ b/scripts/libpng.pc-configure.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng12 Name: libpng Description: Loads and saves PNG files -Version: 1.2.23beta02 +Version: 1.2.23beta03 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index a6ac34f5..c2e6b751 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.23beta02 +Version: 1.2.23beta03 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index cd821a2a..1991ec8b 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 639635cb..c4c04591 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 6e582df8..548c7778 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.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index e23754b8..be28561a 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index e5c805e3..14af31b5 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 7ff58c4c..bac4f0f9 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index fb5f7faf..d084ecd1 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index e27cd43e..5a7bc860 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 8bc5fdff..26a3a3b7 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -14,7 +14,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index cdaa8f0d..9dcede5c 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.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 9670a4f6..e081d9df 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index e7fdf4b8..0d88d98f 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.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 1906125f..f7a982c5 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 40b88e08..614954a2 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index d956ed47..b02a44d3 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.23beta02 +SHLIB_MINOR= 1.2.23beta03 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index c374774b..9c0df73b 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.23beta02 +SHLIB_MINOR= 1.2.23beta03 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx index 443016d8..4533760e 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 4fda8db8..6a298af8 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -8,7 +8,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.23beta02 +SHLIB_MINOR= 1.2.23beta03 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 5de6d55f..9953d1aa 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 822dba30..4c7bed99 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 5a86a1ea..6ca237b5 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index e51b3bee..97eb6340 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index a5f7d778..10c53a46 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 754949b4..f3888341 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.23beta02 +PNGMIN = 1.2.23beta03 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 304217b8..f9d5b2fe 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.23beta02 +; Version 1.2.23beta03 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 8026b591..1f384a45 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.23beta02 +;Version 1.2.23beta03 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3