From 4449a29e1e2dbac71e8def471165993f61b14565 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 5 Feb 2014 22:23:03 -0600 Subject: [PATCH] [libpng15] Imported from libpng-1.5.18.tar --- ANNOUNCE | 33 +++++++++------------------------ CHANGES | 3 +++ CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure | 22 +++++++++++----------- configure.ac | 4 ++-- libpng-manual.txt | 8 ++++---- libpng.3 | 20 ++++++++++---------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 8 ++++---- png.h | 23 ++++++++++++----------- pngconf.h | 2 +- pngdebug.h | 2 +- pngpread.c | 2 +- pngpriv.h | 2 +- pngread.c | 2 +- pngrtran.c | 2 +- pngrutil.c | 2 +- pngtest.c | 4 ++-- pngwio.c | 2 +- pngwutil.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 | 4 ++-- scripts/symbols.def | 2 +- 33 files changed, 89 insertions(+), 100 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 2ad99c707..4307db962 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,36 +1,32 @@ -Libpng 1.5.18rc02 - January 30, 2014 +Libpng 1.5.18 - February 6, 2014 -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.18rc02.tar.xz (LZMA-compressed, recommended) - 1.5.18rc02.tar.gz - 1.5.18rc02.tar.bz2 + libpng-1.5.18.tar.xz (LZMA-compressed, recommended) + libpng-1.5.18.tar.gz + libpng-1.5.18.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1518r02.7z (LZMA-compressed, recommended) - lp1518r02.zip + lpng1518.7z (LZMA-compressed, recommended) + lpng1518.zip Other information: - 1.5.18rc02-README.txt - 1.5.18rc02-LICENSE.txt + libpng-1.5.18-README.txt + libpng-1.5.18-LICENSE.txt Changes since the last public release (1.5.17): -Version 1.5.18beta01 [August 21, 2013] Delay calling png_init_filter_functions() until a row with nonzero filter is found. - -Version 1.5.18beta02 [December 26, 2013] Changed tabs to 3 spaces in png_debug macros and changed '"%s"m' to '"%s" m' to improve portability among compilers. Added "-Wall" to CFLAGS in contrib/pngminim/*/makefile @@ -38,8 +34,6 @@ Version 1.5.18beta02 [December 26, 2013] pngminim. Rebuilt configure scripts with automake-1.14.1 and autoconf-2.69 in the tar distributions. - -Version 1.5.18beta03 [January 1, 2014] Fixed 'unused' warnings and merged with libpng16 pngvalid. Various warnings revealed by configurations added to the tested configurations in libpng 1.6 need corresponding fixes in libpng 1.5. @@ -63,17 +57,8 @@ Version 1.5.18beta03 [January 1, 2014] and libpng.a to point to the newly installed, versioned, files (e.g. libpng17/png.h and libpng17.a). Three new configure options and some rearrangement of Makefile.am allow creation of these links to be disabled. - -Version 1.5.18beta04 [January 10, 2014] Removed potentially misleading warning from png_check_IHDR(). - -Version 1.5.18beta05 [January 20, 2014] Updated scripts/makefile.* to use CPPFLAGS (Cosmin) - -Version 1.5.18rc01 [January 28, 2014] - No changes. - -Version 1.5.18rc02 [January 30, 2014] Quiet an uninitialized memory warning from VC2013 in png_get_png(). Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/CHANGES b/CHANGES index 01588f1a0..a15746b77 100644 --- a/CHANGES +++ b/CHANGES @@ -4200,6 +4200,9 @@ Version 1.5.18rc01 [January 28, 2014] Version 1.5.18rc02 [January 30, 2014] Quiet an uninitialized memory warning from VC2013 in png_get_png(). +Version 1.5.18 [February 6, 2014] + No changes. + 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 b7e6a88fa..cfdcfd5f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -217,7 +217,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.18rc02 +# VERSION 15.${PNGLIB_RELEASE}.1.5.18 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 42d292703..8b2d0bd38 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.18rc02, January 30, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.5.18, February 6, 2014, are Copyright (c) 2004, 2006-2014 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 -January 30, 2014 +February 6, 2014 diff --git a/README b/README index 69d5d867b..8e11776ea 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.18rc02 - January 30, 2014 (shared library 15.0) +README for libpng version 1.5.18 - February 6, 2014 (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 6e56bee0f..75403bb34 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.69 for libpng 1.5.18rc02. +# Generated by GNU Autoconf 2.69 for libpng 1.5.18. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.18rc02' -PACKAGE_STRING='libpng 1.5.18rc02' +PACKAGE_VERSION='1.5.18' +PACKAGE_STRING='libpng 1.5.18' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1351,7 +1351,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.18rc02 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1421,7 +1421,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.18rc02:";; + short | recursive ) echo "Configuration of libpng 1.5.18:";; esac cat <<\_ACEOF @@ -1571,7 +1571,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.18rc02 +libpng configure 1.5.18 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1994,7 +1994,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.18rc02, which was +It was created by libpng $as_me 1.5.18, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2857,7 +2857,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.18rc02' + VERSION='1.5.18' cat >>confdefs.h <<_ACEOF @@ -2973,7 +2973,7 @@ fi -PNGLIB_VERSION=1.5.18rc02 +PNGLIB_VERSION=1.5.18 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=18 @@ -13628,7 +13628,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.18rc02, which was +This file was extended by libpng $as_me 1.5.18, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13694,7 +13694,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.18rc02 +libpng config.status 1.5.18 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index d3b96ce1c..e18f71819 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.18rc02], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.18], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE([1.13 serial-tests subdir-objects]) dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.18rc02 +PNGLIB_VERSION=1.5.18 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=18 diff --git a/libpng-manual.txt b/libpng-manual.txt index 918a326ba..87cf0a26c 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.18rc03 - February 2, 2014 + libpng version 1.5.18 - February 6, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.18rc03 - February 2, 2014 + libpng versions 0.97, January 1998, through 1.5.18 - February 6, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -4673,13 +4673,13 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -February 2, 2014 +February 6, 2014 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.18rc03 are Y2K compliant. It is my belief that earlier +upward through 1.5.18 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 a5f8db0c4..f0a31a14c 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "February 2, 2014" +.TH LIBPNG 3 "February 6, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.18rc03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.18 .SH SYNOPSIS \fB #include \fP @@ -492,7 +492,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.18rc03 - February 2, 2014 + libpng version 1.5.18 - February 6, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -503,7 +503,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.18rc03 - February 2, 2014 + libpng versions 0.97, January 1998, through 1.5.18 - February 6, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5166,13 +5166,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -February 2, 2014 +February 6, 2014 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.18rc03 are Y2K compliant. It is my belief that earlier +upward through 1.5.18 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 @@ -5405,7 +5405,7 @@ the first widely used release: 1.5.17rc01-03 15 10517 15.so.15.17[.0] 1.5.17 15 10517 15.so.15.17[.0] 1.5.18beta01-05 15 10518 15.so.15.18[.0] - 1.5.18rc01-rc02 15 10518 15.so.15.18[.0] + 1.5.18rc01-02 15 10518 15.so.15.18[.0] 1.5.18 15 10518 15.so.15.18[.0] Henceforth the source version will match the shared-library minor @@ -5463,7 +5463,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.18rc03 - February 2, 2014: +Libpng version 1.5.18 - February 6, 2014: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5486,7 +5486,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.18rc03, February 2, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.5.18, February 6, 2014, 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 @@ -5585,7 +5585,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 2, 2014 +February 6, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 03b92279a..ba62143a9 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "January 30, 2014" +.TH LIBPNGPF 3 "February 6, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.18rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.18 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 80a6ffc88..096ccc221 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "January 30, 2014" +.TH PNG 5 "February 6, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 8abe778db..4fdf50d41 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.18 [(PENDING RELEASE)] + * Last changed in libpng 1.5.18 [February 6, 2014] * Copyright (c) 1998-2014 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_18rc02 Your_png_h_is_not_version_1_5_18rc02; +typedef png_libpng_version_1_5_18 Your_png_h_is_not_version_1_5_18; /* 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 @@ -658,13 +658,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.18rc02 - January 30, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.5.18 - February 6, 2014" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 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.18rc02 - January 30, 2014\ + return "libpng version 1.5.18 - February 6, 2014\ Copyright (c) 1998-2014 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 e4d1b28d0..b900fa3e1 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.18rc02 - January 30, 2014 + * libpng version 1.5.18 - February 6, 2014 * Copyright (c) 1998-2014 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.18rc02 - January 30, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.5.18 - February 6, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -194,7 +194,8 @@ * 1.5.17rc01-03 15 10517 15.so.15.17[.0] * 1.5.17 15 10517 15.so.15.17[.0] * 1.5.18beta01-05 15 10518 15.so.15.18[.0] - * 1.5.18rc01-rc02 15 10518 15.so.15.18[.0] + * 1.5.18rc01-02 15 10518 15.so.15.18[.0] + * 1.5.18 15 10518 15.so.15.18[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -226,7 +227,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.18rc02, January 30, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.18, February 6, 2014, are * Copyright (c) 2004, 2006-2014 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: @@ -338,13 +339,13 @@ * Y2K compliance in libpng: * ========================= * - * January 30, 2014 + * February 6, 2014 * * 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.18rc02 are Y2K compliant. It is my belief that + * upward through 1.5.18 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 @@ -403,9 +404,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.18rc02" +#define PNG_LIBPNG_VER_STRING "1.5.18" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.18rc02 - January 30, 2014\n" + " libpng version 1.5.18 - February 6, 2014\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -419,7 +420,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 02 +#define PNG_LIBPNG_VER_BUILD 0 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -436,7 +437,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. @@ -566,7 +567,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_18rc02; +typedef char* png_libpng_version_1_5_18; /* 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 324723cae..0759db0ab 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.18rc02 - January 30, 2014 + * libpng version 1.5.18 - February 6, 2014 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngdebug.h b/pngdebug.h index ad3aca4de..1a6d8b3af 100644 --- a/pngdebug.h +++ b/pngdebug.h @@ -5,7 +5,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.18 [(PENDING RELEASE)] + * Last changed in libpng 1.5.18 [February 6, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/pngpread.c b/pngpread.c index 16adccc91..f7c3d070a 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.18 [(PENDING RELEASE)] + * Last changed in libpng 1.5.18 [February 6, 2014] * Copyright (c) 1998-2014 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 5be4fcbaf..47465c2c0 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.18 [(PENDING RELEASE)] + * Last changed in libpng 1.5.18 [February 6, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/pngread.c b/pngread.c index a81c77081..3543719bc 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.5.18 [(PENDING RELEASE)] + * Last changed in libpng 1.5.18 [February 6, 2014] * Copyright (c) 1998-2014 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/pngrtran.c b/pngrtran.c index 4373c2d64..632ff3b59 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.18 [(PENDING RELEASE)] + * Last changed in libpng 1.5.18 [February 6, 2014] * Copyright (c) 1998-2014 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/pngrutil.c b/pngrutil.c index f4b64e0e4..3dbfe0866 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.5.18 [(PENDING RELEASE)] + * Last changed in libpng 1.5.18 [February 6, 2014] * Copyright (c) 1998-2014 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 6e6c17a0d..fe89c8ea0 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.5.18 [(PENDING RELEASE)] + * Last changed in libpng 1.5.18 [February 6, 2014] * Copyright (c) 1998-2014 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.) @@ -1990,4 +1990,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_18rc02 Your_png_h_is_not_version_1_5_18rc02; +typedef png_libpng_version_1_5_18 Your_png_h_is_not_version_1_5_18; diff --git a/pngwio.c b/pngwio.c index 41c4bda8f..51df62fc2 100644 --- a/pngwio.c +++ b/pngwio.c @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.5.18 [(PENDING RELEASE)] + * Last changed in libpng 1.5.18 [February 6, 2014] * Copyright (c) 1998-2013 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/pngwutil.c b/pngwutil.c index 325e35aed..305559464 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.5.18 [(PENDING RELEASE)] + * Last changed in libpng 1.5.18 [February 6, 2014] * Copyright (c) 1998-2014 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 887e17a0b..1fc787c64 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.18rc02 - January 30, 2014 +libpng version 1.5.18 - February 6, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index f0ba27fc1..4e23743ce 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@