From d5d0bd91d231ed5435dad0cbe7cd8be1b469a551 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 4 Jun 2012 03:02:39 -0500 Subject: [PATCH] [libpng15] Bump version to 1.5.11rc04 --- ANNOUNCE | 21 ++++--- CHANGES | 5 ++ CMakeLists.txt | 2 +- LICENSE | 4 +- README | 2 +- configure | 28 ++++----- configure.ac | 4 +- contrib/README.txt | 107 +--------------------------------- contrib/libtests/pngvalid.c | 30 +++++----- contrib/pngsuite/README | 5 +- libpng-manual.txt | 8 +-- libpng.3 | 20 +++---- libpngpf.3 | 4 +- png.5 | 2 +- png.c | 10 ++-- png.h | 20 +++---- pngconf.h | 2 +- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 ++-- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- scripts/symbols.def | 2 +- 28 files changed, 108 insertions(+), 198 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 06fe6929f..0c4f18306 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.11rc03 - June 4, 2012 +Libpng 1.5.11rc04 - June 4, 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.11rc03.tar.xz (LZMA-compressed, recommended) - 1.5.11rc03.tar.gz - 1.5.11rc03.tar.bz2 + 1.5.11rc04.tar.xz (LZMA-compressed, recommended) + 1.5.11rc04.tar.gz + 1.5.11rc04.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1511r03.7z (LZMA-compressed, recommended) - lp1511r03.zip + lp1511r04.7z (LZMA-compressed, recommended) + lp1511r04.zip Other information: - 1.5.11rc03-README.txt - 1.5.11rc03-LICENSE.txt + 1.5.11rc04-README.txt + 1.5.11rc04-LICENSE.txt Changes since the last public release (1.5.10): @@ -50,6 +50,11 @@ Version 1.5.11rc02 [May 29, 2012] Version 1.5.11rc03 [June 4, 2012] Do not depend upon a GCC feature macro being available for use in generating the linker mapfile symbol prefix. + Made fixes for new optimization warnings from gcc 4.7.0. The compiler + performs an optimization which is safe; however it then warns about it. + Changing the type of 'palette_number' in pngvalid.c removes the warning. + +Version 1.5.11rc04 [June 4, 2012] Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit diff --git a/CHANGES b/CHANGES index a98cedb8a..721538993 100644 --- a/CHANGES +++ b/CHANGES @@ -3878,6 +3878,11 @@ Version 1.5.11rc02 [May 29, 2012] Version 1.5.11rc03 [June 4, 2012] Do not depend upon a GCC feature macro being available for use in generating the linker mapfile symbol prefix. + Made fixes for new optimization warnings from gcc 4.7.0. The compiler + performs an optimization which is safe; however it then warns about it. + Changing the type of 'palette_number' in pngvalid.c removes the warning. + +Version 1.5.11rc04 [June 4, 2012] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 2507d50e8..fc5f1cf4b 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.11rc03 +# VERSION 15.${PNGLIB_RELEASE}.1.5.11rc04 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index f1b264514..c1cd39ce4 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.11rc03, May 29, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.11rc04, June 4, 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 29, 2012 +June 4, 2012 diff --git a/README b/README index 7be740f43..ee5b9041f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.11rc03 - May 29, 2012 (shared library 15.0) +README for libpng version 1.5.11rc04 - June 4, 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 c150059d4..e9dabb82f 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.11rc03. +# Generated by GNU Autoconf 2.68 for libpng 1.5.11rc04. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.11rc03' -PACKAGE_STRING='libpng 1.5.11rc03' +PACKAGE_VERSION='1.5.11rc04' +PACKAGE_STRING='libpng 1.5.11rc04' 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.11rc03 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.11rc04 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.11rc03:";; + short | recursive ) echo "Configuration of libpng 1.5.11rc04:";; 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.11rc03 +libpng configure 1.5.11rc04 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.11rc03, which was +It was created by libpng $as_me 1.5.11rc04, 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.11rc03' + VERSION='1.5.11rc04' cat >>confdefs.h <<_ACEOF @@ -2804,7 +2804,7 @@ fi -PNGLIB_VERSION=1.5.11rc03 +PNGLIB_VERSION=1.5.11rc04 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=11 @@ -12784,9 +12784,9 @@ if test "$have_ld_version_script" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbol prefix" >&5 $as_echo_n "checking for symbol prefix... " >&6; } SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \ - | ${CPP-${CC-gcc} -E} - 2>&1 \ - | ${EGREP-grep} "^PREFIX=" \ - | ${SED-sed} "s:^PREFIX=::"` + | ${CPP-${CC-gcc} -E} - 2>&1 \ + | ${EGREP-grep} "^PREFIX=" \ + | ${SED-sed} -e "s:^PREFIX=::" -e "s:__USER_LABEL_PREFIX__::"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYMBOL_PREFIX" >&5 $as_echo "$SYMBOL_PREFIX" >&6; } @@ -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.11rc03, which was +This file was extended by libpng $as_me 1.5.11rc04, 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.11rc03 +libpng config.status 1.5.11rc04 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 7e5dd0b49..b6c8f323a 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.11rc03], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.11rc04], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.11rc03 +PNGLIB_VERSION=1.5.11rc04 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=11 diff --git a/contrib/README.txt b/contrib/README.txt index ec4af9473..bcd433d35 100644 --- a/contrib/README.txt +++ b/contrib/README.txt @@ -1,105 +1,4 @@ -pngsuite --------- -(c) Willem van Schaik, 1999, 2011, 2012 -Two images are by Glenn Randers-Pehrson, 2012 - -Permission to use, copy, modify, and distribute these images for any -purpose and without fee is hereby granted. - -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 - ------------ ------ -------------- - 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 - - ftbbn0g01.png 1-bit grayscale, black bKGD - ftbbn0g02.png 2-bit grayscale, black bKGD - 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 bas*.png" in -this directory: - -Testing basn0g01.png: PASS (524 zero samples) - Filter 0 was used 32 times -Testing basn0g02.png: PASS (448 zero samples) - Filter 0 was used 32 times -Testing basn0g04.png: PASS (520 zero samples) - Filter 0 was used 32 times -Testing basn0g08.png: PASS (3 zero samples) - Filter 1 was used 9 times - Filter 4 was used 23 times -Testing basn0g16.png: PASS (1 zero samples) - Filter 1 was used 1 times - Filter 2 was used 31 times -Testing basn2c08.png: PASS (6 zero samples) - Filter 1 was used 5 times - Filter 4 was used 27 times -Testing basn2c16.png: PASS (592 zero samples) - Filter 1 was used 1 times - Filter 4 was used 31 times -Testing basn3p01.png: PASS (512 zero samples) - Filter 0 was used 32 times -Testing basn3p02.png: PASS (448 zero samples) - Filter 0 was used 32 times -Testing basn3p04.png: PASS (544 zero samples) - Filter 0 was used 32 times -Testing basn3p08.png: PASS (4 zero samples) - Filter 0 was used 32 times -Testing basn4a08.png: PASS (32 zero samples) - Filter 1 was used 1 times - Filter 4 was used 31 times -Testing basn4a16.png: PASS (64 zero samples) - Filter 0 was used 1 times - Filter 1 was used 2 times - Filter 2 was used 1 times - Filter 4 was used 28 times -Testing basn6a08.png: PASS (160 zero samples) - Filter 1 was used 1 times - Filter 4 was used 31 times -Testing basn6a16.png: PASS (1072 zero samples) - Filter 1 was used 4 times - Filter 4 was used 28 times -libpng passes test - -Willem van Schaik - -October 1999 +This "contrib" directory contains contributions which are not necessarily under +the libpng license, although all are open source. They are not part of +libpng proper and are not used for building the library. diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index 3dd6f2133..15d7cfc95 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -244,7 +244,7 @@ random_choice(void) #define COL_FROM_ID(id) ((png_byte)((id)& 0x7U)) #define DEPTH_FROM_ID(id) ((png_byte)(((id) >> 3) & 0x1fU)) -#define PALETTE_FROM_ID(id) ((int)(((id) >> 8) & 0x1f)) +#define PALETTE_FROM_ID(id) (((id) >> 8) & 0x1f) #define INTERLACE_FROM_ID(id) ((int)(((id) >> 13) & 0x3)) #define DO_INTERLACE_FROM_ID(id) ((int)(((id)>>15) & 1)) #define WIDTH_FROM_ID(id) (((id)>>16) & 0xff) @@ -253,7 +253,7 @@ random_choice(void) /* Utility to construct a standard name for a standard image. */ static size_t standard_name(char *buffer, size_t bufsize, size_t pos, png_byte colour_type, - int bit_depth, int npalette, int interlace_type, + int bit_depth, unsigned int npalette, int interlace_type, png_uint_32 w, png_uint_32 h, int do_interlace) { pos = safecat(buffer, bufsize, pos, colour_types[colour_type]); @@ -315,10 +315,11 @@ standard_name_from_id(char *buffer, size_t bufsize, size_t pos, png_uint_32 id) /* The following defines the number of different palettes to generate for * each log bit depth of a colour type 3 standard image. */ -#define PALETTE_COUNT(bit_depth) ((bit_depth) > 4 ? 1 : 16) +#define PALETTE_COUNT(bit_depth) ((bit_depth) > 4 ? 1U : 16U) static int -next_format(png_bytep colour_type, png_bytep bit_depth, int* palette_number) +next_format(png_bytep colour_type, png_bytep bit_depth, + unsigned int* palette_number) { if (*bit_depth == 0) { @@ -3256,8 +3257,8 @@ transform_row(png_structp pp, png_byte buffer[TRANSFORM_ROWMAX], */ static void make_transform_image(png_store* PNG_CONST ps, png_byte PNG_CONST colour_type, - png_byte PNG_CONST bit_depth, int palette_number, int interlace_type, - png_const_charp name) + png_byte PNG_CONST bit_depth, unsigned int palette_number, + int interlace_type, png_const_charp name) { context(ps, fault); @@ -3384,7 +3385,7 @@ make_transform_images(png_store *ps) { png_byte colour_type = 0; png_byte bit_depth = 0; - int palette_number = 0; + unsigned int palette_number = 0; /* This is in case of errors. */ safecat(ps->test, sizeof ps->test, 0, "make standard images"); @@ -7069,7 +7070,7 @@ perform_transform_test(png_modifier *pm) { png_byte colour_type = 0; png_byte bit_depth = 0; - int palette_number = 0; + unsigned int palette_number = 0; while (next_format(&colour_type, &bit_depth, &palette_number)) { @@ -8428,7 +8429,7 @@ perform_gamma_threshold_tests(png_modifier *pm) { png_byte colour_type = 0; png_byte bit_depth = 0; - int palette_number = 0; + unsigned int palette_number = 0; /* Don't test more than one instance of each palette - it's pointless, in * fact this test is somewhat excessive since libpng doesn't make this @@ -8493,7 +8494,7 @@ static void perform_gamma_transform_tests(png_modifier *pm) { png_byte colour_type = 0; png_byte bit_depth = 0; - int palette_number = 0; + unsigned int palette_number = 0; while (next_format(&colour_type, &bit_depth, &palette_number)) { @@ -8522,11 +8523,8 @@ static void perform_gamma_sbit_tests(png_modifier *pm) */ for (sbit=pm->sbitlow; sbit<(1< 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.11rc03 - May 29, 2012 + libpng versions 0.97, January 1998, through 1.5.11rc04 - June 4, 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 29, 2012 +June 4, 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.11rc03 are Y2K compliant. It is my belief that earlier +upward through 1.5.11rc04 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 f457d3de9..06b2cf757 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "May 29, 2012" +.TH LIBPNG 3 "June 4, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11rc03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11rc04 .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.11rc03 - May 29, 2012 + libpng version 1.5.11rc04 - June 4, 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.11rc03 - May 29, 2012 + libpng versions 0.97, January 1998, through 1.5.11rc04 - June 4, 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 29, 2012 +June 4, 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.11rc03 are Y2K compliant. It is my belief that earlier +upward through 1.5.11rc04 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-03 15 10511 15.so.15.11[.0] + 1.5.11rc01-04 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.11rc03 - May 29, 2012: +Libpng version 1.5.11rc04 - June 4, 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.11rc03, May 29, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.11rc04, June 4, 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 29, 2012 +June 4, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index e427a4f2f..e8492a804 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "May 29, 2012" +.TH LIBPNGPF 3 "June 4, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11rc03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11rc04 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 3b5aaccdf..b787219b7 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "May 29, 2012" +.TH PNG 5 "June 4, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 65634443c..b25c7cb78 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_11rc03 Your_png_h_is_not_version_1_5_11rc03; +typedef png_libpng_version_1_5_11rc04 Your_png_h_is_not_version_1_5_11rc04; /* 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.11rc03 - May 29, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.5.11rc04 - June 4, 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.11rc03 - May 29, 2012\ + return "libpng version 1.5.11rc04 - June 4, 2012\ Copyright (c) 1998-2011 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -969,8 +969,8 @@ int png_XYZ_from_xy(png_XYZ *XYZ, png_xy xy) * and it is certain that it becomes unstable where the end points are close * together. * - * So this code uses the perhaps slighly less optimal but more understandable - * and totally obvious approach of calculating color-scale. + * So this code uses the perhaps slightly less optimal but more + * understandable and totally obvious approach of calculating color-scale. * * This algorithm depends on the precision in white-scale and that is * (1/white-y), so we can immediately see that as white-y approaches 0 the diff --git a/png.h b/png.h index 4309c6a0f..ceb321960 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.11rc03 - May 29, 2012 + * libpng version 1.5.11rc04 - June 4, 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.11rc03 - May 29, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.5.11rc04 - June 4, 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-03 15 10511 15.so.15.11[.0] + * 1.5.11rc01-04 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.11rc03, May 29, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.11rc04, June 4, 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 29, 2012 + * June 4, 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.11rc03 are Y2K compliant. It is my belief that + * upward through 1.5.11rc04 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.11rc03" +#define PNG_LIBPNG_VER_STRING "1.5.11rc04" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.11rc03 - May 29, 2012\n" + " libpng version 1.5.11rc04 - June 4, 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 03 +#define PNG_LIBPNG_VER_BUILD 04 /* 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_11rc03; +typedef char* png_libpng_version_1_5_11rc04; /* 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 6c650fcce..f474d2e51 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.11rc03 - May 29, 2012 + * libpng version 1.5.11rc04 - June 4, 2012 * * Copyright (c) 1998-2012 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 80c222948..91b3ca1e2 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_11rc03 Your_png_h_is_not_version_1_5_11rc03; +typedef png_libpng_version_1_5_11rc04 Your_png_h_is_not_version_1_5_11rc04; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 35939053c..19e2c2660 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.11rc03 - May 29, 2012 +libpng version 1.5.11rc04 - June 4, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 1a6dd74ee..1f243416b 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@