diff --git a/ANNOUNCE b/ANNOUNCE index 519f773d..190a7f2a 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.19rc2 - August 4, 2007 +Libpng 1.2.19rc3 - August 9, 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.19rc2.tar.gz - libpng-1.2.19rc2.tar.bz2 + libpng-1.2.19rc3.tar.gz + libpng-1.2.19rc3.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.19rc2-no-config.tar.gz - libpng-1.2.19rc2-no-config.tar.bz2 + libpng-1.2.19rc3-no-config.tar.gz + libpng-1.2.19rc3-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1219r02.zip - lp1219r02.tar.bz2 + lp1219r03.zip + lp1219r03.tar.bz2 Project files - libpng-1.2.19rc2-project-netware.zip - libpng-1.2.19rc2-project-wince.zip + libpng-1.2.19rc3-project-netware.zip + libpng-1.2.19rc3-project-wince.zip Other information: - libpng-1.2.19rc2-README.txt - libpng-1.2.19rc2-KNOWNBUGS.txt - libpng-1.2.19rc2-LICENSE.txt - libpng-1.2.19rc2-Y2K-compliance.txt + libpng-1.2.19rc3-README.txt + libpng-1.2.19rc3-KNOWNBUGS.txt + libpng-1.2.19rc3-LICENSE.txt + libpng-1.2.19rc3-Y2K-compliance.txt Changes since the last public release (1.2.18): @@ -166,7 +166,7 @@ version 1.2.19beta30 [July 26, 2007] version 1.2.19beta31 [July 27, 2007] Fix typos in pnggccrd.c -version 1.2.19beta32 [August 4, 2007] +version 1.2.19beta32 [August 9, 2007] Disable PNG_MMX_CODE_SUPPORTED when PNG_ASSEMBLER_CODE_SUPPORTED is off. Enable PNG_MMX_READ_FILTER_* by default (they were inadvertently disabled in libpng-1.2.19beta23). @@ -179,6 +179,9 @@ version 1.0.27rc2 and 1.2.19rc2 [August 4, 2007] Issue a png_error() if application attempts to transform a row tht has not been initialized. +version 1.0.27 and 1.2.19 [August 9, 2007] + Slightly revised pngvcrd.c + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index a0e9c129..8658e489 100644 --- a/CHANGES +++ b/CHANGES @@ -1875,6 +1875,9 @@ version 1.0.27rc2 and 1.2.19rc2 [August 4, 2007] Issue a png_error() if application attempts to transform a row tht has not been initialized. +version 1.0.27 and 1.2.19 [August 9, 2007] + Slightly revised pngvcrd.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 diff --git a/INSTALL b/INSTALL index 30c1bc55..3d981ee0 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.19rc2 - August 4, 2007 +Installing libpng version 1.2.19rc3 - August 9, 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.19rc2" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.19rc3" 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.19rc2) + gcc, creates libpng12.so.0.1.2.19rc3) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc2) + (gcc, creates libpng12.so.0.1.2.19rc3) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc2, + (gcc, creates libpng12.so.0.1.2.19rc3, uses assembler code tuned for Intel MMX platform) makefile.nommx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc2 + (gcc, creates libpng12.so.0.1.2.19rc3 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.19rc2) + creates libpng12.so.0.1.2.19rc3) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.19rc2) + creates libpng12.so.0.1.2.19rc3) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.19rc2) + creates libpng12.so.0.1.2.19rc3) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.19rc2) + creates libpng12.so.0.1.2.19rc3) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc diff --git a/KNOWNBUG b/KNOWNBUG index 9c8bb1fa..2e1b95f4 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.19rc2 +Known bugs in libpng version 1.2.19rc3 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when reading interlaced PNG files, when assembler code is enabled but running diff --git a/LICENSE b/LICENSE index d0ea1dc5..e6e3a7f6 100644 --- a/LICENSE +++ b/LICENSE @@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.19rc2, August 4, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.19rc3, August 9, 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 4, 2007 +August 9, 2007 diff --git a/README b/README index e175ff73..90f42bc1 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.19rc2 - August 4, 2007 (shared library 12.0) +README for libpng version 1.2.19rc3 - August 9, 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.19rc2) + gcc, creates libpng12.so.0.1.2.19rc3) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc2) + (gcc, creates libpng12.so.0.1.2.19rc3) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc2, + (gcc, creates libpng12.so.0.1.2.19rc3, 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.19rc2) + (gcc, creates libpng12.so.0.1.2.19rc3) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.19rc2) + (gcc, creates libpng12.so.0.1.2.19rc3) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.19rc2) + (gcc, creates libpng12.so.0.1.2.19rc3) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc diff --git a/Y2KINFO b/Y2KINFO index 9e14f373..eab9dfe1 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - August 4, 2007 + August 9, 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.19rc2 are Y2K compliant. It is my belief that earlier + upward through 1.2.19rc3 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer diff --git a/configure b/configure index c6b36f5d..f41eaa36 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for libpng 1.2.19rc2. +# Generated by GNU Autoconf 2.61 for libpng 1.2.19rc3. # # Report bugs to . # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.19rc2' -PACKAGE_STRING='libpng 1.2.19rc2' +PACKAGE_VERSION='1.2.19rc3' +PACKAGE_STRING='libpng 1.2.19rc3' 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.19rc2 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.19rc3 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.19rc2:";; + short | recursive ) echo "Configuration of libpng 1.2.19rc3:";; 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.19rc2 +libpng configure 1.2.19rc3 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.19rc2, which was +It was created by libpng $as_me 1.2.19rc3, 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.19rc2' + VERSION='1.2.19rc3' cat >>confdefs.h <<_ACEOF @@ -2440,7 +2440,7 @@ fi -PNGLIB_VERSION=1.2.19rc2 +PNGLIB_VERSION=1.2.19rc3 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.19rc2, which was +This file was extended by libpng $as_me 1.2.19rc3, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21335,7 +21335,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpng config.status 1.2.19rc2 +libpng config.status 1.2.19rc3 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 52af9d2f..99995c14 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.19rc2], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.19rc3], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.19rc2 +PNGLIB_VERSION=1.2.19rc3 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=19 diff --git a/libpng-1.2.19rc2.txt b/libpng-1.2.19rc3.txt similarity index 99% rename from libpng-1.2.19rc2.txt rename to libpng-1.2.19rc3.txt index 8719fecc..9ff6860e 100644 --- a/libpng-1.2.19rc2.txt +++ b/libpng-1.2.19rc3.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.19rc2 - August 4, 2007 + libpng version 1.2.19rc3 - August 9, 2007 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -2968,13 +2968,13 @@ application: IX. Y2K Compliance in libpng -August 4, 2007 +August 9, 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.19rc2 are Y2K compliant. It is my belief that earlier +upward through 1.2.19rc3 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpng.3 b/libpng.3 index 8a871217..9791c26e 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "August 4, 2007" +.TH LIBPNG 3 "August 9, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19rc2 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19rc3 .SH SYNOPSIS \fB #include \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.19rc2 - August 4, 2007 + libpng version 1.2.19rc3 - August 9, 2007 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -3378,13 +3378,13 @@ application: .SH IX. Y2K Compliance in libpng -August 4, 2007 +August 9, 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.19rc2 are Y2K compliant. It is my belief that earlier +upward through 1.2.19rc3 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 @@ -3631,7 +3631,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.19rc2 - August 4, 2007: +Libpng version 1.2.19rc3 - August 9, 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). @@ -3652,7 +3652,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.19rc2, August 4, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.19rc3, August 9, 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 @@ -3751,7 +3751,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 4, 2007 +August 9, 2007 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 9ee229dc..dcd663e9 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "August 4, 2007" +.TH LIBPNGPF 3 "August 9, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19rc2 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19rc3 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index c221878e..00280141 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "August 4, 2007" +.TH PNG 5 "August 9, 2007" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index d82cb940..18857ae7 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.2.19 August 4, 2007 + * Last changed in libpng 1.2.19 August 9, 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_19rc2 Your_png_h_is_not_version_1_2_19rc2; +typedef version_1_2_19rc3 Your_png_h_is_not_version_1_2_19rc3; /* 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.19rc2 - August 4, 2007\n\ + return ((png_charp) "\n libpng version 1.2.19rc3 - August 9, 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"); diff --git a/png.h b/png.h index 031bf8a4..01de2df0 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.19rc2 - August 4, 2007 + * libpng version 1.2.19rc3 - August 9, 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.19rc2 - August 4, 2007: Glenn + * libpng versions 0.97, January 1998, through 1.2.19rc3 - August 9, 2007: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -182,7 +182,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.19rc2, August 4, 2007, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.19rc3, August 9, 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: @@ -294,13 +294,13 @@ * Y2K compliance in libpng: * ========================= * - * August 4, 2007 + * August 9, 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.19rc2 are Y2K compliant. It is my belief that earlier + * upward through 1.2.19rc3 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 @@ -356,9 +356,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.19rc2" +#define PNG_LIBPNG_VER_STRING "1.2.19rc3" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.19rc2 - August 4, 2007\n" + " libpng version 1.2.19rc3 - August 9, 2007\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -370,7 +370,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 2 +#define PNG_LIBPNG_VER_BUILD 3 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1409,7 +1409,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_19rc2; +typedef png_structp version_1_2_19rc3; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index f961df73..1accbd44 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.19rc2 - August 4, 2007 + * libpng version 1.2.19rc3 - August 9, 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 7ec3c5f8..7c84c6ee 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 August 4, 2007 + * Last changed in libpng 1.2.19 August 9, 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 56348759..7762d3cc 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -3,7 +3,7 @@ * * For Intel/AMD x86 or x86-64 CPU (Pentium-MMX or later) and GNU C compiler. * - * Last changed in libpng 1.2.19 August 4, 2007 + * Last changed in libpng 1.2.19 August 9, 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 diff --git a/pngpread.c b/pngpread.c index 3053a7c8..2173d2e2 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 August 4, 2007 + * Last changed in libpng 1.2.19 August 9, 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/pngread.c b/pngread.c index ec0752e2..20cbd143 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.2.19 August 4, 2007 + * Last changed in libpng 1.2.19 August 9, 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 15e5d90d..83ec084d 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 August 4, 2007 + * Last changed in libpng 1.2.19 August 9, 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 b6b7eb81..73635c1e 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 August 4, 2007 + * Last changed in libpng 1.2.19 August 9, 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/pngtest.c b/pngtest.c index 58a61b8c..a2ce789d 100644 --- a/pngtest.c +++ b/pngtest.c @@ -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_19rc2 your_png_h_is_not_version_1_2_19rc2; +typedef version_1_2_19rc3 your_png_h_is_not_version_1_2_19rc3; diff --git a/pngvcrd.c b/pngvcrd.c index b5e74506..5a566382 100644 --- a/pngvcrd.c +++ b/pngvcrd.c @@ -3,7 +3,7 @@ * * For Intel x86 CPU and Microsoft Visual C++ compiler * - * Last changed in libpng 1.2.19 August 4, 2007 + * Last changed in libpng 1.2.19 August 9, 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 @@ -24,6 +24,9 @@ * * [Copy 6 bytes per pixel, not 4, and use stride of 6, not 4, in the * second loop of interlace processing of 48-bit pixels, GR-P 20070717] + * + * [move instances of uAll union into local, except for two constant + * instances, GR-P 20070805] */ #define PNG_INTERNAL @@ -34,7 +37,6 @@ static int mmx_supported=2; - int PNGAPI png_mmx_support(void) { @@ -1920,12 +1922,13 @@ loop4_pass0: // These global constants are declared // here to ensure alignment on 8-byte boundaries. - PNG_CONST union uAll { + union uAll { __int64 use; double double_align; long long long_long_align; - } LBCarryMask = {0x0101010101010101}, - HBClearMask = {0x7f7f7f7f7f7f7f7f}; + } ; + static PNG_CONST union uAll LBCarryMask = {0x0101010101010101}, + HBClearMask = {0x7f7f7f7f7f7f7f7f}; // Optimized code for PNG Average filter decoder void /* PRIVATE */ @@ -1934,11 +1937,7 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row { // These variables are declared // here to ensure alignment on 8-byte boundaries. - union uAll { - __int64 use; - double double_align; - long long long_long_align; - } ActiveMask, ShiftBpp, ShiftRem; + union uAll ActiveMask, ShiftBpp, ShiftRem; int bpp; png_uint_32 FullLength; @@ -2375,11 +2374,7 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, { // These variables are declared // here to ensure alignment on 8-byte boundaries. - union uAll { - __int64 use; - double double_align; - long long long_long_align; - } ActiveMask, ActiveMask2, ActiveMaskEnd, ShiftBpp, ShiftRem; + union uAll ActiveMask, ActiveMask2, ActiveMaskEnd, ShiftBpp, ShiftRem; png_uint_32 FullLength; png_uint_32 MMXLength; @@ -3278,11 +3273,7 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) { // These variables are declared // here to ensure alignment on 8-byte boundaries. - union uAll { - __int64 use; - double double_align; - long long long_long_align; - } ActiveMask, ShiftBpp, ShiftRem; + union uAll ActiveMask, ShiftBpp, ShiftRem; //int test; int bpp; diff --git a/pngwutil.c b/pngwutil.c index d8063efb..e515acd7 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 August 4, 2007 + * Last changed in libpng 1.2.19 August 9, 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 15039769..cd591bc3 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -175,7 +175,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.19rc2 +# VERSION 0.${PNGLIB_RELEASE}.1.2.19rc3 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 8d7176ed..9ce39ab6 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.19rc2 +version=1.2.19rc3 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index 873ee68b..ba24b081 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.19rc2 +Version: 1.2.19rc3 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 1eb37f08..afd55539 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.19rc2 +Version: 1.2.19rc3 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 7a3ef59d..dd831abd 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 64b32eb4..c821319c 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index ca5c9c4e..34ffafbb 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.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 97c0fd7c..f145e6a9 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 1fb6acb6..a6a3f1b8 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.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 30a846d9..5554c671 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 6bf2c79b..5bb0667c 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 56e79b9d..8e850e99 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 213b967f..2412069e 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index ce5b1879..85f738fa 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.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index f79d8180..2763792d 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index ac7f4afe..850152c5 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.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 2d0027e4..9aa2161a 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 365c8b0b..3f245adb 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.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 9b1fac9d..ae75ffde 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.19rc2 +SHLIB_MINOR= 1.2.19rc3 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 f0d270b9..8e93969b 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.19rc2 +SHLIB_MINOR= 1.2.19rc3 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 7889061f..2e149d96 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index ed447d18..261d44b1 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.19rc2 +SHLIB_MINOR= 1.2.19rc3 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 3429d376..701b761f 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 3eed5d6f..a21e1d14 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index b32a0ab9..ed2f2fc5 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index e78cecbe..2b1fdc59 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index b42a0912..1d168046 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 997cda7b..32c03a94 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc2 +PNGMIN = 1.2.19rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 0ec04212..a24937ef 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.19rc2 +; Version 1.2.19rc3 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 866d6b5d..e78039ce 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.19rc2 +;Version 1.2.19rc3 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3