From 6df21524cd315f661b3f997fede65dfda7d4d37b Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 12 Nov 2014 21:41:38 -0600 Subject: [PATCH] [libpng16] Imported from libpng-1.6.15rc01.tar --- ANNOUNCE | 19 +++++++++++-------- CHANGES | 3 +++ CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure.ac | 4 ++-- libpng-manual.txt | 8 ++++---- libpng.3 | 19 ++++++++++--------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 21 +++++++++++---------- pngconf.h | 2 +- pngrtran.c | 9 +++++---- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 10 +++++----- 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 +- 26 files changed, 74 insertions(+), 65 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index c00602b89..d7d9dacc2 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.15beta08 - November 8, 2014 +Libpng 1.6.15rc01 - November 13, 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. @@ -8,20 +8,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.15beta08.tar.xz (LZMA-compressed, recommended) - 1.6.15beta08.tar.gz + 1.6.15rc01.tar.xz (LZMA-compressed, recommended) + 1.6.15rc01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1615b08.7z (LZMA-compressed, recommended) - lp1615b08.zip + lp1615r01.7z (LZMA-compressed, recommended) + lp1615r01.zip Other information: - 1.6.15beta08-README.txt - 1.6.15beta08-LICENSE.txt - libpng-1.6.15beta08-*.asc (armored detached GPG signatures) + 1.6.15rc01-README.txt + 1.6.15rc01-LICENSE.txt + libpng-1.6.15rc01-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.14): @@ -74,6 +74,9 @@ Version 1.6.15beta07 [November 7, 2014] Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */" Version 1.6.15beta08 [November 8, 2014] + More housecleaning in *.h + +Version 1.6.15rc01 [November 13, 2014] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 80ecd80da..c7918a76e 100644 --- a/CHANGES +++ b/CHANGES @@ -5082,6 +5082,9 @@ Version 1.6.15beta07 [November 7, 2014] Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */" Version 1.6.15beta08 [November 8, 2014] + More housecleaning in *.h + +Version 1.6.15rc01 [November 13, 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 ff35a757c..1b54e5b99 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.15beta08 +# VERSION 16.${PNGLIB_RELEASE}.1.6.15rc01 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 6a9a26b9f..9022164c5 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.15beta08, November 8, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.15rc01, November 13, 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 -November 8, 2014 +November 13, 2014 diff --git a/README b/README index 862149e31..d4d1deabe 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.15beta08 - November 8, 2014 (shared library 16.0) +README for libpng version 1.6.15rc01 - November 13, 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 224624974..90a5d98de 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.15beta08],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.15rc01],[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.15beta08 +PNGLIB_VERSION=1.6.15rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=15 diff --git a/libpng-manual.txt b/libpng-manual.txt index 8a65fff9d..24c3fdadb 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.15beta08 - November 8, 2014 + libpng version 1.6.15rc01 - November 13, 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.15beta08 - November 8, 2014 + libpng versions 0.97, January 1998, through 1.6.15rc01 - November 13, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5277,13 +5277,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -November 8, 2014 +November 13, 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.15beta08 are Y2K compliant. It is my belief that earlier +upward through 1.6.15rc01 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 ef946592d..272ad2519 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "November 8, 2014" +.TH LIBPNG 3 "November 13, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15beta08 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15rc01 .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.15beta08 - November 8, 2014 + libpng version 1.6.15rc01 - November 13, 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.15beta08 - November 8, 2014 + libpng versions 0.97, January 1998, through 1.6.15rc01 - November 13, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5781,13 +5781,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -November 8, 2014 +November 13, 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.15beta08 are Y2K compliant. It is my belief that earlier +upward through 1.6.15rc01 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 @@ -6034,6 +6034,7 @@ the first widely used release: 1.6.14rc01-02 16 10614 16.so.16.14[.0] 1.6.14 16 10614 16.so.16.14[.0] 1.6.15beta01-08 16 10615 16.so.16.15[.0] + 1.6.15rc01 16 10615 16.so.16.15[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6090,7 +6091,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.15beta08 - November 8, 2014: +Libpng version 1.6.15rc01 - November 13, 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). @@ -6113,7 +6114,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.15beta08, November 8, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.15rc01, November 13, 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 @@ -6212,7 +6213,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 8, 2014 +November 13, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 90c9cb3f7..8963ed01f 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "November 8, 2014" +.TH LIBPNGPF 3 "November 13, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15beta08 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15rc01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 1023de4b6..50bd5804a 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "November 8, 2014" +.TH PNG 5 "November 13, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 4e56bc024..3a6c0fd29 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_15beta08 Your_png_h_is_not_version_1_6_15beta08; +typedef png_libpng_version_1_6_15rc01 Your_png_h_is_not_version_1_6_15rc01; /* 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 @@ -769,13 +769,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.15beta08 - November 8, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.15rc01 - November 13, 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.15beta08 - November 8, 2014\ + return "libpng version 1.6.15rc01 - November 13, 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 0082126e2..ff9393c87 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.15beta08 - November 8, 2014 + * libpng version 1.6.15rc01 - November 13, 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.15beta08 - November 8, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.15rc01 - November 13, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -207,6 +207,7 @@ * 1.6.14rc01-02 16 10614 16.so.16.14[.0] * 1.6.14 16 10614 16.so.16.14[.0] * 1.6.15beta01-08 16 10615 16.so.16.15[.0] + * 1.6.15rc01 16 10615 16.so.16.15[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -238,7 +239,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.15beta08, November 8, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.15rc01, November 13, 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: @@ -350,13 +351,13 @@ * Y2K compliance in libpng: * ========================= * - * November 8, 2014 + * November 13, 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.15beta08 are Y2K compliant. It is my belief that + * upward through 1.6.15rc01 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 @@ -418,9 +419,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.15beta08" +#define PNG_LIBPNG_VER_STRING "1.6.15rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.15beta08 - November 8, 2014\n" + " libpng version 1.6.15rc01 - November 13, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -434,7 +435,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 08 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -451,7 +452,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. @@ -564,7 +565,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_15beta08; +typedef char* png_libpng_version_1_6_15rc01; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 7235effa3..1a4677732 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.15beta08 - November 8, 2014 + * libpng version 1.6.15rc01 - November 13, 2014 * * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index 7f9240b59..a8998af6e 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -91,7 +91,8 @@ png_set_crc_action(png_structrp png_ptr, int crit_action, int ancil_action) #ifdef PNG_READ_TRANSFORMS_SUPPORTED /* Is it OK to set a transformation now? Only if png_start_read_image or * png_read_update_info have not been called. It is not necessary for the IHDR - * to have been read in all cases, the parameter allows for this check too. + * to have been read in all cases; the need_IHDR parameter allows for this + * check too. */ static int png_rtran_ok(png_structrp png_ptr, int need_IHDR) @@ -998,7 +999,7 @@ png_set_rgb_to_gray_fixed(png_structrp png_ptr, int error_action, png_uint_16 red_int, green_int; /* NOTE: this calculation does not round, but this behavior is retained - * for consistency, the inaccuracy is very small. The code here always + * for consistency; the inaccuracy is very small. The code here always * overwrites the coefficients, regardless of whether they have been * defaulted or set already. */ @@ -1091,7 +1092,7 @@ png_gamma_threshold(png_fixed_point screen_gamma, png_fixed_point file_gamma) * the palette. */ -/*For the moment 'png_init_palette_transformations' and +/* For the moment 'png_init_palette_transformations' and * 'png_init_rgb_transformations' only do some flag canceling optimizations. * The intent is that these two routines should have palette or rgb operations * extracted from 'png_init_read_transformations'. @@ -1345,7 +1346,7 @@ png_init_read_transformations(png_structrp png_ptr) #endif /* Certain transformations have the effect of preventing other - * transformations that happen afterward in png_do_read_transformations, + * transformations that happen afterward in png_do_read_transformations; * resolve the interdependencies here. From the code of * png_do_read_transformations the order is: * diff --git a/pngtest.c b/pngtest.c index d31b1af19..9853a4d9d 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2008,4 +2008,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_15beta08 Your_png_h_is_not_version_1_6_15beta08; +typedef png_libpng_version_1_6_15rc01 Your_png_h_is_not_version_1_6_15rc01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index b96bec269..1ca8678ed 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.15beta08 - November 8, 2014 +libpng version 1.6.15rc01 - November 13, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 54fba7bae..838ba7cc4 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@