diff --git a/ANNOUNCE b/ANNOUNCE index 093dcaa90..feeea8d04 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.0beta24 - May 7, 2010 +Libpng 1.5.0beta25 - June 18, 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.0beta24.tar.xz (LZMA-compressed, recommended) - 1.5.0beta24.tar.gz - 1.5.0beta24.tar.bz2 + 1.5.0beta25.tar.xz (LZMA-compressed, recommended) + 1.5.0beta25.tar.gz + 1.5.0beta25.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp150b24.zip - lp150b24.7z + lp150b25.zip + lp150b25.7z Other information: - 1.5.0beta24-README.txt - 1.5.0beta24-LICENSE.txt + 1.5.0beta25-README.txt + 1.5.0beta25-LICENSE.txt Changes since the last public release (1.4.1): @@ -225,6 +225,10 @@ version 1.5.0beta24 [May 7, 2010] offset of the png_ptr->rowbuf pointer into png_ptr->big_row_buf. Added more blank lines for readability. +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 + Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CHANGES b/CHANGES index b68a3b536..519b69279 100644 --- a/CHANGES +++ b/CHANGES @@ -1672,7 +1672,7 @@ version 1.2.15rc2 [December 21, 2006] Added scripts/makefile.nommx version 1.2.15rc3 [December 25, 2006] - Fixed shared library numbering error that was intruduced in 1.2.15beta6. + Fixed shared library numbering error that was introduced in 1.2.15beta6. version 1.2.15rc4 [December 27, 2006] Fixed handling of rgb_to_gray when png_ptr->color.gray isn't set. @@ -2125,7 +2125,7 @@ version 1.4.0beta57 [May 2, 2009] Removed pngprefs.h and MMX from makefiles version 1.4.0beta58 [May 14, 2009] - Changed pngw32.def to pngwin.def in makefile.mingw (typo was intruduced + Changed pngw32.def to pngwin.def in makefile.mingw (typo was introduced in beta57). Clarified usage of sig_bit versus sig_bit_p in example.c (Vincent Torri) @@ -2707,6 +2707,10 @@ version 1.5.0beta24 [May 7, 2010] offset of the png_ptr->rowbuf pointer into png_ptr->big_row_buf. Added more blank lines for readability. +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 + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CMakeLists.txt b/CMakeLists.txt index c28cd5de5..4dd0a9481 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.0beta24 +# VERSION 15.${PNGLIB_RELEASE}.1.5.0beta25 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index e97019bde..1fc78a386 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.5.0beta24 - May 7, 2010 +Installing libpng version 1.5.0beta25 - June 18, 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.0beta24" or "libpng15" and "zlib-1.2.3" +might be called "libpng-1.5.0beta25" 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 eab41d525..dce74fb05 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.0beta24, May 7, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.5.0beta25, June 18, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 7, 2010 +June 18, 2010 diff --git a/README b/README index 3d9b3f5fc..fe58a4603 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.0beta24 - May 7, 2010 (shared library 15.0) +README for libpng version 1.5.0beta25 - June 18, 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 0f903de87..64a5b5582 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.0beta24. +# Generated by GNU Autoconf 2.65 for libpng 1.5.0beta25. # # Report bugs to . # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.0beta24' -PACKAGE_STRING='libpng 1.5.0beta24' +PACKAGE_VERSION='1.5.0beta25' +PACKAGE_STRING='libpng 1.5.0beta25' 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.0beta24 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.0beta25 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.0beta24:";; + short | recursive ) echo "Configuration of libpng 1.5.0beta25:";; 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.0beta24 +libpng configure 1.5.0beta25 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.0beta24, which was +It was created by libpng $as_me 1.5.0beta25, 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.0beta24' + VERSION='1.5.0beta25' cat >>confdefs.h <<_ACEOF @@ -2904,7 +2904,7 @@ fi -PNGLIB_VERSION=1.5.0beta24 +PNGLIB_VERSION=1.5.0beta25 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.0beta24, which was +This file was extended by libpng $as_me 1.5.0beta25, 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.0beta24 +libpng config.status 1.5.0beta25 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index e28aaef41..438f1dc56 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.0beta24], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.0beta25], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.0beta24 +PNGLIB_VERSION=1.5.0beta25 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=0 diff --git a/contrib/pngsuite/README b/contrib/pngsuite/README index 714d12c64..f321e486b 100644 --- a/contrib/pngsuite/README +++ b/contrib/pngsuite/README @@ -6,34 +6,51 @@ pngsuite Permission to use, copy, and distribute these images for any purpose and without fee is hereby granted. -These 15 images are part of the much larger PngSuite test-set of +The 15 "bas*.png" images are part of the much larger PngSuite test-set of images, available for developers of PNG supporting software. The complete set, available at http:/www.schaik.com/pngsuite/, contains a variety of images to test interlacing, gamma settings, ancillary chunks, etc. +The "ft*.png" images are "free/libre" replacements for the transparent +corresponding t*.png images in the PngSuite. + The images in this directory represent the basic PNG color-types: grayscale (1-16 bit deep), full color (8 or 16 bit), paletted (1-8 bit) and grayscale or color images with alpha channel. You can use them to test the proper functioning of PNG software. - filename depth type + filename depth type ------------ ------ -------------- - basn0g01.png 1-bit grayscale - basn0g02.png 2-bit grayscale - basn0g04.png 4-bit grayscale - basn0g08.png 8-bit grayscale - basn0g16.png 16-bit grayscale - basn2c08.png 8-bit truecolor - basn2c16.png 16-bit truecolor - basn3p01.png 1-bit paletted - basn3p02.png 2-bit paletted - basn3p04.png 4-bit paletted - basn3p08.png 8-bit paletted - basn4a08.png 8-bit gray with alpha - basn4a16.png 16-bit gray with alpha - basn6a08.png 8-bit RGBA - basn6a16.png 16-bit RGBA + basn0g01.png 1-bit grayscale + basn0g02.png 2-bit grayscale + basn0g04.png 4-bit grayscale + basn0g08.png 8-bit grayscale + basn0g16.png 16-bit grayscale + basn2c08.png 8-bit truecolor + basn2c16.png 16-bit truecolor + basn3p01.png 1-bit paletted + basn3p02.png 2-bit paletted + basn3p04.png 4-bit paletted + basn3p08.png 8-bit paletted + basn4a08.png 8-bit gray with alpha + basn4a16.png 16-bit gray with alpha + basn6a08.png 8-bit RGBA + basn6a16.png 16-bit RGBA + + ftbbn0g04.png 4-bit grayscale, black bKGD + ftbbn2c16.png 16-bit truecolor, black bKGD + ftbbn3p08.png 8-bit paletted, black bKGD + ftbgn2c16.png 16-bit truecolor, gray bKGD + ftbgn3p08.png 8-bit paletted, gray bKGD + ftbrn2c08.png 8-bit truecolor, red bKGD + ftbwn0g16.png 16-bit gray, white bKGD + ftbwn3p08.png 8-bit paletted, white bKGD + ftbyn3p08.png 8-bit paletted, yellow bKGD + ftp0n0g08.png 8-bit grayscale, opaque + ftp0n2c08.png 8-bit truecolor, opaque + ftp0n3p08.png 8-bit paletted, opaque + ftp1n3p08.png 8-bit paletted, no bKGD Here is the correct result of typing "pngtest -m *.png" in this directory: diff --git a/contrib/pngsuite/ftbbn1g04.png b/contrib/pngsuite/ftbbn1g04.png new file mode 100644 index 000000000..39a7050d2 Binary files /dev/null and b/contrib/pngsuite/ftbbn1g04.png differ diff --git a/contrib/pngsuite/ftbbn2c16.png b/contrib/pngsuite/ftbbn2c16.png new file mode 100644 index 000000000..dd3168e5c Binary files /dev/null and b/contrib/pngsuite/ftbbn2c16.png differ diff --git a/contrib/pngsuite/ftbbn3p08.png b/contrib/pngsuite/ftbbn3p08.png new file mode 100644 index 000000000..0ede3574d Binary files /dev/null and b/contrib/pngsuite/ftbbn3p08.png differ diff --git a/contrib/pngsuite/ftbgn2c16.png b/contrib/pngsuite/ftbgn2c16.png new file mode 100644 index 000000000..85cec395c Binary files /dev/null and b/contrib/pngsuite/ftbgn2c16.png differ diff --git a/contrib/pngsuite/ftbgn3p08.png b/contrib/pngsuite/ftbgn3p08.png new file mode 100644 index 000000000..8cf2e6fb6 Binary files /dev/null and b/contrib/pngsuite/ftbgn3p08.png differ diff --git a/contrib/pngsuite/ftbrn2c08.png b/contrib/pngsuite/ftbrn2c08.png new file mode 100644 index 000000000..5cca0d621 Binary files /dev/null and b/contrib/pngsuite/ftbrn2c08.png differ diff --git a/contrib/pngsuite/ftbwn1g16.png b/contrib/pngsuite/ftbwn1g16.png new file mode 100644 index 000000000..99bdeed2b Binary files /dev/null and b/contrib/pngsuite/ftbwn1g16.png differ diff --git a/contrib/pngsuite/ftbwn3p08.png b/contrib/pngsuite/ftbwn3p08.png new file mode 100644 index 000000000..eacab7a14 Binary files /dev/null and b/contrib/pngsuite/ftbwn3p08.png differ diff --git a/contrib/pngsuite/ftbyn3p08.png b/contrib/pngsuite/ftbyn3p08.png new file mode 100644 index 000000000..656db0989 Binary files /dev/null and b/contrib/pngsuite/ftbyn3p08.png differ diff --git a/contrib/pngsuite/ftp0n1g08.png b/contrib/pngsuite/ftp0n1g08.png new file mode 100644 index 000000000..333465fcd Binary files /dev/null and b/contrib/pngsuite/ftp0n1g08.png differ diff --git a/contrib/pngsuite/ftp0n2c08.png b/contrib/pngsuite/ftp0n2c08.png new file mode 100644 index 000000000..fc6e42cb4 Binary files /dev/null and b/contrib/pngsuite/ftp0n2c08.png differ diff --git a/contrib/pngsuite/ftp0n3p08.png b/contrib/pngsuite/ftp0n3p08.png new file mode 100644 index 000000000..69a69e587 Binary files /dev/null and b/contrib/pngsuite/ftp0n3p08.png differ diff --git a/contrib/pngsuite/ftp1n3p08.png b/contrib/pngsuite/ftp1n3p08.png new file mode 100644 index 000000000..a6c9f35a8 Binary files /dev/null and b/contrib/pngsuite/ftp1n3p08.png differ diff --git a/example.c b/example.c index 26747611b..f7f9e397a 100644 --- a/example.c +++ b/example.c @@ -2,7 +2,7 @@ #if 0 /* in case someone actually tries to compile this */ /* example.c - an example of using libpng - * Last changed in libpng 1.5.0 [May 7, 2010] + * Last changed in libpng 1.5.0 [June 18, 2010] * This file has been placed in the public domain by the authors. * Maintained 1998-2010 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) @@ -511,20 +511,17 @@ row_callback(png_structp png_ptr, png_bytep new_row, * shown below: */ - /* Check if row_num is in bounds. */ - if ((row_num >= 0) && (row_num < height)) - { - /* Get pointer to corresponding row in our - * PNG read buffer. - */ - png_bytep old_row = ((png_bytep *)our_data)[row_num]; + /* Get pointer to corresponding row in our + * PNG read buffer. + */ + png_bytep old_row = ((png_bytep *)our_data)[row_num]; + + /* If both rows are allocated then copy the new row + * data to the corresponding row data. + */ + if ((old_row != NULL) && (new_row != NULL)) + png_progressive_combine_row(png_ptr, old_row, new_row); - /* If both rows are allocated then copy the new row - * data to the corresponding row data. - */ - if ((old_row != NULL) && (new_row != NULL)) - png_progressive_combine_row(png_ptr, old_row, new_row); - } /* * The rows and passes are called in order, so you don't really * need the row_num and pass, but I'm supplying them because it diff --git a/libpng-1.5.0beta24.txt b/libpng-1.5.0beta25.txt similarity index 99% rename from libpng-1.5.0beta24.txt rename to libpng-1.5.0beta25.txt index ee7926f5c..d52153dc9 100644 --- a/libpng-1.5.0beta24.txt +++ b/libpng-1.5.0beta25.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.5.0beta24 - May 7, 2010 + libpng version 1.5.0beta25 - June 18, 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.0beta24 - May 7, 2010 + libpng versions 0.97, January 1998, through 1.5.0beta25 - June 18, 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.0beta24, not all possible expansions are supported. +As of libpng version 1.5.0beta25, 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 @@ -3301,13 +3301,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -May 7, 2010 +June 18, 2010 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.0beta24 are Y2K compliant. It is my belief that earlier +upward through 1.5.0beta25 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 647b5b17b..5db6b1d1f 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "May 7, 2010" +.TH LIBPNG 3 "June 18, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta24 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta25 .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.0beta24 - May 7, 2010 + libpng version 1.5.0beta25 - June 18, 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.0beta24 - May 7, 2010 + libpng versions 0.97, January 1998, through 1.5.0beta25 - June 18, 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.0beta24, not all possible expansions are supported. +As of libpng version 1.5.0beta25, 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 @@ -4090,13 +4090,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -May 7, 2010 +June 18, 2010 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.0beta24 are Y2K compliant. It is my belief that earlier +upward through 1.5.0beta25 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 @@ -4273,7 +4273,7 @@ the first widely used release: 1.4.1rc01 14 10401 14.so.14.1[.0] 1.4.1beta04-12 14 10401 14.so.14.1[.0] 1.4.1 14 10401 14.so.14.1[.0] - 1.5.0beta01-23 15 10500 15.so.15.1[.0] + 1.5.0beta01-25 15 10500 15.so.15.1[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4330,7 +4330,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.0beta24 - May 7, 2010: +Libpng version 1.5.0beta25 - June 18, 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). @@ -4353,7 +4353,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.0beta24, May 7, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.5.0beta25, June 18, 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 @@ -4452,7 +4452,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 7, 2010 +June 18, 2010 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index c8c87657c..7d66aed5b 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "May 7, 2010" +.TH LIBPNGPF 3 "June 18, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta24 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta25 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index a564ad6fb..b9f3d4f99 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "May 7, 2010" +.TH PNG 5 "June 18, 2010" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 0f571cacb..48e3088fd 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.5.0 [May 7, 2010] + * Last changed in libpng 1.5.0 [June 18, 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.) @@ -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_0beta24 Your_png_h_is_not_version_1_5_0beta24; +typedef version_1_5_0beta25 Your_png_h_is_not_version_1_5_0beta25; /* 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.0beta24 - May 7, 2010" PNG_STRING_NEWLINE \ + "libpng version 1.5.0beta25 - June 18, 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.0beta24 - May 7, 2010\ + return ((png_charp) "libpng version 1.5.0beta25 - June 18, 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 079a41289..e1d18ce46 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.0beta24 - May 7, 2010 + * libpng version 1.5.0beta25 - June 18, 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.0beta24 - May 7, 2010: Glenn + * libpng versions 0.97, January 1998, through 1.5.0beta25 - June 18, 2010: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -138,7 +138,7 @@ * 1.4.1rc01 14 10401 14.so.14.1[.0] * 1.4.1beta04-12 14 10401 14.so.14.1[.0] * 1.4.1 14 10401 14.so.14.1[.0] - * 1.5.0beta01-23 15 10500 15.so.15.0[.0] + * 1.5.0beta01-25 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 @@ -170,7 +170,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.0beta24, May 7, 2010, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.0beta25, June 18, 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: @@ -242,8 +242,8 @@ * * 1. The origin of this source code must not be misrepresented. * - * 2. Altered versions must be plainly marked as such and - * must not be misrepresented as being the original source. + * 2. Altered versions must be plainly marked as such and must not + * be misrepresented as being the original source. * * 3. This Copyright notice may not be removed or altered from * any source or altered source distribution. @@ -282,13 +282,13 @@ * Y2K compliance in libpng: * ========================= * - * May 7, 2010 + * June 18, 2010 * * 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.0beta24 are Y2K compliant. It is my belief that earlier + * upward through 1.5.0beta25 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 @@ -344,9 +344,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.0beta24" +#define PNG_LIBPNG_VER_STRING "1.5.0beta25" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.0beta24 - May 7, 2010\n" + " libpng version 1.5.0beta25 - June 18, 2010\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -359,7 +359,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 24 +#define PNG_LIBPNG_VER_BUILD 25 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -834,7 +834,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_0beta24; +typedef png_structp version_1_5_0beta25; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index 2da3e9bd1..524ad7c54 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.0beta24 - May 7, 2010 + * libpng version 1.5.0beta25 - June 18, 2010 * * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngdebug.h b/pngdebug.h index b10ce4bd6..80be8a416 100644 --- a/pngdebug.h +++ b/pngdebug.h @@ -5,7 +5,7 @@ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * Last changed in libpng version 1.5.0 - May 7, 2010 + * Last changed in libpng version 1.5.0 - June 18, 2010 * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -34,7 +34,7 @@ */ #ifndef PNGDEBUG_H #define PNGDEBUG_H -/* These settings control the formatting of messages in pngerror.c */ +/* These settings control the formatting of messages in png.c and pngerror.c */ /* Moved to pngdebug.h at 1.5.0 */ # ifndef PNG_LITERAL_SHARP # define PNG_LITERAL_SHARP 0x23 diff --git a/pngerror.c b/pngerror.c index 1552830fb..39e633148 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.5.0 [May 7, 2010] + * Last changed in libpng 1.5.0 [June 18, 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.) diff --git a/pngget.c b/pngget.c index 6a00a9081..2a88ac432 100644 --- a/pngget.c +++ b/pngget.c @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.4.1 [May 7, 2010] + * Last changed in libpng 1.4.1 [June 18, 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.) diff --git a/pnginfo.h b/pnginfo.h index 7840a8c70..c93841140 100644 --- a/pnginfo.h +++ b/pnginfo.h @@ -5,7 +5,7 @@ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * Last changed in libpng version 1.5.0 - May 7, 2010 + * Last changed in libpng version 1.5.0 - June 18, 2010 * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/pngmem.c b/pngmem.c index 8840be06b..54534eb3b 100644 --- a/pngmem.c +++ b/pngmem.c @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.5.0 [May 7, 2010] + * Last changed in libpng 1.5.0 [June 18, 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.) diff --git a/pngpread.c b/pngpread.c index abfff13c8..b66b84b3b 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.5.0 [May 7, 2010] + * Last changed in libpng 1.5.0 [June 18, 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.) @@ -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) + if (png_ptr->row_fn != NULL && png_ptr->row_number < png_ptr->height) (*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number, (int)png_ptr->pass); } diff --git a/pngpriv.h b/pngpriv.h index f70b52726..a45e17102 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.5.0beta24 - May 7, 2010 + * libpng version 1.5.0beta25 - June 18, 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/pngread.c b/pngread.c index b0d5c3656..7353efaa9 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.5.0 [May 7, 2010] + * Last changed in libpng 1.5.0 [June 18, 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.) diff --git a/pngrio.c b/pngrio.c index 1a637c206..b5c5663a1 100644 --- a/pngrio.c +++ b/pngrio.c @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.5.0 [May 7, 2010] + * Last changed in libpng 1.5.0 [June 18, 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.) diff --git a/pngrtran.c b/pngrtran.c index 29071a324..5802592c6 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.5.0 [May 7, 2010] + * Last changed in libpng 1.5.0 [June 18, 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.) diff --git a/pngrutil.c b/pngrutil.c index f59485af7..972e6c6cf 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.4.1 [May 7, 2010] + * Last changed in libpng 1.4.1 [June 18, 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.) diff --git a/pngset.c b/pngset.c index 934771081..b7f8e7614 100644 --- a/pngset.c +++ b/pngset.c @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.5.0 [May 7, 2010] + * Last changed in libpng 1.5.0 [June 18, 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.) diff --git a/pngstruct.h b/pngstruct.h index e7b776002..99a748e4a 100644 --- a/pngstruct.h +++ b/pngstruct.h @@ -5,7 +5,7 @@ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * Last changed in libpng version 1.5.0 - May 7, 2010 + * Last changed in libpng version 1.5.0 - June 18, 2010 * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/pngtest.c b/pngtest.c index 2e9f71325..ff286d68b 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.5.0 [May 7, 2010] + * Last changed in libpng 1.5.0 [June 18, 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.) @@ -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_0beta24 your_png_h_is_not_version_1_5_0beta24; +typedef version_1_5_0beta25 your_png_h_is_not_version_1_5_0beta25; diff --git a/pngtrans.c b/pngtrans.c index 59cbe6151..233c67a18 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.5.0 [May 7, 2010] + * Last changed in libpng 1.5.0 [June 18, 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.) diff --git a/pngwio.c b/pngwio.c index 0a754d8d4..4fd81e54c 100644 --- a/pngwio.c +++ b/pngwio.c @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.5.0 [May 7, 2010] + * Last changed in libpng 1.5.0 [June 18, 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.) diff --git a/pngwrite.c b/pngwrite.c index b7a157c0b..69a75d2a4 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.5.0 [May 7, 2010] + * Last changed in libpng 1.5.0 [June 18, 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.) diff --git a/pngwtran.c b/pngwtran.c index 5827218aa..00d3e6169 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * Last changed in libpng 1.5.0 [May 7, 2010] + * Last changed in libpng 1.5.0 [June 18, 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.) diff --git a/pngwutil.c b/pngwutil.c index cd4e36a3e..7fff36e9a 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.5.0 [May 7, 2010] + * Last changed in libpng 1.5.0 [June 18, 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.) diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 0592992fe..ac0cb7e75 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.0beta24 - May 7, 2010 +libpng version 1.5.0beta25 - June 18, 2010 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 8870b7c88..a7c360fd6 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@