diff options
43 files changed, 115 insertions, 104 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.10beta5 - April 17, 2006 +Libpng 1.2.10beta6 - April 17, 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.10beta5.tar.gz - 1.2.10beta5.tar.bz2 + 1.2.10beta6.tar.gz + 1.2.10beta6.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - 1.2.10beta5-no-config.tar.gz - 1.2.10beta5-no-config.tar.bz2 + 1.2.10beta6-no-config.tar.gz + 1.2.10beta6-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1210b05.zip - lp1210b05.tar.bz2 + lp1210b06.zip + lp1210b06.tar.bz2 Project files - 1.2.10beta5-project-netware.zip - 1.2.10beta5-project-wince.zip + 1.2.10beta6-project-netware.zip + 1.2.10beta6-project-wince.zip Other information: - 1.2.10beta5-README.txt - 1.2.10beta5-KNOWNBUGS.txt - 1.2.10beta5-LICENSE.txt - 1.2.10beta5-Y2K-compliance.txt + 1.2.10beta6-README.txt + 1.2.10beta6-KNOWNBUGS.txt + 1.2.10beta6-LICENSE.txt + 1.2.10beta6-Y2K-compliance.txt Changes since the last public release (1.2.9): @@ -53,9 +53,14 @@ version 1.2.10beta3 [April 15, 2006] version 1.2.10beta4 [April 16, 2006] Change PNG_BUILDING_LIBPNG to PNG_CONFIGURE_LIBPNG in config/Makefile*. -version 1.2.10beta5 [April 17, 2006] +version 1.2.10beta5 [April 16, 2006] Added a configure check for compiling assembler code in pnggccrd.c +version 1.2.10beta6 [April 17, 2006] + Revised the configure check for pnggccrd.c + Moved -DPNG_CONFIGURE_LIBPNG into @LIBPNG_DEFINES@ + Added @LIBPNG_DEFINES@ to arguments when building libpng.sym + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement @@ -1537,9 +1537,14 @@ version 1.2.10beta3 [April 15, 2006] version 1.2.10beta4 [April 16, 2006] Change PNG_BUILDING_LIBPNG to PNG_CONFIGURE_LIBPNG in config/Makefile*. -version 1.2.10beta5 [April 17, 2006] +version 1.2.10beta5 [April 16, 2006] Added a configure check for compiling assembler code in pnggccrd.c +version 1.2.10beta6 [April 17, 2006] + Revised the configure check for pnggccrd.c + Moved -DPNG_CONFIGURE_LIBPNG into @LIBPNG_DEFINES@ + Added @LIBPNG_DEFINES@ to arguments when building libpng.sym + version 1.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, @@ -1,5 +1,5 @@ -Installing libpng version 1.2.10beta5 - April 17, 2006 +Installing libpng version 1.2.10beta6 - April 17, 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.10beta5" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.10beta6" 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.10beta5) + gcc, creates libpng12.so.0.1.2.10beta6) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.10beta5) + (gcc, creates libpng12.so.0.1.2.10beta6) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.10beta5, + (gcc, creates libpng12.so.0.1.2.10beta6, 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.10beta5) + creates libpng12.so.0.1.2.10beta6) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.10beta5) + creates libpng12.so.0.1.2.10beta6) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.10beta5) + creates libpng12.so.0.1.2.10beta6) 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 @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.10beta5 +Known bugs in libpng version 1.2.10beta6 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 @@ -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.10beta5, April 17, 2006, are +libpng versions 1.2.6, August 15, 2004, through 1.2.10beta6, April 17, 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 diff --git a/Makefile.am b/Makefile.am index 6f05c7a17..00010fadf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,8 +37,8 @@ libpng12_la_SOURCES = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ png.h pngconf.h libpng_la_SOURCES = $(libpng12_la_SOURCES) -libpng_la_CPPFLAGS = @LIBPNG_DEFINES@ -DPNG_CONFIGURE_LIBPNG -libpng12_la_CPPFLAGS = @LIBPNG_DEFINES@ -DPNG_CONFIGURE_LIBPNG +libpng_la_CPPFLAGS = @LIBPNG_DEFINES@ +libpng12_la_CPPFLAGS = @LIBPNG_DEFINES@ # MAJOR UPGRADE: the version-number settings below must be changed. libpng12_la_LDFLAGS = -no-undefined -export-dynamic \ @@ -95,7 +95,7 @@ $(PNGLIB_BASENAME)-config: libpng-config libpng.sym: png.h pngconf.h rm -f $@ $@.new - $(CPP) $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \ + $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \ $(SED) -n -e 's|^.*PNG_FUNCTION_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \ -e 's|^.*PNG_DATA_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \ >$@.new diff --git a/Makefile.in b/Makefile.in index dcf6191b2..405aa628e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -283,8 +283,8 @@ libpng12_la_SOURCES = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ png.h pngconf.h libpng_la_SOURCES = $(libpng12_la_SOURCES) -libpng_la_CPPFLAGS = @LIBPNG_DEFINES@ -DPNG_CONFIGURE_LIBPNG -libpng12_la_CPPFLAGS = @LIBPNG_DEFINES@ -DPNG_CONFIGURE_LIBPNG +libpng_la_CPPFLAGS = @LIBPNG_DEFINES@ +libpng12_la_CPPFLAGS = @LIBPNG_DEFINES@ # MAJOR UPGRADE: the version-number settings below must be changed. libpng12_la_LDFLAGS = -no-undefined -export-dynamic -version-number \ @@ -1237,7 +1237,7 @@ $(PNGLIB_BASENAME)-config: libpng-config libpng.sym: png.h pngconf.h rm -f $@ $@.new - $(CPP) $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \ + $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \ $(SED) -n -e 's|^.*PNG_FUNCTION_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \ -e 's|^.*PNG_DATA_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \ >$@.new @@ -1,4 +1,4 @@ -README for libpng version 1.2.10beta5 - April 17, 2006 (shared library 12.0) +README for libpng version 1.2.10beta6 - April 17, 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.10beta5) + gcc, creates libpng12.so.0.1.2.10beta6) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.10beta5) + (gcc, creates libpng12.so.0.1.2.10beta6) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.10beta5, + (gcc, creates libpng12.so.0.1.2.10beta6, 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.10beta5) + (gcc, creates libpng12.so.0.1.2.10beta6) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.10beta5) + (gcc, creates libpng12.so.0.1.2.10beta6) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.10beta5) + (gcc, creates libpng12.so.0.1.2.10beta6) 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 @@ -7,7 +7,7 @@ an official declaration. This is your unofficial assurance that libpng from version 0.71 and - upward through 1.2.10beta5 are Y2K compliant. It is my belief that earlier + upward through 1.2.10beta6 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 @@ -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.10beta5. +# Generated by GNU Autoconf 2.59 for libpng 1.2.10beta6. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.10beta5' -PACKAGE_STRING='libpng 1.2.10beta5' +PACKAGE_VERSION='1.2.10beta6' +PACKAGE_STRING='libpng 1.2.10beta6' 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.10beta5 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.10beta6 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.10beta5:";; + short | recursive ) echo "Configuration of libpng 1.2.10beta6:";; 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.10beta5 +libpng configure 1.2.10beta6 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.10beta5, which was +It was created by libpng $as_me 1.2.10beta6, 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.10beta5' + VERSION='1.2.10beta6' cat >>confdefs.h <<_ACEOF @@ -1979,7 +1979,7 @@ fi -PNGLIB_VERSION=1.2.10beta5 +PNGLIB_VERSION=1.2.10beta6 PNGLIB_MAJOR=12 PNGLIB_MINOR=10 @@ -20153,7 +20153,7 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -int main() { return 0; } +return 0; ; return 0; } @@ -20185,16 +20185,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -LIBPNG_DEFINES=-DPNG_NO_ASSEMBLER_CODE +LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG -DPNG_NO_ASSEMBLER_CODE fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - if test "$LIBPNG_DEFINES"; then echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 else echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 + LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG fi @@ -20681,7 +20681,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by libpng $as_me 1.2.10beta5, which was +This file was extended by libpng $as_me 1.2.10beta6, 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.10beta5 +libpng config.status 1.2.10beta6 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 cbe9e930f..50b1521ea 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.10beta5], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.10beta6], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.10beta5 +PNGLIB_VERSION=1.2.10beta6 PNGLIB_MAJOR=12 PNGLIB_MINOR=10 @@ -61,15 +61,16 @@ AC_CHECK_LIB(z, zlibVersion, , AC_ERROR([zlib not installed])) AC_MSG_CHECKING([if assembler code in pnggccrd.c can be compiled]) AC_TRY_COMPILE( [#include "pnggccrd.c"], - [int main() { return 0; }], - LIBPNG_DEFINES=,LIBPNG_DEFINES=-DPNG_NO_ASSEMBLER_CODE) -AC_SUBST(LIBPNG_DEFINES) + [return 0;], + LIBPNG_DEFINES=, + LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG -DPNG_NO_ASSEMBLER_CODE) if test "$LIBPNG_DEFINES"; then AC_MSG_RESULT(no) else AC_MSG_RESULT(yes) + LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG fi - +AC_SUBST(LIBPNG_DEFINES) AC_MSG_CHECKING([if libraries can be versioned]) GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script` @@ -1,6 +1,6 @@ .TH LIBPNG 3 "April 17, 2006" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10beta5 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10beta6 .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.10beta5 - April 17, 2006 + libpng version 1.2.10beta6 - April 17, 2006 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -3736,7 +3736,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.10beta5 are Y2K compliant. It is my belief that earlier +upward through 1.2.10beta6 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 @@ -3949,7 +3949,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.10beta5 - April 17, 2006: +Libpng version 1.2.10beta6 - April 17, 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.10beta5, April 17, 2006, are +libpng versions 1.2.6, August 15, 2004, through 1.2.10beta6, April 17, 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 diff --git a/libpng.txt b/libpng.txt index 1f7b9c504..7bff21e07 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.10beta5 - April 17, 2006 + libpng version 1.2.10beta6 - April 17, 2006 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -2915,7 +2915,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.10beta5 are Y2K compliant. It is my belief that earlier +upward through 1.2.10beta6 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 4502b10c5..8664f7c33 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "April 17, 2006" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10beta5 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10beta6 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -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_10beta5 Your_png_h_is_not_version_1_2_10beta5; +typedef version_1_2_10beta6 Your_png_h_is_not_version_1_2_10beta6; /* 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.10beta5 - April 17, 2006\n\ + return ((png_charp) "\n libpng version 1.2.10beta6 - April 17, 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"); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.10beta5 - April 17, 2006 + * libpng version 1.2.10beta6 - April 17, 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.10beta5 - April 17, 2006: Glenn + * libpng versions 0.97, January 1998, through 1.2.10beta6 - April 17, 2006: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -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.10beta5, April 17, 2006, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.10beta6, April 17, 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: @@ -264,7 +264,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.2.10beta5 are Y2K compliant. It is my belief that earlier + * upward through 1.2.10beta6 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.10beta5" +#define PNG_LIBPNG_VER_STRING "1.2.10beta6" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.10beta5 - April 17, 2006 (header)\n" + " libpng version 1.2.10beta6 - April 17, 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 5 +#define PNG_LIBPNG_VER_BUILD 6 /* 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_10beta5; +typedef png_structp version_1_2_10beta6; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.10beta5 - April 17, 2006 + * libpng version 1.2.10beta6 - April 17, 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) @@ -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_10beta5 your_png_h_is_not_version_1_2_10beta5; +typedef version_1_2_10beta6 your_png_h_is_not_version_1_2_10beta6; diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index ba90b823f..5a9685710 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.10beta5 +version=1.2.10beta6 prefix="" libdir="" libs="" diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 4e433c78a..b40a15bdf 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 56045fecf..9f202a28e 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index e1062db9e..a8006781a 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.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 506de2b37..adbb119c6 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index e611e628b..7afdaab4b 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.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 4311f5db8..001f411b9 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index bfde0a84f..ffc4ff57b 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index d3833f309..a52d42951 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index e1702a8f6..8c81d1b37 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 25f394fa2..341e7e565 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.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index ed6a9dbd3..45df8186c 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 8b1db14a3..cc580dfac 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.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 6a92992fe..b23f74a2f 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index adff16057..03573f23d 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.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index c91f856a8..fff398089 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.10beta5 +SHLIB_MINOR= 1.2.10beta6 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 f2a4cd9ff..6e9f7a88e 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.10beta5 +SHLIB_MINOR= 1.2.10beta6 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 fe484a4cd..83a6fb5d4 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.10beta5 +SHLIB_MINOR= 1.2.10beta6 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 d75d95b15..b156999ef 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 9aaa6dd3d..b01b173ce 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 163a20794..906aa2240 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index f00b36afc..17a32a243 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 86a7a1691..953de667d 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.10beta5 +PNGMIN = 1.2.10beta6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index e37924a93..718dcdfdb 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.10beta5 +; Version 1.2.10beta6 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 3263e0a01..b95612369 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.10beta5 +;Version 1.2.10beta6 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |