From f628ee2fa4d632dc5db72797e826e1cf645052c4 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 19 Apr 2006 05:00:04 -0500 Subject: [PATCH] Imported from libpng-1.2.10rc1.tar --- ANNOUNCE | 30 +++++++++++++++++------------- CHANGES | 7 +++++++ 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 | 22 +++++++++++----------- pngconf.h | 4 ++-- pngtest.c | 2 +- scripts/libpng-config-head.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.openbsd | 2 +- scripts/makefile.sco | 22 +++++++++++----------- scripts/makefile.sggcc | 2 +- scripts/makefile.sgi | 2 +- scripts/makefile.so9 | 2 +- scripts/makefile.solaris | 22 +++++++++++----------- scripts/pngos2.def | 2 +- scripts/pngw32.def | 2 +- 42 files changed, 133 insertions(+), 122 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index e425f180..430c898c 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.10beta7 - April 18, 2006 +Libpng 1.2.10rc1 - April 19, 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.10beta7.tar.gz - 1.2.10beta7.tar.bz2 + 1.2.10rc1.tar.gz + 1.2.10rc1.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - 1.2.10beta7-no-config.tar.gz - 1.2.10beta7-no-config.tar.bz2 + 1.2.10rc1-no-config.tar.gz + 1.2.10rc1-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1210b07.zip - lp1210b07.tar.bz2 + lp1210r01.zip + lp1210r01.tar.bz2 Project files - 1.2.10beta7-project-netware.zip - 1.2.10beta7-project-wince.zip + 1.2.10rc1-project-netware.zip + 1.2.10rc1-project-wince.zip Other information: - 1.2.10beta7-README.txt - 1.2.10beta7-KNOWNBUGS.txt - 1.2.10beta7-LICENSE.txt - 1.2.10beta7-Y2K-compliance.txt + 1.2.10rc1-README.txt + 1.2.10rc1-KNOWNBUGS.txt + 1.2.10rc1-LICENSE.txt + 1.2.10rc1-Y2K-compliance.txt Changes since the last public release (1.2.9): @@ -64,6 +64,10 @@ version 1.2.10beta6 [April 17, 2006] version 1.2.10beta7 [April 18, 2006] Change "exec_prefix=$prefix" to "exec_prefix=$(prefix)" in makefiles. +version 1.2.10beta8 [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. + 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 91d901a5..1301b715 100644 --- a/CHANGES +++ b/CHANGES @@ -1548,11 +1548,18 @@ version 1.2.10beta6 [April 17, 2006] 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.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 Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/INSTALL b/INSTALL index 7466535b..36696ecb 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.10beta7 - April 18, 2006 +Installing libpng version 1.2.10rc1 - April 19, 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.10beta7" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.10rc1" 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.10beta7) + gcc, creates libpng12.so.0.1.2.10rc1) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.10beta7) + (gcc, creates libpng12.so.0.1.2.10rc1) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.10beta7, + (gcc, creates libpng12.so.0.1.2.10rc1, 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.10beta7) + creates libpng12.so.0.1.2.10rc1) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.10beta7) + creates libpng12.so.0.1.2.10rc1) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.10beta7) + creates libpng12.so.0.1.2.10rc1) 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 ec460851..7bf8e495 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.10beta7 +Known bugs in libpng version 1.2.10rc1 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 1f58196e..2bbe933d 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.10beta7, April 18, 2006, are +libpng versions 1.2.6, August 15, 2004, through 1.2.10rc1, April 19, 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 18, 2006 +April 19, 2006 diff --git a/README b/README index b0897465..6b85d0a8 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.10beta7 - April 18, 2006 (shared library 12.0) +README for libpng version 1.2.10rc1 - April 19, 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.10beta7) + gcc, creates libpng12.so.0.1.2.10rc1) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.10beta7) + (gcc, creates libpng12.so.0.1.2.10rc1) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.10beta7, + (gcc, creates libpng12.so.0.1.2.10rc1, 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.10beta7) + (gcc, creates libpng12.so.0.1.2.10rc1) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.10beta7) + (gcc, creates libpng12.so.0.1.2.10rc1) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.10beta7) + (gcc, creates libpng12.so.0.1.2.10rc1) 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 d057bb87..8181a5bc 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - April 18, 2006 + April 19, 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.10beta7 are Y2K compliant. It is my belief that earlier + upward through 1.2.10rc1 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 321e3301..f8b563f8 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.10beta7. +# Generated by GNU Autoconf 2.59 for libpng 1.2.10rc1. # # 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.10beta7' -PACKAGE_STRING='libpng 1.2.10beta7' +PACKAGE_VERSION='1.2.10rc1' +PACKAGE_STRING='libpng 1.2.10rc1' 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.10beta7 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.10rc1 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.10beta7:";; + short | recursive ) echo "Configuration of libpng 1.2.10rc1:";; 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.10beta7 +libpng configure 1.2.10rc1 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.10beta7, which was +It was created by libpng $as_me 1.2.10rc1, 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.10beta7' + VERSION='1.2.10rc1' cat >>confdefs.h <<_ACEOF @@ -1979,7 +1979,7 @@ fi -PNGLIB_VERSION=1.2.10beta7 +PNGLIB_VERSION=1.2.10rc1 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.10beta7, which was +This file was extended by libpng $as_me 1.2.10rc1, 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.10beta7 +libpng config.status 1.2.10rc1 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 9ff70671..90695acd 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.10beta7], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.10rc1], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.10beta7 +PNGLIB_VERSION=1.2.10rc1 PNGLIB_MAJOR=12 PNGLIB_MINOR=10 diff --git a/libpng.3 b/libpng.3 index 6544e55d..72507b8a 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "April 18, 2006" +.TH LIBPNG 3 "April 19, 2006" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10beta7 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10rc1 .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.10beta7 - April 18, 2006 + libpng version 1.2.10rc1 - April 19, 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 18, 2006 +April 19, 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.10beta7 are Y2K compliant. It is my belief that earlier +upward through 1.2.10rc1 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-7 13 10210 12.so.0.10[.0] + 1.2.10beta1-8 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.10beta7 - April 18, 2006: +Libpng version 1.2.10rc1 - April 19, 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.10beta7, April 18, 2006, are +libpng versions 1.2.6, August 15, 2004, through 1.2.10rc1, April 19, 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 18, 2006 +April 19, 2006 .\" end of man page diff --git a/libpng.txt b/libpng.txt index 7eb6a472..1df97b67 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.10beta7 - April 18, 2006 + libpng version 1.2.10rc1 - April 19, 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 18, 2006 +April 19, 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.10beta7 are Y2K compliant. It is my belief that earlier +upward through 1.2.10rc1 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 0eb5b5c6..778ec0c2 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "April 18, 2006" +.TH LIBPNGPF 3 "April 19, 2006" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10beta7 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10rc1 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index 15633aab..956836aa 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "April 18, 2006" +.TH PNG 5 "April 19, 2006" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 5b773da2..21ef8fa0 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_10beta7 Your_png_h_is_not_version_1_2_10beta7; +typedef version_1_2_10rc1 Your_png_h_is_not_version_1_2_10rc1; /* 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.10beta7 - April 18, 2006\n\ + return ((png_charp) "\n libpng version 1.2.10rc1 - April 19, 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 ce2c9b02..6442a193 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.10beta7 - April 18, 2006 + * libpng version 1.2.10rc1 - April 19, 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.10beta7 - April 18, 2006: Glenn + * libpng versions 0.97, January 1998, through 1.2.10rc1 - April 19, 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-7 13 10210 12.so.0.10[.0] + * 1.2.10beta1-8 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.10beta7, April 18, 2006, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.10rc1, April 19, 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 18, 2006 + * April 19, 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.10beta7 are Y2K compliant. It is my belief that earlier + * upward through 1.2.10rc1 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.10beta7" +#define PNG_LIBPNG_VER_STRING "1.2.10rc1" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.10beta7 - April 18, 2006 (header)\n" + " libpng version 1.2.10rc1 - April 19, 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 7 +#define PNG_LIBPNG_VER_BUILD 1 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -351,7 +351,7 @@ #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with PNG_LIBPNG_BUILD_PRIVATE */ -#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -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_10beta7; +typedef png_structp version_1_2_10rc1; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index ca689597..f7013f6e 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.10beta7 - April 18, 2006 + * libpng version 1.2.10rc1 - April 19, 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) @@ -731,7 +731,7 @@ # define PNG_MMX_CODE_SUPPORTED # endif # if !defined(PNG_USE_PNGGCCRD) && !defined(PNG_NO_MMX_CODE) && \ - defined(__MMX__) + !defined(PNG_USE_PNGVCRD) && defined(__MMX__) # define PNG_USE_PNGGCCRD # endif #endif diff --git a/pngtest.c b/pngtest.c index eb824909..f1097f84 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_10beta7 your_png_h_is_not_version_1_2_10beta7; +typedef version_1_2_10rc1 your_png_h_is_not_version_1_2_10rc1; diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 53f7c383..fc464e12 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.10beta7 +version=1.2.10rc1 prefix="" libdir="" libs="" diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 25358871..4f3c0db1 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 907e1512..bcad7a8a 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 70d91c04..43f81fed 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.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index feaa1afd..981af284 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 3d223ea2..4acc8e47 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -80,7 +80,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index d28f2eaf..dcbcd28b 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index bd0da9c5..84ecf46c 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index d0dc4290..fd488c6a 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 06e5a91b..d47b2d17 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 65e40f45..9c1f697d 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.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 8ffd9468..d46d6145 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 9ccbcbbe..0eacfb15 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.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 139fb056..162a0204 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 751115c6..e82583a0 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -76,7 +76,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index a389dc8c..407cb9b2 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.10beta7 +SHLIB_MINOR= 1.2.10rc1 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 00272607..b22e4a7c 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.10beta7 +SHLIB_MINOR= 1.2.10rc1 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 9c22d8aa..b8bc74f2 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.10beta7 +SHLIB_MINOR= 1.2.10rc1 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 a1310990..c3fab585 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -92,10 +92,10 @@ libpng-config: chmod +x libpng-config $(LIBSO): $(LIBSOMAJ) - $(LN_FS) $(LIBSOMAJ) $(LIBSO) + $(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LIBSOMAJ): $(LIBSOVER) - $(LN_FS) $(LIBSOVER) $(LIBSOMAJ) + $(LN_SF) $(LIBSOVER) $(LIBSOMAJ) $(LIBSOVER): $(OBJSDLL) $(CC) -G -Wl,-h,$(LIBSOMAJ) -o $(LIBSOVER) \ @@ -120,14 +120,14 @@ install-headers: png.h pngconf.h chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h -@$(RM_F) $(DI)/libpng - (cd $(DI); $(LN_FS) $(LIBNAME) libpng; $(LN_FS) $(LIBNAME)/* .) + (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) install-static: install-headers libpng.a -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a -@$(RM_F) $(DL)/libpng.a - (cd $(DL); $(LN_FS) $(LIBNAME).a libpng.a) + (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBSOVER) libpng.pc \ $(OLDSOVER) @@ -142,16 +142,16 @@ install-shared: install-headers $(LIBSOVER) libpng.pc \ chmod 755 $(DL)/$(LIBSOVER) chmod 755 $(DL)/$(OLDSOVER) (cd $(DL); \ - $(LN_FS) $(OLDSOVER) $(OLDSOMAJ); \ - $(LN_FS) $(OLDSOMAJ) $(OLDSO); \ - $(LN_FS) $(LIBSOVER) $(LIBSOMAJ); \ - $(LN_FS) $(LIBSOMAJ) $(LIBSO)) + $(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \ + $(LN_SF) $(OLDSOMAJ) $(OLDSO); \ + $(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \ + $(LN_SF) $(LIBSOMAJ) $(LIBSO)) -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc - (cd $(DL)/pkgconfig; $(LN_FS) $(LIBNAME).pc libpng.pc) + (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi @@ -170,7 +170,7 @@ install-config: libpng-config -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config - (cd $(DB); $(LN_FS) $(LIBNAME)-config libpng-config) + (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) install: install-static install-shared install-man install-config diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index acb59f60..7f282214 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index cceddd4a..a897a04d 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index f38d2903..e4fed605 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 60a87d3e..1837d257 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta7 +PNGMIN = 1.2.10rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -99,10 +99,10 @@ libpng-config: chmod +x libpng-config $(LIBSO): $(LIBSOMAJ) - $(LN_FS) $(LIBSOMAJ) $(LIBSO) + $(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LIBSOMAJ): $(LIBSOVER) - $(LN_FS) $(LIBSOVER) $(LIBSOMAJ) + $(LN_SF) $(LIBSOVER) $(LIBSOMAJ) $(LIBSOVER): $(OBJSDLL) @case "`type ld`" in *ucb*) \ @@ -137,14 +137,14 @@ install-headers: png.h pngconf.h chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h -@$(RM_F) $(DI)/libpng - (cd $(DI); $(LN_FS) $(LIBNAME) libpng; $(LN_FS) $(LIBNAME)/* .) + (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) install-static: install-headers libpng.a -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a -@$(RM_F) $(DL)/libpng.a - (cd $(DL); $(LN_FS) $(LIBNAME).a libpng.a) + (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBSOVER) libpng.pc \ $(OLDSOVER) @@ -159,16 +159,16 @@ install-shared: install-headers $(LIBSOVER) libpng.pc \ chmod 755 $(DL)/$(LIBSOVER) chmod 755 $(DL)/$(OLDSOVER) (cd $(DL); \ - $(LN_FS) $(OLDSOVER) $(OLDSOMAJ); \ - $(LN_FS) $(OLDSOMAJ) $(OLDSO); \ - $(LN_FS) $(LIBSOVER) $(LIBSO); \ - $(LN_FS) $(LIBSOVER) $(LIBSOMAJ)) + $(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \ + $(LN_SF) $(OLDSOMAJ) $(OLDSO); \ + $(LN_SF) $(LIBSOVER) $(LIBSO); \ + $(LN_SF) $(LIBSOVER) $(LIBSOMAJ)) -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc - (cd $(DL)/pkgconfig; $(LN_FS) $(LIBNAME).pc libpng.pc) + (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi @@ -187,7 +187,7 @@ install-config: libpng-config -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config - (cd $(DB); $(LN_FS) $(LIBNAME)-config libpng-config) + (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) install: install-static install-shared install-man install-config diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 557af81e..057c2270 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.10beta7 +; Version 1.2.10rc1 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 27301c62..ce2c5667 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.10beta7 +;Version 1.2.10rc1 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3