diff --git a/ANNOUNCE b/ANNOUNCE index 75d42a3e8..a8fd787d2 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.5beta09 - September 12, 2011 +Libpng 1.5.5rc01 - September 15, 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.5beta09.tar.xz (LZMA-compressed, recommended) - 1.5.5beta09.tar.gz - 1.5.5beta09.tar.bz2 + 1.5.5rc01.tar.xz (LZMA-compressed, recommended) + 1.5.5rc01.tar.gz + 1.5.5rc01.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp155b09.7z (LZMA-compressed, recommended) - lp155b09.zip + lp155r01.7z (LZMA-compressed, recommended) + lp155r01.zip Other information: - 1.5.5beta09-README.txt - 1.5.5beta09-LICENSE.txt + 1.5.5rc01-README.txt + 1.5.5rc01-LICENSE.txt Changes since the last public release (1.5.4): @@ -97,7 +97,8 @@ Version 1.5.5beta08 [September 10, 2011] Constant changes for 64-bit compatibility (removal of L suffixes). The 16-bit cases still use "L" as we don't have a 16-bit test system. -Version 1.5.5beta09 [September 12, 2011] +Version 1.5.5rc01 [September 15, 2011] + Removed "L" suffixes from constants in pngpriv.h Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit diff --git a/CHANGES b/CHANGES index 384a55c22..227840570 100644 --- a/CHANGES +++ b/CHANGES @@ -3581,7 +3581,8 @@ Version 1.5.5beta08 [September 10, 2011] Constant changes for 64-bit compatibility (removal of L suffixes). The 16-bit cases still use "L" as we don't have a 16-bit test system. -Version 1.5.5beta09 [September 12, 2011] +Version 1.5.5rc01 [September 15, 2011] + Removed "L" suffixes from constants in pngpriv.h Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 75d794a6f..0f135831c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,7 +262,7 @@ CREATE_SYMLINK(${PNGLIB_NAME}-config libpng-config) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.5beta09 +# VERSION 15.${PNGLIB_RELEASE}.1.5.5rc01 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 9fd0d06a2..b9a70f0cd 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.5beta09, September 10, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.5rc01, September 15, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -September 10, 2011 +September 15, 2011 diff --git a/README b/README index cc102709e..388db5f3f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.5beta09 - September 10, 2011 (shared library 15.0) +README for libpng version 1.5.5rc01 - September 15, 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 3659e60c5..e79280f81 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.5beta09. +# Generated by GNU Autoconf 2.68 for libpng 1.5.5rc01. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.5beta09' -PACKAGE_STRING='libpng 1.5.5beta09' +PACKAGE_VERSION='1.5.5rc01' +PACKAGE_STRING='libpng 1.5.5rc01' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1308,7 +1308,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.5beta09 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.5rc01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1378,7 +1378,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.5beta09:";; + short | recursive ) echo "Configuration of libpng 1.5.5rc01:";; esac cat <<\_ACEOF @@ -1486,7 +1486,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.5beta09 +libpng configure 1.5.5rc01 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1909,7 +1909,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.5beta09, which was +It was created by libpng $as_me 1.5.5rc01, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2724,7 +2724,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.5beta09' + VERSION='1.5.5rc01' cat >>confdefs.h <<_ACEOF @@ -2788,7 +2788,7 @@ fi -PNGLIB_VERSION=1.5.5beta09 +PNGLIB_VERSION=1.5.5rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=5 @@ -13073,7 +13073,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.5beta09, which was +This file was extended by libpng $as_me 1.5.5rc01, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13139,7 +13139,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.5beta09 +libpng config.status 1.5.5rc01 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 53c16fb98..dd551d1da 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.5beta09], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.5rc01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.5beta09 +PNGLIB_VERSION=1.5.5rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=5 diff --git a/libpng-manual.txt b/libpng-manual.txt index 32891eef6..623ed1575 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.5beta09 - September 10, 2011 + libpng version 1.5.5rc01 - September 15, 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.5beta09 - September 10, 2011 + libpng versions 0.97, January 1998, through 1.5.5rc01 - September 15, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4560,13 +4560,13 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -September 10, 2011 +September 15, 2011 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.5beta09 are Y2K compliant. It is my belief that earlier +upward through 1.5.5rc01 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 7a010c843..4dd8209f7 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "September 10, 2011" +.TH LIBPNG 3 "September 15, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.5beta09 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.5rc01 .SH SYNOPSIS \fI\fB @@ -977,7 +977,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.5beta09 - September 10, 2011 + libpng version 1.5.5rc01 - September 15, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -988,7 +988,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.5beta09 - September 10, 2011 + libpng versions 0.97, January 1998, through 1.5.5rc01 - September 15, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5538,13 +5538,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -September 10, 2011 +September 15, 2011 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.5beta09 are Y2K compliant. It is my belief that earlier +upward through 1.5.5rc01 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 @@ -5798,7 +5798,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.5beta09 - September 10, 2011: +Libpng version 1.5.5rc01 - September 15, 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). @@ -5821,7 +5821,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.5beta09, September 10, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.5rc01, September 15, 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 @@ -5920,7 +5920,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -September 10, 2011 +September 15, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 2c2217d20..f030e761b 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "September 10, 2011" +.TH LIBPNGPF 3 "September 15, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.5beta09 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.5rc01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 0d8c6f24f..001e5df0c 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "September 10, 2011" +.TH PNG 5 "September 15, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 70adff3ed..d72e5ab66 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_5beta09 Your_png_h_is_not_version_1_5_5beta09; +typedef png_libpng_version_1_5_5rc01 Your_png_h_is_not_version_1_5_5rc01; /* 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 @@ -645,13 +645,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.5beta09 - September 10, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.5.5rc01 - September 15, 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.5beta09 - September 10, 2011\ + return "libpng version 1.5.5rc01 - September 15, 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 c48f75b49..1da84eb43 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.5beta09 - September 10, 2011 + * libpng version 1.5.5rc01 - September 15, 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.5beta09 - September 10, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.5.5rc01 - September 15, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -190,7 +190,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.5beta09, September 10, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.5rc01, September 15, 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: @@ -302,13 +302,13 @@ * Y2K compliance in libpng: * ========================= * - * September 10, 2011 + * September 15, 2011 * * 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.5beta09 are Y2K compliant. It is my belief that + * upward through 1.5.5rc01 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 @@ -363,9 +363,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.5beta09" +#define PNG_LIBPNG_VER_STRING "1.5.5rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.5beta09 - September 10, 2011\n" + " libpng version 1.5.5rc01 - September 15, 2011\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -378,7 +378,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 09 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -525,7 +525,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_5beta09; +typedef char* png_libpng_version_1_5_5rc01; /* 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 83e1cf5b7..acb26ad26 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.5beta09 - September 10, 2011 + * libpng version 1.5.5rc01 - September 15, 2011 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index 92e39ab49..8ca5d1a37 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -364,23 +364,23 @@ typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp; #define PNG_EXPAND 0x1000 #define PNG_GAMMA 0x2000 #define PNG_GRAY_TO_RGB 0x4000 -#define PNG_FILLER 0x8000L -#define PNG_PACKSWAP 0x10000L -#define PNG_SWAP_ALPHA 0x20000L -#define PNG_STRIP_ALPHA 0x40000L -#define PNG_INVERT_ALPHA 0x80000L -#define PNG_USER_TRANSFORM 0x100000L -#define PNG_RGB_TO_GRAY_ERR 0x200000L -#define PNG_RGB_TO_GRAY_WARN 0x400000L -#define PNG_RGB_TO_GRAY 0x600000L /* two bits, RGB_TO_GRAY_ERR|WARN */ -#define PNG_ENCODE_ALPHA 0x800000L /* Added to libpng-1.5.4 */ -#define PNG_ADD_ALPHA 0x1000000L /* Added to libpng-1.2.7 */ -#define PNG_EXPAND_tRNS 0x2000000L /* Added to libpng-1.2.9 */ -#define PNG_SCALE_16_TO_8 0x4000000L /* Added to libpng-1.5.4 */ - /* 0x8000000L unused */ - /* 0x10000000L unused */ - /* 0x20000000L unused */ - /* 0x40000000L unused */ +#define PNG_FILLER 0x8000 +#define PNG_PACKSWAP 0x10000 +#define PNG_SWAP_ALPHA 0x20000 +#define PNG_STRIP_ALPHA 0x40000 +#define PNG_INVERT_ALPHA 0x80000 +#define PNG_USER_TRANSFORM 0x100000 +#define PNG_RGB_TO_GRAY_ERR 0x200000 +#define PNG_RGB_TO_GRAY_WARN 0x400000 +#define PNG_RGB_TO_GRAY 0x600000 /* two bits, RGB_TO_GRAY_ERR|WARN */ +#define PNG_ENCODE_ALPHA 0x800000 /* Added to libpng-1.5.4 */ +#define PNG_ADD_ALPHA 0x1000000 /* Added to libpng-1.2.7 */ +#define PNG_EXPAND_tRNS 0x2000000 /* Added to libpng-1.2.9 */ +#define PNG_SCALE_16_TO_8 0x4000000 /* Added to libpng-1.5.4 */ + /* 0x8000000 unused */ + /* 0x10000000 unused */ + /* 0x20000000 unused */ + /* 0x40000000 unused */ /* Flags for png_create_struct */ #define PNG_STRUCT_PNG 0x0001 #define PNG_STRUCT_INFO 0x0002 diff --git a/pngtest.c b/pngtest.c index 85d556db4..69adf3244 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_5beta09 Your_png_h_is_not_version_1_5_5beta09; +typedef png_libpng_version_1_5_5rc01 Your_png_h_is_not_version_1_5_5rc01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 0f18f2092..8ae36520f 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.5beta09 - September 10, 2011 +libpng version 1.5.5rc01 - September 15, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 663fc0dcd..469c3ffc3 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@