From 88dd30b232362b65cca374dda39096888163dd6b Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sun, 21 Dec 2014 21:08:09 -0600 Subject: [libpng16] Imported from libpng-1.6.16.tar --- ANNOUNCE | 38 +++++++++++--------------------------- CHANGES | 3 +++ CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- arm/arm_init.c | 2 +- arm/filter_neon.S | 2 +- arm/filter_neon_intrinsics.c | 2 +- configure.ac | 4 ++-- contrib/arm-neon/linux.c | 2 +- contrib/libtests/pngstest.c | 2 +- libpng-manual.txt | 8 ++++---- libpng.3 | 19 ++++++++++--------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 8 ++++---- png.h | 21 +++++++++++---------- pngconf.h | 2 +- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 10 +++++----- scripts/def.c | 4 ++-- scripts/intprefix.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/prefix.c | 2 +- scripts/sym.c | 2 +- scripts/symbols.c | 2 +- scripts/symbols.def | 2 +- scripts/vers.c | 2 +- 35 files changed, 81 insertions(+), 92 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index e85eca1d2..c514daf4f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,51 +1,35 @@ -Libpng 1.6.16rc03 - December 21, 2014 +Libpng 1.6.16 - December 22, 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.16rc03.tar.xz (LZMA-compressed, recommended) - 1.6.16rc03.tar.gz + libpng-1.6.16.tar.xz (LZMA-compressed, recommended) + libpng-1.6.16.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1616r03.7z (LZMA-compressed, recommended) - lp1616r03.zip + lpng1616.7z (LZMA-compressed, recommended) + lpng1616.zip Other information: - 1.6.16rc03-README.txt - 1.6.16rc03-LICENSE.txt - libpng-1.6.16rc03-*.asc (armored detached GPG signatures) + libpng-1.6.16-README.txt + libpng-1.6.16-LICENSE.txt + libpng-1.6.16-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.15): - -Version 1.6.16beta01 [December 14, 2014] Added ".align 2" to arm/filter_neon.S to support old GAS assemblers that don't do alignment correctly. - Revised Makefile.am and scripts/symbols.dfn to work with MinGW/MSYS - (Bob Friesenhahn). - -Version 1.6.16beta02 [December 15, 2014] - Revised Makefile.am and scripts/*.dfn again to work with MinGW/MSYS; - renamed scripts/*.dfn to scripts/*.c (John Bowler). - -Version 1.6.16beta03 [December 21, 2014] + Revised Makefile.am and scripts/*.dfn to work with MinGW/MSYS; + renamed scripts/*.dfn to scripts/*.c (Bob Friesenhahn and John Bowler). Quiet a "comparison always true" warning in pngstest.c (John Bowler). - -Version 1.6.16rc01 [December 21, 2014] Restored a test on width that was removed from png.c at libpng-1.6.9 (Bug report by Alex Eubanks). - -Version 1.6.16rc02 [December 21, 2014] - Undid the update to pngrutil.c in 1.6.16rc01. - -Version 1.6.16rc03 [December 21, 2014] Fixed an overflow in png_combine_row with very wide interlaced images. Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/CHANGES b/CHANGES index 6f137c1dc..68a80a583 100644 --- a/CHANGES +++ b/CHANGES @@ -5122,6 +5122,9 @@ Version 1.6.16rc02 [December 21, 2014] Version 1.6.16rc03 [December 21, 2014] Fixed an overflow in png_combine_row with very wide interlaced images. +Version 1.6.16 [December 22, 2014] + No changes. + 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/CMakeLists.txt b/CMakeLists.txt index 84f597416..28d1ca7db 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.16rc03 +# VERSION 16.${PNGLIB_RELEASE}.1.6.16 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 5531c6ad3..f912f6a6d 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.16rc03, December 21, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 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 -December 21, 2014 +December 22, 2014 diff --git a/README b/README index 45484c93b..8c5b0b2f1 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.16rc03 - December 21, 2014 (shared library 16.0) +README for libpng version 1.6.16 - December 22, 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 d87b6e727..fb3d50d04 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.16 [(PENDING RELEASE)] + * Last changed in libpng 1.6.16 [December 22, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/arm/filter_neon.S b/arm/filter_neon.S index b7c0a90b4..3b061d6bb 100644 --- a/arm/filter_neon.S +++ b/arm/filter_neon.S @@ -3,7 +3,7 @@ * * Copyright (c) 2014 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.16 [(PENDING RELEASE)] + * Last changed in libpng 1.6.16 [December 22, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/arm/filter_neon_intrinsics.c b/arm/filter_neon_intrinsics.c index a2b5011f6..d42c78890 100644 --- a/arm/filter_neon_intrinsics.c +++ b/arm/filter_neon_intrinsics.c @@ -5,7 +5,7 @@ * Written by James Yu , October 2013. * Based on filter_neon.S, written by Mans Rullgard, 2011. * - * Last changed in libpng 1.6.16 [(PENDING RELEASE)] + * Last changed in libpng 1.6.16 [December 22, 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 7ef8b6517..c99a4d9ae 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.16rc03],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.16],[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.16rc03 +PNGLIB_VERSION=1.6.16 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=16 diff --git a/contrib/arm-neon/linux.c b/contrib/arm-neon/linux.c index 376709c34..abae9e33b 100644 --- a/contrib/arm-neon/linux.c +++ b/contrib/arm-neon/linux.c @@ -2,7 +2,7 @@ * * Copyright (c) 2014 Glenn Randers-Pehrson * Written by John Bowler, 2014. - * Last changed in libpng 1.6.16 [(PENDING RELEASE)] + * Last changed in libpng 1.6.16 [December 22, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/contrib/libtests/pngstest.c b/contrib/libtests/pngstest.c index c65406be9..d7c1c1e79 100644 --- a/contrib/libtests/pngstest.c +++ b/contrib/libtests/pngstest.c @@ -3,7 +3,7 @@ * * Copyright (c) 2013-2014 John Cunningham Bowler * - * Last changed in libpng 1.6.16 [(PENDING RELEASE)] + * Last changed in libpng 1.6.16 [December 22, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/libpng-manual.txt b/libpng-manual.txt index 4d10796ec..3aa1f5787 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.16rc03 - December 21, 2014 + libpng version 1.6.16 - December 22, 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.16rc03 - December 21, 2014 + libpng versions 0.97, January 1998, through 1.6.16 - December 22, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5274,13 +5274,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -December 21, 2014 +December 22, 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.16rc03 are Y2K compliant. It is my belief that earlier +upward through 1.6.16 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 02e42627c..bb3c3ca05 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "December 21, 2014" +.TH LIBPNG 3 "December 22, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.16rc03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.16 .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.16rc03 - December 21, 2014 + libpng version 1.6.16 - December 22, 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.16rc03 - December 21, 2014 + libpng versions 0.97, January 1998, through 1.6.16 - December 22, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5778,13 +5778,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -December 21, 2014 +December 22, 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.16rc03 are Y2K compliant. It is my belief that earlier +upward through 1.6.16 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 @@ -6035,6 +6035,7 @@ the first widely used release: 1.6.15 16 10615 16.so.16.15[.0] 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] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6091,7 +6092,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.16rc03 - December 21, 2014: +Libpng version 1.6.16 - December 22, 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). @@ -6114,7 +6115,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.16rc03, December 21, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 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 @@ -6213,7 +6214,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 21, 2014 +December 22, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 2cbce6bca..7d489130b 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "December 21, 2014" +.TH LIBPNGPF 3 "December 22, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.16rc03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.16 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 2da6ba10d..ff6083ce6 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "December 21, 2014" +.TH PNG 5 "December 22, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index ea5bd4105..4d93dfa91 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.16 [(PENDING RELEASE)] + * Last changed in libpng 1.6.16 [December 22, 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_16rc03 Your_png_h_is_not_version_1_6_16rc03; +typedef png_libpng_version_1_6_16 Your_png_h_is_not_version_1_6_16; /* 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.16rc03 - December 21, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.16 - December 22, 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.16rc03 - December 21, 2014\ + return "libpng version 1.6.16 - December 22, 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 86d19b317..997130d38 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.16rc03, December 21, 2014 + * libpng version 1.6.16, December 22, 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.16rc03, December 21, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.16, December 22, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -211,6 +211,7 @@ * 1.6.15 16 10615 16.so.16.15[.0] * 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] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -242,7 +243,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.16rc03, December 21, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 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: @@ -354,13 +355,13 @@ * Y2K compliance in libpng: * ========================= * - * December 21, 2014 + * December 22, 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.16rc03 are Y2K compliant. It is my belief that + * upward through 1.6.16 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 @@ -422,9 +423,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.16rc03" +#define PNG_LIBPNG_VER_STRING "1.6.16" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.16rc03 - December 21, 2014\n" + " libpng version 1.6.16 - December 22, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -438,7 +439,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 03 +#define PNG_LIBPNG_VER_BUILD 0 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -455,7 +456,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. @@ -568,7 +569,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_16rc03; +typedef char* png_libpng_version_1_6_16; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index d65951205..03615f0e7 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.16rc03,December 21, 2014 + * libpng version 1.6.16,December 22, 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 1d317e3c8..2e8cb8aa5 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_16rc03 Your_png_h_is_not_version_1_6_16rc03; +typedef png_libpng_version_1_6_16 Your_png_h_is_not_version_1_6_16; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 43cd5d4dd..e7a02d876 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.16rc03 - December 21, 2014 +libpng version 1.6.16 - December 22, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 734410875..adbfea825 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@