From e088ce7363bbd42e25ab6dc6608a15725972eda8 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 14 Jun 2012 06:28:09 -0500 Subject: [PATCH] [libpng15] Imported from libpng-1.5.11.tar --- ANNOUNCE | 44 +++++++++++------------------------ CHANGES | 6 ++--- CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure | 22 +++++++++--------- configure.ac | 4 ++-- contrib/libtests/pngvalid.c | 2 +- libpng-manual.txt | 8 +++---- libpng.3 | 21 +++++++++-------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 8 +++---- png.h | 23 +++++++++--------- pngconf.h | 2 +- pngpread.c | 2 +- pngpriv.h | 2 +- pngrtran.c | 10 ++++---- pngset.c | 2 +- pngtest.c | 2 +- pngtrans.c | 2 +- pngwrite.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 +- 32 files changed, 96 insertions(+), 110 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index e939f5096..83347a0fa 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,32 +1,29 @@ -Libpng 1.5.11rc06 - June 9, 2012 +Libpng 1.5.11 - June 14, 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. +This is a public release of libpng, intended for use in production codes. Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.5.11rc06.tar.xz (LZMA-compressed, recommended) - 1.5.11rc06.tar.gz - 1.5.11rc06.tar.bz2 + libpng-1.5.11.tar.xz (LZMA-compressed, recommended) + libpng-1.5.11.tar.gz + libpng-1.5.11.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1511r06.7z (LZMA-compressed, recommended) - lp1511r06.zip + lpng1511.7z (LZMA-compressed, recommended) + lpng1511.zip Other information: - 1.5.11rc06-README.txt - 1.5.11rc06-LICENSE.txt + libpng-1.5.11-README.txt + libpng-1.5.11-LICENSE.txt Changes since the last public release (1.5.10): - -Version 1.5.11beta01 [April 28, 2012] Revised scripts/makefile.darwin: use system zlib; remove quotes around architecture list; add missing ppc architecture; add architecture options to shared library link; don't try to create a shared lib based on missing @@ -36,36 +33,23 @@ Version 1.5.11beta01 [April 28, 2012] declaration of png_handle_unknown(). 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 23, 2012] - No changes. - -Version 1.5.11rc02 [May 29, 2012] - Fixed some typos in comments. Revised CMakeLists.txt to not attempt to make a symlink under mingw. Added two images to contrib/pngsuite (1-bit and 2-bit transparent grayscale), and renamed three whose names were inconsistent with those in pngsuite/README.txt. - -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. + performed an optimization which is safe but then warned about it. Changing the type of 'palette_number' in pngvalid.c removes the warning. - -Version 1.5.11rc04 [June 6, 2012] Improved efficiency of new do_check_palette_indexes() function. - -Version 1.5.11rc05 [June 7, 2012] Don't check palette indexes if num_palette is 0 (as it can be in MNG files). + Include zlib.h in contrib/gregbook and contrib/visupng examples. -Version 1.5.11rc06 [June 9, 2012] - Include zlib.h in contrib/gregbook and visupng examples. - -Send comments/corrections/commendations to png-mng-implement at lists.sf.net: +Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement -to subscribe) or to glennrp at users.sourceforge.net +to subscribe) +or to glennrp at users.sourceforge.net Glenn R-P diff --git a/CHANGES b/CHANGES index b7d0400ab..16f2ebcf8 100644 --- a/CHANGES +++ b/CHANGES @@ -3879,7 +3879,7 @@ 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. + performed an optimization which is safe but then warned about it. Changing the type of 'palette_number' in pngvalid.c removes the warning. Version 1.5.11rc04 [June 6, 2012] @@ -3888,8 +3888,8 @@ Version 1.5.11rc04 [June 6, 2012] Version 1.5.11rc05 [June 7, 2012] Don't check palette indexes if num_palette is 0 (as it can be in MNG files). -Version 1.5.11rc06 [June 9, 2012] - Include zlib.h in contrib/gregbook and visupng examples. +Version 1.5.11 [June 14, 2012] + Include zlib.h in contrib/gregbook and contrib/visupng examples. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index dab3ea73b..27c3ea66d 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.11rc06 +# VERSION 15.${PNGLIB_RELEASE}.1.5.11 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index bd0e923e6..e8e66ae7d 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.11rc06, June 12, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.11, June 14, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 12, 2012 +June 14, 2012 diff --git a/README b/README index eb51fe8ce..c8b437f4e 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.11rc06 - June 7, 2012 (shared library 15.0) +README for libpng version 1.5.11 - June 14, 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 9678a5e40..deddd3e75 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.11rc06. +# Generated by GNU Autoconf 2.68 for libpng 1.5.11. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.11rc06' -PACKAGE_STRING='libpng 1.5.11rc06' +PACKAGE_VERSION='1.5.11' +PACKAGE_STRING='libpng 1.5.11' 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.11rc06 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.11 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.11rc06:";; + short | recursive ) echo "Configuration of libpng 1.5.11:";; 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.11rc06 +libpng configure 1.5.11 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.11rc06, which was +It was created by libpng $as_me 1.5.11, 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.11rc06' + VERSION='1.5.11' cat >>confdefs.h <<_ACEOF @@ -2804,7 +2804,7 @@ fi -PNGLIB_VERSION=1.5.11rc06 +PNGLIB_VERSION=1.5.11 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.11rc06, which was +This file was extended by libpng $as_me 1.5.11, 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.11rc06 +libpng config.status 1.5.11 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 564676abf..4dc2a823d 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.11rc06], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.11], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.11rc06 +PNGLIB_VERSION=1.5.11 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=11 diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index 15d7cfc95..e10381d81 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -1,7 +1,7 @@ /* pngvalid.c - validate libpng by constructing then reading png files. * - * Last changed in libpng 1.5.8 [%RDATE%] + * Last changed in libpng 1.5.8 [February 1, 2012] * Copyright (c) 2012 Glenn Randers-Pehrson * Written by John Cunningham Bowler * diff --git a/libpng-manual.txt b/libpng-manual.txt index 531bd516c..16b4d23ad 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.11rc06 - June 13, 2012 + libpng version 1.5.11 - June 14, 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.11rc06 - June 13, 2012 + libpng versions 0.97, January 1998, through 1.5.11 - June 14, 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 -June 13, 2012 +June 14, 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.11rc06 are Y2K compliant. It is my belief that earlier +upward through 1.5.11 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 that diff --git a/libpng.3 b/libpng.3 index a42395e54..c91f987fd 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "June 13, 2012" +.TH LIBPNG 3 "June 14, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11rc06 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11 .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.11rc06 - June 13, 2012 + libpng version 1.5.11 - June 14, 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.11rc06 - June 13, 2012 + libpng versions 0.97, January 1998, through 1.5.11 - June 14, 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 -June 13, 2012 +June 14, 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.11rc06 are Y2K compliant. It is my belief that earlier +upward through 1.5.11 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 that @@ -5804,7 +5804,8 @@ 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-06 15 10511 15.so.15.11[.0] + 1.5.11rc01-05 15 10511 15.so.15.11[.0] + 1.5.11 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 +5862,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.11rc06 - June 13, 2012: +Libpng version 1.5.11 - June 14, 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 +5885,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.11rc06, June 13, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.11, June 14, 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 +5984,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 13, 2012 +June 14, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 3d7681a33..b435bfed9 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "June 7, 2012" +.TH LIBPNGPF 3 "June 14, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11rc06 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 0e7ed089f..d0511b3d0 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "June 7, 2012" +.TH PNG 5 "June 14, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 56c7f8bad..aecfd5ca2 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.5.11 [(PENDING RELEASE)] + * Last changed in libpng 1.5.11 [June 14, 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.) @@ -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_11rc06 Your_png_h_is_not_version_1_5_11rc06; +typedef png_libpng_version_1_5_11 Your_png_h_is_not_version_1_5_11; /* 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.11rc06 - June 12, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.5.11 - June 14, 2012" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2012 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.11rc06 - June 12, 2012\ + return "libpng version 1.5.11 - June 14, 2012\ Copyright (c) 1998-2012 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 b8bc16dbe..b1c9e7243 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.11rc06 - June 13, 2012 + * libpng version 1.5.11 - June 14, 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.11rc06 - June 13, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.5.11 - June 14, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -175,7 +175,8 @@ * 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-06 15 10511 15.so.15.11[.0] + * 1.5.11rc01-05 15 10511 15.so.15.11[.0] + * 1.5.11 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 +208,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.11rc06, June 13, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.11, June 14, 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 +320,13 @@ * Y2K compliance in libpng: * ========================= * - * June 13, 2012 + * June 14, 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.11rc06 are Y2K compliant. It is my belief that + * upward through 1.5.11 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 @@ -384,9 +385,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.11rc06" +#define PNG_LIBPNG_VER_STRING "1.5.11" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.11rc06 - June 13, 2012\n" + " libpng version 1.5.11 - June 14, 2012\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -400,7 +401,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 06 +#define PNG_LIBPNG_VER_BUILD 0 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -417,7 +418,7 @@ #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with PNG_LIBPNG_BUILD_PRIVATE */ -#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -547,7 +548,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_11rc06; +typedef char* png_libpng_version_1_5_11; /* 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 da5de63cd..314fcc6ff 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.11rc06 - June 7, 2012 + * libpng version 1.5.11 - June 14, 2012 * * Copyright (c) 1998-2012 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpread.c b/pngpread.c index 46988881f..6b65ba8f4 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.5.11 [(PENDING RELEASE)] + * Last changed in libpng 1.5.11 [June 14, 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.) diff --git a/pngpriv.h b/pngpriv.h index 8b2a1749f..9b69f8c14 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -6,7 +6,7 @@ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * Last changed in libpng 1.5.10 [(PENDING RELEASE)] + * Last changed in libpng 1.5.10 [March 29, 2012] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/pngrtran.c b/pngrtran.c index 4075c7680..96732b55c 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.5.11 [(PENDING RELEASE)] + * Last changed in libpng 1.5.11 [June 14, 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.) @@ -1770,8 +1770,8 @@ png_init_read_transformations(png_structp png_ptr) int num_palette = png_ptr->num_palette; int i; - /*NOTE: there are other transformations that should probably be in here - * too. + /* NOTE: there are other transformations that should probably be in + * here too. */ for (i = 0; i < num_palette; i++) { @@ -2277,7 +2277,7 @@ png_do_read_transformations(png_structp png_ptr, png_row_infop row_info) #endif #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED - /*NOTE: moved here in 1.5.4 (from much later in this list.) */ + /* NOTE: moved here in 1.5.4 (from much later in this list.) */ if ((png_ptr->transformations & PNG_GRAY_TO_RGB) && (png_ptr->mode & PNG_BACKGROUND_IS_GRAY)) png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1); @@ -3303,7 +3303,7 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row) if (red != green || red != blue) { rgb_error |= 1; - /*NOTE: this is the historical approach which simply + /* NOTE: this is the historical approach which simply * truncates the results. */ *(dp++) = (png_byte)((rc*red + gc*green + bc*blue)>>15); diff --git a/pngset.c b/pngset.c index 1ffc7ff7a..8c07eec3e 100644 --- a/pngset.c +++ b/pngset.c @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.5.11 [(PENDING RELEASE)] + * Last changed in libpng 1.5.11 [June 14, 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.) diff --git a/pngtest.c b/pngtest.c index 88d9bebe0..12af28dbb 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_11rc06 Your_png_h_is_not_version_1_5_11rc06; +typedef png_libpng_version_1_5_11 Your_png_h_is_not_version_1_5_11; diff --git a/pngtrans.c b/pngtrans.c index 7210d3250..ee60957fc 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.5.11 [(PENDING RELEASE)] + * Last changed in libpng 1.5.11 [June 14, 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.) diff --git a/pngwrite.c b/pngwrite.c index 929ca4aca..2a72ad33f 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.5.11 [(PENDING RELEASE)] + * Last changed in libpng 1.5.11 [June 14, 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.) diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 44ce4e5b3..a5fc9e953 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.11rc06 - June 7, 2012 +libpng version 1.5.11 - June 14, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index cf959a861..c3d775835 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@