diff --git a/ANNOUNCE b/ANNOUNCE index 3a6063a63993dfebfb39dce9639cfd38ac27be59..cabbce66e14bae21184076439a2b0514608dc1ad 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.19rc4 - August 10, 2007 +Libpng 1.2.19rc5 - August 10, 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.19rc4.tar.gz - libpng-1.2.19rc4.tar.bz2 + libpng-1.2.19rc5.tar.gz + libpng-1.2.19rc5.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.19rc4-no-config.tar.gz - libpng-1.2.19rc4-no-config.tar.bz2 + libpng-1.2.19rc5-no-config.tar.gz + libpng-1.2.19rc5-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1219r04.zip - lp1219r04.tar.bz2 + lp1219r05.zip + lp1219r05.tar.bz2 Project files - libpng-1.2.19rc4-project-netware.zip - libpng-1.2.19rc4-project-wince.zip + libpng-1.2.19rc5-project-netware.zip + libpng-1.2.19rc5-project-wince.zip Other information: - libpng-1.2.19rc4-README.txt - libpng-1.2.19rc4-KNOWNBUGS.txt - libpng-1.2.19rc4-LICENSE.txt - libpng-1.2.19rc4-Y2K-compliance.txt + libpng-1.2.19rc5-README.txt + libpng-1.2.19rc5-KNOWNBUGS.txt + libpng-1.2.19rc5-LICENSE.txt + libpng-1.2.19rc5-Y2K-compliance.txt Changes since the last public release (1.2.18): @@ -188,6 +188,10 @@ version 1.0.27rc4 and 1.2.19rc4 [August 10, 2007] Change default to PNG_NO_GLOBAL_ARRAYS for MSVC. Turn off PNG_FLAG_ROW_INIT flag when setting transforms that expand pixels. +version 1.0.27rc5 and 1.2.19rc5 [August 10, 2007] + Fix typo (missing '"') in pnggccrd.c + Revise handling of png_strtod in recent versions of WINCE + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index f4574e6132c0f6a98fa43a84511dca1cfdaefd99..6af0235f29cb50965fff0f1abc218b33278c13c2 100644 --- a/CHANGES +++ b/CHANGES @@ -1884,6 +1884,10 @@ version 1.0.27rc4 and 1.2.19rc4 [August 10, 2007] Change default to PNG_NO_GLOBAL_ARRAYS for MSVC. Turn off PNG_FLAG_ROW_INIT flag when setting transforms that expand pixels. +version 1.0.27rc5 and 1.2.19rc5 [August 10, 2007] + Fix typo (missing '"') in pnggccrd.c + Revise handling of png_strtod in recent versions of WINCE + 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 48fdaed8b6c5deb812bf66644446dd7675438840..cad2c7d03b798bbcf22c07a1db00a36d933a5e5b 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.19rc4 - August 10, 2007 +Installing libpng version 1.2.19rc5 - August 10, 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.19rc4" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.19rc5" 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.19rc4) + gcc, creates libpng12.so.0.1.2.19rc5) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc4) + (gcc, creates libpng12.so.0.1.2.19rc5) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc4, + (gcc, creates libpng12.so.0.1.2.19rc5, uses assembler code tuned for Intel MMX platform) makefile.nommx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc4 + (gcc, creates libpng12.so.0.1.2.19rc5 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.19rc4) + creates libpng12.so.0.1.2.19rc5) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.19rc4) + creates libpng12.so.0.1.2.19rc5) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.19rc4) + creates libpng12.so.0.1.2.19rc5) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.19rc4) + creates libpng12.so.0.1.2.19rc5) 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 1a466da1b829fd5231b471fee7007c9d848fb241..eccdf4377a2bad341392d3296c1eadf9b8083633 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.19rc4 +Known bugs in libpng version 1.2.19rc5 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 d300e73f5a289bb14329808cf053075f99a0daed..f5604326d8b58d89bcec03c3f3ac2bef0619cfa9 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.19rc4, August 10, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.19rc5, August 10, 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 diff --git a/README b/README index b1a58f053819f1ca373bf6f4bbe2b3c94f739405..75a12f00fe68652351e6df2ca46533559c6e3973 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.19rc4 - August 10, 2007 (shared library 12.0) +README for libpng version 1.2.19rc5 - August 10, 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.19rc4) + gcc, creates libpng12.so.0.1.2.19rc5) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc4) + (gcc, creates libpng12.so.0.1.2.19rc5) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc4, + (gcc, creates libpng12.so.0.1.2.19rc5, 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.19rc4) + (gcc, creates libpng12.so.0.1.2.19rc5) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.19rc4) + (gcc, creates libpng12.so.0.1.2.19rc5) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.19rc4) + (gcc, creates libpng12.so.0.1.2.19rc5) 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 eb28c03e522a6fd62384b8b4b4a1efd0fff7fe5f..ae2a81009f19bce6e3926a7f0af9e248a03fe8af 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -7,7 +7,7 @@ an official declaration. This is your unofficial assurance that libpng from version 0.71 and - upward through 1.2.19rc4 are Y2K compliant. It is my belief that earlier + upward through 1.2.19rc5 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 e85359ec73635fd5d01ce70d65400d37534b4f89..3a2c8f4c3c61c0e327fdc98e2bf81207e78d3474 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.19rc4. +# Generated by GNU Autoconf 2.61 for libpng 1.2.19rc5. # # 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.19rc4' -PACKAGE_STRING='libpng 1.2.19rc4' +PACKAGE_VERSION='1.2.19rc5' +PACKAGE_STRING='libpng 1.2.19rc5' 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.19rc4 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.19rc5 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.19rc4:";; + short | recursive ) echo "Configuration of libpng 1.2.19rc5:";; 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.19rc4 +libpng configure 1.2.19rc5 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.19rc4, which was +It was created by libpng $as_me 1.2.19rc5, 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.19rc4' + VERSION='1.2.19rc5' cat >>confdefs.h <<_ACEOF @@ -2440,7 +2440,7 @@ fi -PNGLIB_VERSION=1.2.19rc4 +PNGLIB_VERSION=1.2.19rc5 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.19rc4, which was +This file was extended by libpng $as_me 1.2.19rc5, 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.19rc4 +libpng config.status 1.2.19rc5 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 76ab1afed4dba72c0287d5fdd33405b439968604..3cd1637141261109c6000423c8e5485755bede73 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.19rc4], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.19rc5], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.19rc4 +PNGLIB_VERSION=1.2.19rc5 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=19 diff --git a/libpng-1.2.19rc4.txt b/libpng-1.2.19rc5.txt similarity index 99% rename from libpng-1.2.19rc4.txt rename to libpng-1.2.19rc5.txt index 7ffc86a4b7fee5e3bd2ebf3ade892e90e2c4bdfc..6f406e3c71473b526409e7ffc41ee3105bd6a0f4 100644 --- a/libpng-1.2.19rc4.txt +++ b/libpng-1.2.19rc5.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.19rc4 - August 10, 2007 + libpng version 1.2.19rc5 - August 10, 2007 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -2974,7 +2974,7 @@ Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.2.19rc4 are Y2K compliant. It is my belief that earlier +upward through 1.2.19rc5 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 1fa6f6235752de08ee06125e21cca06bfa3aed2d..2fb821c2e5c13c303ba6c7a89e4d4bfe3b31e754 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "August 10, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19rc4 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19rc5 .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.19rc4 - August 10, 2007 + libpng version 1.2.19rc5 - August 10, 2007 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -3384,7 +3384,7 @@ Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.2.19rc4 are Y2K compliant. It is my belief that earlier +upward through 1.2.19rc5 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.19rc4 - August 10, 2007: +Libpng version 1.2.19rc5 - August 10, 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.19rc4, August 10, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.19rc5, August 10, 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 diff --git a/libpngpf.3 b/libpngpf.3 index 7376e77dfac15dc77cc4e3a0e30e16b17b6d263b..c60134b3368e6adab415a52c9f9b7fa26e227eaf 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "August 10, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19rc4 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19rc5 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.c b/png.c index 3d2746afcae5e1f14aced012e30eabb276c23da2..e522a27bb36c44b47a33593b3459f7c260b70f48 100644 --- a/png.c +++ b/png.c @@ -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_19rc4 Your_png_h_is_not_version_1_2_19rc4; +typedef version_1_2_19rc5 Your_png_h_is_not_version_1_2_19rc5; /* 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.19rc4 - August 10, 2007\n\ + return ((png_charp) "\n libpng version 1.2.19rc5 - August 10, 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 50b6ddf4ea8fd2c9ce609390e49ad9c6766897c3..0cc4fda72b3164a71a86dcf50f0de8d49db78446 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.19rc4 - August 10, 2007 + * libpng version 1.2.19rc5 - August 10, 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.19rc4 - August 10, 2007: Glenn + * libpng versions 0.97, January 1998, through 1.2.19rc5 - August 10, 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.19rc4, August 10, 2007, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.19rc5, August 10, 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: @@ -300,7 +300,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.2.19rc4 are Y2K compliant. It is my belief that earlier + * upward through 1.2.19rc5 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.19rc4" +#define PNG_LIBPNG_VER_STRING "1.2.19rc5" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.19rc4 - August 10, 2007\n" + " libpng version 1.2.19rc5 - August 10, 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 4 +#define PNG_LIBPNG_VER_BUILD 5 /* 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_19rc4; +typedef png_structp version_1_2_19rc5; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index dbe9c7f34dd27e39bde3548989460461938018ee..9c94c2ab200a8e468289f26927ccaa05a45d6145 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.19rc4 - August 10, 2007 + * libpng version 1.2.19rc5 - August 10, 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 89265a708d0ba63479083d024daa752e20cc64bc..81e6b574b5ce46cee99be637751d96e8e2139ba1 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -5784,22 +5784,6 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep break; case 1: - - -#if 0 -fdef PNG_MMX_READ_FILTER_SUB_SUPPORTED -#if !defined(PNG_1_0_X) - ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_SUB) && - (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) && - (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold)) -#else - _mmx_supported -#endif - ? "MMX" : -#endif - "C"); -#endif /* 0 */ - png_snprintf(filtname, 10, "sub-%s", #ifdef PNG_MMX_READ_FILTER_SUB_SUPPORTED #if !defined(PNG_1_0_X) @@ -5841,7 +5825,7 @@ fdef PNG_MMX_READ_FILTER_SUB_SUPPORTED #endif ? "MMX" : #endif - C"); + "C"); break; case 4: @@ -5858,7 +5842,7 @@ fdef PNG_MMX_READ_FILTER_SUB_SUPPORTED ? "MMX" : #endif /* PNG_x86_64_USE_GOTPCREL || PNG_THREAD_UNSAFE_OK */ #endif - "C"); + "C"); break; default: diff --git a/pngrutil.c b/pngrutil.c index efb82ca85925abf9df2d93fe3bac2f34cc651cc4..6af2afb2234781a333ebd30a1ca20bcd8c3faf45 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -16,8 +16,12 @@ #if defined(PNG_READ_SUPPORTED) +#if defined(_WIN32_WCE) && (_WIN32_WCE<0x500) +# define WIN32_WCE_OLD +#endif + #ifdef PNG_FLOATING_POINT_SUPPORTED -# if defined(_WIN32_WCE) +# if defined(WIN32_WCE_OLD) /* strtod() function is not supported on WindowsCE */ __inline double png_strtod(png_structp png_ptr, PNG_CONST char *nptr, char **endptr) { diff --git a/pngtest.c b/pngtest.c index 67bfde3ec1577a5b690b282a0433907053e53420..19b6141aa5f0840da2c4af8cd8ac1ca72eb62f08 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_19rc4 your_png_h_is_not_version_1_2_19rc4; +typedef version_1_2_19rc5 your_png_h_is_not_version_1_2_19rc5; diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index e4e42344da6bab8aed1795bfddf948e5090529ff..1287197e9b8a731828c32ba1841046cbf2e9761a 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.19rc4 +# VERSION 0.${PNGLIB_RELEASE}.1.2.19rc5 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 1e4400ed030923aff47f97ae97374df453b8bf61..703a07bcde14f5e6f417f175d28317dbf38e6836 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.19rc4 +version=1.2.19rc5 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index e1da5f8da24110fff95dd97772be7b9f02f01e9b..e6e8e2c25f82ffe41841e9d662ea87684b93651b 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.19rc4 +Version: 1.2.19rc5 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index b531f4dc93f03f33a005ab06a8a1057b7e636310..8a1615d32b91012eaf7ace73807bbf831cfe93c2 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.19rc4 +Version: 1.2.19rc5 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 0f8c7e37d05c54792fc365ecdc59fb6701f7823b..c1deb9cb28aa9d8822ac52253bf190a30ff0a1b1 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 2a80336ff14603e0edbec0de4f349f0c0d0e80ff..b9863e93ada443fcc8beb4ec468761bd69594ec5 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 0a7cf9c759f14ae8aa0b5d76689283667918d76c..207c19a69bd4b3d760d633ebaf3bc51f67dc3658 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.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index a899c3f5b1076418d0a7e5b959a951ddd04df34e..ea7710f9e13af053857a52c45d0fb8f39eeb97d7 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index fef4b7f957f9b83ce36182faf991d920e1b77245..80c822c4feba5d167cd26c2d805966bcd55c668d 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.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index b71e154384b6dcf7ff76e4c373831400db1f77e2..6141360ffbb96709b24a380d145cac061343172f 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 7bb56481476f5d1eaa5ee9306278a5c95c1e6887..36ea417ad0d0e6fa620c29ebbc14ac6760a99c18 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index edd4830366a482aeb2cbdd57f1531bff0cdc8530..860c41823325e6ed5538b0999bceadd9a876d43d 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index e99f9113ad2b59dfcc9b6d051ec6fc11285e2bfa..7c092ad4c57f781be3ded6f116ac476f8fdfe83d 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 3a408469ed9afd44fe6d1048e384c9c87b80a68b..42c8e86d71ebe51999319c19c4d0c1c01cca71df 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.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 2fa8404bebcc40fef9be2ba66852e576ba3ee1db..0939fa63a6ed70dffcca138ba20bbd175c06a4ae 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 1c60348cc3ac60e19aadad7b882163666b2c88c3..116d4a67228f26d857c4285541355ab40bfc16a3 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.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index ce554152e9233838394ab5931742e3e989a5df3f..1b388d1ebb081af29e58ae71e43fd5bcece2d1b3 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index e343adb38f7baa78db13988fb02328ed24651b02..ec32af2b728febe6968a73778392959f7cdeebc1 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.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 983542f018a1f5ad7142889c88e6a7fda9fd8f69..edfaeebb5689923f53533ea581a18b58f803e1b8 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.19rc4 +SHLIB_MINOR= 1.2.19rc5 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 c89b63d3cd1416dbeecca25de65bde7e1eec6a03..41ee85e365933c9a33751804de5919d19d17ef36 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.19rc4 +SHLIB_MINOR= 1.2.19rc5 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 af3c4eaa4b75805b114197dc84e6a10a2f76f3ea..8ec89f7fe88fe892d9e2a9de6ba851bdaed9604e 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 45f40b852b66f0ceb906baadee0cc87b952640d8..1d7160bc5e89263963ff2b56d2696bfbff47f8bb 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.19rc4 +SHLIB_MINOR= 1.2.19rc5 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 c728265143831dd643d2dd44959c6a0cb8c4810d..332edcf73362f48cf807784939a84ea895a80cf5 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 632ea198606ffa4601659982b63ff902c9a5f732..d3d4ec0e21650e03d67dbab381c75d8b5d766aa5 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 2089dc98fafba071a488d5d2e92d5899ab99c045..999aa12ff14179b5c21aa2c0d04069e2f60ced48 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 5137b690a6595bfdace2eaed2048f673ecb401ee..d5bace041cb53d31e184d5bfd8dce061b6656839 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index acbe11496027ce7e137871ca3929b06405c03262..4ec6247b2973c41fcf7114821e131b78fd84951b 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 13c18c9db51be22f2b2f890ab2a06e9f0f1ff6c3..d1e7f8e77525da041ea1c6cda4a8396b9906bda7 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc4 +PNGMIN = 1.2.19rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index e52c455327a3ce675046018822573181a9e9a173..4a946d4e7f4561b4dfe99e516183ca183cd85975 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.19rc4 +; Version 1.2.19rc5 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index df63efe9058639852ebc2bfb247a9f5e3703a0f6..21bbc5b6d582022206327f70256ad35c433a8df3 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.19rc4 +;Version 1.2.19rc5 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3