diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2007-06-30 05:26:07 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:13:46 -0500 |
| commit | e404eed318011c11817415097913a0cd46dcca4f (patch) | |
| tree | 7b53b3e07e76a17c320699e91094583e616cab97 | |
| parent | 3c115428eac352101f183e7f07a01b3c9d122eb9 (diff) | |
| download | libpng-e404eed318011c11817415097913a0cd46dcca4f.tar.gz | |
Imported from libpng-1.2.19beta21.tarv1.2.19beta21
57 files changed, 327 insertions, 307 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.19beta20 - June 29, 2007 +Libpng 1.2.19beta21 - June 30, 2007 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -9,32 +9,32 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.19beta20.tar.gz - libpng-1.2.19beta20.tar.bz2 + libpng-1.2.19beta21.tar.gz + libpng-1.2.19beta21.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.19beta20-no-config.tar.gz - libpng-1.2.19beta20-no-config.tar.bz2 + libpng-1.2.19beta21-no-config.tar.gz + libpng-1.2.19beta21-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1219b20.zip - lp1219b20.tar.bz2 + lp1219b21.zip + lp1219b21.tar.bz2 Project files - libpng-1.2.19beta20-project-netware.zip - libpng-1.2.19beta20-project-wince.zip + libpng-1.2.19beta21-project-netware.zip + libpng-1.2.19beta21-project-wince.zip Other information: - libpng-1.2.19beta20-README.txt - libpng-1.2.19beta20-KNOWNBUGS.txt - libpng-1.2.19beta20-LICENSE.txt - libpng-1.2.19beta20-Y2K-compliance.txt + libpng-1.2.19beta21-README.txt + libpng-1.2.19beta21-KNOWNBUGS.txt + libpng-1.2.19beta21-LICENSE.txt + libpng-1.2.19beta21-Y2K-compliance.txt Changes since the last public release (1.2.18): @@ -121,6 +121,10 @@ version 1.2.19beta20 [June 29, 2007] Rebuilt Makefile.in and configure using libtool-1.5.24. Fixed typo in pnggccrd.c +version 1.2.19beta20 [June 30, 2007] + More revision of pnggccrd.c + Added "test" target to Makefile.in and Makefile.am + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -1814,6 +1814,10 @@ version 1.2.19beta20 [June 29, 2007] Rebuilt Makefile.in and configure using libtool-1.5.24. Fixed typo in pnggccrd.c +version 1.2.19beta20 [June 30, 2007] + More revision of pnggccrd.c + Added "test" target to Makefile.in and Makefile.am + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement @@ -1,5 +1,5 @@ -Installing libpng version 1.2.19beta20 - June 29, 2007 +Installing libpng version 1.2.19beta21 - June 30, 2007 On Unix/Linux and similar systems, you can simply type @@ -44,7 +44,7 @@ to have access to the zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.2.19beta20" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.19beta21" or "lpng109" and "zlib-1.2.1" or "zlib121") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -101,14 +101,14 @@ include CMakeLists.txt => "cmake" script makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.19beta20) + gcc, creates libpng12.so.0.1.2.19beta21) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19beta20) + (gcc, creates libpng12.so.0.1.2.19beta21) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19beta20, + (gcc, creates libpng12.so.0.1.2.19beta21, uses assembler code tuned for Intel MMX platform) makefile.nommx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19beta20 + (gcc, creates libpng12.so.0.1.2.19beta21 does not use Intel MMX assembler code) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -131,14 +131,14 @@ include makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sggcc => Silicon Graphics (gcc, - creates libpng12.so.0.1.2.19beta20) + creates libpng12.so.0.1.2.19beta21) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.19beta20) + creates libpng12.so.0.1.2.19beta21) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.19beta20) + creates libpng12.so.0.1.2.19beta21) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.19beta20) + creates libpng12.so.0.1.2.19beta21) 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.19beta20 +Known bugs in libpng version 1.2.19beta21 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.19beta20, June 29, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.19beta21, June 30, 2007, are Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -106,4 +106,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 29, 2007 +June 30, 2007 diff --git a/Makefile.am b/Makefile.am index 0da7f982d..de7dd3115 100644 --- a/Makefile.am +++ b/Makefile.am @@ -109,6 +109,8 @@ libpng.vers: libpng.sym $(ECHO) 'local: *; };' >> $@.new mv $@.new $@ +test: check + # install the .../include headers as links to the new ones install-data-hook: cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h diff --git a/Makefile.in b/Makefile.in index 6641b6247..41913eba3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1259,6 +1259,8 @@ libpng.vers: libpng.sym $(ECHO) 'local: *; };' >> $@.new mv $@.new $@ +test: check + # install the .../include headers as links to the new ones install-data-hook: cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h @@ -1,4 +1,4 @@ -README for libpng version 1.2.19beta20 - June 29, 2007 (shared library 12.0) +README for libpng version 1.2.19beta21 - June 30, 2007 (shared library 12.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -190,11 +190,11 @@ Files in this distribution: descrip.mms => VMS makefile for MMS or MMK makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.19beta20) + gcc, creates libpng12.so.0.1.2.19beta21) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19beta20) + (gcc, creates libpng12.so.0.1.2.19beta21) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19beta20, + (gcc, creates libpng12.so.0.1.2.19beta21, 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.19beta20) + (gcc, creates libpng12.so.0.1.2.19beta21) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.19beta20) + (gcc, creates libpng12.so.0.1.2.19beta21) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.19beta20) + (gcc, creates libpng12.so.0.1.2.19beta21) 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,13 +1,13 @@ Y2K compliance in libpng: ========================= - June 29, 2007 + June 30, 2007 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.19beta20 are Y2K compliant. It is my belief that earlier + upward through 1.2.19beta21 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.61 for libpng 1.2.19beta20. +# Generated by GNU Autoconf 2.61 for libpng 1.2.19beta21. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.19beta20' -PACKAGE_STRING='libpng 1.2.19beta20' +PACKAGE_VERSION='1.2.19beta21' +PACKAGE_STRING='libpng 1.2.19beta21' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' ac_unique_file="pngget.c" @@ -1405,7 +1405,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libpng 1.2.19beta20 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.19beta21 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1475,7 +1475,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.2.19beta20:";; + short | recursive ) echo "Configuration of libpng 1.2.19beta21:";; esac cat <<\_ACEOF @@ -1585,7 +1585,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.2.19beta20 +libpng configure 1.2.19beta21 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1599,7 +1599,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libpng $as_me 1.2.19beta20, which was +It was created by libpng $as_me 1.2.19beta21, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2269,7 +2269,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.2.19beta20' + VERSION='1.2.19beta21' cat >>confdefs.h <<_ACEOF @@ -2440,7 +2440,7 @@ fi -PNGLIB_VERSION=1.2.19beta20 +PNGLIB_VERSION=1.2.19beta21 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=19 @@ -21282,7 +21282,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpng $as_me 1.2.19beta20, which was +This file was extended by libpng $as_me 1.2.19beta21, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21335,7 +21335,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpng config.status 1.2.19beta20 +libpng config.status 1.2.19beta21 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 391805841..95682444b 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.19beta20], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.19beta21], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.19beta20 +PNGLIB_VERSION=1.2.19beta21 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=19 diff --git a/libpng-1.2.19beta20.txt b/libpng-1.2.19beta21.txt index 4c8df2350..dbd2bad36 100644 --- a/libpng-1.2.19beta20.txt +++ b/libpng-1.2.19beta21.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.19beta20 - June 29, 2007 + libpng version 1.2.19beta21 - June 30, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -2921,13 +2921,13 @@ application: IX. Y2K Compliance in libpng -June 29, 2007 +June 30, 2007 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.19beta20 are Y2K compliant. It is my belief that earlier +upward through 1.2.19beta21 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 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "June 29, 2007" +.TH LIBPNG 3 "June 30, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta20 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta21 .SH SYNOPSIS \fB #include <png.h>\fP @@ -410,7 +410,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.2.19beta20 - June 29, 2007 + libpng version 1.2.19beta21 - June 30, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -3331,13 +3331,13 @@ application: .SH IX. Y2K Compliance in libpng -June 29, 2007 +June 30, 2007 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.19beta20 are Y2K compliant. It is my belief that earlier +upward through 1.2.19beta21 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 @@ -3526,7 +3526,7 @@ the first widely used release: 1.2.17 13 10217 12.so.0.17[.0] 1.0.26 10 10026 10.so.0.26[.0] 1.2.18 13 10218 12.so.0.18[.0] - 1.2.19beta1-20 13 10219 12.so.0.19[.0] + 1.2.19beta1-21 13 10219 12.so.0.19[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3582,7 +3582,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.19beta20 - June 29, 2007: +Libpng version 1.2.19beta21 - June 30, 2007: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -3603,7 +3603,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.19beta20, June 29, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.19beta21, June 30, 2007, are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -3702,7 +3702,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 29, 2007 +June 30, 2007 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 4c4f171c6..95af7d171 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "June 29, 2007" +.TH LIBPNGPF 3 "June 30, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta20 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta21 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "June 29, 2007" +.TH PNG 5 "June 30, 2007" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.2.19 June 29, 2007 + * Last changed in libpng 1.2.19 June 30, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -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_19beta20 Your_png_h_is_not_version_1_2_19beta20; +typedef version_1_2_19beta21 Your_png_h_is_not_version_1_2_19beta21; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -706,7 +706,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { png_ptr = png_ptr; /* silence compiler warning about unused png_ptr */ - return ((png_charp) "\n libpng version 1.2.19beta20 - June 29, 2007\n\ + return ((png_charp) "\n libpng version 1.2.19beta21 - June 30, 2007\n\ Copyright (c) 1998-2007 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.19beta20 - June 29, 2007 + * libpng version 1.2.19beta21 - June 30, 2007 * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -9,7 +9,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.2.19beta20 - June 29, 2007: Glenn + * libpng versions 0.97, January 1998, through 1.2.19beta21 - June 30, 2007: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -150,7 +150,7 @@ * 1.2.17 13 10217 12.so.0.17[.0] * 1.0.26 10 10026 10.so.0.26[.0] * 1.2.18 13 10218 12.so.0.18[.0] - * 1.2.19beta1-20 13 10219 12.so.0.19[.0] + * 1.2.19beta1-21 13 10219 12.so.0.19[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -180,7 +180,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.19beta20, June 29, 2007, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.19beta21, June 30, 2007, are * Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -292,13 +292,13 @@ * Y2K compliance in libpng: * ========================= * - * June 29, 2007 + * June 30, 2007 * * 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.19beta20 are Y2K compliant. It is my belief that earlier + * upward through 1.2.19beta21 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 @@ -354,9 +354,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.19beta20" +#define PNG_LIBPNG_VER_STRING "1.2.19beta21" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.19beta20 - June 29, 2007 (header)\n" + " libpng version 1.2.19beta21 - June 30, 2007 (header)\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -368,7 +368,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 20 +#define PNG_LIBPNG_VER_BUILD 21 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1407,7 +1407,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_19beta20; +typedef png_structp version_1_2_19beta21; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.19beta20 - June 29, 2007 + * libpng version 1.2.19beta21 - June 30, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index 697a0c58a..35341c676 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.2.19 June 29, 2007 + * Last changed in libpng 1.2.19 June 30, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pnggccrd.c b/pnggccrd.c index 41d01d915..c8ff3de9d 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -3,7 +3,7 @@ * * For Intel x86 CPU (Pentium-MMX or later) and GNU C compiler. * - * Last changed in libpng 1.2.19 June 29, 2007 + * Last changed in libpng 1.2.19 June 30, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998 Intel Corporation * Copyright (c) 1999-2002,2007 Greg Roelofs @@ -368,7 +368,7 @@ * - rearranged pass-related if-blocks in png_do_read_interlace() to put most * frequent cases (4, 5) at top [GRP suggestion] * - * 20070624-28: + * 20070624-29: * - fixed 64-bit crash bug: pointers -> rsi/rdi, not esi/edi (switched to * %0/%1/%2/%3/%4 notation; eliminated size suffixes from relevant add/ * inc/sub/mov instructions; changed dummy vars to pointers) @@ -376,15 +376,16 @@ * - png_do_read_interlace() * - png_read_filter_row_mmx_avg() * - png_read_filter_row_mmx_paeth() + * - png_read_filter_row_mmx_sub() * - NOTE: this fix makes use of the fact that modifying a 32-bit reg (e.g., * %%ebx) clears the top half of its corresponding 64-bit reg (%%rbx), so * it's safe to mix 32-bit operations with 64-bit base/index addressing - * (see new PSI/PDI/PAX/PDX/PBP/etc. "pointer-register" macros) + * (see new PSI/PDI/PAX/PDX/PBP/etc. "pointer-register" macros); applies + * also to clobber lists * * 200706xx: * - continued fixing intermittent 64-bit crash bug: - * - png_read_filter_row_mmx_sub() * - png_read_filter_row_mmx_up() * @@ -3231,6 +3232,7 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, # define PBX "%%rbx" # define PCX "%%rcx" # define PDX "%%rdx" +# define PSI "%%rsi" # define CLEAR_BOTTOM_3_BITS "and $0xfffffffffffffff8, " #else # define PBP "%%ebp" @@ -3238,6 +3240,7 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, # define PBX "%%ebx" # define PCX "%%ecx" # define PDX "%%edx" +# define PSI "%%esi" # define CLEAR_BOTTOM_3_BITS "and $0xfffffff8, " #endif __asm__ __volatile__ ( @@ -3278,11 +3281,11 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, "sub %2, " PBP " \n\t" // subtract row ptr again => ebp = "jz avg_go \n\t" // target value of ebx at alignment + "xorl %%ecx, %%ecx \n\t" + // fix alignment // Compute the Raw value for the bytes up to the alignment boundary // Raw(x) = Avg(x) + ((Raw(x-bpp) + Prior(x))/2) - "xorl %%ecx, %%ecx \n\t" - "avg_lp1: \n\t" "xorl %%eax, %%eax \n\t" "movb (%1," PBX ",), %%cl \n\t" // load cl with Prior(x) @@ -4018,11 +4021,11 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "sub %2, " PBP " \n\t" // subtract row ptr again => ebp = "jz paeth_go \n\t" // target value of ebx at alignment - // fix alignment "xorl %%ecx, %%ecx \n\t" SAVE_r11_r12_r13 + // fix alignment "paeth_lp1: \n\t" "xorl %%eax, %%eax \n\t" // pav = p - a = (a + b - c) - a = b - c @@ -5088,7 +5091,7 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) int dummy_value_a; int dummy_value_c; int dummy_value_d; - int dummy_value_D; + png_bytep dummy_value_D; int diff; // __attribute__((used)); bpp = (row_info->pixel_depth + 7) >> 3; // calc number of bytes per pixel @@ -5098,24 +5101,27 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) __asm__ __volatile__ ( SAVE_r15 SAVE_ebp -//pre "movl row, %%edi \n\t" // edi/rdi - "movl %%edi, %%esi \n\t" // lp = row +//pre "movl row, %1 \n\t" // edi/rdi + "mov %1, " PSI " \n\t" // lp = row //pre "movl bpp, %%ecx \n\t" - "addl %%ecx, %%edi \n\t" // rp = row + bpp + "add " PCX ", %1 \n\t" // rp = row + bpp //pre "movl FullLength, %%eax \n\t" // bring in via eax... SAVE_FullLength // ...but store for later use - // get # of bytes to alignment - "movl %%edi, %%ebp \n\t" // take start of row - "addl $0xf, %%ebp \n\t" // add 7+8 to incr past alignment bdry "xorl %%eax, %%eax \n\t" - "andl $0xfffffff8, %%ebp \n\t" // mask to alignment boundary - "subl %%edi, %%ebp \n\t" // subtract from start ==> value - "jz sub_go \n\t" // eax at alignment + + // get # of bytes to alignment (note: computing _delta_ of two pointers, + // so hereafter %%ebp is sufficient even on 64-bit) + "mov %1, " PBP " \n\t" // take start of row + "add $0xf, " PBP " \n\t" // add 7+8 to incr past alignment bdry +// "andl $0xfffffff8, %%ebp \n\t" // mask to alignment boundary (32-bit!) + CLEAR_BOTTOM_3_BITS PBP "\n\t" // mask to alignment boundary + "sub %1, " PBP " \n\t" // subtract row ptr again => ebp = + "jz sub_go \n\t" // target value of eax at alignment "sub_lp1: \n\t" // fix alignment - "movb (%%esi,%%eax,), %%cl \n\t" - "addb %%cl, (%%edi,%%eax,) \n\t" + "movb (" PSI "," PAX ",), %%cl \n\t" + "addb %%cl, (%1," PAX ",) \n\t" "incl %%eax \n\t" "cmpl %%ebp, %%eax \n\t" "jb sub_lp1 \n\t" @@ -5127,13 +5133,13 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "andl $0x00000007, %%edx \n\t" // calc bytes over mult of 8 "subl %%edx, %%ecx \n\t" // drop over bytes from length //out "movl %%ecx, MMXLength \n\t" - "movl %%ebp, %%edi \n\t" // ebp = diff, but no reg constraint(?) - RESTORE_ebp // (could swap ebp and ecx functions) - RESTORE_r15 + "movl %%ebp, %%eax \n\t" // ebp = diff, but no reg constraint(?) + RESTORE_ebp // (could swap ebp and ecx functions, + RESTORE_r15 // but %%cl issues...) : "=c" (MMXLength), // 0 // output regs - "=D" (diff), // 1 - "=a" (dummy_value_a) // 2 + "=D" (dummy_value_D), // 1 + "=a" (diff) // 2 : "0" (bpp), // ecx // input regs "1" (row), // edi @@ -5153,27 +5159,27 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) // _ShiftRem = 40; // == 64 - 24 __asm__ __volatile__ ( -// preload "movl row, %%edi \n\t" // edi/rdi +// preload "mov row, %1 \n\t" // edi/rdi LOAD_GOT_rbp // load (former) _ActiveMask for 2nd active byte group "movq " AMASK2_3_3 ", %%mm7 \n\t" // _amask2_3_3 RESTORE_rbp - "movl %%edi, %%esi \n\t" // lp = row +// notused "mov %1, " PSI " \n\t" // lp = row // preload "movl bpp, %%ecx \n\t" - "addl %%ecx, %%edi \n\t" // rp = row + bpp + "add " PCX ", %1 \n\t" // rp = row + bpp "movq %%mm7, %%mm6 \n\t" // preload "movl diff, %%edx \n\t" "psllq $24, %%mm6 \n\t" // move mask in mm6 to cover // 3rd active byte group // prime the pump: load the first Raw(x-bpp) data set - "movq -8(%%edi,%%edx,), %%mm1 \n\t" + "movq -8(%1," PDX ",), %%mm1 \n\t" "sub_3lp: \n\t" // shift data for adding first "psrlq $40, %%mm1 \n\t" // bpp bytes (no need for mask; // shift clears inactive bytes) // add 1st active group - "movq (%%edi,%%edx,), %%mm0 \n\t" + "movq (%1," PDX ",), %%mm0 \n\t" "paddb %%mm1, %%mm0 \n\t" // add 2nd active group @@ -5190,7 +5196,7 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "paddb %%mm1, %%mm0 \n\t" "cmpl %%eax, %%edx \n\t" // MMXLength - "movq %%mm0, -8(%%edi,%%edx,) \n\t" // write updated Raws to array + "movq %%mm0, -8(%1," PDX ",) \n\t" // write updated Raws to array "movq %%mm0, %%mm1 \n\t" // prep 1st add at top of loop "jb sub_3lp \n\t" @@ -5204,9 +5210,8 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "2" (diff), // edx "3" (MMXLength) // eax - : "%esi" // clobber list #if defined(CLOBBER_MMX_REGS_SUPPORTED) - , "%mm0", "%mm1", "%mm6", "%mm7" + : "%mm0", "%mm1", "%mm6", "%mm7" // clobber list #endif ); } @@ -5219,19 +5224,19 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) // _ShiftRem = 64 - _ShiftBpp; // 32 (psrlq) __asm__ __volatile__ ( -// preload "movl row, %%edi \n\t" // edi/rdi +// preload "mov row, %1 \n\t" // edi/rdi // preload "movl diff, %%edx \n\t" - "movl %%edi, %%esi \n\t" // lp = row +// notused "mov %1, " PSI " \n\t" // lp = row // preload "movl bpp, %%ecx \n\t" - "addl %%ecx, %%edi \n\t" // rp = row + bpp + "add " PCX ", %1 \n\t" // rp = row + bpp // prime the pump: load the first Raw(x-bpp) data set - "movq -8(%%edi,%%edx,), %%mm1 \n\t" + "movq -8(%1," PDX ",), %%mm1 \n\t" "sub_4lp: \n\t" // shift data for adding first "psrlq $32, %%mm1 \n\t" // bpp bytes (no need for mask; // shift clears inactive bytes) - "movq (%%edi,%%edx,), %%mm0 \n\t" + "movq (%1," PDX ",), %%mm0 \n\t" "paddb %%mm1, %%mm0 \n\t" // add 2nd active group @@ -5241,7 +5246,7 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "paddb %%mm1, %%mm0 \n\t" "cmpl %%eax, %%edx \n\t" // MMXLength - "movq %%mm0, -8(%%edi,%%edx,) \n\t" // write updated Raws to array + "movq %%mm0, -8(%1," PDX ",) \n\t" // write updated Raws to array "movq %%mm0, %%mm1 \n\t" // prep 1st add at top of loop "jb sub_4lp \n\t" @@ -5255,9 +5260,8 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "2" (diff), // edx "3" (MMXLength) // eax - : "%esi" // clobber list #if defined(CLOBBER_MMX_REGS_SUPPORTED) - , "%mm0", "%mm1" + : "%mm0", "%mm1" // clobber list #endif ); } @@ -5267,18 +5271,18 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) { __asm__ __volatile__ ( // preload "movl diff, %%edx \n\t" -// preload "movl row, %%edi \n\t" // edi/rdi +// preload "mov row, %1 \n\t" // edi/rdi // preload "cmpl FullLength, %%edx \n\t" "cmpl %%eax, %%edx \n\t" "jnb sub_1end \n\t" - "movl %%edi, %%esi \n\t" // lp = row + "mov %1, " PSI " \n\t" // lp = row // irrel. "xorl %%ecx, %%ecx \n\t" // (actually bug with preload) // preload "movl bpp, %%ecx \n\t" - "addl %%ecx, %%edi \n\t" // rp = row + bpp + "add " PCX ", %1 \n\t" // rp = row + bpp "sub_1lp: \n\t" - "movb (%%esi,%%edx,), %%cl \n\t" - "addb %%cl, (%%edi,%%edx,) \n\t" + "movb (" PSI "," PDX ",), %%cl \n\t" + "addb %%cl, (%1," PDX ",) \n\t" "incl %%edx \n\t" "cmpl %%eax, %%edx \n\t" // compare with FullLength "jb sub_1lp \n\t" @@ -5312,23 +5316,23 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) RESTORE_rbp // preload "movl diff, %%edx \n\t" "movq %%mm7, %%mm6 \n\t" -// preload "movl row, %%edi \n\t" // edi/rdi +// preload "mov row, %1 \n\t" // edi/rdi "psllq $16, %%mm6 \n\t" // move mask in mm6 to cover // 3rd active byte group - "movl %%edi, %%esi \n\t" // lp = row +// notused "mov %1, " PSI " \n\t" // lp = row "movq %%mm6, %%mm5 \n\t" // preload "movl bpp, %%ecx \n\t" - "addl %%ecx, %%edi \n\t" // rp = row + bpp + "add " PCX ", %1 \n\t" // rp = row + bpp "psllq $16, %%mm5 \n\t" // move mask in mm5 to cover // 4th active byte group // prime the pump: load the first Raw(x-bpp) data set - "movq -8(%%edi,%%edx,), %%mm1 \n\t" + "movq -8(%1," PDX ",), %%mm1 \n\t" "sub_2lp: \n\t" // shift data for adding first "psrlq $48, %%mm1 \n\t" // bpp bytes (no need for mask; // shift clears inactive bytes) // add 1st active group - "movq (%%edi,%%edx,), %%mm0 \n\t" + "movq (%1," PDX ",), %%mm0 \n\t" "paddb %%mm1, %%mm0 \n\t" // add 2nd active group @@ -5350,7 +5354,7 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "addl $8, %%edx \n\t" "paddb %%mm1, %%mm0 \n\t" "cmpl %%eax, %%edx \n\t" // MMXLength - "movq %%mm0, -8(%%edi,%%edx,) \n\t" // write updated Raws to array + "movq %%mm0, -8(%1," PDX ",) \n\t" // write updated Raws to array "movq %%mm0, %%mm1 \n\t" // prep 1st add at top of loop "jb sub_2lp \n\t" @@ -5364,9 +5368,9 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "2" (diff), // edx "3" (MMXLength) // eax - : "%esi" // clobber list #if defined(CLOBBER_MMX_REGS_SUPPORTED) - , "%mm0", "%mm1", "%mm5", "%mm6", "%mm7" + : "%mm0", "%mm1", "%mm5", "%mm6" // clobber list + , "%mm7" #endif ); } @@ -5378,19 +5382,19 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) // _ShiftRem = 64 - _ShiftBpp; // 16 (psrlq) __asm__ __volatile__ ( -// preload "movl row, %%edi \n\t" // edi/rdi +// preload "mov row, %1 \n\t" // edi/rdi // preload "movl diff, %%edx \n\t" - "movl %%edi, %%esi \n\t" // lp = row +// notused "mov %1, " PSI " \n\t" // lp = row // preload "movl bpp, %%ecx \n\t" - "addl %%ecx, %%edi \n\t" // rp = row + bpp + "add " PCX ", %1 \n\t" // rp = row + bpp // prime the pump: load the first Raw(x-bpp) data set - "movq -8(%%edi,%%edx,), %%mm1 \n\t" + "movq -8(%1," PDX ",), %%mm1 \n\t" "sub_6lp: \n\t" // shift data for adding first "psrlq $16, %%mm1 \n\t" // bpp bytes (no need for mask; // shift clears inactive bytes) - "movq (%%edi,%%edx,), %%mm0 \n\t" + "movq (%1," PDX ",), %%mm0 \n\t" "paddb %%mm1, %%mm0 \n\t" // add 2nd active group @@ -5400,7 +5404,7 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "paddb %%mm1, %%mm0 \n\t" "cmpl %%eax, %%edx \n\t" // MMXLength - "movq %%mm0, -8(%%edi,%%edx,) \n\t" // write updated Raws to array + "movq %%mm0, -8(%1," PDX ",) \n\t" // write updated Raws to array "movq %%mm0, %%mm1 \n\t" // prep 1st add at top of loop "jb sub_6lp \n\t" @@ -5414,9 +5418,8 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "2" (diff), // edx "3" (MMXLength) // eax - : "%esi" // clobber list #if defined(CLOBBER_MMX_REGS_SUPPORTED) - , "%mm0", "%mm1" + : "%mm0", "%mm1" // clobber list #endif ); } @@ -5426,23 +5429,23 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) { __asm__ __volatile__ ( SAVE_ebp -// preload "movl row, %%edi \n\t" // edi/rdi +// preload "mov row, %1 \n\t" // edi/rdi // preload "movl diff, %%edx \n\t" - "movl %%edi, %%esi \n\t" // lp = row +// notused "mov %1, " PSI " \n\t" // lp = row // preload "movl bpp, %%ecx \n\t" - "addl %%ecx, %%edi \n\t" // rp = row + bpp + "add " PCX ", %1 \n\t" // rp = row + bpp // preload "movl MMXLength, %%eax \n\t" // prime the pump: load the first Raw(x-bpp) data set - "movq -8(%%edi,%%edx,), %%mm7 \n\t" + "movq -8(%1," PDX ",), %%mm7 \n\t" "movl %%eax, %%ebp \n\t" // copy of MMXLength -> ebp "andl $0x0000003f, %%ebp \n\t" // calc bytes over mult of 64 "sub_8lp: \n\t" - "movq (%%edi,%%edx,), %%mm0 \n\t" // load Sub(x) for 1st 8 bytes + "movq (%1," PDX ",), %%mm0 \n\t" // load Sub(x) for 1st 8 bytes "paddb %%mm7, %%mm0 \n\t" - "movq 8(%%edi,%%edx,), %%mm1 \n\t" // load Sub(x) for 2nd 8 bytes - "movq %%mm0, (%%edi,%%edx,) \n\t" // write Raw(x) for 1st 8 bytes + "movq 8(%1," PDX ",), %%mm1 \n\t" // load Sub(x) for 2nd 8 bytes + "movq %%mm0, (%1," PDX ",) \n\t" // write Raw(x) for 1st 8 bytes // Now mm0 will be used as Raw(x-bpp) for the 2nd group of 8 bytes. // This will be repeated for each group of 8 bytes with the 8th @@ -5450,38 +5453,38 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) // next loop. "paddb %%mm0, %%mm1 \n\t" - "movq 16(%%edi,%%edx,), %%mm2 \n\t" // load Sub(x) for 3rd 8 bytes - "movq %%mm1, 8(%%edi,%%edx,) \n\t" // write Raw(x) for 2nd 8 bytes + "movq 16(%1," PDX ",), %%mm2 \n\t" // load Sub(x) for 3rd 8 bytes + "movq %%mm1, 8(%1," PDX ",) \n\t" // write Raw(x) for 2nd 8 bytes "paddb %%mm1, %%mm2 \n\t" - "movq 24(%%edi,%%edx,), %%mm3 \n\t" // load Sub(x) for 4th 8 bytes - "movq %%mm2, 16(%%edi,%%edx,) \n\t" // write Raw(x) for 3rd 8 bytes + "movq 24(%1," PDX ",), %%mm3 \n\t" // load Sub(x) for 4th 8 bytes + "movq %%mm2, 16(%1," PDX ",) \n\t" // write Raw(x) for 3rd 8 bytes "paddb %%mm2, %%mm3 \n\t" - "movq 32(%%edi,%%edx,), %%mm4 \n\t" // load Sub(x) for 5th 8 bytes - "movq %%mm3, 24(%%edi,%%edx,) \n\t" // write Raw(x) for 4th 8 bytes + "movq 32(%1," PDX ",), %%mm4 \n\t" // load Sub(x) for 5th 8 bytes + "movq %%mm3, 24(%1," PDX ",) \n\t" // write Raw(x) for 4th 8 bytes "paddb %%mm3, %%mm4 \n\t" - "movq 40(%%edi,%%edx,), %%mm5 \n\t" // load Sub(x) for 6th 8 bytes - "movq %%mm4, 32(%%edi,%%edx,) \n\t" // write Raw(x) for 5th 8 bytes + "movq 40(%1," PDX ",), %%mm5 \n\t" // load Sub(x) for 6th 8 bytes + "movq %%mm4, 32(%1," PDX ",) \n\t" // write Raw(x) for 5th 8 bytes "paddb %%mm4, %%mm5 \n\t" - "movq 48(%%edi,%%edx,), %%mm6 \n\t" // load Sub(x) for 7th 8 bytes - "movq %%mm5, 40(%%edi,%%edx,) \n\t" // write Raw(x) for 6th 8 bytes + "movq 48(%1," PDX ",), %%mm6 \n\t" // load Sub(x) for 7th 8 bytes + "movq %%mm5, 40(%1," PDX ",) \n\t" // write Raw(x) for 6th 8 bytes "paddb %%mm5, %%mm6 \n\t" - "movq 56(%%edi,%%edx,), %%mm7 \n\t" // load Sub(x) for 8th 8 bytes - "movq %%mm6, 48(%%edi,%%edx,) \n\t" // write Raw(x) for 7th 8 bytes + "movq 56(%1," PDX ",), %%mm7 \n\t" // load Sub(x) for 8th 8 bytes + "movq %%mm6, 48(%1," PDX ",) \n\t" // write Raw(x) for 7th 8 bytes "addl $64, %%edx \n\t" "paddb %%mm6, %%mm7 \n\t" "cmpl %%ebp, %%edx \n\t" // cmp to bytes over mult of 64 - "movq %%mm7, -8(%%edi,%%edx,) \n\t" // write Raw(x) for 8th 8 bytes + "movq %%mm7, -8(%1," PDX ",) \n\t" // write Raw(x) for 8th 8 bytes "jb sub_8lp \n\t" "cmpl %%eax, %%edx \n\t" // compare to MMXLength "jnb sub_8lt8 \n\t" "sub_8lpA: \n\t" - "movq (%%edi,%%edx,), %%mm0 \n\t" + "movq (%1," PDX ",), %%mm0 \n\t" "addl $8, %%edx \n\t" "paddb %%mm7, %%mm0 \n\t" "cmpl %%eax, %%edx \n\t" // compare to MMXLength - "movq %%mm0, -8(%%edi,%%edx,) \n\t" // -8 to offset early addl edx + "movq %%mm0, -8(%1," PDX ",) \n\t" // -8 to offset early addl edx "movq %%mm0, %%mm7 \n\t" // move calculated Raw(x) data "jb sub_8lpA \n\t" // to mm7 to be new Raw(x-bpp) // for next loop @@ -5498,6 +5501,8 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "2" (diff), // edx "3" (MMXLength) // eax +// GRR FIXME: esi not clobbered, but need to deal with COLON/COMMA issue: +// GRR FIXME: [or just use esi instead of ebp and lose SAVE/RESTORE/CLOBBERs] : "%esi" // clobber list _CLOBBER_ebp #if defined(CLOBBER_MMX_REGS_SUPPORTED) @@ -5522,19 +5527,19 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) __asm__ __volatile__ ( //pre "movl MMXLength, %%eax \n\t" -//pre "movl row, %%edi \n\t" // edi/rdi +//pre "mov row, %1 \n\t" // edi/rdi //pre "cmpl FullLength, %%eax \n\t" "cmpl %%edx, %%eax \n\t" "jnb sub_end \n\t" - "movl %%edi, %%esi \n\t" // lp = row + "mov %1, " PSI " \n\t" // lp = row //pre "movl bpp, %%ecx \n\t" - "addl %%ecx, %%edi \n\t" // rp = row + bpp + "add " PCX ", %1 \n\t" // rp = row + bpp "xorl %%ecx, %%ecx \n\t" "sub_lp2: \n\t" - "movb (%%esi,%%eax,), %%cl \n\t" - "addb %%cl, (%%edi,%%eax,) \n\t" + "movb (" PSI "," PAX ",), %%cl \n\t" + "addb %%cl, (%1," PAX ",) \n\t" "incl %%eax \n\t" "cmpl %%edx, %%eax \n\t" // FullLength "jb sub_lp2 \n\t" @@ -5574,127 +5579,130 @@ png_read_filter_row_mmx_up(png_row_infop row_info, png_bytep row, { png_uint_32 len; int dummy_value_d; // fix 'forbidden register 3 (dx) was spilled' error - int dummy_value_S; - int dummy_value_D; + png_bytep dummy_value_S; + png_bytep dummy_value_D; len = row_info->rowbytes; // number of bytes to filter __asm__ __volatile__ ( SAVE_GOT_ebx -//pre "movl row, %%edi \n\t" // edi/rdi - // get # of bytes to alignment - "movl %%edi, %%ecx \n\t" - "xorl %%ebx, %%ebx \n\t" - "addl $0x7, %%ecx \n\t" - "xorl %%eax, %%eax \n\t" - "andl $0xfffffff8, %%ecx \n\t" -//pre "movl prev_row, %%esi \n\t" // esi/rsi - "subl %%edi, %%ecx \n\t" - "jz up_go \n\t" - - "up_lp1: \n\t" // fix alignment - "movb (%%edi,%%ebx,), %%al \n\t" - "addb (%%esi,%%ebx,), %%al \n\t" - "incl %%ebx \n\t" - "cmpl %%ecx, %%ebx \n\t" - "movb %%al, -1(%%edi,%%ebx,) \n\t" // mov does not affect flags; -1 to - "jb up_lp1 \n\t" // offset incl ebx - - "up_go: \n\t" -//pre "movl len, %%edx \n\t" - "movl %%edx, %%ecx \n\t" - "subl %%ebx, %%edx \n\t" // subtract alignment fix - "andl $0x0000003f, %%edx \n\t" // calc bytes over mult of 64 - "subl %%edx, %%ecx \n\t" // drop over bytes from length +//pre "mov prev_row, %1 \n\t" // esi/rsi +//pre "movl row, %2 \n\t" // edi/rdi + + "xorl %%ebx, %%ebx \n\t" + "xorl %%eax, %%eax \n\t" + + // get # of bytes to alignment (note: computing _delta_ of two pointers, + // so hereafter %%ecx is sufficient even on 64-bit) + "mov %2, " PCX " \n\t" // take start of row + "add $0x7, " PCX " \n\t" // add 7 to incr past alignment bdry +// "andl $0xfffffff8, %%ecx \n\t" // mask to alignment boundary (32-bit!) + CLEAR_BOTTOM_3_BITS PCX "\n\t" // mask to alignment boundary + "sub %2, " PCX " \n\t" // subtract row ptr again => ebp = + "jz up_go \n\t" // target value of ecx at alignment + + "up_lp1: \n\t" // fix alignment + "movb (%2," PBX ",), %%al \n\t" + "addb (%1," PBX ",), %%al \n\t" + "incl %%ebx \n\t" + "cmpl %%ecx, %%ebx \n\t" + "movb %%al, -1(%2," PBX ",) \n\t" // mov does not affect flags; -1 to + "jb up_lp1 \n\t" // offset incl ebx + + "up_go: \n\t" +//pre "movl len, %%edx \n\t" + "movl %%edx, %%ecx \n\t" + "subl %%ebx, %%edx \n\t" // subtract alignment fix + "andl $0x0000003f, %%edx \n\t" // calc bytes over mult of 64 + "subl %%edx, %%ecx \n\t" // sub over-bytes from original length // unrolled loop - use all MMX registers and interleave to reduce // number of branch instructions (loops) and reduce partial stalls - "up_loop: \n\t" - "movq (%%esi,%%ebx,), %%mm1 \n\t" - "movq (%%edi,%%ebx,), %%mm0 \n\t" - "movq 8(%%esi,%%ebx,), %%mm3 \n\t" - "paddb %%mm1, %%mm0 \n\t" - "movq 8(%%edi,%%ebx,), %%mm2 \n\t" - "movq %%mm0, (%%edi,%%ebx,) \n\t" - "paddb %%mm3, %%mm2 \n\t" - "movq 16(%%esi,%%ebx,), %%mm5 \n\t" - "movq %%mm2, 8(%%edi,%%ebx,) \n\t" - "movq 16(%%edi,%%ebx,), %%mm4 \n\t" - "movq 24(%%esi,%%ebx,), %%mm7 \n\t" - "paddb %%mm5, %%mm4 \n\t" - "movq 24(%%edi,%%ebx,), %%mm6 \n\t" - "movq %%mm4, 16(%%edi,%%ebx,) \n\t" - "paddb %%mm7, %%mm6 \n\t" - "movq 32(%%esi,%%ebx,), %%mm1 \n\t" - "movq %%mm6, 24(%%edi,%%ebx,) \n\t" - "movq 32(%%edi,%%ebx,), %%mm0 \n\t" - "movq 40(%%esi,%%ebx,), %%mm3 \n\t" - "paddb %%mm1, %%mm0 \n\t" - "movq 40(%%edi,%%ebx,), %%mm2 \n\t" - "movq %%mm0, 32(%%edi,%%ebx,) \n\t" - "paddb %%mm3, %%mm2 \n\t" - "movq 48(%%esi,%%ebx,), %%mm5 \n\t" - "movq %%mm2, 40(%%edi,%%ebx,) \n\t" - "movq 48(%%edi,%%ebx,), %%mm4 \n\t" - "movq 56(%%esi,%%ebx,), %%mm7 \n\t" - "paddb %%mm5, %%mm4 \n\t" - "movq 56(%%edi,%%ebx,), %%mm6 \n\t" - "movq %%mm4, 48(%%edi,%%ebx,) \n\t" - "addl $64, %%ebx \n\t" - "paddb %%mm7, %%mm6 \n\t" - "cmpl %%ecx, %%ebx \n\t" - "movq %%mm6, -8(%%edi,%%ebx,) \n\t" // (+56)movq does not affect flags; - "jb up_loop \n\t" // -8 to offset addl ebx - - "cmpl $0, %%edx \n\t" // test for bytes over mult of 64 - "jz up_end \n\t" - - "cmpl $8, %%edx \n\t" // test for less than 8 bytes - "jb up_lt8 \n\t" // [added by lcreeve at netins.net] - - "addl %%edx, %%ecx \n\t" - "andl $0x00000007, %%edx \n\t" // calc bytes over mult of 8 - "subl %%edx, %%ecx \n\t" // drop over bytes from length - "jz up_lt8 \n\t" - - "up_lpA: \n\t" // use MMX regs to update 8 bytes sim. - "movq (%%esi,%%ebx,), %%mm1 \n\t" - "movq (%%edi,%%ebx,), %%mm0 \n\t" - "addl $8, %%ebx \n\t" - "paddb %%mm1, %%mm0 \n\t" - "cmpl %%ecx, %%ebx \n\t" - "movq %%mm0, -8(%%edi,%%ebx,) \n\t" // movq does not affect flags; -8 to - "jb up_lpA \n\t" // offset add ebx - "cmpl $0, %%edx \n\t" // test for bytes over mult of 8 - "jz up_end \n\t" - - "up_lt8: \n\t" - "xorl %%eax, %%eax \n\t" - "addl %%edx, %%ecx \n\t" // move over byte count into counter - - "up_lp2: \n\t" // use x86 regs for remaining bytes - "movb (%%edi,%%ebx,), %%al \n\t" - "addb (%%esi,%%ebx,), %%al \n\t" - "incl %%ebx \n\t" - "cmpl %%ecx, %%ebx \n\t" - "movb %%al, -1(%%edi,%%ebx,) \n\t" // mov does not affect flags; -1 to - "jb up_lp2 \n\t" // offset inc ebx - - "up_end: \n\t" - "EMMS \n\t" // conversion of filtered row complete + "up_loop: \n\t" + "movq (%1," PBX ",), %%mm1 \n\t" + "movq (%2," PBX ",), %%mm0 \n\t" + "movq 8(%1," PBX ",), %%mm3 \n\t" + "paddb %%mm1, %%mm0 \n\t" + "movq 8(%2," PBX ",), %%mm2 \n\t" + "movq %%mm0, (%2," PBX ",) \n\t" + "paddb %%mm3, %%mm2 \n\t" + "movq 16(%1," PBX ",), %%mm5 \n\t" + "movq %%mm2, 8(%2," PBX ",) \n\t" + "movq 16(%2," PBX ",), %%mm4 \n\t" + "movq 24(%1," PBX ",), %%mm7 \n\t" + "paddb %%mm5, %%mm4 \n\t" + "movq 24(%2," PBX ",), %%mm6 \n\t" + "movq %%mm4, 16(%2," PBX ",) \n\t" + "paddb %%mm7, %%mm6 \n\t" + "movq 32(%1," PBX ",), %%mm1 \n\t" + "movq %%mm6, 24(%2," PBX ",) \n\t" + "movq 32(%2," PBX ",), %%mm0 \n\t" + "movq 40(%1," PBX ",), %%mm3 \n\t" + "paddb %%mm1, %%mm0 \n\t" + "movq 40(%2," PBX ",), %%mm2 \n\t" + "movq %%mm0, 32(%2," PBX ",) \n\t" + "paddb %%mm3, %%mm2 \n\t" + "movq 48(%1," PBX ",), %%mm5 \n\t" + "movq %%mm2, 40(%2," PBX ",) \n\t" + "movq 48(%2," PBX ",), %%mm4 \n\t" + "movq 56(%1," PBX ",), %%mm7 \n\t" + "paddb %%mm5, %%mm4 \n\t" + "movq 56(%2," PBX ",), %%mm6 \n\t" + "movq %%mm4, 48(%2," PBX ",) \n\t" + "addl $64, %%ebx \n\t" + "paddb %%mm7, %%mm6 \n\t" + "cmpl %%ecx, %%ebx \n\t" + "movq %%mm6, -8(%2," PBX ",) \n\t" // (+56)movq does not affect flags; + "jb up_loop \n\t" // -8 to offset addl ebx + + "cmpl $0, %%edx \n\t" // test for bytes over mult of 64 + "jz up_end \n\t" + + "cmpl $8, %%edx \n\t" // test for less than 8 bytes + "jb up_lt8 \n\t" // [added by lcreeve at netins.net] + + "addl %%edx, %%ecx \n\t" + "andl $0x00000007, %%edx \n\t" // calc bytes over mult of 8 + "subl %%edx, %%ecx \n\t" // drop over-bytes from length + "jz up_lt8 \n\t" + + "up_lpA: \n\t" // use MMX regs to update 8 bytes sim. + "movq (%1," PBX ",), %%mm1 \n\t" + "movq (%2," PBX ",), %%mm0 \n\t" + "addl $8, %%ebx \n\t" + "paddb %%mm1, %%mm0 \n\t" + "cmpl %%ecx, %%ebx \n\t" + "movq %%mm0, -8(%2," PBX ",) \n\t" // movq does not affect flags; -8 to + "jb up_lpA \n\t" // offset add ebx + "cmpl $0, %%edx \n\t" // test for bytes over mult of 8 + "jz up_end \n\t" + + "up_lt8: \n\t" + "xorl %%eax, %%eax \n\t" + "addl %%edx, %%ecx \n\t" // move over byte count into counter + + "up_lp2: \n\t" // use x86 regs for remaining bytes + "movb (%2," PBX ",), %%al \n\t" + "addb (%1," PBX ",), %%al \n\t" + "incl %%ebx \n\t" + "cmpl %%ecx, %%ebx \n\t" + "movb %%al, -1(%2," PBX ",) \n\t" // mov does not affect flags; -1 to + "jb up_lp2 \n\t" // offset inc ebx + + "up_end: \n\t" + "EMMS \n\t" // conversion of filtered row complete RESTORE_GOT_ebx - : "=d" (dummy_value_d), // 0 // output regs (dummy) + : "=d" (dummy_value_d), // 0 // output regs (dummy) "=S" (dummy_value_S), // 1 "=D" (dummy_value_D) // 2 - : "0" (len), // edx // input regs + : "0" (len), // edx // input regs "1" (prev_row), // esi "2" (row) // edi - : "%eax", "%ecx" // clobber list (no input regs!) + : "%eax", "%ecx" // clobber list (no input regs!) _CLOBBER_GOT_ebx - #if defined(PNG_CLOBBER_MMX_REGS_SUPPORTED) , "%mm0", "%mm1", "%mm2", "%mm3" , "%mm4", "%mm5", "%mm6", "%mm7" diff --git a/pngpread.c b/pngpread.c index 122e4328c..cc29bcc61 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.2.19 June 29, 2007 + * Last changed in libpng 1.2.19 June 30, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.2.19 June 29, 2007 + * Last changed in libpng 1.2.19 June 30, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index 1bd588e48..277ce5916 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.2.19 June 29, 2007 + * Last changed in libpng 1.2.19 June 30, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index 8b108d92f..131bd9e14 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.19 June 29, 2007 + * Last changed in libpng 1.2.19 June 30, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1553,4 +1553,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_19beta20 your_png_h_is_not_version_1_2_19beta20; +typedef version_1_2_19beta21 your_png_h_is_not_version_1_2_19beta21; @@ -3,7 +3,7 @@ * * For Intel x86 CPU and Microsoft Visual C++ compiler * - * Last changed in libpng 1.2.19 June 29, 2007 + * Last changed in libpng 1.2.19 June 30, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation diff --git a/pngwutil.c b/pngwutil.c index 6711e9eb5..4534c3484 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.2.19 June 29, 2007 + * Last changed in libpng 1.2.19 June 30, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 2922382f8..22c3eb797 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -169,7 +169,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in # SET UP LINKS set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 0.${PNGLIB_RELEASE}.1.2.19beta20 +# VERSION 0.${PNGLIB_RELEASE}.1.2.19beta21 VERSION 0.${PNGLIB_RELEASE}.0 SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 7f7a28e18..0c33c4382 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.19beta20 +version=1.2.19beta21 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index ef7092864..1d3d2223f 100644 --- a/scripts/libpng.pc-configure.in +++ b/scripts/libpng.pc-configure.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng12 Name: libpng Description: Loads and saves PNG files -Version: 1.2.19beta20 +Version: 1.2.19beta21 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index cf5d9fbeb..f0ab7d98e 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng12 Name: libpng Description: Loads and saves PNG files -Version: 1.2.19beta20 +Version: 1.2.19beta21 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 6c8e14a93..46ab942b1 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 6b6c2ff9f..3c4556a41 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index bc534c00b..cbb18a818 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.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index e3da760ca..2565dba20 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index e3f02593e..268f38b39 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index f520745d7..d281faed0 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index daab7ef7f..7d7810548 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index b5e23d4eb..b5b6c7477 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index b83a645ec..742b0430a 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 505320b7a..a0bc28581 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.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 694e63648..b85a3c65f 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 1d348dcba..71674c637 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.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 6608527de..0b6696a93 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 634231170..c8fe75633 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -78,7 +78,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index af4b19931..30a8bf572 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.19beta20 +SHLIB_MINOR= 1.2.19beta21 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 993445d72..e8444f980 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.19beta20 +SHLIB_MINOR= 1.2.19beta21 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.nommx b/scripts/makefile.nommx index dd298e6dc..27a420dc2 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 088831fdf..b1db28ebf 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -8,7 +8,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.19beta20 +SHLIB_MINOR= 1.2.19beta21 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 779a22f9d..ae403260a 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index b0804b97a..f27d0ef62 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index c488336a4..00be4170b 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 23936416d..2c82b2756 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 29f0aee4f..c305c650f 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 109b03208..074a18b10 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta20 +PNGMIN = 1.2.19beta21 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 7e1eb5109..58b4e0e4f 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.19beta20 +; Version 1.2.19beta21 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 53897b470..96d81ad93 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.19beta20 +;Version 1.2.19beta21 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |