diff --git a/ANNOUNCE b/ANNOUNCE index 6d72af3262d83ddf739b5dff97032f88a725818e..750536d75d9f17f4955ddf211350826dd1dfd7c0 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.5beta01 - July 13, 2011 +Libpng 1.5.5beta02 - July 13, 2011 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.5beta01.tar.xz (LZMA-compressed, recommended) - 1.5.5beta01.tar.gz - 1.5.5beta01.tar.bz2 + 1.5.5beta02.tar.xz (LZMA-compressed, recommended) + 1.5.5beta02.tar.gz + 1.5.5beta02.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp155b01.7z (LZMA-compressed, recommended) - lp155b01.zip + lp155b02.7z (LZMA-compressed, recommended) + lp155b02.zip Other information: - 1.5.5beta01-README.txt - 1.5.5beta01-LICENSE.txt + 1.5.5beta02-README.txt + 1.5.5beta02-LICENSE.txt Changes since the last public release (1.5.4): @@ -30,6 +30,8 @@ Version 1.5.5beta01 [July 13, 2011] Fixed some typos and made other minor changes in the manual. Updated contrib/pngminus/makefile.std (Samuli Souminen) +Version 1.5.5beta02 [July 13, 2011] + 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 1bde27cc01f76df9159260e5010adb3ee3cb1fb4..768d9e806d9ff94b3a9452f7dc485f096317c659 100644 --- a/CHANGES +++ b/CHANGES @@ -3512,6 +3512,8 @@ Version 1.5.4 [July 7, 2011] Version 1.5.5beta01 [July 13, 2011] Fixed some typos and made other minor changes in the manual. Updated contrib/pngminus/makefile.std (Samuli Souminen) +` +Version 1.5.5beta02 [July 13, 2011] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index d9407e862dff7ca76f2972398e04ed3e3d9b7aa1..5b132284e9049c36e2235b17fee770a154576953 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -260,7 +260,7 @@ install(CODE ${PNG_CONFIG_INSTALL_CODE}) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.5beta01 +# VERSION 15.${PNGLIB_RELEASE}.1.5.5beta02 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 2773059efbdb33ae45c3ca3f7a51302d49e79eb4..3aa5b97c6ec78ccd548d724852fcc3dad92c77bc 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.5beta01, July 13, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.5beta02, July 13, 2011, are Copyright (c) 2004, 2006-2011 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 76ce482bc1ea4cdc6b1af85ecd6617ec5fd41d88..b5c4f32017c0fa812d6aeb0467301f8b43338c62 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.5beta01 - July 13, 2011 (shared library 15.0) +README for libpng version 1.5.5beta02 - July 13, 2011 (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 2df3877242998104573c6c99ee98924f30ba2189..497288ccdab8a5b125c6ec5ca107b68b324aa74c 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.68 for libpng 1.5.5beta01. +# Generated by GNU Autoconf 2.68 for libpng 1.5.5beta02. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.5beta01' -PACKAGE_STRING='libpng 1.5.5beta01' +PACKAGE_VERSION='1.5.5beta02' +PACKAGE_STRING='libpng 1.5.5beta02' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1307,7 +1307,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.5beta01 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.5beta02 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1377,7 +1377,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.5beta01:";; + short | recursive ) echo "Configuration of libpng 1.5.5beta02:";; esac cat <<\_ACEOF @@ -1485,7 +1485,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.5beta01 +libpng configure 1.5.5beta02 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1908,7 +1908,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.5beta01, which was +It was created by libpng $as_me 1.5.5beta02, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2723,7 +2723,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.5beta01' + VERSION='1.5.5beta02' cat >>confdefs.h <<_ACEOF @@ -2787,7 +2787,7 @@ fi -PNGLIB_VERSION=1.5.5beta01 +PNGLIB_VERSION=1.5.5beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=5 @@ -13040,7 +13040,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.5beta01, which was +This file was extended by libpng $as_me 1.5.5beta02, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13106,7 +13106,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.5beta01 +libpng config.status 1.5.5beta02 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index c9c0dce9716771e5cf3f2fb6d0dc1e588b163d66..68f58e1ee7488c24661a42b0d18826fa76c8aef2 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.5beta01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.5beta02], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.5beta01 +PNGLIB_VERSION=1.5.5beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=5 diff --git a/libpng-manual.txt b/libpng-manual.txt index e3064663ad49a701e3e7842f71ec4ba9463be012..25210ee5bdac5eeb6318e2c0b98a0964900c6e65 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.5beta01 - July 13, 2011 + libpng version 1.5.5beta02 - July 13, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.5beta01 - July 13, 2011 + libpng versions 0.97, January 1998, through 1.5.5beta02 - July 13, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4453,7 +4453,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.5beta01 are Y2K compliant. It is my belief that earlier +upward through 1.5.5beta02 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 76fd2ecdbfa43b93700e0414a5b783276c79ffb7..f4f60978ec6347575bc30471eb8f7edaffb95b7f 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "July 13, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.5beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.5beta02 .SH SYNOPSIS \fI\fB @@ -955,7 +955,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.5beta01 - July 13, 2011 + libpng version 1.5.5beta02 - July 13, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -966,7 +966,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.5beta01 - July 13, 2011 + libpng versions 0.97, January 1998, through 1.5.5beta02 - July 13, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5408,7 +5408,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.5beta01 are Y2K compliant. It is my belief that earlier +upward through 1.5.5beta02 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 @@ -5604,6 +5604,7 @@ the first widely used release: 1.5.4beta01-08 15 10504 15.so.15.4[.0] 1.5.4rc01 15 10504 15.so.15.4[.0] 1.5.4 15 10504 15.so.15.4[.0] + 1.5.5beta01-02 15 10505 15.so.15.5[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5660,7 +5661,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.5beta01 - July 13, 2011: +Libpng version 1.5.5beta02 - July 13, 2011: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5683,7 +5684,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.5beta01, July 13, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.5beta02, July 13, 2011, 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 aa7df30f2604e5e1acd29cd5ed34d218110101e7..d1186ac5e3f4387845a01745f883bcfe79a857c0 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "July 13, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.5beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.5beta02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 4b5cae4ffc9d907a947d8f3ce555ace4fa629ec8..51b765e91a046c8b10583bb014229948378b888d 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 png_libpng_version_1_5_5beta01 Your_png_h_is_not_version_1_5_5beta01; +typedef png_libpng_version_1_5_5beta02 Your_png_h_is_not_version_1_5_5beta02; /* Tells libpng that we have already handled the first "num_bytes" bytes * of the PNG file signature. If the PNG data is embedded into another @@ -617,13 +617,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.5beta01 - July 13, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.5.5beta02 - July 13, 2011" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2011 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 "libpng version 1.5.5beta01 - July 13, 2011\ + return "libpng version 1.5.5beta02 - July 13, 2011\ Copyright (c) 1998-2011 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 290d126654581cbb2b92c5bf0f446211a2742b4e..dd307a1f8273e7a5f649aa8f7d02928280d2b13c 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.5beta01 - July 13, 2011 + * libpng version 1.5.5beta02 - July 13, 2011 * Copyright (c) 1998-2011 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.5beta01 - July 13, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.5.5beta02 - July 13, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -157,6 +157,7 @@ * 1.5.4beta01-08 15 10504 15.so.15.4[.0] * 1.5.4rc01 15 10504 15.so.15.4[.0] * 1.5.4 15 10504 15.so.15.4[.0] + * 1.5.5beta01-02 15 10505 15.so.15.5[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -188,7 +189,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.5beta01, July 13, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.5beta02, July 13, 2011, are * Copyright (c) 2004, 2006-2011 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: @@ -306,7 +307,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.5.5beta01 are Y2K compliant. It is my belief that + * upward through 1.5.5beta02 are Y2K compliant. It is my belief that * earlier versions were also Y2K compliant. * * Libpng only has two year fields. One is a 2-byte unsigned integer @@ -361,9 +362,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.5beta01" +#define PNG_LIBPNG_VER_STRING "1.5.5beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.5beta01 - July 13, 2011\n" + " libpng version 1.5.5beta02 - July 13, 2011\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -376,7 +377,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 01 +#define PNG_LIBPNG_VER_BUILD 02 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -523,7 +524,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_5_5beta01; +typedef char* png_libpng_version_1_5_5beta02; /* Three color definitions. The order of the red, green, and blue, (and the * exact size) is not important, although the size of the fields need to diff --git a/pngconf.h b/pngconf.h index a8a363c4ef297b14cb6e53969693c13c2eba0ee0..3eef02e7ab92f7da8df4ce8661e427f0253fe1c7 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.5beta01 - July 13, 2011 + * libpng version 1.5.5beta02 - July 13, 2011 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 3d60ffd9594fbb65a70089fad5a5d7f1d2bd15db..e6dfb5283da3bc99e00f7d06333c6c311bdd878d 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1794,4 +1794,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_5beta01 Your_png_h_is_not_version_1_5_5beta01; +typedef png_libpng_version_1_5_5beta02 Your_png_h_is_not_version_1_5_5beta02; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index aaacaa1a9e77acef46db153e0be803b55258bd44..d57c6200ffeaf492967f298d6e06f7e2e370594a 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.5beta01 - July 13, 2011 +libpng version 1.5.5beta02 - July 13, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 511857a63fce2888e6f09eca31d2a736e62edeb0..b6dd2de75fa05eddc5d04d61d2b6af81ce354b8a 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@