diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2007-08-10 15:58:50 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-09-03 12:24:31 -0500 |
| commit | bfb1ddd2c94b723c1ccffdf2a018a344a703b381 (patch) | |
| tree | f472efe01a25d6e507ce4e913e5376686d664845 | |
| parent | 0a7bbf869742fa34e1749a0aedf7d1926c39de43 (diff) | |
| download | libpng-bfb1ddd2c94b723c1ccffdf2a018a344a703b381.tar.gz | |
[libpng10] Imported from libpng-1.0.27rc5.tarv1.0.27rc5
48 files changed, 117 insertions, 121 deletions
@@ -1,5 +1,5 @@ -Libpng 1.0.27rc4 - August 10, 2007 +Libpng 1.0.27rc5 - 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.0.27rc4.tar.gz - libpng-1.0.27rc4.tar.bz2 + libpng-1.0.27rc5.tar.gz + libpng-1.0.27rc5.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.0.27rc4-no-config.tar.gz - libpng-1.0.27rc4-no-config.tar.bz2 + libpng-1.0.27rc5-no-config.tar.gz + libpng-1.0.27rc5-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1027r04.zip - lp1027r04.tar.bz2 + lp1027r05.zip + lp1027r05.tar.bz2 Project files - libpng-1.0.27rc4-project-netware.zip - libpng-1.0.27rc4-project-wince.zip + libpng-1.0.27rc5-project-netware.zip + libpng-1.0.27rc5-project-wince.zip Other information: - libpng-1.0.27rc4-README.txt - libpng-1.0.27rc4-KNOWNBUGS.txt - libpng-1.0.27rc4-LICENSE.txt - libpng-1.0.27rc4-Y2K-compliance.txt + libpng-1.0.27rc5-README.txt + libpng-1.0.27rc5-KNOWNBUGS.txt + libpng-1.0.27rc5-LICENSE.txt + libpng-1.0.27rc5-Y2K-compliance.txt Changes since the last public release (1.0.26): @@ -182,12 +182,16 @@ version 1.0.27rc2 and 1.2.19rc2 [August 4, 2007] version 1.0.27rc3 and 1.2.19rc3 [August 9, 2007] Slightly revised pngvcrd.c -version 1.0.27rc4 and 1.2.19rc4 [August 10, 2007] +version 1.0.27rc4 and 1.2.19rc4 [August 9, 2007] Revised pnggccrd.c debugging change of rc1, which was broken. Revised scripts/CMakeLists.txt 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 @@ -1867,12 +1867,16 @@ version 1.0.27rc2 and 1.2.19rc2 [August 4, 2007] version 1.0.27rc3 and 1.2.19rc3 [August 9, 2007] Slightly revised pngvcrd.c -version 1.0.27rc4 and 1.2.19rc4 [August 10, 2007] +version 1.0.27rc4 and 1.2.19rc4 [August 9, 2007] Revised pnggccrd.c debugging change of rc1, which was broken. Revised scripts/CMakeLists.txt 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 @@ -1,5 +1,5 @@ -Installing libpng version 1.0.27rc4 - August 10, 2007 +Installing libpng version 1.0.27rc5 - 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.0.27rc4" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.0.27rc5" 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 libpng10.so.0.1.0.27rc4) + gcc, creates libpng10.so.0.1.0.27rc5) makefile.linux => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.27rc4) + (gcc, creates libpng10.so.0.1.0.27rc5) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.27rc4, + (gcc, creates libpng10.so.0.1.0.27rc5, uses assembler code tuned for Intel MMX platform) makefile.nommx => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.27rc4 + (gcc, creates libpng10.so.0.1.0.27rc5 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 libpng10.so.0.1.0.27rc4) + creates libpng10.so.0.1.0.27rc5) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng10.so.0.1.0.27rc4) + creates libpng10.so.0.1.0.27rc5) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng10.so.0.1.0.27rc4) + creates libpng10.so.0.1.0.27rc5) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng10.so.0.1.0.27rc4) + creates libpng10.so.0.1.0.27rc5) 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.0.27rc4 +Known bugs in libpng version 1.0.27rc5 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when reading interlaced PNG files, when assembler code is enabled but running @@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.0.27rc4, August 10, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.0.27rc5, 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 @@ -1,4 +1,4 @@ -README for libpng version 1.0.27rc4 - August 10, 2007 (shared library 10.0) +README for libpng version 1.0.27rc5 - August 10, 2007 (shared library 10.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 libpng10.so.0.1.0.27rc4) + gcc, creates libpng10.so.0.1.0.27rc5) makefile.linux => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.27rc4) + (gcc, creates libpng10.so.0.1.0.27rc5) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.27rc4, + (gcc, creates libpng10.so.0.1.0.27rc5, 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 libpng10.so.0.1.0.27rc4) + (gcc, creates libpng10.so.0.1.0.27rc5) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng10.so.0.1.0.27rc4) + (gcc, creates libpng10.so.0.1.0.27rc5) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng10.so.0.1.0.27rc4) + (gcc, creates libpng10.so.0.1.0.27rc5) 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 @@ -7,7 +7,7 @@ an official declaration. This is your unofficial assurance that libpng from version 0.71 and - upward through 1.0.27rc4 are Y2K compliant. It is my belief that earlier + upward through 1.0.27rc5 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.0.27rc4. +# Generated by GNU Autoconf 2.61 for libpng 1.0.27rc5. # # 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.0.27rc4' -PACKAGE_STRING='libpng 1.0.27rc4' +PACKAGE_VERSION='1.0.27rc5' +PACKAGE_STRING='libpng 1.0.27rc5' 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.0.27rc4 to adapt to many kinds of systems. +\`configure' configures libpng 1.0.27rc5 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.0.27rc4:";; + short | recursive ) echo "Configuration of libpng 1.0.27rc5:";; 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.0.27rc4 +libpng configure 1.0.27rc5 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.0.27rc4, which was +It was created by libpng $as_me 1.0.27rc5, 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.0.27rc4' + VERSION='1.0.27rc5' cat >>confdefs.h <<_ACEOF @@ -2440,7 +2440,7 @@ fi -PNGLIB_VERSION=1.0.27rc4 +PNGLIB_VERSION=1.0.27rc5 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 PNGLIB_RELEASE=27 @@ -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.0.27rc4, which was +This file was extended by libpng $as_me 1.0.27rc5, 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.0.27rc4 +libpng config.status 1.0.27rc5 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 bc6781045..f8e96ca37 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.0.27rc4], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.0.27rc5], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.0.27rc4 +PNGLIB_VERSION=1.0.27rc5 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 PNGLIB_RELEASE=27 diff --git a/libpng-1.0.27rc4.txt b/libpng-1.0.27rc5.txt index 22842e1c9..6aed5412e 100644 --- a/libpng-1.0.27rc4.txt +++ b/libpng-1.0.27rc5.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.0.27rc4 - August 10, 2007 + libpng version 1.0.27rc5 - August 10, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -2772,7 +2772,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.0.27rc4 are Y2K compliant. It is my belief that earlier +upward through 1.0.27rc5 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that @@ -1,6 +1,6 @@ .TH LIBPNG 3 "August 10, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.27rc4 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.27rc5 .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.0.27rc4 - August 10, 2007 + libpng version 1.0.27rc5 - August 10, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -3182,7 +3182,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.0.27rc4 are Y2K compliant. It is my belief that earlier +upward through 1.0.27rc5 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 @@ -3372,8 +3372,8 @@ the first widely used release: 1.0.26 10 10026 10.so.0.26[.0] 1.2.18 13 10218 12.so.0.18[.0] 1.2.19beta1-31 13 10219 12.so.0.19[.0] - 1.0.27rc1-4 10 10027 10.so.0.27[.0] - 1.2.19rc1-4 13 10219 12.so.0.19[.0] + 1.0.27rc1-5 10 10027 10.so.0.27[.0] + 1.2.19rc1-5 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 @@ -3429,7 +3429,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.27rc4 - August 10, 2007: +Libpng version 1.0.27rc5 - 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). @@ -3450,7 +3450,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.0.27rc4, August 10, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.0.27rc5, 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 62771598b..ffb1e63ba 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.0.27rc4 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.27rc5 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -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_0_27rc4 Your_png_h_is_not_version_1_0_27rc4; +typedef version_1_0_27rc5 Your_png_h_is_not_version_1_0_27rc5; /* 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.0.27rc4 - August 10, 2007\n\ + return ((png_charp) "\n libpng version 1.0.27rc5 - 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"); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.0.27rc4 - August 10, 2007 + * libpng version 1.0.27rc5 - 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.0.27rc4 - August 10, 2007: Glenn + * libpng versions 0.97, January 1998, through 1.0.27rc5 - August 10, 2007: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -151,8 +151,8 @@ * 1.0.26 10 10026 10.so.0.26[.0] * 1.2.18 13 10218 12.so.0.18[.0] * 1.2.19beta1-31 13 10219 12.so.0.19[.0] - * 1.0.27rc1-4 10 10027 10.so.0.27[.0] - * 1.2.19rc1-4 13 10219 12.so.0.19[.0] + * 1.0.27rc1-5 10 10027 10.so.0.27[.0] + * 1.2.19rc1-5 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 @@ -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.0.27rc4, August 10, 2007, are + * libpng versions 1.2.6, August 15, 2004, through 1.0.27rc5, 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.0.27rc4 are Y2K compliant. It is my belief that earlier + * upward through 1.0.27rc5 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.0.27rc4" +#define PNG_LIBPNG_VER_STRING "1.0.27rc5" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.0.27rc4 - August 10, 2007\n" + " libpng version 1.0.27rc5 - August 10, 2007\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 10 @@ -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_0_27rc4; +typedef png_structp version_1_0_27rc5; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.0.27rc4 - August 10, 2007 + * libpng version 1.0.27rc5 - 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 89265a708..81e6b574b 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 efb82ca85..6af2afb22 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) { @@ -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_0_27rc4 your_png_h_is_not_version_1_0_27rc4; +typedef version_1_0_27rc5 your_png_h_is_not_version_1_0_27rc5; diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 2e4f68a84..48dc7ddc5 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.0.27rc4 +# VERSION 0.${PNGLIB_RELEASE}.1.0.27rc5 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 0cd268475..543280b98 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.0.27rc4 +version=1.0.27rc5 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index 07df13a0d..58b116f5c 100644 --- a/scripts/libpng.pc-configure.in +++ b/scripts/libpng.pc-configure.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng10 Name: libpng Description: Loads and saves PNG files -Version: 1.0.27rc4 +Version: 1.0.27rc5 Libs: -L${libdir} -lpng10 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 41c9bf815..8df7f6e55 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng10 Name: libpng Description: Loads and saves PNG files -Version: 1.0.27rc4 +Version: 1.0.27rc5 Libs: -L${libdir} -lpng10 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 0d9154b2f..bc7c10090 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 5ed623b37..0cdde30b8 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 113b2a536..3afcd81dc 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -20,7 +20,7 @@ LN_SF = ln -f -s LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 4c99656e0..7356e3da5 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 24ead92ca..70ff5113f 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng10 PNGMAJ = 0 CYGDLL = 10 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 288de6d97..108b8297c 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 4bab17a61..d8f473e45 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 89e257ca0..8c7c4e63a 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index ff3fcad1a..01907ed44 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 7eb3267b5..5cf222542 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 7226f4d64..cfeafe392 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 63f5f2c67..4109e57fb 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index faa0665d2..36fdd9967 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index ee2874c08..071ade8e7 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -78,7 +78,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng10 PNGMAJ = 0 MINGDLL = 10 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index d8e15cfca..c44ab0268 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng10 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.0.27rc4 +SHLIB_MINOR= 1.0.27rc5 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 d3b29d872..b73f32660 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.0.27rc4 +SHLIB_MINOR= 1.0.27rc5 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 0c6f682d0..527c23f23 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 7e96700bd..4f79f6318 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.0.27rc4 +SHLIB_MINOR= 1.0.27rc5 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 27178c486..7768223a0 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 96c41c660..3313d7aa0 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index a71e6d7d0..0ab456a0f 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index e4cbf9b32..8558f79e7 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 374651203..e0e9bebe6 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index c471aee3b..d4f34b9c6 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.27rc4 +PNGMIN = 1.0.27rc5 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 788de2c81..9ffa23575 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.0.27rc4 +; Version 1.0.27rc5 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index dd775d8c7..c14541f75 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.0.27rc4 +;Version 1.0.27rc5 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |