From fa49aae286c5de4dade7226594f1942bfed3a996 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 8 Nov 2014 09:01:10 -0600 Subject: [PATCH] [libpng16] Imported from libpng-1.6.15beta08.tar --- ANNOUNCE | 4 ++-- CHANGES | 2 +- LICENSE | 4 ++-- README | 2 +- contrib/arm-neon/linux.c | 4 +++- libpng-manual.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 +++++----- pngconf.h | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 16 files changed, 33 insertions(+), 31 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index aa06ea7f9..c00602b89 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.15beta08 - November 7, 2014 +Libpng 1.6.15beta08 - November 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. @@ -73,7 +73,7 @@ Version 1.6.15beta07 [November 7, 2014] png_do_swap(). Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */" -Version 1.6.15beta08 [November 7, 2014] +Version 1.6.15beta08 [November 8, 2014] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index b3071201e..80ecd80da 100644 --- a/CHANGES +++ b/CHANGES @@ -5081,7 +5081,7 @@ Version 1.6.15beta07 [November 7, 2014] png_do_swap(). Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */" -Version 1.6.15beta08 [November 7, 2014] +Version 1.6.15beta08 [November 8, 2014] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/LICENSE b/LICENSE index d9eabaea2..6a9a26b9f 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 7, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.15beta08, November 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 -November 7, 2014 +November 8, 2014 diff --git a/README b/README index fbed59ae6..862149e31 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.15beta08 - November 7, 2014 (shared library 16.0) +README for libpng version 1.6.15beta08 - November 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/contrib/arm-neon/linux.c b/contrib/arm-neon/linux.c index 182f37605..8cc948d5a 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.10 [March 6, 2014] + * Last changed in libpng 1.6.15 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -152,8 +152,10 @@ png_have_neon(png_structp png_ptr) } } +#ifdef PNG_WARNINGS_SUPPORTED else png_warning(png_ptr, "/proc/cpuinfo open failed"); +#endif return 0; } diff --git a/libpng-manual.txt b/libpng-manual.txt index abe8ba00e..8a65fff9d 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 7, 2014 + libpng version 1.6.15beta08 - November 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.15beta08 - November 7, 2014 + libpng versions 0.97, January 1998, through 1.6.15beta08 - November 8, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5277,7 +5277,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -November 7, 2014 +November 8, 2014 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng.3 b/libpng.3 index f9433cf0a..ef946592d 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "November 7, 2014" +.TH LIBPNG 3 "November 8, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15beta08 .SH SYNOPSIS @@ -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 7, 2014 + libpng version 1.6.15beta08 - November 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.15beta08 - November 7, 2014 + libpng versions 0.97, January 1998, through 1.6.15beta08 - November 8, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5781,7 +5781,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -November 7, 2014 +November 8, 2014 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6090,7 +6090,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.15beta08 - November 7, 2014: +Libpng version 1.6.15beta08 - November 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). @@ -6113,7 +6113,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.15beta08, November 7, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.15beta08, November 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 @@ -6212,7 +6212,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 7, 2014 +November 8, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 905073104..90c9cb3f7 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "November 7, 2014" +.TH LIBPNGPF 3 "November 8, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15beta08 (private functions) diff --git a/png.5 b/png.5 index b32fe7a1c..1023de4b6 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "November 7, 2014" +.TH PNG 5 "November 8, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 816fcd691..4e56bc024 100644 --- a/png.c +++ b/png.c @@ -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 7, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.15beta08 - November 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.15beta08 - November 7, 2014\ + return "libpng version 1.6.15beta08 - November 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 2eaf11df7..0082126e2 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 7, 2014 + * libpng version 1.6.15beta08 - November 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.15beta08 - November 7, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.15beta08 - November 8, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -238,7 +238,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.15beta08, November 7, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.15beta08, November 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: @@ -350,7 +350,7 @@ * Y2K compliance in libpng: * ========================= * - * November 7, 2014 + * November 8, 2014 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -420,7 +420,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.15beta08" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.15beta08 - November 7, 2014\n" + " libpng version 1.6.15beta08 - November 8, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index 303ddf524..7235effa3 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.15beta08 - November 7, 2014 + * libpng version 1.6.15beta08 - November 8, 2014 * * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 14a17f242..b96bec269 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.15beta08 - November 7, 2014 +libpng version 1.6.15beta08 - November 8, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 516088a33..54fba7bae 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@