From 78d55454aae12bc47f40a2bdc64d51af23b86137 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 19 Jun 2010 07:03:50 -0500 Subject: [PATCH] [devel] Imported from libpng-1.5.0beta27.tar --- ANNOUNCE | 20 +++++++++-------- CHANGES | 4 +++- CMakeLists.txt | 2 +- INSTALL | 4 ++-- LICENSE | 2 +- README | 2 +- configure | 22 +++++++++---------- configure.ac | 4 ++-- ...-1.5.0beta26.txt => libpng-1.5.0beta27.txt | 8 +++---- libpng.3 | 16 +++++++------- libpngpf.3 | 2 +- png.c | 6 ++--- png.h | 18 +++++++-------- pngconf.h | 2 +- pngpread.c | 2 +- pngpriv.h | 2 +- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 +++++----- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h | 2 +- scripts/pngwin.def | 2 +- scripts/symbols.def | 2 +- 28 files changed, 77 insertions(+), 73 deletions(-) rename libpng-1.5.0beta26.txt => libpng-1.5.0beta27.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index 765578c71..8065cd662 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.0beta26 - June 19, 2010 +Libpng 1.5.0beta27 - June 19, 2010 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,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.5.0beta26.tar.xz (LZMA-compressed, recommended) - 1.5.0beta26.tar.gz - 1.5.0beta26.tar.bz2 + 1.5.0beta27.tar.xz (LZMA-compressed, recommended) + 1.5.0beta27.tar.gz + 1.5.0beta27.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp150b26.zip - lp150b26.7z + lp150b27.zip + lp150b27.7z Other information: - 1.5.0beta26-README.txt - 1.5.0beta26-LICENSE.txt + 1.5.0beta27-README.txt + 1.5.0beta27-LICENSE.txt Changes since the last public release (1.4.1): @@ -229,8 +229,10 @@ version 1.5.0beta25 [June 19, 2010] In pngpread.c: png_push_have_row() add check for new_row > height Removed the now-redundant check for out-of-bounds new_row from example.c -version 1.5.0beta26 [June 19, 2010] +version 1.5.0beta26 [June 18, 2010] In pngpread.c: png_push_process_row() add check for too many rows. + +version 1.5.0beta27 [June 19, 2010] Removed the check added in beta25 as it is now redundant. Send comments/corrections/commendations to png-mng-implement at lists.sf.net: diff --git a/CHANGES b/CHANGES index f180231ab..b982ba39b 100644 --- a/CHANGES +++ b/CHANGES @@ -2711,8 +2711,10 @@ version 1.5.0beta25 [June 18, 2010] In pngpread.c: png_push_have_row() add check for new_row > height Removed the now-redundant check for out-of-bounds new_row from example.c -version 1.5.0beta26 [June 19, 2010] +version 1.5.0beta26 [June 18, 2010] In pngpread.c: png_push_process_row() add check for too many rows. + +version 1.5.0beta27 [June 19, 2010] Removed the check added in beta25 as it is now redundant. Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f1df20dd..d9e52a3ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -207,7 +207,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.0beta26 +# VERSION 15.${PNGLIB_RELEASE}.1.5.0beta27 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index 5ad6fae7d..905ab48d0 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.5.0beta26 - June 19, 2010 +Installing libpng version 1.5.0beta27 - June 19, 2010 On Unix/Linux and similar systems, you can simply type @@ -46,7 +46,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.5.0beta26" or "libpng15" and "zlib-1.2.3" +might be called "libpng-1.5.0beta27" or "libpng15" and "zlib-1.2.3" or "zlib123") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: diff --git a/LICENSE b/LICENSE index 2c9e83f3a..efbff6b45 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.0beta26, June 19, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.5.0beta27, June 19, 2010, are Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors diff --git a/README b/README index 0dd1628de..de27eaf70 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.0beta26 - June 19, 2010 (shared library 15.0) +README for libpng version 1.5.0beta27 - June 19, 2010 (shared library 15.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. diff --git a/configure b/configure index 392d2f1eb..9b56206b2 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for libpng 1.5.0beta26. +# Generated by GNU Autoconf 2.65 for libpng 1.5.0beta27. # # Report bugs to . # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.0beta26' -PACKAGE_STRING='libpng 1.5.0beta26' +PACKAGE_VERSION='1.5.0beta27' +PACKAGE_STRING='libpng 1.5.0beta27' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1432,7 +1432,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libpng 1.5.0beta26 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.0beta27 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1502,7 +1502,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.0beta26:";; + short | recursive ) echo "Configuration of libpng 1.5.0beta27:";; esac cat <<\_ACEOF @@ -1607,7 +1607,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.0beta26 +libpng configure 1.5.0beta27 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2032,7 +2032,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.5.0beta26, which was +It was created by libpng $as_me 1.5.0beta27, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2840,7 +2840,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.0beta26' + VERSION='1.5.0beta27' cat >>confdefs.h <<_ACEOF @@ -2904,7 +2904,7 @@ fi -PNGLIB_VERSION=1.5.0beta26 +PNGLIB_VERSION=1.5.0beta27 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=0 @@ -12119,7 +12119,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpng $as_me 1.5.0beta26, which was +This file was extended by libpng $as_me 1.5.0beta27, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12185,7 +12185,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libpng config.status 1.5.0beta26 +libpng config.status 1.5.0beta27 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 41913e85e..6b3ab8e06 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.5.0beta26], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.0beta27], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.0beta26 +PNGLIB_VERSION=1.5.0beta27 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=0 diff --git a/libpng-1.5.0beta26.txt b/libpng-1.5.0beta27.txt similarity index 99% rename from libpng-1.5.0beta26.txt rename to libpng-1.5.0beta27.txt index d7a632285..bd3029757 100644 --- a/libpng-1.5.0beta26.txt +++ b/libpng-1.5.0beta27.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.5.0beta26 - June 19, 2010 + libpng version 1.5.0beta27 - June 19, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.0beta26 - June 19, 2010 + libpng versions 0.97, January 1998, through 1.5.0beta27 - June 19, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -906,7 +906,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.5.0beta26, not all possible expansions are supported. +As of libpng version 1.5.0beta27, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -3307,7 +3307,7 @@ Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.5.0beta26 are Y2K compliant. It is my belief that earlier +upward through 1.5.0beta27 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 diff --git a/libpng.3 b/libpng.3 index 282409a57..8c7d9c574 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "June 19, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta26 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta27 .SH SYNOPSIS \fI\fB @@ -789,7 +789,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.5.0beta26 - June 19, 2010 + libpng version 1.5.0beta27 - June 19, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -800,7 +800,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.0beta26 - June 19, 2010 + libpng versions 0.97, January 1998, through 1.5.0beta27 - June 19, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -1695,7 +1695,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.5.0beta26, not all possible expansions are supported. +As of libpng version 1.5.0beta27, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -4096,7 +4096,7 @@ Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.5.0beta26 are Y2K compliant. It is my belief that earlier +upward through 1.5.0beta27 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 @@ -4275,7 +4275,7 @@ the first widely used release: 1.4.1 14 10401 14.so.14.1[.0] 1.4.2 14 10402 14.so.14.2[.0] 1.4.3 14 10403 14.so.14.3[.0] - 1.5.0beta01-26 15 10500 15.so.15.1[.0] + 1.5.0beta01-27 15 10500 15.so.15.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4332,7 +4332,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.0beta26 - June 19, 2010: +Libpng version 1.5.0beta27 - June 19, 2010: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4355,7 +4355,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.0beta26, June 19, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.5.0beta27, June 19, 2010, are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors diff --git a/libpngpf.3 b/libpngpf.3 index 7b7cf626e..40bbe9f11 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "June 19, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta26 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta27 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index ae56be92a..726d1540e 100644 --- a/png.c +++ b/png.c @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_5_0beta26 Your_png_h_is_not_version_1_5_0beta26; +typedef version_1_5_0beta27 Your_png_h_is_not_version_1_5_0beta27; /* Version information for C files. This had better match the version * string defined in png.h. @@ -560,13 +560,13 @@ png_get_copyright(png_structp png_ptr) #else # ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.5.0beta26 - June 19, 2010" PNG_STRING_NEWLINE \ + "libpng version 1.5.0beta27 - June 19, 2010" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE); # else - return ((png_charp) "libpng version 1.5.0beta26 - June 19, 2010\ + return ((png_charp) "libpng version 1.5.0beta27 - June 19, 2010\ Copyright (c) 1998-2010 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); diff --git a/png.h b/png.h index 5a4cc3e40..ae7462dd0 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.0beta26 - June 19, 2010 + * libpng version 1.5.0beta27 - June 19, 2010 * Copyright (c) 1998-2010 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.) @@ -11,7 +11,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.5.0beta26 - June 19, 2010: Glenn + * libpng versions 0.97, January 1998, through 1.5.0beta27 - June 19, 2010: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -140,7 +140,7 @@ * 1.4.1 14 10401 14.so.14.1[.0] * 1.4.2 14 10402 14.so.14.2[.0] * 1.4.3 14 10403 14.so.14.3[.0] - * 1.5.0beta01-26 15 10500 15.so.15.0[.0] + * 1.5.0beta01-27 15 10500 15.so.15.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -172,7 +172,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.0beta26, June 19, 2010, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.0beta27, June 19, 2010, are * Copyright (c) 2004, 2006-2010 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: @@ -290,7 +290,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.5.0beta26 are Y2K compliant. It is my belief that earlier + * upward through 1.5.0beta27 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 @@ -346,9 +346,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.0beta26" +#define PNG_LIBPNG_VER_STRING "1.5.0beta27" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.0beta26 - June 19, 2010\n" + " libpng version 1.5.0beta27 - June 19, 2010\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -361,7 +361,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 26 +#define PNG_LIBPNG_VER_BUILD 27 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -836,7 +836,7 @@ typedef PNG_CALLBACK(void, *png_free_ptr, (png_structp, png_voidp),); /* 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_5_0beta26; +typedef png_structp version_1_5_0beta27; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index 9bd63459d..b451046fb 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.0beta26 - June 19, 2010 + * libpng version 1.5.0beta27 - June 19, 2010 * * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpread.c b/pngpread.c index 4a2c057a6..390a82cd2 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1693,7 +1693,7 @@ png_push_have_end(png_structp png_ptr, png_infop info_ptr) void /* PRIVATE */ png_push_have_row(png_structp png_ptr, png_bytep row) { - if (png_ptr->row_fn != NULL && png_ptr->row_number < png_ptr->height) + if (png_ptr->row_fn != NULL) (*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number, (int)png_ptr->pass); } diff --git a/pngpriv.h b/pngpriv.h index 7a6436493..6974e649d 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.5.0beta26 - June 19, 2010 + * libpng version 1.5.0beta27 - June 19, 2010 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 39a6ee958..f7c61e67a 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1716,4 +1716,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_5_0beta26 your_png_h_is_not_version_1_5_0beta26; +typedef version_1_5_0beta27 your_png_h_is_not_version_1_5_0beta27; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index fbf247df0..148b481ae 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.0beta26 - June 19, 2010 +libpng version 1.5.0beta27 - June 19, 2010 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index ec46f3726..bf78fbda1 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@