diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2007-07-03 16:28:18 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:13:48 -0500 |
| commit | 62626737a5aea93ab4f89dd5a6313d093763fb15 (patch) | |
| tree | 9468c549cf7c6b8a18b11ef23acf29cddf64d60d | |
| parent | e404eed318011c11817415097913a0cd46dcca4f (diff) | |
| download | libpng-1.2.19beta22.tar.gz | |
Imported from libpng-1.2.19beta22.tarv1.2.19beta22
55 files changed, 185 insertions, 128 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.19beta21 - June 30, 2007 +Libpng 1.2.19beta22 - July 3, 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.19beta21.tar.gz - libpng-1.2.19beta21.tar.bz2 + libpng-1.2.19beta22.tar.gz + libpng-1.2.19beta22.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.19beta21-no-config.tar.gz - libpng-1.2.19beta21-no-config.tar.bz2 + libpng-1.2.19beta22-no-config.tar.gz + libpng-1.2.19beta22-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1219b21.zip - lp1219b21.tar.bz2 + lp1219b22.zip + lp1219b22.tar.bz2 Project files - libpng-1.2.19beta21-project-netware.zip - libpng-1.2.19beta21-project-wince.zip + libpng-1.2.19beta22-project-netware.zip + libpng-1.2.19beta22-project-wince.zip Other information: - 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 + libpng-1.2.19beta22-README.txt + libpng-1.2.19beta22-KNOWNBUGS.txt + libpng-1.2.19beta22-LICENSE.txt + libpng-1.2.19beta22-Y2K-compliance.txt Changes since the last public release (1.2.18): @@ -121,10 +121,14 @@ 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] +version 1.2.19beta21 [June 30, 2007] More revision of pnggccrd.c Added "test" target to Makefile.in and Makefile.am +version 1.2.19beta22 [July 3, 2007] + Added info about pngrutil/pnggccrd/pngvcrd to png_get_header_version() + Fix type definition of dummy_value_a, b in pnggccrd.c + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -1814,10 +1814,14 @@ 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] +version 1.2.19beta21 [June 30, 2007] More revision of pnggccrd.c Added "test" target to Makefile.in and Makefile.am +version 1.2.19beta22 [July 3, 2007] + Added info about pngrutil/pnggccrd/pngvcrd to png_get_header_version() + Fix type definition of dummy_value_a, b in pnggccrd.c + 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.19beta21 - June 30, 2007 +Installing libpng version 1.2.19beta22 - July 3, 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.19beta21" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.19beta22" 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.19beta21) + gcc, creates libpng12.so.0.1.2.19beta22) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19beta21) + (gcc, creates libpng12.so.0.1.2.19beta22) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19beta21, + (gcc, creates libpng12.so.0.1.2.19beta22, uses assembler code tuned for Intel MMX platform) makefile.nommx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19beta21 + (gcc, creates libpng12.so.0.1.2.19beta22 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.19beta21) + creates libpng12.so.0.1.2.19beta22) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.19beta21) + creates libpng12.so.0.1.2.19beta22) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.19beta21) + creates libpng12.so.0.1.2.19beta22) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.19beta21) + creates libpng12.so.0.1.2.19beta22) 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.19beta21 +Known bugs in libpng version 1.2.19beta22 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 @@ -20,10 +20,11 @@ Known bugs in libpng version 1.2.19beta21 that are generated by the custom makefiles. 4. June 28, 2007: Pnggccrd.c has been reported to be unreliable on - some 64-bit platforms. It appears to build properly, but it does - not always read files correctly, leading to corrupted output or - to a crash of the application. + several 64-bit platforms running gcc-3.4.6. It appears to build + properly, but it does not always read files correctly, leading to + corrupted output or to a crash of the application. - STATUS: Under investigation. A workaround is to use -DPNG_NO_MMX_CODE - on 64-bit platforms. + STATUS: Appears to be a bug in the 64-bit version of gcc-3.4.6. + Workarounds are to use -DPNG_NO_MMX_CODE or to upgrade gcc to a + newer version. @@ -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.19beta21, June 30, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.19beta22, July 3, 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 30, 2007 +July 3, 2007 @@ -1,4 +1,4 @@ -README for libpng version 1.2.19beta21 - June 30, 2007 (shared library 12.0) +README for libpng version 1.2.19beta22 - July 3, 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.19beta21) + gcc, creates libpng12.so.0.1.2.19beta22) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19beta21) + (gcc, creates libpng12.so.0.1.2.19beta22) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19beta21, + (gcc, creates libpng12.so.0.1.2.19beta22, 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.19beta21) + (gcc, creates libpng12.so.0.1.2.19beta22) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.19beta21) + (gcc, creates libpng12.so.0.1.2.19beta22) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.19beta21) + (gcc, creates libpng12.so.0.1.2.19beta22) 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 30, 2007 + July 3, 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.19beta21 are Y2K compliant. It is my belief that earlier + upward through 1.2.19beta22 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.19beta21. +# Generated by GNU Autoconf 2.61 for libpng 1.2.19beta22. # # 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.19beta21' -PACKAGE_STRING='libpng 1.2.19beta21' +PACKAGE_VERSION='1.2.19beta22' +PACKAGE_STRING='libpng 1.2.19beta22' 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.19beta21 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.19beta22 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.19beta21:";; + short | recursive ) echo "Configuration of libpng 1.2.19beta22:";; 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.19beta21 +libpng configure 1.2.19beta22 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.19beta21, which was +It was created by libpng $as_me 1.2.19beta22, 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.19beta21' + VERSION='1.2.19beta22' cat >>confdefs.h <<_ACEOF @@ -2440,7 +2440,7 @@ fi -PNGLIB_VERSION=1.2.19beta21 +PNGLIB_VERSION=1.2.19beta22 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.19beta21, which was +This file was extended by libpng $as_me 1.2.19beta22, 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.19beta21 +libpng config.status 1.2.19beta22 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 95682444b..959ad6ad4 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.19beta21], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.19beta22], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.19beta21 +PNGLIB_VERSION=1.2.19beta22 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=19 diff --git a/libpng-1.2.19beta21.txt b/libpng-1.2.19beta22.txt index dbd2bad36..6c533c168 100644 --- a/libpng-1.2.19beta21.txt +++ b/libpng-1.2.19beta22.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.19beta21 - June 30, 2007 + libpng version 1.2.19beta22 - July 3, 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 30, 2007 +July 3, 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.19beta21 are Y2K compliant. It is my belief that earlier +upward through 1.2.19beta22 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 30, 2007" +.TH LIBPNG 3 "July 3, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta21 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta22 .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.19beta21 - June 30, 2007 + libpng version 1.2.19beta22 - July 3, 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 30, 2007 +July 3, 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.19beta21 are Y2K compliant. It is my belief that earlier +upward through 1.2.19beta22 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-21 13 10219 12.so.0.19[.0] + 1.2.19beta1-22 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.19beta21 - June 30, 2007: +Libpng version 1.2.19beta22 - July 3, 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.19beta21, June 30, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.19beta22, July 3, 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 30, 2007 +July 3, 2007 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 95af7d171..ab7cb7815 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "June 30, 2007" +.TH LIBPNGPF 3 "July 3, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta21 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta22 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "June 30, 2007" +.TH PNG 5 "July 3, 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 30, 2007 + * Last changed in libpng 1.2.19 July 3, 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_19beta21 Your_png_h_is_not_version_1_2_19beta21; +typedef version_1_2_19beta22 Your_png_h_is_not_version_1_2_19beta22; /* 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.19beta21 - June 30, 2007\n\ + return ((png_charp) "\n libpng version 1.2.19beta22 - July 3, 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"); @@ -741,7 +741,53 @@ png_get_header_version(png_structp png_ptr) { /* Returns longer string containing both version and date */ png_ptr = png_ptr; /* silence compiler warning about unused png_ptr */ - return ((png_charp) PNG_HEADER_VERSION_STRING); + return ((png_charp) PNG_HEADER_VERSION_STRING +#ifdef PNG_READ_SUPPORTED +# ifdef PNG_USE_PNGGCCRD +# ifdef __x86_64__ +# ifdef __PIC__ + " (PNGGCRD x86_64, PIC)\n" +# else +# ifdef PNG_THREAD_UNSAFE_OK + " (PNGGCRD x86_64, Thread unsafe)\n" +# else + " (PNGGCRD x86_64, Thread safe)\n" +# endif +# endif +# else +# ifdef PNG_THREAD_UNSAFE_OK + " (PNGGCRD, Thread unsafe)\n" +# else + " (PNGGCRD, Thread safe)\n" +# endif +# endif +# else +# ifdef PNG_USE_PNGVCRD +# ifdef __x86_64__ + " (x86_64 PNGVCRD)\n" +# else + " (PNGVCRD)\n" +# endif +# else +# ifdef __x86_64__ +# ifdef PNG_OPTIMIZED_CODE_SUPPORTED + " (x86_64 OPTIMIZED)\n" +# else + " (x86_64 NOT OPTIMIZED)\n" +# endif +# else +# ifdef PNG_OPTIMIZED_CODE_SUPPORTED + " (OPTIMIZED)\n" +# else + " (NOT OPTIMIZED)\n" +# endif +# endif +# endif +# endif +#else + " (NO READ SUPPORT)\n" +#endif + ); } #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.19beta21 - June 30, 2007 + * libpng version 1.2.19beta22 - July 3, 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.19beta21 - June 30, 2007: Glenn + * libpng versions 0.97, January 1998, through 1.2.19beta22 - July 3, 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-21 13 10219 12.so.0.19[.0] + * 1.2.19beta1-22 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.19beta21, June 30, 2007, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.19beta22, July 3, 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 30, 2007 + * July 3, 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.19beta21 are Y2K compliant. It is my belief that earlier + * upward through 1.2.19beta22 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.19beta21" +#define PNG_LIBPNG_VER_STRING "1.2.19beta22" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.19beta21 - June 30, 2007 (header)\n" + " libpng version 1.2.19beta22 - July 3, 2007\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 21 +#define PNG_LIBPNG_VER_BUILD 22 /* 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_19beta21; +typedef png_structp version_1_2_19beta22; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.19beta21 - June 30, 2007 + * libpng version 1.2.19beta22 - July 3, 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 35341c676..4999c986c 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 30, 2007 + * Last changed in libpng 1.2.19 July 3, 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 c8ff3de9d..583a81d78 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 30, 2007 + * Last changed in libpng 1.2.19 July 3, 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 @@ -383,11 +383,13 @@ * (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_up() - + * + * 20070703: + * - changed pngbytep dummy_value_a and b to ull dummy_value_a and b. * * * STILL TO DO: @@ -2244,8 +2246,8 @@ png_do_read_interlace(png_structp png_ptr) int dummy_value_c; // fix 'forbidden register spilled' png_bytep dummy_value_S; png_bytep dummy_value_D; - png_bytep dummy_value_a; - png_bytep dummy_value_d; + ull dummy_value_a; + ull dummy_value_d; //-------------------------------------------------------------- if (pixel_bytes == BPP3) diff --git a/pngpread.c b/pngpread.c index cc29bcc61..97ce9fc24 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 30, 2007 + * Last changed in libpng 1.2.19 July 3, 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 30, 2007 + * Last changed in libpng 1.2.19 July 3, 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 277ce5916..d4f7385f5 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 30, 2007 + * Last changed in libpng 1.2.19 July 3, 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 131bd9e14..962e2486d 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 30, 2007 + * Last changed in libpng 1.2.19 July 3, 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_19beta21 your_png_h_is_not_version_1_2_19beta21; +typedef version_1_2_19beta22 your_png_h_is_not_version_1_2_19beta22; @@ -3,7 +3,7 @@ * * For Intel x86 CPU and Microsoft Visual C++ compiler * - * Last changed in libpng 1.2.19 June 30, 2007 + * Last changed in libpng 1.2.19 July 3, 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 4534c3484..0d912482c 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 30, 2007 + * Last changed in libpng 1.2.19 July 3, 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 22c3eb797..1ae560a1a 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.19beta21 +# VERSION 0.${PNGLIB_RELEASE}.1.2.19beta22 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 0c33c4382..28c42e712 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.19beta21 +version=1.2.19beta22 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index 1d3d2223f..110c43b26 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.19beta21 +Version: 1.2.19beta22 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index f0ab7d98e..66dc45db4 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.19beta21 +Version: 1.2.19beta22 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 46ab942b1..58255ebff 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 3c4556a41..7b1be2f49 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index cbb18a818..ac1e78754 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.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 2565dba20..eb6e47fb0 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 268f38b39..06b06d927 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.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index d281faed0..9e4a4976d 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 7d7810548..8e51276b1 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index b5b6c7477..21a79a77d 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 742b0430a..dfc4c7ae5 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index a0bc28581..823c8cd44 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.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index b85a3c65f..39cd19651 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 71674c637..76f0033fa 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.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 0b6696a93..c19a75ef3 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index c8fe75633..6772ae67f 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.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 30a8bf572..53322ef06 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.19beta21 +SHLIB_MINOR= 1.2.19beta22 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 e8444f980..1f0b13e6f 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.19beta21 +SHLIB_MINOR= 1.2.19beta22 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 27a420dc2..3c363c5e3 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index b1db28ebf..bd683b9e3 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.19beta21 +SHLIB_MINOR= 1.2.19beta22 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 ae403260a..7401f1236 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index f27d0ef62..6baa6cb7b 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 00be4170b..98c15abe4 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 2c82b2756..8627307be 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index c305c650f..bfc482ac3 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 074a18b10..1478a1ef5 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta21 +PNGMIN = 1.2.19beta22 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 58b4e0e4f..032a8825e 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.19beta21 +; Version 1.2.19beta22 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 96d81ad93..c91bec025 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.19beta21 +;Version 1.2.19beta22 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |