diff --git a/ANNOUNCE b/ANNOUNCE index 1751d34fb..5c3686765 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.11rc01 - May 22, 2012 +Libpng 1.5.11rc02 - May 23, 2012 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.11rc01.tar.xz (LZMA-compressed, recommended) - 1.5.11rc01.tar.gz - 1.5.11rc01.tar.bz2 + 1.5.11rc02.tar.xz (LZMA-compressed, recommended) + 1.5.11rc02.tar.gz + 1.5.11rc02.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1511r01.7z (LZMA-compressed, recommended) - lp1511r01.zip + lp1511r02.7z (LZMA-compressed, recommended) + lp1511r02.zip Other information: - 1.5.11rc01-README.txt - 1.5.11rc01-LICENSE.txt + 1.5.11rc02-README.txt + 1.5.11rc02-LICENSE.txt Changes since the last public release (1.5.10): @@ -37,9 +37,12 @@ Version 1.5.11beta01 [April 28, 2012] Added -lssp_nonshared in a comment in scripts/makefile.freebsd and changed deprecated NOOBJ and NOPROFILE to NO_OBJ and NO_PROFILE. -Version 1.5.11rc01 [May 22, 2012] +Version 1.5.11rc01 [May 23, 2012] No changes. +Version 1.5.11rc02 [May 23, 2012] + Fixed some typos in comments. + 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 65862d1e2..ff7e2fd8e 100644 --- a/CHANGES +++ b/CHANGES @@ -3865,9 +3865,12 @@ Version 1.5.11beta01 [April 28, 2012] Added -lssp_nonshared in a comment in scripts/makefile.freebsd and changed deprecated NOOBJ and NOPROFILE to NO_OBJ and NO_PROFILE. -Version 1.5.11rc01 [May 22, 2012] +Version 1.5.11rc01 [May 23, 2012] No changes. +Version 1.5.11rc02 [May 23, 2012] + Fixed some typos in comments. + 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 f18ba2a3d..c9faaf2f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -225,7 +225,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.11rc01 +# VERSION 15.${PNGLIB_RELEASE}.1.5.11rc02 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 946f4ae72..ca09554cf 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.11rc01, May 22, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.11rc02, May 23, 2012, 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 -May 22, 2012 +May 23, 2012 diff --git a/README b/README index 64a3d6c19..7d7289478 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.11rc01 - May 22, 2012 (shared library 15.0) +README for libpng version 1.5.11rc02 - May 23, 2012 (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 8ba0d8392..70200ac4e 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.11rc01. +# Generated by GNU Autoconf 2.68 for libpng 1.5.11rc02. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.11rc01' -PACKAGE_STRING='libpng 1.5.11rc01' +PACKAGE_VERSION='1.5.11rc02' +PACKAGE_STRING='libpng 1.5.11rc02' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1321,7 +1321,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.11rc01 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.11rc02 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1391,7 +1391,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.11rc01:";; + short | recursive ) echo "Configuration of libpng 1.5.11rc02:";; esac cat <<\_ACEOF @@ -1502,7 +1502,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.11rc01 +libpng configure 1.5.11rc02 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1925,7 +1925,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.11rc01, which was +It was created by libpng $as_me 1.5.11rc02, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2740,7 +2740,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.11rc01' + VERSION='1.5.11rc02' cat >>confdefs.h <<_ACEOF @@ -2804,7 +2804,7 @@ fi -PNGLIB_VERSION=1.5.11rc01 +PNGLIB_VERSION=1.5.11rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=11 @@ -13417,7 +13417,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.11rc01, which was +This file was extended by libpng $as_me 1.5.11rc02, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13483,7 +13483,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.11rc01 +libpng config.status 1.5.11rc02 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 8ba267a31..c08982171 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.11rc01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.11rc02], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.11rc01 +PNGLIB_VERSION=1.5.11rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=11 diff --git a/libpng-manual.txt b/libpng-manual.txt index 07d5dfdb7..50a4d630a 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.11rc01 - May 22, 2012 + libpng version 1.5.11rc02 - May 23, 2012 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.11rc01 - May 22, 2012 + libpng versions 0.97, January 1998, through 1.5.11rc02 - May 23, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4602,13 +4602,13 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -May 22, 2012 +May 23, 2012 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.11rc01 are Y2K compliant. It is my belief that earlier +upward through 1.5.11rc02 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 7c24be135..69fecd42c 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "May 22, 2012" +.TH LIBPNG 3 "May 23, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11rc02 .SH SYNOPSIS \fI\fB @@ -981,7 +981,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.11rc01 - May 22, 2012 + libpng version 1.5.11rc02 - May 23, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -992,7 +992,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.11rc01 - May 22, 2012 + libpng versions 0.97, January 1998, through 1.5.11rc02 - May 23, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5584,13 +5584,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -May 22, 2012 +May 23, 2012 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.11rc01 are Y2K compliant. It is my belief that earlier +upward through 1.5.11rc02 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 @@ -5804,7 +5804,7 @@ the first widely used release: 1.5.10beta01-05 15 10510 15.so.15.10[.0] 1.5.10 15 10510 15.so.15.10[.0] 1.5.11beta01 15 10511 15.so.15.11[.0] - 1.5.11rc01 15 10511 15.so.15.11[.0] + 1.5.11rc01-02 15 10511 15.so.15.11[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5861,7 +5861,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.11rc01 - May 22, 2012: +Libpng version 1.5.11rc02 - May 23, 2012: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5884,7 +5884,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.11rc01, May 22, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.11rc02, May 23, 2012, 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 @@ -5983,7 +5983,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 22, 2012 +May 23, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 752d70aef..73cdd2558 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "May 22, 2012" +.TH LIBPNGPF 3 "May 23, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11rc02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index dfaa54c63..d233fa670 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "May 22, 2012" +.TH PNG 5 "May 23, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 569a1b54d..d4736cb1b 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_11rc01 Your_png_h_is_not_version_1_5_11rc01; +typedef png_libpng_version_1_5_11rc02 Your_png_h_is_not_version_1_5_11rc02; /* 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 @@ -655,13 +655,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.11rc01 - May 22, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.5.11rc02 - May 23, 2012" 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.11rc01 - May 22, 2012\ + return "libpng version 1.5.11rc02 - May 23, 2012\ Copyright (c) 1998-2011 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -2044,7 +2044,7 @@ png_muldiv_warn(png_structp png_ptr, png_fixed_point a, png_int_32 times, } #endif -#ifdef PNG_READ_GAMMA_SUPPORTED /* more fixed point functions for gammma */ +#ifdef PNG_READ_GAMMA_SUPPORTED /* more fixed point functions for gamma */ /* Calculate a reciprocal, return 0 on div-by-zero or overflow. */ png_fixed_point png_reciprocal(png_fixed_point a) diff --git a/png.h b/png.h index 08c06502d..194c10b4e 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.11rc01 - May 22, 2012 + * libpng version 1.5.11rc02 - May 23, 2012 * Copyright (c) 1998-2012 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.11rc01 - May 22, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.5.11rc02 - May 23, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -175,7 +175,7 @@ * 1.5.10beta01-05 15 10510 15.so.15.10[.0] * 1.5.10 15 10510 15.so.15.10[.0] * 1.5.11beta01 15 10511 15.so.15.11[.0] - * 1.5.11rc01 15 10511 15.so.15.11[.0] + * 1.5.11rc01-02 15 10511 15.so.15.11[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -207,7 +207,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.11rc01, May 22, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.11rc02, May 23, 2012, are * Copyright (c) 2004, 2006-2012 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: @@ -319,13 +319,13 @@ * Y2K compliance in libpng: * ========================= * - * May 22, 2012 + * May 23, 2012 * * 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.11rc01 are Y2K compliant. It is my belief that + * upward through 1.5.11rc02 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 @@ -383,9 +383,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.11rc01" +#define PNG_LIBPNG_VER_STRING "1.5.11rc02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.11rc01 - May 22, 2012\n" + " libpng version 1.5.11rc02 - May 23, 2012\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -399,7 +399,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 @@ -546,7 +546,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_11rc01; +typedef char* png_libpng_version_1_5_11rc02; /* 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 b501a88ab..81fd41786 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.11rc01 - May 22, 2012 + * libpng version 1.5.11rc02 - May 23, 2012 * * Copyright (c) 1998-2012 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -25,7 +25,7 @@ #ifndef PNG_BUILDING_SYMBOL_TABLE /* PNG_NO_LIMITS_H may be used to turn off the use of the standard C * definition file for machine specific limits, this may impact the - * correctness of the definitons below (see uses of INT_MAX). + * correctness of the definitions below (see uses of INT_MAX). */ # ifndef PNG_NO_LIMITS_H # include diff --git a/pngset.c b/pngset.c index 10891c7a6..b79aec11f 100644 --- a/pngset.c +++ b/pngset.c @@ -149,7 +149,7 @@ png_set_gAMA_fixed(png_structp png_ptr, png_infop info_ptr, png_fixed_point * possible for 1/gamma to overflow the limit of 21474 and this means the * gamma value must be at least 5/100000 and hence at most 20000.0. For * safety the limits here are a little narrower. The values are 0.00016 to - * 6250.0, which are truly ridiculous gammma values (and will produce + * 6250.0, which are truly ridiculous gamma values (and will produce * displays that are all black or all white.) */ if (file_gamma < 16 || file_gamma > 625000000) diff --git a/pngtest.c b/pngtest.c index d6d3966c8..d8f273038 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1817,4 +1817,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_11rc01 Your_png_h_is_not_version_1_5_11rc01; +typedef png_libpng_version_1_5_11rc02 Your_png_h_is_not_version_1_5_11rc02; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 10ad921d1..c2cb57c5b 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.11rc01 - May 22, 2012 +libpng version 1.5.11rc02 - May 23, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index c2981d388..7833ed074 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@