From 3e0bef6da4b81a5282036955ca00c9f16e0894c7 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 4 Mar 2015 09:45:57 -0600 Subject: [PATCH] [libpng16] Imported from libpng-1.6.17rc01.tar --- ANNOUNCE | 19 ++++++++++--------- CHANGES | 3 ++- CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure.ac | 4 ++-- libpng-manual.txt | 8 ++++---- libpng.3 | 21 +++++++++++---------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 24 +++++++++++++----------- pngconf.h | 6 ++---- pngtest.c | 2 +- pngwrite.c | 8 ++++---- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 10 +++++----- scripts/def.c | 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 +- 26 files changed, 75 insertions(+), 72 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index ecfb7f7c2..6ffab17f2 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.17beta07 - February 28, 2015 +Libpng 1.6.17rc01 - March 4, 2015 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. @@ -8,20 +8,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.17beta07.tar.xz (LZMA-compressed, recommended) - 1.6.17beta07.tar.gz + 1.6.17rc01.tar.xz (LZMA-compressed, recommended) + 1.6.17rc01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1617b07.7z (LZMA-compressed, recommended) - lp1617b07.zip + lp1617r01.7z (LZMA-compressed, recommended) + lp1617r01.zip Other information: - 1.6.17beta07-README.txt - 1.6.17beta07-LICENSE.txt - libpng-1.6.17beta07-*.asc (armored detached GPG signatures) + 1.6.17rc01-README.txt + 1.6.17rc01-LICENSE.txt + libpng-1.6.17rc01-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.16): @@ -65,7 +65,8 @@ Version 1.6.17beta06 [February 27, 2015] Avoid runtime checks when converting integer to png_byte with Visual Studio (Sergey Kosarevsky) -Version 1.6.17beta07 [February 28, 2015] +Version 1.6.17rc01 [March 4, 2015] + No changes. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 23005e1eb..8481d531f 100644 --- a/CHANGES +++ b/CHANGES @@ -5166,7 +5166,8 @@ Version 1.6.17beta06 [February 27, 2015] Avoid runtime checks when converting integer to png_byte with Visual Studio (Sergey Kosarevsky) -Version 1.6.17beta07 [February 28, 2015] +Version 1.6.17rc01 [March 4, 2015] + 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 bb2e7da0b..646f4db5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -253,7 +253,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.17beta07 +# VERSION 16.${PNGLIB_RELEASE}.1.6.17rc01 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index fb5733976..557a1e6ff 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.17beta07, February 28, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.6.17rc01, March 4, 2015, are Copyright (c) 2004, 2006-2015 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 -February 28, 2015 +March 4, 2015 diff --git a/README b/README index 2446fd947..c4232cccc 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.17beta07 - February 28, 2015 (shared library 16.0) +README for libpng version 1.6.17rc01 - March 4, 2015 (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 21d4a323c..1441ce7dc 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.17beta07],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.17rc01],[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.17beta07 +PNGLIB_VERSION=1.6.17rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=17 diff --git a/libpng-manual.txt b/libpng-manual.txt index 665ded75f..67273665a 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.17beta07 - February 28, 2015 + libpng version 1.6.17rc01 - March 4, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 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.17beta07 - February 28, 2015 + libpng versions 0.97, January 1998, through 1.6.17rc01 - March 4, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5275,13 +5275,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -February 28, 2015 +March 4, 2015 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.17beta07 are Y2K compliant. It is my belief that earlier +upward through 1.6.17rc01 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 73ce21528..08d5c9b6f 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "February 28, 2015" +.TH LIBPNG 3 "March 4, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.17beta07 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.17rc01 .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.17beta07 - February 28, 2015 + libpng version 1.6.17rc01 - March 4, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 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.17beta07 - February 28, 2015 + libpng versions 0.97, January 1998, through 1.6.17rc01 - March 4, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5779,13 +5779,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -February 28, 2015 +March 4, 2015 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.17beta07 are Y2K compliant. It is my belief that earlier +upward through 1.6.17rc01 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 @@ -6037,7 +6037,8 @@ the first widely used release: 1.6.16beta01-03 16 10616 16.so.16.16[.0] 1.6.16rc01-02 16 10616 16.so.16.16[.0] 1.6.16 16 10616 16.so.16.16[.0] - 1.6.17beta01-07 16 10617 16.so.16.17[.0] + 1.6.17beta01-06 16 10617 16.so.16.17[.0] + 1.6.17rc01 16 10617 16.so.16.17[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6094,7 +6095,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.17beta07 - February 28, 2015: +Libpng version 1.6.17rc01 - March 4, 2015: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6117,7 +6118,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.17beta07, February 28, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.6.17rc01, March 4, 2015, 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 @@ -6216,7 +6217,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 28, 2015 +March 4, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index c68ddaaf5..f6db97cb5 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "February 28, 2015" +.TH LIBPNGPF 3 "March 4, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.17beta07 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.17rc01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 2f8613e23..956a85c42 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "February 28, 2015" +.TH PNG 5 "March 4, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index b7726dfe4..0626b4d41 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_17beta07 Your_png_h_is_not_version_1_6_17beta07; +typedef png_libpng_version_1_6_17rc01 Your_png_h_is_not_version_1_6_17rc01; /* 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 @@ -772,13 +772,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.17beta07 - February 28, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.6.17rc01 - March 4, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 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.17beta07 - February 28, 2015\ + return "libpng version 1.6.17rc01 - March 4, 2015\ Copyright (c) 1998-2015 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 cdcebe8b5..9cc9dea27 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,8 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.17beta07, February 28, 2015 + * libpng version 1.6.17rc01, March 4, 2015 + * * Copyright (c) 1998-2015 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 +12,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.17beta07, February 28, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.6.17rc01, March 4, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -212,7 +213,8 @@ * 1.6.16beta01-03 16 10616 16.so.16.16[.0] * 1.6.16rc01-02 16 10616 16.so.16.16[.0] * 1.6.16 16 10616 16.so.16.16[.0] - * 1.6.17beta01-07 16 10617 16.so.16.17[.0] + * 1.6.17beta01-06 16 10617 16.so.16.17[.0] + * 1.6.17rc01 16 10617 16.so.16.17[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -244,7 +246,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.17beta07, February 28, 2015, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.17rc01, March 4, 2015, are * Copyright (c) 2004, 2006-2015 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: @@ -356,13 +358,13 @@ * Y2K compliance in libpng: * ========================= * - * February 28, 2015 + * March 4, 2015 * * 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.17beta07 are Y2K compliant. It is my belief that + * upward through 1.6.17rc01 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 @@ -424,9 +426,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.17beta07" +#define PNG_LIBPNG_VER_STRING "1.6.17rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.17beta07 - February 28, 2015\n" + " libpng version 1.6.17rc01 - March 4, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -440,7 +442,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 07 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -457,7 +459,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_BETA +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -570,7 +572,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_17beta07; +typedef char* png_libpng_version_1_6_17rc01; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index f2932558d..7e79de25b 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.17beta07, (PENDING RELEASE) + * libpng version 1.6.17rc01, (PENDING RELEASE) * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -11,9 +11,7 @@ * For conditions of distribution and use, see the disclaimer * and license in png.h * - */ - -/* Any machine specific code is near the front of this file, so if you + * Any machine specific code is near the front of this file, so if you * are configuring libpng for a machine, you may want to read the section * starting here down to where it starts to typedef png_color, png_text, * and png_info. diff --git a/pngtest.c b/pngtest.c index 2d25c4599..737334561 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2028,4 +2028,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_17beta07 Your_png_h_is_not_version_1_6_17beta07; +typedef png_libpng_version_1_6_17rc01 Your_png_h_is_not_version_1_6_17rc01; diff --git a/pngwrite.c b/pngwrite.c index 6fe0a8d33..181b0f854 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1051,8 +1051,8 @@ png_set_filter(png_structrp png_ptr, int method, int filters) * it is too late to start using the filters that need it, since we * will be missing the data in the previous row. If an application * wants to start and stop using particular filters during compression, - * it should start out with all of the filters, and then add and - * remove them after the start of compression. + * it should start out with all of the filters, and then remove them + * or add them back after the start of compression. */ if (png_ptr->row_buf != NULL) { @@ -1419,8 +1419,8 @@ png_set_compression_window_bits(png_structrp png_ptr, int window_bits) if (png_ptr == NULL) return; - /* Prior to 1.6.0 this would warn but then set the window_bits value, this - * meant that negative window bits values could be selected which would cause + /* Prior to 1.6.0 this would warn but then set the window_bits value. This + * meant that negative window bits values could be selected that would cause * libpng to write a non-standard PNG file with raw deflate or gzip * compressed IDAT or ancillary chunks. Such files can be read and there is * no warning on read, so this seems like a very bad idea. diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 1aa9edf97..5a8307cf2 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.17beta07 - February 28, 2015 +libpng version 1.6.17rc01 - March 4, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index d62acf536..8875a1058 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@