diff --git a/ANNOUNCE b/ANNOUNCE index e7557aab2..47181be42 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,45 +1,36 @@ -Libpng 1.6.12rc04 - June 8, 2014 +Libpng 1.6.12 - June 12, 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.12rc04.tar.xz (LZMA-compressed, recommended) - 1.6.12rc04.tar.gz + libpng-1.6.12.tar.xz (LZMA-compressed, recommended) + libpng-1.6.12.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1612r04.7z (LZMA-compressed, recommended) - lp1612r04.zip + lpng1612.7z (LZMA-compressed, recommended) + lpng1612.zip Other information: - 1.6.12rc04-README.txt - 1.6.12rc04-LICENSE.txt - libpng-1.6.12rc04-*.asc (armored detached GPG signatures) + libpng-1.6.12-README.txt + libpng-1.6.12-LICENSE.txt + libpng-1.6.12-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.11): - -Version 1.6.12rc01 [June 6, 2014] - Relocated new code from 1.6.11beta06 in png.c to a point after the + Relocated new code from 1.6.11 in png.c to a point after the declarations (Max Stepin). - -Version 1.6.12rc02 [June 7, 2014] Changed file permissions of contrib/tools/intgamma.sh, test-driver, and compile from 0644 to 0755 (Cosmin). - -Version 1.6.12rc03 [June 8, 2014] Ensure "__has_attribute()" macro exists before trying to use it with old clang compilers (MacPorts Ticket #43939). -Version 1.6.12rc04 [June 8, 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 ed31e1df0..c1951a783 100644 --- a/CHANGES +++ b/CHANGES @@ -4937,7 +4937,8 @@ Version 1.6.12rc03 [June 8, 2014] Ensure "__has_attribute()" macro exists before trying to use it with old clang compilers (MacPorts Ticket #43939). -Version 1.6.12rc04 [June 8, 2014] +Version 1.6.12 [June 12, 2014] + No changes. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 932ff80ff..f74147b2d 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.12rc04 +# VERSION 16.${PNGLIB_RELEASE}.1.6.12 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 98172a330..b77abddf1 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.12rc04, June 8, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.12, June 12, 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 -June 8, 2014 +June 12, 2014 diff --git a/README b/README index 2c157b159..dc6c00b18 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.12rc04 - June 8, 2014 (shared library 16.0) +README for libpng version 1.6.12 - June 12, 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 a672eaebb..cff47ff60 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 [June 12, 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 856c8e293..0ea4dd29d 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.12rc04],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.12],[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.12rc04 +PNGLIB_VERSION=1.6.12 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=12 diff --git a/example.c b/example.c index 8ef300235..e9747a87b 100644 --- a/example.c +++ b/example.c @@ -2,7 +2,7 @@ #if 0 /* in case someone actually tries to compile this */ /* example.c - an example of using libpng - * Last changed in libpng 1.6.11 [(PENDING RELEASE)] + * Last changed in libpng 1.6.11 [June 12, 2014] * Maintained 1998-2014 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) diff --git a/libpng-manual.txt b/libpng-manual.txt index 86fd6aecf..f79ca7e3c 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.12rc04 - June 8, 2014 + libpng version 1.6.12 - June 12, 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.12rc04 - June 8, 2014 + libpng versions 0.97, January 1998, through 1.6.12 - June 12, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5043,7 +5043,7 @@ libpng-1.6.11, recognizing and checking sRGB profiles can be avoided by means of #ifdef PNG_SKIP_sRGB_CHECK_PROFILE - png_set_option(ping, PNG_SKIP_sRGB_CHECK_PROFILE, + png_set_option(png_ptr, PNG_SKIP_sRGB_CHECK_PROFILE, PNG_OPTION_ON); #endif @@ -5275,13 +5275,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -June 8, 2014 +June 12, 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.12rc04 are Y2K compliant. It is my belief that earlier +upward through 1.6.12 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 674748bb5..6ac1b6a0d 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "June 8, 2014" +.TH LIBPNG 3 "June 12, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.12rc04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.12 .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.12rc04 - June 8, 2014 + libpng version 1.6.12 - June 12, 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.12rc04 - June 8, 2014 + libpng versions 0.97, January 1998, through 1.6.12 - June 12, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5547,7 +5547,7 @@ libpng-1.6.11, recognizing and checking sRGB profiles can be avoided by means of #ifdef PNG_SKIP_sRGB_CHECK_PROFILE - png_set_option(ping, PNG_SKIP_sRGB_CHECK_PROFILE, + png_set_option(png_ptr, PNG_SKIP_sRGB_CHECK_PROFILE, PNG_OPTION_ON); #endif @@ -5779,13 +5779,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -June 8, 2014 +June 12, 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.12rc04 are Y2K compliant. It is my belief that earlier +upward through 1.6.12 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 @@ -6022,7 +6022,8 @@ the first widely used release: 1.6.11beta01-06 16 10611 16.so.16.11[.0] 1.6.11rc01-02 16 10611 16.so.16.11[.0] 1.6.11 16 10611 16.so.16.11[.0] - 1.6.12rc01-04 16 10612 16.so.16.12[.0] + 1.6.12rc01 16 10612 16.so.16.12[.0] + 1.6.12 16 10612 16.so.16.12[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6079,7 +6080,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.12rc04 - June 8, 2014: +Libpng version 1.6.12 - June 12, 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). @@ -6102,7 +6103,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.12rc04, June 8, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.12, June 12, 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 @@ -6201,7 +6202,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 8, 2014 +June 12, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 1d2ed59f3..6ac628562 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "June 8, 2014" +.TH LIBPNGPF 3 "June 12, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.12rc04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.12 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 015d8cadd..8f329fd20 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "June 8, 2014" +.TH PNG 5 "June 12, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 98fa467cc..f813e0a22 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.6.12 [(PENDING RELEASE)] + * Last changed in libpng 1.6.12 [June 12, 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_6_12rc04 Your_png_h_is_not_version_1_6_12rc04; +typedef png_libpng_version_1_6_12 Your_png_h_is_not_version_1_6_12; /* 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.12rc04 - June 8, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.12 - June 12, 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.12rc04 - June 8, 2014\ + return "libpng version 1.6.12 - June 12, 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 d1665dc18..75e87362d 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.12rc04 - June 8, 2014 + * libpng version 1.6.12 - June 12, 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.12rc04 - June 8, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.12 - June 12, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -198,7 +198,8 @@ * 1.6.11beta01-06 16 10611 16.so.16.11[.0] * 1.6.11rc01-02 16 10611 16.so.16.11[.0] * 1.6.11 16 10611 16.so.16.11[.0] - * 1.6.12rc01-04 16 10612 16.so.16.12[.0] + * 1.6.12rc01-03 16 10612 16.so.16.12[.0] + * 1.6.12 16 10612 16.so.16.12[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -230,7 +231,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.12rc04, June 8, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.12, June 12, 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: @@ -342,13 +343,13 @@ * Y2K compliance in libpng: * ========================= * - * June 8, 2014 + * June 12, 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.12rc04 are Y2K compliant. It is my belief that + * upward through 1.6.12 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 @@ -410,9 +411,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.12rc04" +#define PNG_LIBPNG_VER_STRING "1.6.12" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.12rc04 - June 8, 2014\n" + " libpng version 1.6.12 - June 12, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -426,7 +427,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 @@ -443,7 +444,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. @@ -556,7 +557,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_12rc04; +typedef char* png_libpng_version_1_6_12; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 3a3c72e09..72ec81fa2 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.12rc04 - June 8, 2014 + * libpng version 1.6.12 - June 12, 2014 * * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index e6fab3900..f21f4dda5 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.11 [(PENDING RELEASE)] + * Last changed in libpng 1.6.11 [June 12, 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/pngget.c b/pngget.c index 67b31f891..9e205ad1e 100644 --- a/pngget.c +++ b/pngget.c @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.6.11 [(PENDING RELEASE)] + * Last changed in libpng 1.6.11 [June 12, 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 d02aa367d..819db0305 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.11 [(PENDING RELEASE)] + * Last changed in libpng 1.6.11 [June 12, 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/pngread.c b/pngread.c index e26f001af..4bf20219b 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.6.11 [(PENDING RELEASE)] + * Last changed in libpng 1.6.11 [June 12, 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 1cb652981..5b8942397 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.11 [(PENDING RELEASE)] + * Last changed in libpng 1.6.11 [June 12, 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 01d346682..cc52202a5 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.11 [(PENDING RELEASE)] + * Last changed in libpng 1.6.11 [June 12, 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/pngset.c b/pngset.c index b30acbf6b..0c827d3c1 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.6.11 [(PENDING RELEASE)] + * Last changed in libpng 1.6.11 [June 12, 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 d426e5d98..ffac74e7b 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.6.11 [(PENDING RELEASE)] + * Last changed in libpng 1.6.11 [June 12, 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.) @@ -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_12rc04 Your_png_h_is_not_version_1_6_12rc04; +typedef png_libpng_version_1_6_12 Your_png_h_is_not_version_1_6_12; diff --git a/pngtrans.c b/pngtrans.c index b5ea49bc5..792e13a44 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.6.11 [(PENDING RELEASE)] + * Last changed in libpng 1.6.11 [June 12, 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/pngwrite.c b/pngwrite.c index 73ff60111..7087d08cd 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.11 [(PENDING RELEASE)] + * Last changed in libpng 1.6.11 [June 12, 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/pngwutil.c b/pngwutil.c index f4abeba9a..cfc331246 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.6.11 [(PENDING RELEASE)] + * Last changed in libpng 1.6.11 [June 12, 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 bf675b81c..a39fed546 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.12rc04 - June 8, 2014 +libpng version 1.6.12 - June 12, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 91f6aa6c9..7d09a412e 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@