From db1a0e763fac64c45e8eedf488f08b2cc88b0979 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 7 Jun 2014 22:41:00 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.12rc03.tar --- ANNOUNCE | 20 +++++++++++--------- CHANGES | 4 +++- CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure.ac | 4 ++-- libpng-manual.txt | 8 ++++---- libpng.3 | 20 ++++++++++---------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 20 ++++++++++---------- pngconf.h | 2 +- pngtest.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 +- 25 files changed, 69 insertions(+), 65 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 15a731624..c177b8e20 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.12rc02 - June 8, 2014 +Libpng 1.6.12rc03 - June 8, 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. @@ -9,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.12rc02.tar.xz (LZMA-compressed, recommended) - 1.6.12rc02.tar.gz + 1.6.12rc03.tar.xz (LZMA-compressed, recommended) + 1.6.12rc03.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1612r02.7z (LZMA-compressed, recommended) - lp1612r02.zip + lp1612r03.7z (LZMA-compressed, recommended) + lp1612r03.zip Other information: - 1.6.12rc02-README.txt - 1.6.12rc02-LICENSE.txt - libpng-1.6.12rc02-*.asc (armored detached GPG signatures) + 1.6.12rc03-README.txt + 1.6.12rc03-LICENSE.txt + libpng-1.6.12rc03-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.11): @@ -30,9 +30,11 @@ Version 1.6.12rc01 [June 6, 2014] Relocated new code from 1.6.11beta06 in png.c to a point after the declarations (Max Stepin). -Version 1.6.12rc03 [June 8, 2014] +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). diff --git a/CHANGES b/CHANGES index 5a04d9f41..e3b0504ce 100644 --- a/CHANGES +++ b/CHANGES @@ -4929,9 +4929,11 @@ Version 1.6.12rc01 [June 6, 2014] Relocated new code from 1.6.11beta06 in png.c to a point after the declarations (Max Stepin). -Version 1.6.12rc03 [June 8, 2014] +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). diff --git a/CMakeLists.txt b/CMakeLists.txt index 71d79d73f..3f13bb5de 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.12rc02 +# VERSION 16.${PNGLIB_RELEASE}.1.6.12rc03 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index db883d8a0..f02a4cb06 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.12rc02, June 7, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.12rc03, June 8, 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 7, 2014 +June 8, 2014 diff --git a/README b/README index 6d54d091a..73254ddb1 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.12rc02 - June 7, 2014 (shared library 16.0) +README for libpng version 1.6.12rc03 - June 8, 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/configure.ac b/configure.ac index 98dad34ee..0f23c83bd 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.12rc02],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.12rc03],[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.12rc02 +PNGLIB_VERSION=1.6.12rc03 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=12 diff --git a/libpng-manual.txt b/libpng-manual.txt index 8c1e8e169..817d35415 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.12rc02 - June 7, 2014 + libpng version 1.6.12rc03 - June 8, 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.12rc02 - June 7, 2014 + libpng versions 0.97, January 1998, through 1.6.12rc03 - June 8, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5275,13 +5275,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -June 7, 2014 +June 8, 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.12rc02 are Y2K compliant. It is my belief that earlier +upward through 1.6.12rc03 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 30ae808e2..ff549f867 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "June 7, 2014" +.TH LIBPNG 3 "June 8, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.12rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.12rc03 .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.12rc02 - June 7, 2014 + libpng version 1.6.12rc03 - June 8, 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.12rc02 - June 7, 2014 + libpng versions 0.97, January 1998, through 1.6.12rc03 - June 8, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5779,13 +5779,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -June 7, 2014 +June 8, 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.12rc02 are Y2K compliant. It is my belief that earlier +upward through 1.6.12rc03 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,7 @@ 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.12beta01 16 10612 16.so.16.12[.0] + 1.6.12rc01-03 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 +6079,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.12rc02 - June 7, 2014: +Libpng version 1.6.12rc03 - June 8, 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 +6102,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.12rc02, June 7, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.12rc03, June 8, 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 +6201,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 7, 2014 +June 8, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 5d5285785..ebdf462da 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "June 7, 2014" +.TH LIBPNGPF 3 "June 8, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.12rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.12rc03 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index fd8655ada..015d8cadd 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "June 7, 2014" +.TH PNG 5 "June 8, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 778ce6011..46eea9c61 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_12rc02 Your_png_h_is_not_version_1_6_12rc02; +typedef png_libpng_version_1_6_12rc03 Your_png_h_is_not_version_1_6_12rc03; /* 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.12rc02 - June 7, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.12rc03 - June 8, 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.12rc02 - June 7, 2014\ + return "libpng version 1.6.12rc03 - June 8, 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 e7d1b365c..43ecd984c 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.12rc02 - June 7, 2014 + * libpng version 1.6.12rc03 - June 8, 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.12rc02 - June 7, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.12rc03 - June 8, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -198,7 +198,7 @@ * 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.12beta01 16 10612 16.so.16.12[.0] + * 1.6.12rc01-03 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 +230,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.12rc02, June 7, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.12rc03, June 8, 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 +342,13 @@ * Y2K compliance in libpng: * ========================= * - * June 7, 2014 + * June 8, 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.12rc02 are Y2K compliant. It is my belief that + * upward through 1.6.12rc03 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 +410,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.12rc02" +#define PNG_LIBPNG_VER_STRING "1.6.12rc03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.12rc02 - June 7, 2014\n" + " libpng version 1.6.12rc03 - June 8, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -426,7 +426,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 02 +#define PNG_LIBPNG_VER_BUILD 03 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -556,7 +556,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_12rc02; +typedef char* png_libpng_version_1_6_12rc03; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 7211c8be9..127daad07 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.12rc02 - June 8, 2014 + * libpng version 1.6.12rc03 - June 8, 2014 * * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index a1fd92a1c..5b51d93e1 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_12rc02 Your_png_h_is_not_version_1_6_12rc02; +typedef png_libpng_version_1_6_12rc03 Your_png_h_is_not_version_1_6_12rc03; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 9aa01d44b..22cd9a0c4 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.12rc02 - June 7, 2014 +libpng version 1.6.12rc03 - June 8, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index ad376026a..aff2caefb 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@