diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-08-01 08:50:51 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-08-01 08:57:10 -0500 |
| commit | 9e88fcd58c8ce7f2183bc2045e5180cba0043f09 (patch) | |
| tree | 12048b1c79ce60923fb5875b0e2cb999c689bb0f | |
| parent | 39ffc1c3c7cb42463f087ab676890d881f376f31 (diff) | |
| download | libpng-9e88fcd58c8ce7f2183bc2045e5180cba0043f09.tar.gz | |
[master] Imported from libpng-1.2.39beta05.tarv1.2.39beta05
48 files changed, 128 insertions, 105 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.39beta04 - August 1, 2009 +Libpng 1.2.39beta05 - August 1, 2009 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,36 +9,36 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.39beta04.txz (LZMA-compressed, recommended) - libpng-1.2.39beta04.tar.gz - libpng-1.2.39beta04.tar.bz2 + libpng-1.2.39beta05.txz (LZMA-compressed, recommended) + libpng-1.2.39beta05.tar.gz + libpng-1.2.39beta05.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.39beta04-no-config.txz (LZMA-compressed, recommended) - libpng-1.2.39beta04-no-config.tar.gz - libpng-1.2.39beta04-no-config.tar.bz2 + libpng-1.2.39beta05-no-config.txz (LZMA-compressed, recommended) + libpng-1.2.39beta05-no-config.tar.gz + libpng-1.2.39beta05-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1239b04.zip - lp1239b04.7z - lp1239b04.tar.bz2 + lp1239b05.zip + lp1239b05.7z + lp1239b05.tar.bz2 Project files - libpng-1.2.39beta04-project-netware.zip - libpng-1.2.39beta04-project-wince.zip + libpng-1.2.39beta05-project-netware.zip + libpng-1.2.39beta05-project-wince.zip Other information: - libpng-1.2.39beta04-README.txt - libpng-1.2.39beta04-KNOWNBUGS.txt - libpng-1.2.39beta04-LICENSE.txt - libpng-1.2.39beta04-Y2K-compliance.txt - libpng-1.2.39beta04-[previous version]-diff.txt + libpng-1.2.39beta05-README.txt + libpng-1.2.39beta05-KNOWNBUGS.txt + libpng-1.2.39beta05-LICENSE.txt + libpng-1.2.39beta05-Y2K-compliance.txt + libpng-1.2.39beta05-[previous version]-diff.txt Changes since the last public release (1.2.38): @@ -55,6 +55,14 @@ version 1.2.39beta03 [August 1, 2009] the documentation. Rebuilt configure scripts with autoconf-2.64. +version 1.2.39beta04 [August 1, 2009] + Replaced *.tar.lzma with *.txz in distribution. Get the xz codec + from <http://tukaani.org/xz>. + +version 1.2.39beta05 [August 1, 2009] + Reject attempt to write iCCP chunk with negative embedded profile length + (JD Chen) + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -2449,6 +2449,10 @@ version 1.2.39beta04 [August 1, 2009] Replaced *.tar.lzma with *.txz in distribution. Get the xz codec from <http://tukaani.org/xz>. +version 1.2.39beta05 [August 1, 2009] + Reject attempt to write iCCP chunk with negative embedded profile length + (JD Chen) + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement @@ -1,5 +1,5 @@ -Installing libpng version 1.2.39beta04 - August 1, 2009 +Installing libpng version 1.2.39beta05 - August 1, 2009 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.39beta04" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.39beta05" 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,9 +101,9 @@ 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.39beta04) + gcc, creates libpng12.so.0.1.2.39beta05) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.39beta04) + (gcc, creates libpng12.so.0.1.2.39beta05) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -125,14 +125,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.39beta04) + creates libpng12.so.0.1.2.39beta05) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.39beta04) + creates libpng12.so.0.1.2.39beta05) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.39beta04) + creates libpng12.so.0.1.2.39beta05) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.39beta04) + creates libpng12.so.0.1.2.39beta05) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.39beta04 +Known bugs in libpng version 1.2.39beta05 1. February 23, 2006: The custom makefiles don't build libpng with -lz. @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.2.39beta04, August 1, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.2.39beta05, August 1, 2009, are Copyright (c) 2004, 2006-2009 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 121a3efee..e6b9888e3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,7 +86,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.2.39beta04.txt pngvcrd.c + example.c libpng-1.2.39beta05.txt pngvcrd.c CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index 11ab7210b..ee8e4fa43 100644 --- a/Makefile.in +++ b/Makefile.in @@ -352,7 +352,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.2.39beta04.txt pngvcrd.c + example.c libpng-1.2.39beta05.txt pngvcrd.c CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym @@ -1,4 +1,4 @@ -README for libpng version 1.2.39beta04 - August 1, 2009 (shared library 12.0) +README for libpng version 1.2.39beta05 - August 1, 2009 (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. @@ -194,11 +194,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.39beta04) + gcc, creates libpng12.so.0.1.2.39beta05) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.39beta04) + (gcc, creates libpng12.so.0.1.2.39beta05) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.39beta04, + (gcc, creates libpng12.so.0.1.2.39beta05, 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 @@ -220,12 +220,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.39beta04) + (gcc, creates libpng12.so.0.1.2.39beta05) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.39beta04) + (gcc, creates libpng12.so.0.1.2.39beta05) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.39beta04) + (gcc, creates libpng12.so.0.1.2.39beta05) 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.2.39beta04 are Y2K compliant. It is my belief that earlier + upward through 1.2.39beta05 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.64 for libpng 1.2.39beta04. +# Generated by GNU Autoconf 2.64 for libpng 1.2.39beta05. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -698,8 +698,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.39beta04' -PACKAGE_STRING='libpng 1.2.39beta04' +PACKAGE_VERSION='1.2.39beta05' +PACKAGE_STRING='libpng 1.2.39beta05' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1432,7 +1432,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.39beta04 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.39beta05 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1502,7 +1502,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.2.39beta04:";; + short | recursive ) echo "Configuration of libpng 1.2.39beta05:";; esac cat <<\_ACEOF @@ -1609,7 +1609,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.2.39beta04 +libpng configure 1.2.39beta05 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2034,7 +2034,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.39beta04, which was +It was created by libpng $as_me 1.2.39beta05, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -2842,7 +2842,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.2.39beta04' + VERSION='1.2.39beta05' cat >>confdefs.h <<_ACEOF @@ -2906,7 +2906,7 @@ fi -PNGLIB_VERSION=1.2.39beta04 +PNGLIB_VERSION=1.2.39beta05 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=39 @@ -12047,7 +12047,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.39beta04, which was +This file was extended by libpng $as_me 1.2.39beta05, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12111,7 +12111,7 @@ Report bugs to <png-mng-implement@lists.sourceforge.net>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libpng config.status 1.2.39beta04 +libpng config.status 1.2.39beta05 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index ac78ea28d..ed5604cd4 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.39beta04], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.39beta05], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.39beta04 +PNGLIB_VERSION=1.2.39beta05 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=39 diff --git a/libpng-1.2.39beta04.txt b/libpng-1.2.39beta05.txt index 986d906e6..e24cd129f 100644 --- a/libpng-1.2.39beta04.txt +++ b/libpng-1.2.39beta05.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.39beta04 - August 1, 2009 + libpng version 1.2.39beta05 - August 1, 2009 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.39beta04 - August 1, 2009 + libpng versions 0.97, January 1998, through 1.2.39beta05 - August 1, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3063,7 +3063,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.39beta04 are Y2K compliant. It is my belief that earlier +upward through 1.2.39beta05 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 1, 2009" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.39beta04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.39beta05 .SH SYNOPSIS \fI\fB @@ -821,7 +821,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.39beta04 - August 1, 2009 + libpng version 1.2.39beta05 - August 1, 2009 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -832,7 +832,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.39beta04 - August 1, 2009 + libpng versions 0.97, January 1998, through 1.2.39beta05 - August 1, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3884,7 +3884,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.39beta04 are Y2K compliant. It is my belief that earlier +upward through 1.2.39beta05 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 @@ -4159,7 +4159,7 @@ the first widely used release: 1.2.38rc01-03 13 10238 12.so.0.38[.0] 1.0.47 10 10047 10.so.0.47[.0] 1.2.38 13 10238 12.so.0.38[.0] - 1.2.39beta01-04 13 10239 12.so.0.39[.0] + 1.2.39beta01-05 13 10239 12.so.0.39[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4215,7 +4215,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.39beta04 - August 1, 2009: +Libpng version 1.2.39beta05 - August 1, 2009: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4238,7 +4238,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.2.39beta04, August 1, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.2.39beta05, August 1, 2009, are Copyright (c) 2004,2006-2008 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 3ce18d66a..ac09837fb 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "August 1, 2009" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.39beta04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.39beta05 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -16,7 +16,7 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_39beta04 Your_png_h_is_not_version_1_2_39beta04; +typedef version_1_2_39beta05 Your_png_h_is_not_version_1_2_39beta05; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -705,7 +705,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.39beta04 - August 1, 2009\n\ + return ((png_charp) "\n libpng version 1.2.39beta05 - August 1, 2009\n\ Copyright (c) 1998-2009 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.39beta04 - August 1, 2009 + * libpng version 1.2.39beta05 - August 1, 2009 * Copyright (c) 1998-2009 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.) @@ -10,7 +10,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.39beta04 - August 1, 2009: Glenn + * libpng versions 0.97, January 1998, through 1.2.39beta05 - August 1, 2009: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -237,7 +237,7 @@ * 1.2.38rc01-03 13 10238 12.so.0.38[.0] * 1.0.47 10 10047 10.so.0.47[.0] * 1.2.38 13 10238 12.so.0.38[.0] - * 1.2.39beta01-04 13 10239 12.so.0.39[.0] + * 1.2.39beta01-05 13 10239 12.so.0.39[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -269,7 +269,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.39beta04, August 1, 2009, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.39beta05, August 1, 2009, are * Copyright (c) 2004, 2006-2009 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: @@ -387,7 +387,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.2.39beta04 are Y2K compliant. It is my belief that earlier + * upward through 1.2.39beta05 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 @@ -443,9 +443,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.39beta04" +#define PNG_LIBPNG_VER_STRING "1.2.39beta05" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.39beta04 - August 1, 2009\n" + " libpng version 1.2.39beta05 - August 1, 2009\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -458,7 +458,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 04 +#define PNG_LIBPNG_VER_BUILD 05 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1510,7 +1510,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_39beta04; +typedef png_structp version_1_2_39beta05; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.39beta04 - August 1, 2009 + * libpng version 1.2.39beta05 - August 1, 2009 * Copyright (c) 1998-2009 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.) @@ -1689,4 +1689,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_39beta04 your_png_h_is_not_version_1_2_39beta04; +typedef version_1_2_39beta05 your_png_h_is_not_version_1_2_39beta05; diff --git a/pngwutil.c b/pngwutil.c index cd0d3d37a..333a9e47c 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -788,6 +788,14 @@ png_write_iCCP(png_structp png_ptr, png_charp name, int compression_type, ((*( (png_bytep)profile + 2))<< 8) | ((*( (png_bytep)profile + 3)) ); + if (embedded_profile_len < 0) + { + png_warning(png_ptr, + "Embedded profile length in iCCP chunk is negative"); + png_free(png_ptr, new_name); + return; + } + if (profile_len < embedded_profile_len) { png_warning(png_ptr, @@ -2119,9 +2127,12 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info) png_uint_32 mins, bpp; png_byte filter_to_do = png_ptr->do_filter; png_uint_32 row_bytes = row_info->rowbytes; -#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) +#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED int num_p_filters = (int)png_ptr->num_prev_filters; -#endif +#endif + + png_debug(1, "in png_write_find_filter"); + png_debug(1, "in png_write_find_filter"); /* Find out how many bytes offset each pixel is */ diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 79db3cf1a..943e529fc 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -172,7 +172,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.39beta04 +# VERSION 0.${PNGLIB_RELEASE}.1.2.39beta05 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 17e1d0de3..1d0a092b3 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.2.39beta04 +version=1.2.39beta05 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 6544d3678..d5954cb0c 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.39beta04 +Version: 1.2.39beta05 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 6349f9639..48993cfed 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 7812a343e..9d82f1ee4 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index bc0d76128..94bbea0a9 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -23,7 +23,7 @@ LN_SF = ln -f -s LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 3e4ce55cb..db4665490 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 8158ab090..bbd871708 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.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 4e3460a65..660fe5aca 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -22,7 +22,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 12 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 44002b076..2410f2b05 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index f9eebcb2f..bae8a5f2e 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index bf640dd49..bded8bf5a 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -17,7 +17,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index e2788a441..cd587fbf8 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 0ac23f38d..6cc379592 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index f4d43d2c7..e4a6f8b2b 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 5e9e51cea..69e4d92b1 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index d9b5973da..cf1024a4f 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index f90e25352..0f95b3e42 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.39beta04 +SHLIB_MINOR= 1.2.39beta05 SRCS= 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 c0f38e70a..df00212bd 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.39beta04 +SHLIB_MINOR= 1.2.39beta05 SRCS= 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 2db803edb..da772e265 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 3330e6475..6eb7b5046 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.39beta04 +SHLIB_MINOR= 1.2.39beta05 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 92064d01f..fb13dfbb4 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 17bbd1653..b3a0d3364 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index bdbc835e7..796c9762c 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 64ddd2757..5cc75099a 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -11,7 +11,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 5bcdf1857..ae484d94f 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 14688503d..bee8cb706 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.39beta04 +PNGMIN = 1.2.39beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index a274f5403..eb10fde1b 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.39beta04 +; Version 1.2.39beta05 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index dc4fc8b9b..73225b41b 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.39beta04 +;Version 1.2.39beta05 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |