From f6ca49c8632bdefd6b496447cf87e38f0441ec51 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 14 May 2016 09:43:59 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.22rc01.tar --- ANNOUNCE | 19 ++++++++++--------- CHANGES | 3 ++- CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure.ac | 4 ++-- libpng-manual.txt | 6 +++--- libpng.3 | 16 ++++++++-------- 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 | 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 +- 25 files changed, 63 insertions(+), 61 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 29529c87a..8bc7994dc 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.22beta07 - May 6, 2016 +Libpng 1.6.22rc01 - May 14, 2016 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.22beta07.tar.xz (LZMA-compressed, recommended) - 1.6.22beta07.tar.gz + 1.6.22rc01.tar.xz (LZMA-compressed, recommended) + 1.6.22rc01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1622b07.7z (LZMA-compressed, recommended) - lp1622b07.zip + lp1622r01.7z (LZMA-compressed, recommended) + lp1622r01.zip Other information: - 1.6.22beta07-README.txt - 1.6.22beta07-LICENSE.txt - libpng-1.6.22beta07-*.asc (armored detached GPG signatures) + 1.6.22rc01-README.txt + 1.6.22rc01-LICENSE.txt + libpng-1.6.22rc01-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.21): @@ -99,7 +99,8 @@ Version 1.6.22beta06 [May 5, 2016] Fixed CMAKE_C_FLAGS with multiple values when genout is compiled on MSVC, Fixed pnglibconf.c compilation on OS X including the sysroot path. -Version 1.6.22beta07 [May 6, 2016] +Version 1.6.22rcp1 [May 14, 2016] + No changes. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 75f057b87..e6f39191f 100644 --- a/CHANGES +++ b/CHANGES @@ -5559,7 +5559,8 @@ Version 1.6.22beta06 [May 5, 2016] Fixed CMAKE_C_FLAGS with multiple values when genout is compiled on MSVC, Fixed pnglibconf.c compilation on OS X including the sysroot path. -Version 1.6.22beta07 [May 6, 2016] +Version 1.6.22rc01 [May 14, 2016] + 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 340f9dcb8..f69d6d3b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -696,7 +696,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(png PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.22beta07 +# VERSION 16.${PNGLIB_RELEASE}.1.6.22rc01 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index d6f9c74b3..dcb348251 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.22beta07, May 6, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.22rc01, May 14, 2016 are Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -127,4 +127,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 6, 2016 +May 14, 2016 diff --git a/README b/README index f9e9abfb4..10eb805aa 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.22beta07 - May 6, 2016 (shared library 16.0) +README for libpng version 1.6.22rc01 - May 14, 2016 (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 63d9bb2a9..087d3ae20 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.22beta07],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.22rc01],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -46,7 +46,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.22beta07 +PNGLIB_VERSION=1.6.22rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=22 diff --git a/libpng-manual.txt b/libpng-manual.txt index aafa41cce..98dc27533 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.22beta07 - May 6, 2016 + libpng version 1.6.22rc01 - May 14, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 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.22beta07 - May 6, 2016 + libpng versions 0.97, January 1998, through 1.6.22rc01 - May 14, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5345,7 +5345,7 @@ 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.22beta07 are Y2K compliant. It is my belief that earlier +upward through 1.6.22rc01 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 5bc989cfd..c718a1a17 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "May 6, 2016" +.TH LIBPNG 3 "May 14, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22beta07 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22rc01 .SH SYNOPSIS \fB #include \fP @@ -510,7 +510,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.22beta07 - May 6, 2016 + libpng version 1.6.22rc01 - May 14, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -521,7 +521,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.22beta07 - May 6, 2016 + libpng versions 0.97, January 1998, through 1.6.22rc01 - May 14, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5855,7 +5855,7 @@ 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.22beta07 are Y2K compliant. It is my belief that earlier +upward through 1.6.22rc01 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 @@ -6013,7 +6013,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.22beta07 - May 6, 2016: +Libpng version 1.6.22rc01 - May 14, 2016: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6038,7 +6038,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.22beta07, May 6, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.22rc01, May 14, 2016 are Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -6163,7 +6163,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 6, 2016 +May 14, 2016 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 858ca6ff4..081840546 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "May 6, 2016" +.TH LIBPNGPF 3 "May 14, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22beta07 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22rc01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index ee18271ba..bc2496d1b 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "May 6, 2016" +.TH PNG 5 "May 14, 2016" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 614285b4d..d03cbdfe4 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_22beta07 Your_png_h_is_not_version_1_6_22beta07; +typedef png_libpng_version_1_6_22rc01 Your_png_h_is_not_version_1_6_22rc01; /* 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 @@ -775,14 +775,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.22beta07 - May 6, 2016" PNG_STRING_NEWLINE \ + "libpng version 1.6.22rc01 - May 14, 2016" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2016 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.22beta07 - May 6, 2016\ + return "libpng version 1.6.22rc01 - May 14, 2016\ Copyright (c) 1998-2002,2004,2006-2016 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 b840ef2e9..254d54a44 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.22beta07, May 6, 2016 + * libpng version 1.6.22rc01, May 14, 2016 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.22beta07, May 6, 2016: + * libpng versions 0.97, January 1998, through 1.6.22rc01, May 14, 2016: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -29,7 +29,7 @@ * files that are distributed with libpng have other copyright owners and * are released under other open source licenses. * - * libpng versions 1.0.7, July 1, 2000 through 1.6.22beta07, May 6, 2016 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.22rc01, May 14, 2016 are * Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are * derived from libpng-1.0.6, and are distributed according to the same * disclaimer and license as libpng-1.0.6 with the following individuals @@ -245,13 +245,13 @@ * Y2K compliance in libpng: * ========================= * - * May 6, 2016 + * May 14, 2016 * * 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.22beta07 are Y2K compliant. It is my belief that + * upward through 1.6.22rc01 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 @@ -313,9 +313,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.22beta07" +#define PNG_LIBPNG_VER_STRING "1.6.22rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.22beta07 - May 6, 2016\n" + " libpng version 1.6.22rc01 - May 14, 2016\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -329,7 +329,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 @@ -346,7 +346,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. @@ -464,7 +464,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_22beta07; +typedef char* png_libpng_version_1_6_22rc01; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index e48b92f9a..975f54c60 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.22beta07, May 6, 2016 + * libpng version 1.6.22rc01, May 14, 2016 * * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index ae2c7e457..5d9f02f58 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2079,4 +2079,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_22beta07 Your_png_h_is_not_version_1_6_22beta07; +typedef png_libpng_version_1_6_22rc01 Your_png_h_is_not_version_1_6_22rc01; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 5b47f981e..8ea47bc31 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.22beta07 - May 6, 2016 +libpng version 1.6.22rc01 - May 14, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 60a247458..978adf2ee 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@