From ad310547a2c1ea85222a5ff58e2dc678bc8bdbed Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 18 Apr 2006 05:31:20 -0500 Subject: [PATCH] Imported from libpng-1.2.10beta7.tar --- ANNOUNCE | 29 ++++++++++++++++------------- CHANGES | 3 +++ INSTALL | 16 ++++++++-------- KNOWNBUG | 2 +- LICENSE | 4 ++-- README | 14 +++++++------- Y2KINFO | 4 ++-- configure | 22 +++++++++++----------- configure.ac | 4 ++-- libpng.3 | 18 +++++++++--------- libpng.txt | 6 +++--- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 4 ++-- png.h | 20 ++++++++++---------- pngconf.h | 2 +- pngtest.c | 2 +- scripts/libpng-config-head.in | 2 +- scripts/makefile.32sunu | 4 ++-- scripts/makefile.64sunu | 4 ++-- scripts/makefile.aix | 2 +- scripts/makefile.beos | 4 ++-- scripts/makefile.cygwin | 4 ++-- scripts/makefile.darwin | 4 ++-- scripts/makefile.dec | 4 ++-- scripts/makefile.elf | 4 ++-- scripts/makefile.gcmmx | 4 ++-- scripts/makefile.hp64 | 4 ++-- scripts/makefile.hpgcc | 4 ++-- scripts/makefile.hpux | 4 ++-- scripts/makefile.linux | 4 ++-- scripts/makefile.mingw | 4 ++-- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/makefile.sco | 4 ++-- scripts/makefile.sggcc | 4 ++-- scripts/makefile.sgi | 4 ++-- scripts/makefile.so9 | 4 ++-- scripts/makefile.solaris | 4 ++-- scripts/pngos2.def | 2 +- scripts/pngw32.def | 2 +- 42 files changed, 124 insertions(+), 118 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index b382bc33..e425f180 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.10beta6 - April 17, 2006 +Libpng 1.2.10beta7 - April 18, 2006 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -9,32 +9,32 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.2.10beta6.tar.gz - 1.2.10beta6.tar.bz2 + 1.2.10beta7.tar.gz + 1.2.10beta7.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - 1.2.10beta6-no-config.tar.gz - 1.2.10beta6-no-config.tar.bz2 + 1.2.10beta7-no-config.tar.gz + 1.2.10beta7-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1210b06.zip - lp1210b06.tar.bz2 + lp1210b07.zip + lp1210b07.tar.bz2 Project files - 1.2.10beta6-project-netware.zip - 1.2.10beta6-project-wince.zip + 1.2.10beta7-project-netware.zip + 1.2.10beta7-project-wince.zip Other information: - 1.2.10beta6-README.txt - 1.2.10beta6-KNOWNBUGS.txt - 1.2.10beta6-LICENSE.txt - 1.2.10beta6-Y2K-compliance.txt + 1.2.10beta7-README.txt + 1.2.10beta7-KNOWNBUGS.txt + 1.2.10beta7-LICENSE.txt + 1.2.10beta7-Y2K-compliance.txt Changes since the last public release (1.2.9): @@ -61,6 +61,9 @@ version 1.2.10beta6 [April 17, 2006] 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. + 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 d5f14510..91d901a5 100644 --- a/CHANGES +++ b/CHANGES @@ -1545,6 +1545,9 @@ version 1.2.10beta6 [April 17, 2006] 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.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, diff --git a/INSTALL b/INSTALL index fcb70ce2..7466535b 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.10beta6 - April 17, 2006 +Installing libpng version 1.2.10beta7 - April 18, 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.10beta6" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.10beta7" 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.10beta6) + gcc, creates libpng12.so.0.1.2.10beta7) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.10beta6) + (gcc, creates libpng12.so.0.1.2.10beta7) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.10beta6, + (gcc, creates libpng12.so.0.1.2.10beta7, 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.10beta6) + creates libpng12.so.0.1.2.10beta7) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.10beta6) + creates libpng12.so.0.1.2.10beta7) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.10beta6) + creates libpng12.so.0.1.2.10beta7) 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 3baafa47..ec460851 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.10beta6 +Known bugs in libpng version 1.2.10beta7 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 02daddf6..1f58196e 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.10beta6, April 17, 2006, are +libpng versions 1.2.6, August 15, 2004, through 1.2.10beta7, April 18, 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 -April 17, 2006 +April 18, 2006 diff --git a/README b/README index cc409a8a..b0897465 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.10beta6 - April 17, 2006 (shared library 12.0) +README for libpng version 1.2.10beta7 - April 18, 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.10beta6) + gcc, creates libpng12.so.0.1.2.10beta7) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.10beta6) + (gcc, creates libpng12.so.0.1.2.10beta7) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.10beta6, + (gcc, creates libpng12.so.0.1.2.10beta7, 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.10beta6) + (gcc, creates libpng12.so.0.1.2.10beta7) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.10beta6) + (gcc, creates libpng12.so.0.1.2.10beta7) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.10beta6) + (gcc, creates libpng12.so.0.1.2.10beta7) 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 4ecc4483..d057bb87 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - April 17, 2006 + April 18, 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.10beta6 are Y2K compliant. It is my belief that earlier + upward through 1.2.10beta7 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 bb1ad857..321e3301 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.10beta6. +# Generated by GNU Autoconf 2.59 for libpng 1.2.10beta7. # # 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.10beta6' -PACKAGE_STRING='libpng 1.2.10beta6' +PACKAGE_VERSION='1.2.10beta7' +PACKAGE_STRING='libpng 1.2.10beta7' 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.10beta6 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.10beta7 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.10beta6:";; + short | recursive ) echo "Configuration of libpng 1.2.10beta7:";; 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.10beta6 +libpng configure 1.2.10beta7 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.10beta6, which was +It was created by libpng $as_me 1.2.10beta7, 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.10beta6' + VERSION='1.2.10beta7' cat >>confdefs.h <<_ACEOF @@ -1979,7 +1979,7 @@ fi -PNGLIB_VERSION=1.2.10beta6 +PNGLIB_VERSION=1.2.10beta7 PNGLIB_MAJOR=12 PNGLIB_MINOR=10 @@ -20681,7 +20681,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by libpng $as_me 1.2.10beta6, which was +This file was extended by libpng $as_me 1.2.10beta7, 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.10beta6 +libpng config.status 1.2.10beta7 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 50b1521e..9ff70671 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.10beta6], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.10beta7], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.10beta6 +PNGLIB_VERSION=1.2.10beta7 PNGLIB_MAJOR=12 PNGLIB_MINOR=10 diff --git a/libpng.3 b/libpng.3 index 9af32563..6544e55d 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "April 17, 2006" +.TH LIBPNG 3 "April 18, 2006" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10beta6 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10beta7 .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.10beta6 - April 17, 2006 + libpng version 1.2.10beta7 - April 18, 2006 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -3730,13 +3730,13 @@ application: .SH IX. Y2K Compliance in libpng -April 17, 2006 +April 18, 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.10beta6 are Y2K compliant. It is my belief that earlier +upward through 1.2.10beta7 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 @@ -3893,7 +3893,7 @@ the first widely used release: 1.2.9beta4-11 13 10209 12.so.0.9[.0] 1.2.9rc1 13 10209 12.so.0.9[.0] 1.2.9 13 10209 12.so.0.9[.0] - 1.2.10beta1-5 13 10210 12.so.0.10[.0] + 1.2.10beta1-7 13 10210 12.so.0.10[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3949,7 +3949,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.10beta6 - April 17, 2006: +Libpng version 1.2.10beta7 - April 18, 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). @@ -3970,7 +3970,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.10beta6, April 17, 2006, are +libpng versions 1.2.6, August 15, 2004, through 1.2.10beta7, April 18, 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 @@ -4069,7 +4069,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 17, 2006 +April 18, 2006 .\" end of man page diff --git a/libpng.txt b/libpng.txt index 7bff21e0..7eb6a472 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.10beta6 - April 17, 2006 + libpng version 1.2.10beta7 - April 18, 2006 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -2909,13 +2909,13 @@ application: IX. Y2K Compliance in libpng -April 17, 2006 +April 18, 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.10beta6 are Y2K compliant. It is my belief that earlier +upward through 1.2.10beta7 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 8664f7c3..0eb5b5c6 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "April 17, 2006" +.TH LIBPNGPF 3 "April 18, 2006" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10beta6 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10beta7 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index 5e776e86..15633aab 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "April 17, 2006" +.TH PNG 5 "April 18, 2006" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 8f86db0f..5b773da2 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_10beta6 Your_png_h_is_not_version_1_2_10beta6; +typedef version_1_2_10beta7 Your_png_h_is_not_version_1_2_10beta7; /* 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.10beta6 - April 17, 2006\n\ + return ((png_charp) "\n libpng version 1.2.10beta7 - April 18, 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 787e98ee..ce2c9b02 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.10beta6 - April 17, 2006 + * libpng version 1.2.10beta7 - April 18, 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.10beta6 - April 17, 2006: Glenn + * libpng versions 0.97, January 1998, through 1.2.10beta7 - April 18, 2006: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -116,7 +116,7 @@ * 1.2.9beta4-11 13 10209 12.so.0.9[.0] * 1.2.9rc1 13 10209 12.so.0.9[.0] * 1.2.9 13 10209 12.so.0.9[.0] - * 1.2.10beta1-5 13 10210 12.so.0.10[.0] + * 1.2.10beta1-7 13 10210 12.so.0.10[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -146,7 +146,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.10beta6, April 17, 2006, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.10beta7, April 18, 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: @@ -258,13 +258,13 @@ * Y2K compliance in libpng: * ========================= * - * April 17, 2006 + * April 18, 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.10beta6 are Y2K compliant. It is my belief that earlier + * upward through 1.2.10beta7 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 @@ -320,9 +320,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.10beta6" +#define PNG_LIBPNG_VER_STRING "1.2.10beta7" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.10beta6 - April 17, 2006 (header)\n" + " libpng version 1.2.10beta7 - April 18, 2006 (header)\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -334,7 +334,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 6 +#define PNG_LIBPNG_VER_BUILD 7 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1364,7 +1364,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_10beta6; +typedef png_structp version_1_2_10beta7; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index 0f60490e..ca689597 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.10beta6 - April 17, 2006 + * libpng version 1.2.10beta7 - April 18, 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/pngtest.c b/pngtest.c index 80bf4517..eb824909 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_10beta6 your_png_h_is_not_version_1_2_10beta6; +typedef version_1_2_10beta7 your_png_h_is_not_version_1_2_10beta7; diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 5a968571..53f7c383 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.10beta6 +version=1.2.10beta7 prefix="" libdir="" libs="" diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index b40a15bd..25358871 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -32,7 +32,7 @@ SUN_LD_FLAGS=-fast -xtarget=ultra # where make install puts libpng.a, libpng12.so and libpng12/png.h prefix=/a -exec_prefix=$prefix +exec_prefix=$(prefix) # Where the zlib library and include files are located # Changing these to ../zlib poses a security risk. If you want diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 9f202a28..907e1512 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -32,7 +32,7 @@ SUN_LD_FLAGS=-fast -xtarget=ultra -xarch=v9 # where make install puts libpng.a, libpng12.so and libpng12/png.h prefix=/a -exec_prefix=$prefix +exec_prefix=$(prefix) # Where the zlib library and include files are located # Changing these to ../zlib poses a security risk. If you want diff --git a/scripts/makefile.aix b/scripts/makefile.aix index a8006781..70d91c04 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.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index adbb119c..feaa1afd 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -48,7 +48,7 @@ LDFLAGS=-L. -Wl,-soname=$(LIBSOMAJ) -L$(ZLIBLIB) -lz # where make install puts libpng.a, libpng12.so*, and png.h prefix=/usr/local -exec_prefix=$prefix +exec_prefix=$(prefix) INCPATH=$(prefix)/include LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 7afdaab4..3d223ea2 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -46,7 +46,7 @@ ifndef prefix prefix=/usr $(warning You haven't specified a 'prefix=' location. Defaulting to "/usr") endif -exec_prefix=$prefix +exec_prefix=$(prefix) # Where the zlib library and include files are located ZLIBLIB= /usr/lib @@ -80,7 +80,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 001f411b..d28f2eaf 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -8,7 +8,7 @@ # where "make install" puts libpng.a, libpng12.dylib, png.h and pngconf.h prefix=/usr/local -exec_prefix=$prefix +exec_prefix=$(prefix) # Where the zlib library and include files are located #ZLIBLIB=/usr/local/lib @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index ffc4ff57..bd0da9c5 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -27,7 +27,7 @@ RM_F=/bin/rm -f # where make install puts libpng.a and png.h prefix=/usr/local -exec_prefix=$prefix +exec_prefix=$(prefix) INCPATH=$(prefix)/include LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man diff --git a/scripts/makefile.elf b/scripts/makefile.elf index a52d4295..d0dc4290 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -35,7 +35,7 @@ RM_F=/bin/rm -f # libpng12/png.h and libpng12/pngconf.h # Prefix must be a full pathname. prefix=/usr/local -exec_prefix=$prefix +exec_prefix=$(prefix) # Where the zlib library and include files are located. ZLIBLIB=/usr/local/lib diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 8c81d1b3..06e5a91b 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -40,7 +40,7 @@ RM_F = /bin/rm -f # libpng12/png.h and libpng12/pngconf.h # Prefix must be a full pathname. prefix=/usr/local -exec_prefix=$prefix +exec_prefix=$(prefix) # Where the zlib library and include files are located. #ZLIBLIB=/usr/local/lib diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 341e7e56..65e40f45 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.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -47,7 +47,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm # where make install puts libpng.a, libpng12.sl, and png.h prefix=/opt/libpng -exec_prefix=$prefix +exec_prefix=$(prefix) INCPATH=$(prefix)/include LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 45df8186..8ffd9468 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -30,7 +30,7 @@ RM_F=/bin/rm -f # where "make install" puts libpng.a, $(OLDSO)*, png.h and pngconf.h prefix=/usr/local -exec_prefix=$prefix +exec_prefix=$(prefix) # Where the zlib library and include files are located ZLIBLIB=/opt/zlib/lib diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index cc580dfa..9ccbcbbe 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.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -39,7 +39,7 @@ RM_F=/bin/rm -f # where make install puts libpng.a, libpng12.sl, and png.h prefix=/opt/libpng -exec_prefix=$prefix +exec_prefix=$(prefix) INCPATH=$(prefix)/include LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man diff --git a/scripts/makefile.linux b/scripts/makefile.linux index b23f74a2..139fb056 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -29,7 +29,7 @@ RM_F=/bin/rm -f # libpng12/png.h and libpng12/pngconf.h # Prefix must be a full pathname. prefix=/usr/local -exec_prefix=$prefix +exec_prefix=$(prefix) # Where the zlib library and include files are located. #ZLIBLIB=/usr/local/lib diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 03573f23..751115c6 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -44,7 +44,7 @@ ifndef prefix prefix=/usr $(warning You haven't specified a 'prefix=' location. Defaulting to "/usr") endif -exec_prefix=$prefix +exec_prefix=$(prefix) # Where the zlib library and include files are located ZLIBLIB= /usr/lib @@ -76,7 +76,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index fff39808..a389dc8c 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.10beta6 +SHLIB_MINOR= 1.2.10beta7 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 6e9f7a88..00272607 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.10beta6 +SHLIB_MINOR= 1.2.10beta7 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 83a6fb5d..9c22d8aa 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.10beta6 +SHLIB_MINOR= 1.2.10beta7 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 b156999e..a1310990 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -30,7 +30,7 @@ RM_F=/bin/rm -f # where make install puts libpng.a, $(OLDSO)*, and png.h prefix=/usr/local -exec_prefix=$prefix +exec_prefix=$(prefix) # Where the zlib library and include files are located #ZLIBLIB=/usr/local/lib diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index b01b173c..acb59f60 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -29,7 +29,7 @@ RM_F=/bin/rm -f # Prefix must be a full pathname. prefix=/usr/local -exec_prefix=$prefix +exec_prefix=$(prefix) # Where the zlib library and include files are located #ZLIBLIB=/usr/local/lib32 diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 906aa224..cceddd4a 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -29,7 +29,7 @@ RM_F=/bin/rm -f # Prefix must be a full pathname. prefix=/usr/local -exec_prefix=$prefix +exec_prefix=$(prefix) # Where the zlib library and include files are located #ZLIBLIB=/usr/local/lib32 diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 17a32a24..f38d2903 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -31,7 +31,7 @@ RM_F=/bin/rm -f # Where make install puts libpng.a, $(OLDSO)*, and png.h prefix=/usr/local -exec_prefix=$prefix +exec_prefix=$(prefix) # Where the zlib library and include files are located # Changing these to ../zlib poses a security risk. If you want diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 953de667..60a87d3e 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta6 +PNGMIN = 1.2.10beta7 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -29,7 +29,7 @@ RM_F=/bin/rm -f # Where make install puts libpng.a, libpng12.so*, and png.h prefix=/usr/local -exec_prefix=$prefix +exec_prefix=$(prefix) # Where the zlib library and include files are located # Changing these to ../zlib poses a security risk. If you want diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 718dcdfd..557af81e 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.10beta6 +; Version 1.2.10beta7 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index b9561236..27301c62 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.10beta6 +;Version 1.2.10beta7 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3