diff --git a/ANNOUNCE b/ANNOUNCE index b0d197db8..1b4d39730 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.0beta46 - August 28, 2010 +Libpng 1.5.0beta47 - August 28, 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.0beta46.tar.xz (LZMA-compressed, recommended) - 1.5.0beta46.tar.gz - 1.5.0beta46.tar.bz2 + 1.5.0beta47.tar.xz (LZMA-compressed, recommended) + 1.5.0beta47.tar.gz + 1.5.0beta47.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp150b46.zip - lp150b46.7z + lp150b47.zip + lp150b47.7z Other information: - 1.5.0beta46-README.txt - 1.5.0beta46-LICENSE.txt + 1.5.0beta47-README.txt + 1.5.0beta47-LICENSE.txt Changes since the last public release (1.4.1): @@ -393,6 +393,8 @@ Version 1.5.0beta46 [August 28, 2010] Added PNG_READ_16BIT, PNG_WRITE_16BIT, and PNG_16BIT options. Added reference to scripts/pnglibconf.h.prebuilt in the visualc71 project. +Version 1.5.0beta47 [August 28, 2010] + 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 cbcf9132a..24ebee6a0 100644 --- a/CHANGES +++ b/CHANGES @@ -3030,6 +3030,8 @@ Version 1.5.0beta46 [August 28, 2010] Added PNG_READ_16BIT, PNG_WRITE_16BIT, and PNG_16BIT options. Added reference to scripts/pnglibconf.h.prebuilt in the visualc71 project. +Version 1.5.0beta47 [August 28, 2010] + 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 e223aca30..4d353d05a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -228,7 +228,7 @@ install(CODE " # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.0beta46 +# VERSION 15.${PNGLIB_RELEASE}.1.5.0beta47 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index 5cd1d7f4b..a438baa15 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.5.0beta46 - August 28, 2010 +Installing libpng version 1.5.0beta47 - August 28, 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.0beta46" or "libpng15" and "zlib-1.2.3" +might be called "libpng-1.5.0beta47" 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 4c1881782..7f5c7150e 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.0beta46, August 28, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.5.0beta47, August 28, 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 diff --git a/README b/README index ac607911e..ed6cb886f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.0beta46 - August 28, 2010 (shared library 15.0) +README for libpng version 1.5.0beta47 - August 28, 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 869e56a26..5fd9250df 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.0beta46. +# Generated by GNU Autoconf 2.65 for libpng 1.5.0beta47. # # Report bugs to . # @@ -562,8 +562,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.0beta46' -PACKAGE_STRING='libpng 1.5.0beta46' +PACKAGE_VERSION='1.5.0beta47' +PACKAGE_STRING='libpng 1.5.0beta47' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1292,7 +1292,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.0beta46 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.0beta47 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1362,7 +1362,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.0beta46:";; + short | recursive ) echo "Configuration of libpng 1.5.0beta47:";; esac cat <<\_ACEOF @@ -1467,7 +1467,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.0beta46 +libpng configure 1.5.0beta47 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1892,7 +1892,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.0beta46, which was +It was created by libpng $as_me 1.5.0beta47, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2700,7 +2700,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.0beta46' + VERSION='1.5.0beta47' cat >>confdefs.h <<_ACEOF @@ -2764,7 +2764,7 @@ fi -PNGLIB_VERSION=1.5.0beta46 +PNGLIB_VERSION=1.5.0beta47 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=0 @@ -12262,7 +12262,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.0beta46, which was +This file was extended by libpng $as_me 1.5.0beta47, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12328,7 +12328,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.0beta46 +libpng config.status 1.5.0beta47 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index e992758ee..a7e31903e 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.0beta46], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.0beta47], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.0beta46 +PNGLIB_VERSION=1.5.0beta47 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=0 diff --git a/libpng-1.5.0beta46.txt b/libpng-1.5.0beta47.txt similarity index 99% rename from libpng-1.5.0beta46.txt rename to libpng-1.5.0beta47.txt index 9528fed9b..524dda44c 100644 --- a/libpng-1.5.0beta46.txt +++ b/libpng-1.5.0beta47.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.5.0beta46 - August 28, 2010 + libpng version 1.5.0beta47 - August 28, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 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.0beta46 - August 28, 2010 + libpng versions 0.97, January 1998, through 1.5.0beta47 - August 28, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -940,7 +940,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.0beta46, not all possible expansions are supported. +As of libpng version 1.5.0beta47, 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 @@ -3372,7 +3372,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.0beta46 are Y2K compliant. It is my belief that earlier +upward through 1.5.0beta47 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 3637d362f..05b0bca1b 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "August 28, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta46 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta47 .SH SYNOPSIS \fI\fB @@ -851,7 +851,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.0beta46 - August 28, 2010 + libpng version 1.5.0beta47 - August 28, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -862,7 +862,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.0beta46 - August 28, 2010 + libpng versions 0.97, January 1998, through 1.5.0beta47 - August 28, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -1791,7 +1791,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.0beta46, not all possible expansions are supported. +As of libpng version 1.5.0beta47, 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 @@ -4223,7 +4223,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.0beta46 are Y2K compliant. It is my belief that earlier +upward through 1.5.0beta47 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 @@ -4402,7 +4402,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-46 15 10500 15.so.15.0[.0] + 1.5.0beta01-47 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 @@ -4459,7 +4459,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.0beta46 - August 28, 2010: +Libpng version 1.5.0beta47 - August 28, 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). @@ -4482,7 +4482,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.0beta46, August 28, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.5.0beta47, August 28, 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 8b4c6b5f9..ca9369a93 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "August 28, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta46 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta47 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 5332e52a0..53a5de2fa 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_0beta46 Your_png_h_is_not_version_1_5_0beta46; +typedef version_1_5_0beta47 Your_png_h_is_not_version_1_5_0beta47; /* 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_STRING_NEWLINE \ - "libpng version 1.5.0beta46 - August 28, 2010" PNG_STRING_NEWLINE \ + "libpng version 1.5.0beta47 - August 28, 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 "libpng version 1.5.0beta46 - August 28, 2010\ + return "libpng version 1.5.0beta47 - August 28, 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 d09a70d91..c6cb703db 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.0beta46 - August 28, 2010 + * libpng version 1.5.0beta47 - August 28, 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.0beta46 - August 28, 2010: Glenn + * libpng versions 0.97, January 1998, through 1.5.0beta47 - August 28, 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-45 15 10500 15.so.15.0[.0] + * 1.5.0beta01-47 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.0beta46, August 28, 2010, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.0beta47, August 28, 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.0beta46 are Y2K compliant. It is my belief that + * upward through 1.5.0beta47 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.0beta46" +#define PNG_LIBPNG_VER_STRING "1.5.0beta47" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.0beta46 - August 28, 2010\n" + " libpng version 1.5.0beta47 - August 28, 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 46 +#define PNG_LIBPNG_VER_BUILD 47 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -871,7 +871,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_0beta46; +typedef png_structp version_1_5_0beta47; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index 5ffc3e2a7..dadfdf4c2 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.0beta46 - August 28, 2010 + * libpng version 1.5.0beta47 - August 28, 2010 * * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index 8da0a98e3..e5acf4510 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.5.0beta46 - August 28, 2010 + * libpng version 1.5.0beta47 - August 28, 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 78b102994..e1f0992cd 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1726,4 +1726,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_0beta46 your_png_h_is_not_version_1_5_0beta46; +typedef version_1_5_0beta47 your_png_h_is_not_version_1_5_0beta47; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index faf552ce5..b27fd16e7 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.0beta46 - August 28, 2010 +libpng version 1.5.0beta47 - August 28, 2010 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index af607dfed..4cd96c743 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@