diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2008-08-19 18:20:52 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:10:22 -0500 |
commit | dbed41fde1a2004a417072b0dbe8e7e9b1f799c6 (patch) | |
tree | 3385f866b798f329de21286bf4f9cdd3a5da7c32 | |
parent | 4198360421ded7c83fb5e36e8eff8e2058d3eeaf (diff) | |
download | libpng-1.4.0beta32.tar.gz |
Imported from libpng-1.4.0beta32.tarv1.4.0beta32
48 files changed, 111 insertions, 99 deletions
@@ -1,5 +1,5 @@ -Libpng 1.4.0beta31 - August 19, 2008 +Libpng 1.4.0beta32 - August 19, 2008 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,27 +9,27 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.4.0beta31.tar.gz - 1.4.0beta31.tar.bz2 + 1.4.0beta32.tar.gz + 1.4.0beta32.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - 1.4.0beta31-no-config.tar.gz - 1.4.0beta31-no-config.tar.bz2 + 1.4.0beta32-no-config.tar.gz + 1.4.0beta32-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp140b31.zip - lp140b31.tar.bz2 + lp140b32.zip + lp140b32.tar.bz2 Other information: - 1.4.0beta31-README.txt - 1.4.0beta31-KNOWNBUGS.txt - 1.4.0beta31-LICENSE.txt - 1.4.0beta31-Y2K-compliance.txt + 1.4.0beta32-README.txt + 1.4.0beta32-KNOWNBUGS.txt + 1.4.0beta32-LICENSE.txt + 1.4.0beta32-Y2K-compliance.txt Changes since the last public release (1.2.10): @@ -309,8 +309,14 @@ version 1.4.0beta29 [August 9, 2008] version 1.4.0beta30 [August 14, 2008] Added premultiplied alpha feature (Volker Wiendl). -version 1.4.0beta31 [August 19, 2008] +version 1.4.0beta31 [August 18, 2008] Moved png_set_premultiply_alpha from pngtrans.c to pngrtran.c + Removed extra crc check at the end of png_handle_cHRM(). Bug introduced + in libpng-1.4.0beta20. + +version 1.4.0beta32 [August 19, 2008] + Added PNG_WRITE_FLUSH_SUPPORTED block around new png_flush() call. + Revised PNG_NO_STDIO version of png_write_flush() version 1.4.0betaN [future] Build shared libraries with -lz and sometimes -lm. @@ -1982,11 +1982,15 @@ version 1.4.0beta29 [August 9, 2008] version 1.4.0beta30 [August 14, 2008] Added premultiplied alpha feature (Volker Wiendl). -version 1.4.0beta31 [August 19, 2008] +version 1.4.0beta31 [August 18, 2008] Moved png_set_premultiply_alpha from pngtrans.c to pngrtran.c Removed extra crc check at the end of png_handle_cHRM(). Bug introduced in libpng-1.4.0beta20. +version 1.4.0beta32 [August 19, 2008] + Added PNG_WRITE_FLUSH_SUPPORTED block around new png_flush() call. + Revised PNG_NO_STDIO version of png_write_flush() + version 1.4.0betaN [future] Build shared libraries with -lz and sometimes -lm. @@ -1,5 +1,5 @@ -Installing libpng version 1.4.0beta31 - August 19, 2008 +Installing libpng version 1.4.0beta32 - August 19, 2008 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.4.0beta31" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.4.0beta32" 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: @@ -95,14 +95,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 libpng14.so.0.1.4.0beta31) + gcc, creates libpng14.so.0.1.4.0beta32) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.0.1.4.0beta31) + (gcc, creates libpng14.so.0.1.4.0beta32) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng14.so.0.1.4.0beta31, + (gcc, creates libpng14.so.0.1.4.0beta32, uses assembler code tuned for Intel MMX platform) makefile.nommx => Linux/ELF makefile - (gcc, creates libpng14.so.0.1.4.0beta31 + (gcc, creates libpng14.so.0.1.4.0beta32 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 @@ -125,12 +125,12 @@ include makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sggcc => Silicon Graphics (gcc, - creates libpng14.so.0.1.4.0beta31) + creates libpng14.so.0.1.4.0beta32) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng14.so.0.1.4.0beta31) + creates libpng14.so.0.1.4.0beta32) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng14.so.0.1.4.0beta31) + creates libpng14.so.0.1.4.0beta32) 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.4.0beta31 +Known bugs in libpng version 1.4.0beta32 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.4.0beta31, August 19, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta32, August 19, 2008, 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/Makefile.am b/Makefile.am index 5a4e6d898..85027f903 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,7 +86,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.0beta31.txt pngvcrd.c + example.c libpng-1.4.0beta32.txt pngvcrd.c CLEANFILES= pngout.png libpng14.pc libpng14-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index d4688ef81..e57e1c9b2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -331,7 +331,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.0beta31.txt pngvcrd.c + example.c libpng-1.4.0beta32.txt pngvcrd.c CLEANFILES = pngout.png libpng14.pc libpng14-config libpng.vers \ libpng.sym @@ -1,4 +1,4 @@ -README for libpng version 1.4.0beta31 - August 19, 2008 (shared library 14.0) +README for libpng version 1.4.0beta32 - August 19, 2008 (shared library 14.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -184,11 +184,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 libpng14.so.0.1.4.0beta31) + gcc, creates libpng14.so.0.1.4.0beta32) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.0.1.4.0beta31) + (gcc, creates libpng14.so.0.1.4.0beta32) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng14.so.0.1.4.0beta31, + (gcc, creates libpng14.so.0.1.4.0beta32, 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 @@ -210,12 +210,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng14.so.0.1.4.0beta31) + (gcc, creates libpng14.so.0.1.4.0beta32) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.0.1.4.0beta31) + (gcc, creates libpng14.so.0.1.4.0beta32) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.0.1.4.0beta31) + (gcc, creates libpng14.so.0.1.4.0beta32) 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,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for libpng 1.4.0beta31. +# Generated by GNU Autoconf 2.62 for libpng 1.4.0beta32. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.4.0beta31' -PACKAGE_STRING='libpng 1.4.0beta31' +PACKAGE_VERSION='1.4.0beta32' +PACKAGE_STRING='libpng 1.4.0beta32' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' ac_unique_file="pngget.c" @@ -1484,7 +1484,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.4.0beta31 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.0beta32 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1554,7 +1554,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.4.0beta31:";; + short | recursive ) echo "Configuration of libpng 1.4.0beta32:";; esac cat <<\_ACEOF @@ -1661,7 +1661,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.4.0beta31 +libpng configure 1.4.0beta32 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1675,7 +1675,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.4.0beta31, which was +It was created by libpng $as_me 1.4.0beta32, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -2389,7 +2389,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.4.0beta31' + VERSION='1.4.0beta32' cat >>confdefs.h <<_ACEOF @@ -2558,7 +2558,7 @@ fi -PNGLIB_VERSION=1.4.0beta31 +PNGLIB_VERSION=1.4.0beta32 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=0 @@ -13125,7 +13125,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.4.0beta31, which was +This file was extended by libpng $as_me 1.4.0beta32, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13178,7 +13178,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libpng config.status 1.4.0beta31 +libpng config.status 1.4.0beta32 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 8f15803a9..a915cb72c 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.4.0beta31], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.0beta32], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.4.0beta31 +PNGLIB_VERSION=1.4.0beta32 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=0 diff --git a/libpng-1.4.0beta31.txt b/libpng-1.4.0beta32.txt index c7a418036..5add3d3e0 100644 --- a/libpng-1.4.0beta31.txt +++ b/libpng-1.4.0beta32.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.0beta31 - August 19, 2008 + libpng version 1.4.0beta32 - August 19, 2008 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -2934,7 +2934,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.4.0beta31 are Y2K compliant. It is my belief that earlier +upward through 1.4.0beta32 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 19, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta31 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta32 .SH SYNOPSIS \fI\fB @@ -801,7 +801,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.4.0beta31 - August 19, 2008 + libpng version 1.4.0beta32 - August 19, 2008 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -3735,7 +3735,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.4.0beta31 are Y2K compliant. It is my belief that earlier +upward through 1.4.0beta32 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 @@ -3902,7 +3902,7 @@ the first widely used release: 1.2.12 13 10212 12.so.0.12[.0] 1.4.0beta9-14 14 10400 14.so.0.0[.0] 1.2.13 13 10213 12.so.0.13[.0] - 1.4.0beta15-31 14 10400 14.so.0.0[.0] + 1.4.0beta15-32 14 10400 14.so.0.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3958,7 +3958,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.0beta31 - August 19, 2008: +Libpng version 1.4.0beta32 - August 19, 2008: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -3979,7 +3979,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.4.0beta31, August 19, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta32, August 19, 2008, 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 4ad2a4e6a..16394e867 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "August 19, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta31 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta32 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -13,7 +13,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_0beta31 Your_png_h_is_not_version_1_4_0beta31; +typedef version_1_4_0beta32 Your_png_h_is_not_version_1_4_0beta32; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -641,13 +641,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version x 1.4.0beta31 - August 19, 2008" PNG_STRING_NEWLINE \ + "libpng version x 1.4.0beta32 - August 19, 2008" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2008 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE); #else - return ((png_charp) "libpng version 1.4.0beta31 - August 19, 2008\ + return ((png_charp) "libpng version 1.4.0beta32 - August 19, 2008\ Copyright (c) 1998-2008 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.0beta31 - August 19, 2008 + * libpng version 1.4.0beta32 - August 19, 2008 * Copyright (c) 1998-2008 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.4.0beta31 - August 19, 2008: Glenn + * libpng versions 0.97, January 1998, through 1.4.0beta32 - August 19, 2008: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -126,7 +126,7 @@ * 1.2.12 13 10212 12.so.0.10[.0] * 1.4.0beta9-14 14 10400 14.so.0.0[.0] * 1.2.13 13 10213 12.so.0.10[.0] - * 1.4.0beta15-31 14 10400 14.so.0.0[.0] + * 1.4.0beta15-32 14 10400 14.so.0.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -156,7 +156,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta31, August 19, 2008, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta32, August 19, 2008, 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: @@ -274,7 +274,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.4.0beta31 are Y2K compliant. It is my belief that earlier + * upward through 1.4.0beta32 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 @@ -330,9 +330,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.0beta31" +#define PNG_LIBPNG_VER_STRING "1.4.0beta32" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.0beta31 - August 19, 2008\n" + " libpng version 1.4.0beta32 - August 19, 2008\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -344,7 +344,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 31 +#define PNG_LIBPNG_VER_BUILD 32 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1347,7 +1347,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_4_0beta31; +typedef png_structp version_1_4_0beta32; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.0beta31 - August 19, 2008 + * libpng version 1.4.0beta32 - August 19, 2008 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.0beta31 - August 19, 2008 + * libpng version 1.4.0beta32 - August 19, 2008 * 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) @@ -1613,4 +1613,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_0beta31 your_png_h_is_not_version_1_4_0beta31; +typedef version_1_4_0beta32 your_png_h_is_not_version_1_4_0beta32; @@ -119,7 +119,7 @@ png_default_flush(png_structp png_ptr) png_FILE_p io_ptr; if (png_ptr == NULL) return; io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr)); - if (io_ptr != NULL) + if (io_ptr != NULL && fileno(io_ptr)!=-1) fflush(io_ptr); } #endif diff --git a/pngwrite.c b/pngwrite.c index 70774fc1f..9123bda1e 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -399,7 +399,9 @@ png_write_end(png_structp png_ptr, png_infop info_ptr) * experiences this problem, please report the event to * png-mng-implement at lists.sf.net . */ +#if defined(PNG_WRITE_FLUSH_SUPPORTED) png_flush(png_ptr); +#endif } #if defined(PNG_WRITE_tIME_SUPPORTED) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 7b81e4e4a..e78d524e9 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -178,7 +178,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.4.0beta31 +# VERSION 0.${PNGLIB_RELEASE}.1.4.0beta32 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 49d122543..1c00f70c7 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.4.0beta31 +version=1.4.0beta32 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index fb76e9955..888f5af5d 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng14 Name: libpng Description: Loads and saves PNG files -Version: 1.4.0beta31 +Version: 1.4.0beta32 Libs: -L${libdir} -lpng14 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 5b201a0c4..071f29009 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index e7270fc39..93d67cb0a 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index a7034d0f3..0aff5df16 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -20,7 +20,7 @@ LN_SF = ln -f -s LIBNAME=libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index bfc5c2521..fe60829d9 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 9a03b784f..d097c77f4 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -65,7 +65,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng14 PNGMAJ = 0 CYGDLL = 14 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 7e6eec5cc..94ce54567 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng14 PNGMAJ = 12 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 6a137a910..9d2fc9d49 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng14 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 4821bcc31..382ad2774 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index e1fc44a64..b4d4facbd 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index fd6ff0658..05660b1b6 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index b3ff703ad..741a4774e 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 79edde3c9..567eebc88 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 6c5d2af14..331a1698d 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index b4e360a3e..66cbb355d 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -81,7 +81,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng14 PNGMAJ = 0 MINGDLL = 14 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 3fc3b1c73..a31c0a9c0 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng14 LIB= png14 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.4.0beta31 +SHLIB_MINOR= 1.4.0beta32 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 bf937c7cc..60e585ffb 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.4.0beta31 +SHLIB_MINOR= 1.4.0beta32 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 9acb3cdaf..152876ab2 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index e12555de5..1fd3469a7 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.4.0beta31 +SHLIB_MINOR= 1.4.0beta32 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 505addbba..87f14e0b8 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 88c9d88ea..c0f33c97b 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 87136367a..2b23d98e4 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index db722560d..2516a8ea3 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng14 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 0d0269b2b..c1c952a66 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta31 +PNGMIN = 1.4.0beta32 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 737882498..b85f32dcb 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.4.0beta31 +; Version 1.4.0beta32 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngwin.def b/scripts/pngwin.def index e51105b98..4c4ffa1d6 100644 --- a/scripts/pngwin.def +++ b/scripts/pngwin.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.4.0beta31 +;Version 1.4.0beta32 png_build_grayscale_palette png_chunk_error png_chunk_warning |