From 4df37bfa4f79dcd742fca6155e26b8d37b591c30 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 6 Mar 2014 12:35:04 -0600 Subject: [PATCH] [libpng16] Imported from libpng-1.6.10.tar --- ANNOUNCE | 35 +++++++++------------------------- CHANGES | 2 +- CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- arm/arm_init.c | 2 +- configure.ac | 4 ++-- contrib/arm-neon/android-ndk.c | 2 +- contrib/arm-neon/linux-auxv.c | 2 +- contrib/arm-neon/linux.c | 2 +- contrib/libtests/pngimage.c | 2 +- contrib/libtests/pngunknown.c | 2 +- contrib/libtests/pngvalid.c | 2 +- contrib/tools/pngfix.c | 2 +- libpng-manual.txt | 12 ++++++------ libpng.3 | 23 +++++++++++----------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 21 ++++++++++---------- pngconf.h | 2 +- pngerror.c | 2 +- pngpread.c | 2 +- pngpriv.h | 2 +- pngread.c | 2 +- pngrtran.c | 2 +- pngrutil.c | 2 +- pngtest.c | 2 +- pngwrite.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 ++++++------ scripts/def.dfn | 2 +- 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 +- 40 files changed, 85 insertions(+), 100 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 4d8ece772..9f198806f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,32 +1,29 @@ -Libpng 1.6.10rc04 - March 4, 2014 +Libpng 1.6.10 - March 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.6.10rc04.tar.xz (LZMA-compressed, recommended) - 1.6.10rc04.tar.gz + libpng-1.6.10.tar.xz (LZMA-compressed, recommended) + libpng-1.6.10.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1610r04.7z (LZMA-compressed, recommended) - lp1610r04.zip + lpng1610.7z (LZMA-compressed, recommended) + lpng1610.zip Other information: - 1.6.10rc04-README.txt - 1.6.10rc04-LICENSE.txt - libpng-1.6.10rc04-*.asc (armored detached GPG signatures) + libpng-1.6.10-README.txt + libpng-1.6.10-LICENSE.txt + libpng-1.6.10-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.9): - -Version 1.6.10beta01 [February 9, 2014] Backported changes from libpng-1.7.0beta30 and beta31: Fixed a large number of instances where PNGCBAPI was omitted from function definitions. @@ -54,8 +51,6 @@ Version 1.6.10beta01 [February 9, 2014] png_app_error() if the app requests something that cannot be done and it adds corresponding code to pngimage.c to handle such options by not attempting to test them. - -Version 1.6.10beta02 [February 23, 2014] Moved redefines of png_error(), png_warning(), png_chunk_error(), and png_chunk_warning() from pngpriv.h to png.h to make them visible to libpng-calling applications. @@ -82,24 +77,12 @@ Version 1.6.10beta02 [February 23, 2014] This fixes CERT VU#684412 and CVE-2014-0333. Don't recognize known sRGB profiles as sRGB if they have been hacked, but don't reject them and don't issue a copyright violation warning. - -Version 1.6.10beta03 [February 25, 2014] Moved some documentation from png.h to libpng.3 and libpng-manual.txt Minor editing of contrib/arm-neon/README and contrib/examples/*.c - -Version 1.6.10rc01 [February 27, 2014] Fixed typos in the manual and in scripts/pnglibconf.dfa (CFLAGS -> CPPFLAGS and PNG_USR_CONFIG -> PNG_USER_CONFIG). - -Version 1.6.10rc02 [February 28, 2014] - Removed unreachable return statement after png_chunk_error() - in pngrutil.c - -Version 1.6.10rc03 [March 4, 2014] Un-deprecated png_data_freer(). -Version 1.6.10rc04 [March 4, 2014] - 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 07b3ce47d..b3e09f857 100644 --- a/CHANGES +++ b/CHANGES @@ -4872,7 +4872,7 @@ Version 1.6.10rc02 [February 28, 2014] Version 1.6.10rc03 [March 4, 2014] Un-deprecated png_data_freer(). -Version 1.6.10rc04 [March 4, 2014] +Version 1.6.10 [March 6, 2014] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index bcdccc25e..34d62b5d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,7 +252,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.10rc04 +# VERSION 16.${PNGLIB_RELEASE}.1.6.10 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 06e31316e..94f5e9500 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.6.10rc04, March 4, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.10, March 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 -March 4, 2014 +March 6, 2014 diff --git a/README b/README index d49515aa1..57f287bf1 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.10rc04 - March 4, 2014 (shared library 16.0) +README for libpng version 1.6.10 - March 6, 2014 (shared library 16.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/arm/arm_init.c b/arm/arm_init.c index 580053016..952b8029f 100644 --- a/arm/arm_init.c +++ b/arm/arm_init.c @@ -3,7 +3,7 @@ * * Copyright (c) 2014 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 6, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/configure.ac b/configure.ac index 9c20a896f..a1ec12909 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.10rc04],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.10],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -39,7 +39,7 @@ dnl automake, so the following is not necessary (and is not defined anyway): dnl AM_PREREQ([1.11.2]) dnl stop configure from automagically running automake -PNGLIB_VERSION=1.6.10rc04 +PNGLIB_VERSION=1.6.10 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=10 diff --git a/contrib/arm-neon/android-ndk.c b/contrib/arm-neon/android-ndk.c index a6e5de557..724012348 100644 --- a/contrib/arm-neon/android-ndk.c +++ b/contrib/arm-neon/android-ndk.c @@ -2,7 +2,7 @@ * * Copyright (c) 2014 Glenn Randers-Pehrson * Written by John Bowler, 2014. - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 6, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/contrib/arm-neon/linux-auxv.c b/contrib/arm-neon/linux-auxv.c index 6fc978240..696e297ef 100644 --- a/contrib/arm-neon/linux-auxv.c +++ b/contrib/arm-neon/linux-auxv.c @@ -2,7 +2,7 @@ * * Copyright (c) 2014 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 6, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/contrib/arm-neon/linux.c b/contrib/arm-neon/linux.c index ccf23620e..182f37605 100644 --- a/contrib/arm-neon/linux.c +++ b/contrib/arm-neon/linux.c @@ -2,7 +2,7 @@ * * Copyright (c) 2014 Glenn Randers-Pehrson * Written by John Bowler, 2014. - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 6, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/contrib/libtests/pngimage.c b/contrib/libtests/pngimage.c index 17040566d..372845ead 100644 --- a/contrib/libtests/pngimage.c +++ b/contrib/libtests/pngimage.c @@ -2,7 +2,7 @@ * * Copyright (c) 2014 John Cunningham Bowler * - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 6, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/contrib/libtests/pngunknown.c b/contrib/libtests/pngunknown.c index a1d944e23..b8c4899de 100644 --- a/contrib/libtests/pngunknown.c +++ b/contrib/libtests/pngunknown.c @@ -1,7 +1,7 @@ /* pngunknown.c - test the read side unknown chunk handling * - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 6, 2014] * Copyright (c) 2014 Glenn Randers-Pehrson * Written by John Cunningham Bowler * diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index 457342e07..788b69327 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.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 6, 2014] * Copyright (c) 2014 Glenn Randers-Pehrson * Written by John Cunningham Bowler * diff --git a/contrib/tools/pngfix.c b/contrib/tools/pngfix.c index 1bd74159a..3b64627c2 100644 --- a/contrib/tools/pngfix.c +++ b/contrib/tools/pngfix.c @@ -2,7 +2,7 @@ * * Copyright (c) 2014 John Cunningham Bowler * - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 6, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/libpng-manual.txt b/libpng-manual.txt index 2e82241a2..73e09abd0 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.6.10rc04 - March 5, 2014 + libpng version 1.6.10 - March 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.6.10rc04 - March 5, 2014 + libpng versions 0.97, January 1998, through 1.6.10 - March 6, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5337,8 +5337,8 @@ We don't use C++ style ("//") comments. We have, however, used them in the past in some now-abandoned MMX assembler code. -Functions and their curly braces are not indented, exported -functions are marked with PNGAPI: +Functions and their curly braces are not indented, and +exported functions are marked with PNGAPI: /* This is a public function that is visible to * application programmers. It does thus-and-so. @@ -5416,13 +5416,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -March 5, 2014 +March 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.6.10rc04 are Y2K compliant. It is my belief that earlier +upward through 1.6.10 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 diff --git a/libpng.3 b/libpng.3 index d1df32cac..db4990f33 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "March 5, 2014" +.TH LIBPNG 3 "March 6, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.10rc04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.10 .SH SYNOPSIS \fB #include \fP @@ -504,7 +504,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.6.10rc04 - March 5, 2014 + libpng version 1.6.10 - March 6, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.10rc04 - March 5, 2014 + libpng versions 0.97, January 1998, through 1.6.10 - March 6, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5842,8 +5842,8 @@ We don't use C++ style ("//") comments. We have, however, used them in the past in some now-abandoned MMX assembler code. -Functions and their curly braces are not indented, exported -functions are marked with PNGAPI: +Functions and their curly braces are not indented, and +exported functions are marked with PNGAPI: /* This is a public function that is visible to * application programmers. It does thus-and-so. @@ -5921,13 +5921,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -March 5, 2014 +March 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.6.10rc04 are Y2K compliant. It is my belief that earlier +upward through 1.6.10 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 @@ -6160,6 +6160,7 @@ the first widely used release: 1.6.9 16 10609 16.so.16.9[.0] 1.6.10beta01-03 16 10610 16.so.16.10[.0] 1.6.10rc01-04 16 10610 16.so.16.10[.0] + 1.6.10 16 10610 16.so.16.10[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6216,7 +6217,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.10rc04 - March 5, 2014: +Libpng version 1.6.10 - March 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). @@ -6239,7 +6240,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.10rc04, March 5, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.10, March 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 @@ -6338,7 +6339,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 5, 2014 +March 6, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index ac433a0a9..844a9fcef 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 4, 2014" +.TH LIBPNGPF 3 "March 6, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.10rc04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.10 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index a066ac95f..3beacfae5 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "March 4, 2014" +.TH PNG 5 "March 6, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 86934c4e3..0cb4a1d04 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_6_10rc04 Your_png_h_is_not_version_1_6_10rc04; +typedef png_libpng_version_1_6_10 Your_png_h_is_not_version_1_6_10; /* 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 @@ -773,13 +773,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.10rc04 - March 5, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.10 - March 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.6.10rc04 - March 5, 2014\ + return "libpng version 1.6.10 - March 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 9163a6b56..16d3299aa 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.10rc04 - March 4, 2014 + * libpng version 1.6.10 - March 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.6.10rc04 - March 4, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.10 - March 6, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -194,6 +194,7 @@ * 1.6.9 16 10609 16.so.16.9[.0] * 1.6.10beta01-03 16 10610 16.so.16.10[.0] * 1.6.10betarc01-04 16 10610 16.so.16.10[.0] + * 1.6.10beta 16 10610 16.so.16.10[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -225,7 +226,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.10rc04, March 4, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.10, March 6, 2014, are * Copyright (c) 2004, 2006-2013 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: @@ -337,13 +338,13 @@ * Y2K compliance in libpng: * ========================= * - * March 4, 2014 + * March 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.6.10rc04 are Y2K compliant. It is my belief that + * upward through 1.6.10 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.6.10rc04" +#define PNG_LIBPNG_VER_STRING "1.6.10" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.10rc04 - March 4, 2014\n" + " libpng version 1.6.10 - March 6, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -419,7 +420,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 04 +#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. @@ -549,7 +550,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_6_10rc04; +typedef char* png_libpng_version_1_6_10; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 1277fccbe..afc0ead2b 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.10rc04 - March 4, 2014 + * libpng version 1.6.10 - March 6, 2014 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index a8f2cf3e7..5876b477c 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 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/pngpread.c b/pngpread.c index 99beebb30..6c8404e47 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.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 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 e3f574f1f..a3fd1a46a 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.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 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 e459ed6cb..cd9ab58b4 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 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 0ab73b4a4..53953966e 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.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 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 7fd4503e2..98e952406 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 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 a64b77a28..3b1f055db 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1991,4 +1991,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_10rc04 Your_png_h_is_not_version_1_6_10rc04; +typedef png_libpng_version_1_6_10 Your_png_h_is_not_version_1_6_10; diff --git a/pngwrite.c b/pngwrite.c index 4143916e1..cff7864cb 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.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 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 35260fbc3..2ee18ff2a 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.10rc04 - March 4, 2014 +libpng version 1.6.10 - March 6, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 0a0e2ecf2..8438f36fe 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@