diff options
51 files changed, 119 insertions, 115 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.26beta04 - March 18, 2008 +Libpng 1.2.26beta05 - March 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,37 +9,37 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.26beta04.tar.gz - libpng-1.2.26beta04.tar.lzma + libpng-1.2.26beta05.tar.gz + libpng-1.2.26beta05.tar.lzma (Get the lzma codec from <http://tukaani.org/lzma>). - libpng-1.2.26beta04.tar.bz2 + libpng-1.2.26beta05.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.26beta04-no-config.tar.gz - libpng-1.2.26beta04-no-config.tar.lzma - libpng-1.2.26beta04-no-config.tar.bz2 + libpng-1.2.26beta05-no-config.tar.gz + libpng-1.2.26beta05-no-config.tar.lzma + libpng-1.2.26beta05-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1226b04.zip - lp1226b04.7z - lp1226b04.tar.bz2 + lp1226b05.zip + lp1226b05.7z + lp1226b05.tar.bz2 Project files - libpng-1.2.26beta04-project-netware.zip - libpng-1.2.26beta04-project-wince.zip + libpng-1.2.26beta05-project-netware.zip + libpng-1.2.26beta05-project-wince.zip Other information: - libpng-1.2.26beta04-README.txt - libpng-1.2.26beta04-KNOWNBUGS.txt - libpng-1.2.26beta04-LICENSE.txt - libpng-1.2.26beta04-Y2K-compliance.txt - libpng-1.2.26beta04-[previous version]-diff.txt + libpng-1.2.26beta05-README.txt + libpng-1.2.26beta05-KNOWNBUGS.txt + libpng-1.2.26beta05-LICENSE.txt + libpng-1.2.26beta05-Y2K-compliance.txt + libpng-1.2.26beta05-[previous version]-diff.txt Changes since the last public release (1.2.25): @@ -58,6 +58,9 @@ version 1.2.26beta04 [March 18, 2008] Free png_ptr->big_row_buf and png_ptr->prev_row before allocating new copies in png_read_start_row(). +version 1.2.26beta05 [March 19, 2008] + Removed extra png_free() added in libpng-1.2.26beta04. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -2089,7 +2089,10 @@ version 1.2.26beta03 [March 16, 2008] version 1.2.26beta04 [March 18, 2008] Free png_ptr->big_row_buf and png_ptr->prev_row before allocating - new copies in png_read_start_row(). + new copies in png_read_start_row(). Bug introduced in libpng-1.2.22. + +version 1.2.26beta05 [March 19, 2008] + Removed extra png_free() added in libpng-1.2.26beta04. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -1,5 +1,5 @@ -Installing libpng version 1.2.26beta04 - March 18, 2008 +Installing libpng version 1.2.26beta05 - March 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.2.26beta04" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.26beta05" 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.26beta04) + gcc, creates libpng12.so.0.1.2.26beta05) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.26beta04) + (gcc, creates libpng12.so.0.1.2.26beta05) 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.26beta04) + creates libpng12.so.0.1.2.26beta05) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.26beta04) + creates libpng12.so.0.1.2.26beta05) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.26beta04) + creates libpng12.so.0.1.2.26beta05) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.26beta04) + creates libpng12.so.0.1.2.26beta05) 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.26beta04 +Known bugs in libpng version 1.2.26beta05 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.26beta04, March 18, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.26beta05, March 19, 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 -March 18, 2008 +March 19, 2008 @@ -1,4 +1,4 @@ -README for libpng version 1.2.26beta04 - March 18, 2008 (shared library 12.0) +README for libpng version 1.2.26beta05 - March 19, 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.26beta04) + gcc, creates libpng12.so.0.1.2.26beta05) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.26beta04) + (gcc, creates libpng12.so.0.1.2.26beta05) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.26beta04, + (gcc, creates libpng12.so.0.1.2.26beta05, 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.26beta04) + (gcc, creates libpng12.so.0.1.2.26beta05) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.26beta04) + (gcc, creates libpng12.so.0.1.2.26beta05) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.26beta04) + (gcc, creates libpng12.so.0.1.2.26beta05) 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: ========================= - March 18, 2008 + March 19, 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.26beta04 are Y2K compliant. It is my belief that earlier + upward through 1.2.26beta05 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.26beta04. +# Generated by GNU Autoconf 2.61 for libpng 1.2.26beta05. # # 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.26beta04' -PACKAGE_STRING='libpng 1.2.26beta04' +PACKAGE_VERSION='1.2.26beta05' +PACKAGE_STRING='libpng 1.2.26beta05' 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.26beta04 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.26beta05 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.26beta04:";; + short | recursive ) echo "Configuration of libpng 1.2.26beta05:";; 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.26beta04 +libpng configure 1.2.26beta05 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.26beta04, which was +It was created by libpng $as_me 1.2.26beta05, 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.26beta04' + VERSION='1.2.26beta05' cat >>confdefs.h <<_ACEOF @@ -2441,7 +2441,7 @@ fi -PNGLIB_VERSION=1.2.26beta04 +PNGLIB_VERSION=1.2.26beta05 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.26beta04, which was +This file was extended by libpng $as_me 1.2.26beta05, 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.26beta04 +libpng config.status 1.2.26beta05 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 4bc8a5b94..498c91c07 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.26beta04], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.26beta05], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.26beta04 +PNGLIB_VERSION=1.2.26beta05 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=26 diff --git a/libpng-1.2.26beta04.txt b/libpng-1.2.26beta05.txt index 54e6d05ab..23210b1d9 100644 --- a/libpng-1.2.26beta04.txt +++ b/libpng-1.2.26beta05.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.26beta04 - March 18, 2008 + libpng version 1.2.26beta05 - March 19, 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 -March 18, 2008 +March 19, 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.26beta04 are Y2K compliant. It is my belief that earlier +upward through 1.2.26beta05 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 "March 18, 2008" +.TH LIBPNG 3 "March 19, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.26beta04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.26beta05 .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.26beta04 - March 18, 2008 + libpng version 1.2.26beta05 - March 19, 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 -March 18, 2008 +March 19, 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.26beta04 are Y2K compliant. It is my belief that earlier +upward through 1.2.26beta05 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 @@ -3897,7 +3897,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.26beta04 - March 18, 2008: +Libpng version 1.2.26beta05 - March 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). @@ -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.26beta04, March 18, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.26beta05, March 19, 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 -March 18, 2008 +March 19, 2008 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 68c596751..8928ac093 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 18, 2008" +.TH LIBPNGPF 3 "March 19, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.26beta04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.26beta05 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "March 18, 2008" +.TH PNG 5 "March 19, 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_26beta04 Your_png_h_is_not_version_1_2_26beta04; +typedef version_1_2_26beta05 Your_png_h_is_not_version_1_2_26beta05; /* 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.26beta04 - March 18, 2008\n\ + return ((png_charp) "\n libpng version 1.2.26beta05 - March 19, 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.26beta04 - March 18, 2008 + * libpng version 1.2.26beta05 - March 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.2.26beta04 - March 18, 2008: Glenn + * libpng versions 0.97, January 1998, through 1.2.26beta05 - March 19, 2008: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -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.26beta04, March 18, 2008, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.26beta05, March 19, 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: * ========================= * - * March 18, 2008 + * March 19, 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.26beta04 are Y2K compliant. It is my belief that earlier + * upward through 1.2.26beta05 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.26beta04" +#define PNG_LIBPNG_VER_STRING "1.2.26beta05" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.26beta04 - March 18, 2008\n" + " libpng version 1.2.26beta05 - March 19, 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 04 +#define PNG_LIBPNG_VER_BUILD 05 /* 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_26beta04; +typedef png_structp version_1_2_26beta05; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.26beta04 - March 18, 2008 + * libpng version 1.2.26beta05 - March 19, 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,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.2.26 [March 18, 2008] + * Last changed in libpng 1.2.26 [March 19, 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) diff --git a/pngpread.c b/pngpread.c index 8713c3a7d..b06f45025 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.2.26 [March 18, 2008] + * Last changed in libpng 1.2.26 [March 19, 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) diff --git a/pngrutil.c b/pngrutil.c index 21f0021a9..609afe370 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.25 [February 18, 2008] + * Last changed in libpng 1.2.26 [March 19, 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) @@ -3142,8 +3142,6 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) if (png_ptr->big_row_buf) png_free(png_ptr,png_ptr->big_row_buf); png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes+64); - if (png_ptr->row_buf) - png_free(png_ptr,png_ptr->row_buf); png_ptr->row_buf = png_ptr->big_row_buf+32; #ifdef PNG_MAX_MALLOC_64K @@ -3153,7 +3151,7 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) if ((png_uint_32)png_ptr->rowbytes > (png_uint_32)(PNG_SIZE_MAX - 1)) png_error(png_ptr, "Row has too many bytes to allocate in memory."); if (png_ptr->prev_row) - png_free(png_ptr,png_ptr->prev_row); + png_free(png_ptr,png_ptr->prev_row); png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, (png_uint_32)( png_ptr->rowbytes + 1)); @@ -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_26beta04 your_png_h_is_not_version_1_2_26beta04; +typedef version_1_2_26beta05 your_png_h_is_not_version_1_2_26beta05; diff --git a/pngwutil.c b/pngwutil.c index 36137283c..d5aed7a22 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.2.26 [March 18, 2008 + * Last changed in libpng 1.2.26 [March 19, 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) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 2cfd75f15..e5126cd12 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.26beta04 +# VERSION 0.${PNGLIB_RELEASE}.1.2.26beta05 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 19b9f6a7a..72c3060ce 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.26beta04 +version=1.2.26beta05 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index 9c440932a..2496734df 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.26beta04 +Version: 1.2.26beta05 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 8dea30443..5ed15e417 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.26beta04 +Version: 1.2.26beta05 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 5f7554132..6d66d9e77 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 68c36014b..1f1602c9f 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 44dd540ed..502419a4d 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.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 79dfecb94..1c7928561 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index f956af044..d3500f49a 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.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 950338d95..0c7e5ae1a 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index ee41d9229..e5c7f88f3 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index a7d4122b2..5fba5f74c 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index e016bec36..e401ab16d 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -14,7 +14,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 7930b5781..12c670747 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.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 6fbf98d30..8798390e5 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index b0abda815..4cd04d37e 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.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 0da499fbf..8319fd254 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 82c8cb098..d0a11c715 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.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 7651e238c..8443d4f97 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.26beta04 +SHLIB_MINOR= 1.2.26beta05 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 0b801f0b0..abc68591d 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.26beta04 +SHLIB_MINOR= 1.2.26beta05 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 b48113553..90d65caa1 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 0a2120483..5b8575cd0 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.26beta04 +SHLIB_MINOR= 1.2.26beta05 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index ee477bf72..810fe0955 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index affdcda3b..bef37aeeb 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index e9fac8737..ed574d748 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 1c879f2a8..53998e183 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index c87b36c04..5abcf1b53 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index e90b3dc8e..8db463637 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta04 +PNGMIN = 1.2.26beta05 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 65176ca16..07a6453b3 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.26beta04 +; Version 1.2.26beta05 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index c29603c63..80bfc5795 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.26beta04 +;Version 1.2.26beta05 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |