diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2008-01-26 10:53:35 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:16:00 -0500 |
| commit | 5c58e3ee31b986c1f337f7ba9ee9d6f1eb5211b7 (patch) | |
| tree | d3f444b79088fa5561424d4de83265b87f2c788a | |
| parent | 49f304bd07b9b53c63aad8bf2d6a8f1e5c400087 (diff) | |
| download | libpng-1.2.25beta04.tar.gz | |
Imported from libpng-1.2.25beta04.tarv1.2.25beta04
52 files changed, 138 insertions, 128 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.25beta03 - January 22, 2008 +Libpng 1.2.25beta04 - January 26, 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,32 +9,32 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.25beta03.tar.gz - libpng-1.2.25beta03.tar.bz2 + libpng-1.2.25beta04.tar.gz + libpng-1.2.25beta04.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.25beta03-no-config.tar.gz - libpng-1.2.25beta03-no-config.tar.bz2 + libpng-1.2.25beta04-no-config.tar.gz + libpng-1.2.25beta04-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1225b03.zip - lp1225b03.tar.bz2 + lp1225b04.zip + lp1225b04.tar.bz2 Project files - libpng-1.2.25beta03-project-netware.zip - libpng-1.2.25beta03-project-wince.zip + libpng-1.2.25beta04-project-netware.zip + libpng-1.2.25beta04-project-wince.zip Other information: - libpng-1.2.25beta03-README.txt - libpng-1.2.25beta03-KNOWNBUGS.txt - libpng-1.2.25beta03-LICENSE.txt - libpng-1.2.25beta03-Y2K-compliance.txt + libpng-1.2.25beta04-README.txt + libpng-1.2.25beta04-KNOWNBUGS.txt + libpng-1.2.25beta04-LICENSE.txt + libpng-1.2.25beta04-Y2K-compliance.txt Changes since the last public release (1.2.23): @@ -66,7 +66,7 @@ version 1.2.25beta01 [January 7, 2008] version 1.2.25beta02 [January 10, 2008] Prevent gamma from being applied twice. -version 1.2.25rc01 [January 17, 2001] +version 1.2.25rc01 [January 17, 2008] No changes. version 1.2.25beta03 [January 22, 2008] @@ -76,6 +76,10 @@ version 1.2.25beta03 [January 22, 2008] Return from png_destroy_read_struct() if png_ptr_ptr is NULL. Fix overflow of "msg" in png_decompres_chunk(). +version 1.2.25beta03 [January 26, 2008] + Work around Coverity bug report by slightly refactoring + png_read_push_finish_row() + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -2038,7 +2038,7 @@ version 1.2.25beta01 [January 7, 2008] version 1.2.25beta02 [January 10, 2008] Prevent gamma from being applied twice. -version 1.2.25rc01 [January 17, 2001] +version 1.2.25rc01 [January 17, 2008] No changes. version 1.2.25beta03 [January 22, 2008] @@ -2050,6 +2050,10 @@ version 1.2.25beta03 [January 22, 2008] Return from png_destroy_read_struct() if png_ptr_ptr is NULL. Fix overflow of "msg" in png_decompres_chunk(). +version 1.2.25beta03 [January 26, 2008] + Work around Coverity bug report by slightly refactoring + png_read_push_finish_row() + 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.25beta03 - January 22, 2008 +Installing libpng version 1.2.25beta04 - January 26, 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.25beta03" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.25beta04" 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.25beta03) + gcc, creates libpng12.so.0.1.2.25beta04) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.25beta03) + (gcc, creates libpng12.so.0.1.2.25beta04) 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.25beta03) + creates libpng12.so.0.1.2.25beta04) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.25beta03) + creates libpng12.so.0.1.2.25beta04) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.25beta03) + creates libpng12.so.0.1.2.25beta04) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.25beta03) + creates libpng12.so.0.1.2.25beta04) 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.25beta03 +Known bugs in libpng version 1.2.25beta04 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.25beta03, January 22, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.25beta04, January 26, 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 -January 22, 2008 +January 26, 2008 @@ -1,4 +1,4 @@ -README for libpng version 1.2.25beta03 - January 22, 2008 (shared library 12.0) +README for libpng version 1.2.25beta04 - January 26, 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. @@ -190,11 +190,11 @@ Files in this distribution: descrip.mms => VMS makefile for MMS or MMK makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.25beta03) + gcc, creates libpng12.so.0.1.2.25beta04) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.25beta03) + (gcc, creates libpng12.so.0.1.2.25beta04) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.25beta03, + (gcc, creates libpng12.so.0.1.2.25beta04, uses assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -216,12 +216,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng12.so.0.1.2.25beta03) + (gcc, creates libpng12.so.0.1.2.25beta04) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.25beta03) + (gcc, creates libpng12.so.0.1.2.25beta04) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.25beta03) + (gcc, creates libpng12.so.0.1.2.25beta04) 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: ========================= - January 22, 2008 + January 26, 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.25beta03 are Y2K compliant. It is my belief that earlier + upward through 1.2.25beta04 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.25beta03. +# Generated by GNU Autoconf 2.61 for libpng 1.2.25beta04. # # 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.25beta03' -PACKAGE_STRING='libpng 1.2.25beta03' +PACKAGE_VERSION='1.2.25beta04' +PACKAGE_STRING='libpng 1.2.25beta04' 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.25beta03 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.25beta04 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.25beta03:";; + short | recursive ) echo "Configuration of libpng 1.2.25beta04:";; 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.25beta03 +libpng configure 1.2.25beta04 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.25beta03, which was +It was created by libpng $as_me 1.2.25beta04, 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.25beta03' + VERSION='1.2.25beta04' cat >>confdefs.h <<_ACEOF @@ -2441,7 +2441,7 @@ fi -PNGLIB_VERSION=1.2.25beta03 +PNGLIB_VERSION=1.2.25beta04 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=25 @@ -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.25beta03, which was +This file was extended by libpng $as_me 1.2.25beta04, 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.25beta03 +libpng config.status 1.2.25beta04 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 064465d4e..14e59e4d2 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.25beta03], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.25beta04], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.25beta03 +PNGLIB_VERSION=1.2.25beta04 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=25 diff --git a/libpng-1.2.25beta03.txt b/libpng-1.2.25beta04.txt index 71b567c04..8e69f006c 100644 --- a/libpng-1.2.25beta03.txt +++ b/libpng-1.2.25beta04.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.25beta03 - January 22, 2008 + libpng version 1.2.25beta04 - January 26, 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 -January 22, 2008 +January 26, 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.25beta03 are Y2K compliant. It is my belief that earlier +upward through 1.2.25beta04 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 "January 22, 2008" +.TH LIBPNG 3 "January 26, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.25beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.25beta04 .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.25beta03 - January 22, 2008 + libpng version 1.2.25beta04 - January 26, 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 -January 22, 2008 +January 26, 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.25beta03 are Y2K compliant. It is my belief that earlier +upward through 1.2.25beta04 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 @@ -3893,7 +3893,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.25beta03 - January 22, 2008: +Libpng version 1.2.25beta04 - January 26, 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). @@ -3914,7 +3914,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.25beta03, January 22, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.25beta04, January 26, 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 @@ -4013,7 +4013,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 22, 2008 +January 26, 2008 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 990e63274..87a0d69b4 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "January 22, 2008" +.TH LIBPNGPF 3 "January 26, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.25beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.25beta04 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "January 22, 2008" +.TH PNG 5 "January 26, 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_25beta03 Your_png_h_is_not_version_1_2_25beta03; +typedef version_1_2_25beta04 Your_png_h_is_not_version_1_2_25beta04; /* 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.25beta03 - January 22, 2008\n\ + return ((png_charp) "\n libpng version 1.2.25beta04 - January 26, 2008\n\ Copyright (c) 1998-2007 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.25beta03 - January 22, 2008 + * libpng version 1.2.25beta04 - January 26, 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.25beta03 - January 22, 2008: Glenn + * libpng versions 0.97, January 1998, through 1.2.25beta04 - January 26, 2008: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -205,7 +205,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.25beta03, January 22, 2008, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.25beta04, January 26, 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: @@ -317,13 +317,13 @@ * Y2K compliance in libpng: * ========================= * - * January 22, 2008 + * January 26, 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.25beta03 are Y2K compliant. It is my belief that earlier + * upward through 1.2.25beta04 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 @@ -379,9 +379,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.25beta03" +#define PNG_LIBPNG_VER_STRING "1.2.25beta04" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.25beta03 - January 22, 2008\n" + " libpng version 1.2.25beta04 - January 26, 2008\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -393,7 +393,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 03 +#define PNG_LIBPNG_VER_BUILD 04 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1431,7 +1431,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_25beta03; +typedef png_structp version_1_2_25beta04; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.25beta03 - January 22, 2008 + * libpng version 1.2.25beta04 - January 26, 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 b1cc44f3a..72b40fce0 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.25 [January 22, 2008] + * Last changed in libpng 1.2.25 [January 26, 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) @@ -1026,24 +1026,26 @@ png_read_push_finish_row(png_structp png_ptr) if (png_ptr->pass > 7) png_ptr->pass--; - if (png_ptr->pass >= 7) - break; - - png_ptr->iwidth = (png_ptr->width + - png_pass_inc[png_ptr->pass] - 1 - - png_pass_start[png_ptr->pass]) / - png_pass_inc[png_ptr->pass]; - - png_ptr->irowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, - png_ptr->iwidth) + 1; - - if (png_ptr->transformations & PNG_INTERLACE) - break; - - png_ptr->num_rows = (png_ptr->height + - png_pass_yinc[png_ptr->pass] - 1 - - png_pass_ystart[png_ptr->pass]) / - png_pass_yinc[png_ptr->pass]; + if (png_ptr->pass < 7) + { + png_ptr->iwidth = (png_ptr->width + + png_pass_inc[png_ptr->pass] - 1 - + png_pass_start[png_ptr->pass]) / + png_pass_inc[png_ptr->pass]; + + png_ptr->irowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, + png_ptr->iwidth) + 1; + + if (png_ptr->transformations & PNG_INTERLACE) + break; + + png_ptr->num_rows = (png_ptr->height + + png_pass_yinc[png_ptr->pass] - 1 - + png_pass_ystart[png_ptr->pass]) / + png_pass_yinc[png_ptr->pass]; + } + else + break; } while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0); } @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.2.25 [January 22, 2008] + * Last changed in libpng 1.2.25 [January 26, 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/pngrtran.c b/pngrtran.c index 822a827f8..4d5c18a56 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.2.25 [January 22, 2008] + * Last changed in libpng 1.2.25 [January 26, 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 f4921a4a9..a4090d40e 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 [January 22, 2008] + * Last changed in libpng 1.2.25 [January 26, 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 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.2.25 [January 22, 2008] + * Last changed in libpng 1.2.25 [January 26, 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) @@ -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_25beta03 your_png_h_is_not_version_1_2_25beta03; +typedef version_1_2_25beta04 your_png_h_is_not_version_1_2_25beta04; diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 5e87e993d..b3a976139 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.25beta03 +# VERSION 0.${PNGLIB_RELEASE}.1.2.25beta04 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 bb3085ee5..8b23fd055 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.25beta03 +version=1.2.25beta04 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index 76fa700c1..f333f8fdf 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.25beta03 +Version: 1.2.25beta04 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 8bb9a63b8..e1e45566b 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.25beta03 +Version: 1.2.25beta04 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 42f913c73..0d028d5ca 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 9b2352a21..7b7602a9d 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index b8902166c..cd756957a 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.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 88dadb5ff..d2f34ad63 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 1c9fd5b0d..0e890b353 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.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 5027c3575..1634298b7 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 41b2b4590..26c80d472 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 399dbaf15..de5ac8d2d 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 641318d6a..f06265a2d 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -14,7 +14,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 1b2625f23..b6314a386 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.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 190c02092..2acd7e9ab 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 1784deba6..f6cf6255e 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.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index c9bc9b6d7..1a0679973 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 98ee10ec1..643fe0e26 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.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 103e0519b..a7185b399 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.25beta03 +SHLIB_MINOR= 1.2.25beta04 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 438cc296c..d76463568 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.25beta03 +SHLIB_MINOR= 1.2.25beta04 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 d58d079d6..c49673da2 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 20ecdda44..e61bad749 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.25beta03 +SHLIB_MINOR= 1.2.25beta04 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 443a514f9..0bb2eed44 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 1165e0daf..b4a131b47 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index fd80cc0ba..1f386bdc2 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 13ada76fa..0b0000adb 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 5e7eb2ede..00bdf0cae 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 89981af5b..3d9fc749e 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta03 +PNGMIN = 1.2.25beta04 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 0aa0d8626..a3e67c724 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.25beta03 +; Version 1.2.25beta04 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index de33ff331..2eca346b5 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.25beta03 +;Version 1.2.25beta04 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |