diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2007-08-22 19:45:04 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:14:40 -0500 |
| commit | e736f1ead93ee569e87f8499e3110fb18116d349 (patch) | |
| tree | 35feaa7616c2927374d10aff2207b379ffcf0862 | |
| parent | b56c1f6023dcc07ac40aeb4eea972bdf638d6c79 (diff) | |
| download | libpng-e736f1ead93ee569e87f8499e3110fb18116d349.tar.gz | |
Imported from libpng-1.2.20rc1.tarv1.2.20rc1
50 files changed, 135 insertions, 121 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.20beta04 - August 21, 2007 +Libpng 1.2.20rc1 - August 23, 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.20beta04.tar.gz - libpng-1.2.20beta04.tar.bz2 + libpng-1.2.20rc1.tar.gz + libpng-1.2.20rc1.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.20beta04-no-config.tar.gz - libpng-1.2.20beta04-no-config.tar.bz2 + libpng-1.2.20rc1-no-config.tar.gz + libpng-1.2.20rc1-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1220b04.zip - lp1220b04.tar.bz2 + lp1220r01.zip + lp1220r01.tar.bz2 Project files - libpng-1.2.20beta04-project-netware.zip - libpng-1.2.20beta04-project-wince.zip + libpng-1.2.20rc1-project-netware.zip + libpng-1.2.20rc1-project-wince.zip Other information: - libpng-1.2.20beta04-README.txt - libpng-1.2.20beta04-KNOWNBUGS.txt - libpng-1.2.20beta04-LICENSE.txt - libpng-1.2.20beta04-Y2K-compliance.txt + libpng-1.2.20rc1-README.txt + libpng-1.2.20rc1-KNOWNBUGS.txt + libpng-1.2.20rc1-LICENSE.txt + libpng-1.2.20rc1-Y2K-compliance.txt Changes since the last public release (1.2.19): @@ -54,6 +54,9 @@ version 1.2.20beta03 [August 20, 2007] version 1.2.20beta04 [August 21, 2007] Revised pngvcrd.c for improved efficiency (Steve Snyder). +version 1.2.20beta05 [August 23, 2007] + Revised pngconf.h to set PNG_NO_MMX_CODE for gcc-3.x compilers. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -1911,6 +1911,9 @@ version 1.2.20beta03 [August 20, 2007] version 1.2.20beta04 [August 21, 2007] Revised pngvcrd.c for improved efficiency (Steve Snyder). +version 1.2.20beta05 [August 23, 2007] + Revised pngconf.h to set PNG_NO_MMX_CODE for gcc-3.x compilers. + 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.20beta04 - August 21, 2007 +Installing libpng version 1.2.20rc1 - August 23, 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.20beta04" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.20rc1" 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.20beta04) + gcc, creates libpng12.so.0.1.2.20rc1) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.20beta04) + (gcc, creates libpng12.so.0.1.2.20rc1) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.20beta04, + (gcc, creates libpng12.so.0.1.2.20rc1, uses assembler code tuned for Intel MMX platform) makefile.nommx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.20beta04 + (gcc, creates libpng12.so.0.1.2.20rc1 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.20beta04) + creates libpng12.so.0.1.2.20rc1) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.20beta04) + creates libpng12.so.0.1.2.20rc1) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.20beta04) + creates libpng12.so.0.1.2.20rc1) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.20beta04) + creates libpng12.so.0.1.2.20rc1) 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.20beta04 +Known bugs in libpng version 1.2.20rc1 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.20beta04, August 21, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.20rc1, August 23, 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 -August 21, 2007 +August 23, 2007 @@ -1,4 +1,4 @@ -README for libpng version 1.2.20beta04 - August 21, 2007 (shared library 12.0) +README for libpng version 1.2.20rc1 - August 23, 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.20beta04) + gcc, creates libpng12.so.0.1.2.20rc1) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.20beta04) + (gcc, creates libpng12.so.0.1.2.20rc1) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.20beta04, + (gcc, creates libpng12.so.0.1.2.20rc1, 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.20beta04) + (gcc, creates libpng12.so.0.1.2.20rc1) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.20beta04) + (gcc, creates libpng12.so.0.1.2.20rc1) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.20beta04) + (gcc, creates libpng12.so.0.1.2.20rc1) 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: ========================= - August 21, 2007 + August 23, 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.20beta04 are Y2K compliant. It is my belief that earlier + upward through 1.2.20rc1 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.20beta04. +# Generated by GNU Autoconf 2.61 for libpng 1.2.20rc1. # # 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.20beta04' -PACKAGE_STRING='libpng 1.2.20beta04' +PACKAGE_VERSION='1.2.20rc1' +PACKAGE_STRING='libpng 1.2.20rc1' 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.20beta04 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.20rc1 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.20beta04:";; + short | recursive ) echo "Configuration of libpng 1.2.20rc1:";; 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.20beta04 +libpng configure 1.2.20rc1 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.20beta04, which was +It was created by libpng $as_me 1.2.20rc1, 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.20beta04' + VERSION='1.2.20rc1' cat >>confdefs.h <<_ACEOF @@ -2440,7 +2440,7 @@ fi -PNGLIB_VERSION=1.2.20beta04 +PNGLIB_VERSION=1.2.20rc1 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=20 @@ -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.20beta04, which was +This file was extended by libpng $as_me 1.2.20rc1, 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.20beta04 +libpng config.status 1.2.20rc1 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 a2601f017..0b5734810 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.20beta04], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.20rc1], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.20beta04 +PNGLIB_VERSION=1.2.20rc1 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=20 diff --git a/libpng-1.2.20beta04.txt b/libpng-1.2.20rc1.txt index fce8d4eb6..c0727cc2e 100644 --- a/libpng-1.2.20beta04.txt +++ b/libpng-1.2.20rc1.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.20beta04 - August 21, 2007 + libpng version 1.2.20rc1 - August 23, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -2968,13 +2968,13 @@ application: IX. Y2K Compliance in libpng -August 21, 2007 +August 23, 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.20beta04 are Y2K compliant. It is my belief that earlier +upward through 1.2.20rc1 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 "August 21, 2007" +.TH LIBPNG 3 "August 23, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.20beta04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.20rc1 .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.20beta04 - August 21, 2007 + libpng version 1.2.20rc1 - August 23, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -3378,13 +3378,13 @@ application: .SH IX. Y2K Compliance in libpng -August 21, 2007 +August 23, 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.20beta04 are Y2K compliant. It is my belief that earlier +upward through 1.2.20rc1 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 @@ -3579,6 +3579,8 @@ the first widely used release: 1.0.27 10 10027 10.so.0.27[.0] 1.2.19 13 10219 12.so.0.19[.0] 1.2.20beta01-04 13 10220 12.so.0.20[.0] + 1.0.28rc1 10 10028 10.so.0.28[.0] + 1.2.20rc1 13 10220 12.so.0.20[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3634,7 +3636,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.20beta04 - August 21, 2007: +Libpng version 1.2.20rc1 - August 23, 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). @@ -3655,7 +3657,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.20beta04, August 21, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.20rc1, August 23, 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 @@ -3754,7 +3756,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 21, 2007 +August 23, 2007 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 5627330d5..5bc9878d7 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "August 21, 2007" +.TH LIBPNGPF 3 "August 23, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.20beta04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.20rc1 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "August 21, 2007" +.TH PNG 5 "August 23, 2007" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -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_20beta04 Your_png_h_is_not_version_1_2_20beta04; +typedef version_1_2_20rc1 Your_png_h_is_not_version_1_2_20rc1; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -698,7 +698,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.20beta04 - August 21, 2007\n\ + return ((png_charp) "\n libpng version 1.2.20rc1 - August 23, 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.20beta04 - August 21, 2007 + * libpng version 1.2.20rc1 - August 23, 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.20beta04 - August 21, 2007: Glenn + * libpng versions 0.97, January 1998, through 1.2.20rc1 - August 23, 2007: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -156,6 +156,8 @@ * 1.0.27 10 10027 10.so.0.27[.0] * 1.2.19 13 10219 12.so.0.19[.0] * 1.2.20beta01-04 13 10220 12.so.0.20[.0] + * 1.0.28rc1 10 10028 10.so.0.28[.0] + * 1.2.20rc1 13 10220 12.so.0.20[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -185,7 +187,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.20beta04, August 21, 2007, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.20rc1, August 23, 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: @@ -297,13 +299,13 @@ * Y2K compliance in libpng: * ========================= * - * August 21, 2007 + * August 23, 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.20beta04 are Y2K compliant. It is my belief that earlier + * upward through 1.2.20rc1 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 @@ -359,9 +361,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.20beta04" +#define PNG_LIBPNG_VER_STRING "1.2.20rc1" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.20beta04 - August 21, 2007\n" + " libpng version 1.2.20rc1 - August 23, 2007\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -373,7 +375,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 04 +#define PNG_LIBPNG_VER_BUILD 1 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -390,7 +392,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. @@ -1412,7 +1414,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_20beta04; +typedef png_structp version_1_2_20rc1; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.20beta04 - August 21, 2007 + * libpng version 1.2.20rc1 - August 23, 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) @@ -749,6 +749,13 @@ # define PNG_ASSEMBLER_CODE_SUPPORTED # endif +# if defined(__GNUC__) && defined(__x86_64__) && (__GNUC__ < 4) + /* work around 64-bit gcc compiler bugs in gcc-3.x */ +# if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE) +# define PNG_NO_MMX_CODE +# endif +# endif + # if defined(__APPLE__) # if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE) # define PNG_NO_MMX_CODE @@ -1502,18 +1509,15 @@ typedef z_stream FAR * png_zstreamp; # ifndef PNG_NO_MMX_FILTER_SUB # define PNG_MMX_READ_FILTER_SUB_SUPPORTED # endif -# if !(defined(__GNUC__) && defined(__x86_64__) && (__GNUC__ < 4)) - /* work around 64-bit gcc compiler bugs in gcc-3.x */ -# ifndef PNG_NO_MMX_FILTER_UP -# define PNG_MMX_READ_FILTER_UP_SUPPORTED -# endif -# ifndef PNG_NO_MMX_FILTER_AVG -# define PNG_MMX_READ_FILTER_AVG_SUPPORTED -# endif -# ifndef PNG_NO_MMX_FILTER_PAETH -# define PNG_MMX_READ_FILTER_PAETH_SUPPORTED -# endif -# endif /* !((__x86_64__) && (GNUC < 4)) */ +# ifndef PNG_NO_MMX_FILTER_UP +# define PNG_MMX_READ_FILTER_UP_SUPPORTED +# endif +# ifndef PNG_NO_MMX_FILTER_AVG +# define PNG_MMX_READ_FILTER_AVG_SUPPORTED +# endif +# ifndef PNG_NO_MMX_FILTER_PAETH +# define PNG_MMX_READ_FILTER_PAETH_SUPPORTED +# endif # endif /* These are the default thresholds before the MMX code kicks in; if either * rowbytes or bitdepth is below the threshold, plain C code is used. These diff --git a/pngerror.c b/pngerror.c index be6d4f237..0c2161cc2 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.20 August 21, 2007 + * Last changed in libpng 1.2.20 August 23, 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/pngpread.c b/pngpread.c index 610a7da06..e27f2bd5c 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.20 August 21, 2007 + * Last changed in libpng 1.2.20 August 23, 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) @@ -1548,4 +1548,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_20beta04 your_png_h_is_not_version_1_2_20beta04; +typedef version_1_2_20rc1 your_png_h_is_not_version_1_2_20rc1; @@ -3,7 +3,7 @@ * * For Intel x86 CPU and Microsoft Visual C++ compiler * - * Last changed in libpng 1.2.20 August 21, 2007 + * Last changed in libpng 1.2.20 August 23, 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/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 19c806b2c..c2c5a364f 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -180,7 +180,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.20beta04 +# VERSION 0.${PNGLIB_RELEASE}.1.2.20rc1 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 47bb1f7f9..d79cc926a 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.20beta04 +version=1.2.20rc1 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index 3cedd7c7d..713d41ced 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.20beta04 +Version: 1.2.20rc1 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index a3a0acfed..341156df9 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.20beta04 +Version: 1.2.20rc1 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 4b8bd5169..ea28e6191 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 23be2cdd7..036418035 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index ad93f2dd0..ac40d7e99 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.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 582df2485..4d2cb6010 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index d28cee2ca..943933812 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.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 6a5a27a37..a06abfcfe 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 38a956bac..d7c256103 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index a269ecd05..b7ee2a707 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index fa8a229ce..a5b451d98 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index e1e528358..f34e4b5f6 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.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index ff5cd2f92..14abd9c3e 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 0ec663557..107f845e6 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.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index bf21d6f17..db7ccdfd6 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 96de7a1a1..f0c81ed84 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.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 71fba69e4..fd50fa0a2 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.20beta04 +SHLIB_MINOR= 1.2.20rc1 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 80ae886e9..eecb6e582 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.20beta04 +SHLIB_MINOR= 1.2.20rc1 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 f37daec4b..a8150f2c2 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 47cb0efde..2310f1cce 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.20beta04 +SHLIB_MINOR= 1.2.20rc1 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 1f8c0a731..85aba1f98 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 927a4fa1e..f49d911f6 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 0613fdeb4..dbd9a84fb 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index e7f71a81c..f5c93bbdf 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index caa386e0c..8e3780c70 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index d69a40c6b..6c27a2f21 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20beta04 +PNGMIN = 1.2.20rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 936135666..a93cd8b16 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.20beta04 +; Version 1.2.20rc1 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index a642d8339..c441e18ea 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.20beta04 +;Version 1.2.20rc1 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |