diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2008-03-12 21:44:46 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:16:15 -0500 |
| commit | c13f8f10e608e9e49713f80e3589ce483f667154 (patch) | |
| tree | 669ea115ed9b721bf069daf87084f69fab2426a7 | |
| parent | d8b530b93c504692c55e0c5e2bd0c4e9b39cd582 (diff) | |
| download | libpng-c13f8f10e608e9e49713f80e3589ce483f667154.tar.gz | |
Imported from libpng-1.2.26beta02.tarv1.2.26beta02
50 files changed, 138 insertions, 117 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.26beta01 - February 21, 2008 +Libpng 1.2.26beta02 - March 13, 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,43 +9,47 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.26beta01.tar.gz - libpng-1.2.26beta01.tar.lzma + libpng-1.2.26beta02.tar.gz + libpng-1.2.26beta02.tar.lzma (Get the lzma codec from <http://tukaani.org/lzma>). - libpng-1.2.26beta01.tar.bz2 + libpng-1.2.26beta02.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.26beta01-no-config.tar.gz - libpng-1.2.26beta01-no-config.tar.lzma - libpng-1.2.26beta01-no-config.tar.bz2 + libpng-1.2.26beta02-no-config.tar.gz + libpng-1.2.26beta02-no-config.tar.lzma + libpng-1.2.26beta02-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1226b01.zip - lp1226b01.7z - lp1226b01.tar.bz2 + lp1226b02.zip + lp1226b02.7z + lp1226b02.tar.bz2 Project files - libpng-1.2.26beta01-project-netware.zip - libpng-1.2.26beta01-project-wince.zip + libpng-1.2.26beta02-project-netware.zip + libpng-1.2.26beta02-project-wince.zip Other information: - libpng-1.2.26beta01-README.txt - libpng-1.2.26beta01-KNOWNBUGS.txt - libpng-1.2.26beta01-LICENSE.txt - libpng-1.2.26beta01-Y2K-compliance.txt - libpng-1.2.26beta01-[previous version]-diff.txt + libpng-1.2.26beta02-README.txt + libpng-1.2.26beta02-KNOWNBUGS.txt + libpng-1.2.26beta02-LICENSE.txt + libpng-1.2.26beta02-Y2K-compliance.txt + libpng-1.2.26beta02-[previous version]-diff.txt Changes since the last public release (1.2.25): version 1.2.26beta01 [February 21, 2008] Added missing "(" in pngmem.c. Bug introduced in libpng-1.2.2/1.0.13 +version 1.2.26beta02 [March 13, 2008] + Refined error message returned from deflateInit2 in pngwutil.c + Check IHDR length in png_push_read_chunk() before saving it. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -2079,6 +2079,10 @@ version 1.2.25 and 1.0.31 [February 18, 2008] version 1.2.26beta01 [February 21, 2008] Added missing "(" in pngmem.c. Bug introduced in libpng-1.2.2/1.0.13 +version 1.2.26beta02 [March 13, 2008] + Refined error message returned from deflateInit2 in pngwutil.c + Check IHDR length in png_push_read_chunk() before saving it. + 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.26beta01 - February 21, 2008 +Installing libpng version 1.2.26beta02 - March 13, 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.2.26beta01" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.26beta02" 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.26beta01) + gcc, creates libpng12.so.0.1.2.26beta02) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.26beta01) + (gcc, creates libpng12.so.0.1.2.26beta02) 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.26beta01) + creates libpng12.so.0.1.2.26beta02) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.26beta01) + creates libpng12.so.0.1.2.26beta02) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.26beta01) + creates libpng12.so.0.1.2.26beta02) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.26beta01) + creates libpng12.so.0.1.2.26beta02) 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.26beta01 +Known bugs in libpng version 1.2.26beta02 1. February 23, 2006: The custom makefiles don't build libpng with -lz. @@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.26beta01, February 21, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.26beta02, March 13, 2008, 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 @@ -106,4 +106,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 21, 2008 +March 13, 2008 @@ -1,4 +1,4 @@ -README for libpng version 1.2.26beta01 - February 21, 2008 (shared library 12.0) +README for libpng version 1.2.26beta02 - March 13, 2008 (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. @@ -191,11 +191,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.26beta01) + gcc, creates libpng12.so.0.1.2.26beta02) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.26beta01) + (gcc, creates libpng12.so.0.1.2.26beta02) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.26beta01, + (gcc, creates libpng12.so.0.1.2.26beta02, 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 @@ -217,12 +217,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.26beta01) + (gcc, creates libpng12.so.0.1.2.26beta02) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.26beta01) + (gcc, creates libpng12.so.0.1.2.26beta02) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.26beta01) + (gcc, creates libpng12.so.0.1.2.26beta02) 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,13 +1,13 @@ Y2K compliance in libpng: ========================= - February 21, 2008 + March 13, 2008 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.26beta01 are Y2K compliant. It is my belief that earlier + upward through 1.2.26beta02 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.2.26beta01. +# Generated by GNU Autoconf 2.61 for libpng 1.2.26beta02. # # 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.2.26beta01' -PACKAGE_STRING='libpng 1.2.26beta01' +PACKAGE_VERSION='1.2.26beta02' +PACKAGE_STRING='libpng 1.2.26beta02' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' ac_unique_file="pngget.c" @@ -1406,7 +1406,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.26beta01 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.26beta02 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1476,7 +1476,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.2.26beta01:";; + short | recursive ) echo "Configuration of libpng 1.2.26beta02:";; esac cat <<\_ACEOF @@ -1586,7 +1586,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.2.26beta01 +libpng configure 1.2.26beta02 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1600,7 +1600,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.26beta01, which was +It was created by libpng $as_me 1.2.26beta02, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2270,7 +2270,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.2.26beta01' + VERSION='1.2.26beta02' cat >>confdefs.h <<_ACEOF @@ -2441,7 +2441,7 @@ fi -PNGLIB_VERSION=1.2.26beta01 +PNGLIB_VERSION=1.2.26beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=26 @@ -21295,7 +21295,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpng $as_me 1.2.26beta01, which was +This file was extended by libpng $as_me 1.2.26beta02, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21348,7 +21348,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpng config.status 1.2.26beta01 +libpng config.status 1.2.26beta02 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 830b9f365..91854406f 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.26beta01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.26beta02], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.26beta01 +PNGLIB_VERSION=1.2.26beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=26 diff --git a/libpng-1.2.26beta01.txt b/libpng-1.2.26beta02.txt index 940448f96..cc68b23f1 100644 --- a/libpng-1.2.26beta01.txt +++ b/libpng-1.2.26beta02.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.26beta01 - February 21, 2008 + libpng version 1.2.26beta02 - March 13, 2008 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -2796,13 +2796,13 @@ application: IX. Y2K Compliance in libpng -February 21, 2008 +March 13, 2008 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.26beta01 are Y2K compliant. It is my belief that earlier +upward through 1.2.26beta02 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 "February 21, 2008" +.TH LIBPNG 3 "March 13, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.26beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.26beta02 .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.26beta01 - February 21, 2008 + libpng version 1.2.26beta02 - March 13, 2008 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -3617,13 +3617,13 @@ application: .SH IX. Y2K Compliance in libpng -February 21, 2008 +March 13, 2008 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.26beta01 are Y2K compliant. It is my belief that earlier +upward through 1.2.26beta02 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 @@ -3841,7 +3841,7 @@ the first widely used release: 1.2.25rc01-02 13 10225 12.so.0.25[.0] 1.0.31 10 10031 10.so.0.31[.0] 1.2.25 13 10225 12.so.0.25[.0] - 1.2.26b01 13 10226 12.so.0.26[.0] + 1.2.26beta01-02 13 10226 12.so.0.26[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3897,7 +3897,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.26beta01 - February 21, 2008: +Libpng version 1.2.26beta02 - March 13, 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). @@ -3918,7 +3918,7 @@ included in the libpng distribution, the latter shall prevail.) If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.26beta01, February 21, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.26beta02, March 13, 2008, 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 @@ -4017,7 +4017,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 21, 2008 +March 13, 2008 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index c4568f94f..e73770f7c 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "February 21, 2008" +.TH LIBPNGPF 3 "March 13, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.26beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.26beta02 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "February 21, 2008" +.TH PNG 5 "March 13, 2008" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -13,7 +13,7 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_26beta01 Your_png_h_is_not_version_1_2_26beta01; +typedef version_1_2_26beta02 Your_png_h_is_not_version_1_2_26beta02; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -693,7 +693,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.26beta01 - February 21, 2008\n\ + return ((png_charp) "\n libpng version 1.2.26beta02 - March 13, 2008\n\ Copyright (c) 1998-2008 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.2.26beta01 - February 21, 2008 + * libpng version 1.2.26beta02 - March 13, 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.2.26beta01 - February 21, 2008: Glenn + * libpng versions 0.97, January 1998, through 1.2.26beta02 - March 13, 2008: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -179,7 +179,7 @@ * 1.2.25rc01-02 13 10225 12.so.0.25[.0] * 1.0.31 10 10031 10.so.0.31[.0] * 1.2.25 13 10225 12.so.0.25[.0] - * 1.2.26beta01 13 10226 12.so.0.26[.0] + * 1.2.26beta01-2 13 10226 12.so.0.26[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -209,7 +209,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.26beta01, February 21, 2008, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.26beta02, March 13, 2008, 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: @@ -321,13 +321,13 @@ * Y2K compliance in libpng: * ========================= * - * February 21, 2008 + * March 13, 2008 * * 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.26beta01 are Y2K compliant. It is my belief that earlier + * upward through 1.2.26beta02 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 @@ -383,9 +383,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.26beta01" +#define PNG_LIBPNG_VER_STRING "1.2.26beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.26beta01 - February 21, 2008\n" + " libpng version 1.2.26beta02 - March 13, 2008\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -397,7 +397,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 01 +#define PNG_LIBPNG_VER_BUILD 02 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1435,7 +1435,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_26beta01; +typedef png_structp version_1_2_26beta02; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.26beta01 - February 21, 2008 + * libpng version 1.2.26beta02 - March 13, 2008 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,9 +1,9 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.2.13 November 13, 2006 + * Last changed in libpng 1.2.26 [March 13, 2008] * For conditions of distribution and use, see copyright notice in png.h - * Copyright (c) 1998-2006 Glenn Randers-Pehrson + * 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.) * diff --git a/pngpread.c b/pngpread.c index a02cdfcb2..ec8fb1644 100644 --- a/pngpread.c +++ b/pngpread.c @@ -224,6 +224,8 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr) { if (png_ptr->push_length + 4 > png_ptr->buffer_size) { + if (png_ptr->push_length != 13) + png_error(png_ptr, "Invalid IHDR length"); png_push_save_buffer(png_ptr); return; } @@ -1553,4 +1553,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_26beta01 your_png_h_is_not_version_1_2_26beta01; +typedef version_1_2_26beta02 your_png_h_is_not_version_1_2_26beta02; diff --git a/pngwutil.c b/pngwutil.c index fef38aef9..10009bcbf 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,9 +1,9 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.2.20 Septhember 3, 2007 + * Last changed in libpng 1.2.26 [March 13, 2008 * For conditions of distribution and use, see copyright notice in png.h - * Copyright (c) 1998-2007 Glenn Randers-Pehrson + * 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.) */ @@ -380,6 +380,8 @@ png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height, #ifdef PNG_USE_LOCAL_ARRAYS PNG_IHDR; #endif + int ret; + png_byte buf[13]; /* buffer to store the IHDR info */ png_debug(1, "in png_write_IHDR\n"); @@ -523,10 +525,19 @@ png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height, png_ptr->zlib_window_bits = 15; if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_METHOD)) png_ptr->zlib_method = 8; - if (deflateInit2(&png_ptr->zstream, png_ptr->zlib_level, - png_ptr->zlib_method, png_ptr->zlib_window_bits, - png_ptr->zlib_mem_level, png_ptr->zlib_strategy) != Z_OK) - png_error(png_ptr, "zlib failed to initialize compressor"); + ret = deflateInit2(&png_ptr->zstream, png_ptr->zlib_level, + png_ptr->zlib_method, png_ptr->zlib_window_bits, + png_ptr->zlib_mem_level, png_ptr->zlib_strategy); + if (ret != Z_OK) + { + if (ret == Z_VERSION_ERROR) png_error(png_ptr, + "zlib failed to initialize compressor -- version error"); + if (ret == Z_STREAM_ERROR) png_error(png_ptr, + "zlib failed to initialize compressor -- stream error"); + if (ret == Z_MEM_ERROR) png_error(png_ptr, + "zlib failed to initialize compressor -- mem error"); + png_error(png_ptr, "zlib failed to initialize compressor"); + } png_ptr->zstream.next_out = png_ptr->zbuf; png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size; /* libpng is not interested in zstream.data_type */ diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 7274e1691..e719e58b4 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -169,7 +169,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.26beta01 +# VERSION 0.${PNGLIB_RELEASE}.1.2.26beta02 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 bebcdfa16..790a7e385 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.26beta01 +version=1.2.26beta02 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index a3add721b..2fdfb4f83 100644 --- a/scripts/libpng.pc-configure.in +++ b/scripts/libpng.pc-configure.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng12 Name: libpng Description: Loads and saves PNG files -Version: 1.2.26beta01 +Version: 1.2.26beta02 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 5fbbf2178..1120c5362 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.26beta01 +Version: 1.2.26beta02 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index b2df25938..f54d01871 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index af0a1de7c..cff9b642e 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 9b30badf1..3d9843150 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -20,7 +20,7 @@ LN_SF = ln -f -s LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 5ca3e017f..393ee89f6 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index f3d41ca62..1a4cddd9a 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index dccf7b40d..fe05fd161 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 9ebffda15..40e584b80 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 88fc52f7a..fa861687e 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index cd02c702c..d87325df9 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -14,7 +14,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index f2946fb8a..9aa4551cf 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index c4b1c7e38..22c57d998 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 95a69a8c9..79ab49a9c 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 81ff8a43e..0f2784a1e 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index d055a831b..8c1e21cc7 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index fca121439..13df29b2e 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.26beta01 +SHLIB_MINOR= 1.2.26beta02 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 802906c01..30c30cc1a 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.26beta01 +SHLIB_MINOR= 1.2.26beta02 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 5e0db690e..74e3827a5 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 2ccd507b4..2e36aa329 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -8,7 +8,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.26beta01 +SHLIB_MINOR= 1.2.26beta02 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index a85dcf305..0678e98c9 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 28fc315f5..e6e20357d 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index fa5955257..5bc3528ef 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index ea13d0840..af1e55f3d 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index fbeaeb639..61815962d 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 78bfdb32b..f749642a7 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta01 +PNGMIN = 1.2.26beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 5b1bfba73..3e901c9e1 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.26beta01 +; Version 1.2.26beta02 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index e6c47e42d..cc2d56086 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.26beta01 +;Version 1.2.26beta02 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |