From ae6503fe0eb260d080b5666e014a515f67c2a673 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 18 Feb 2013 12:46:31 -0600 Subject: [PATCH] [libpng17] Imported from libpng-1.7.0beta02.tar --- ANNOUNCE | 6 ++++-- CHANGES | 7 +++++-- LICENSE | 4 ++-- README | 2 +- arm/arm_init.c | 4 ++-- libpng-manual.txt | 6 +++--- libpng.3 | 16 ++++++++-------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 12 ++++++------ 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, 40 insertions(+), 35 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index ade31471d..6890c34ff 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta02 - February 16, 2013 +Libpng 1.7.0beta02 - February 18, 2013 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. @@ -168,12 +168,14 @@ Version 1.7.0beta01 [February 15, 2013] Enclosed the new png_get_palette_max in #ifdef PNG_GET_PALETTE_MAX_SUPPORTED block, and revised pnglibconf.h and pnglibconf.h.prebuilt accordingly. -Version 1.7.0beta02 [February 16, 2013] +Version 1.7.0beta02 [February 18, 2013] Fixed a race condition in the creation of the build 'scripts' directory while building with a parallel make. Use approved/supported Android method to check for NEON, use Linux/POSIX 1003.1 API to check /proc/self/auxv avoiding buffer allocation and other library calls (ported from libpng15). + Use parentheses more consistently in "#if defined(MACRO)" tests. + Folded long lines. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 4411366d9..e635ab489 100644 --- a/CHANGES +++ b/CHANGES @@ -3672,7 +3672,8 @@ Version 1.5.6 [November 3, 2011] No changes. Version 1.5.7beta01 [November 4, 2011] - Added support for ARM processor (Mans Rullgard) + Added support for ARM processor, when decoding all PNG up-filtered rows + and any other-filtered rows with 3 or 4 bytes per pixel (Mans Rullgard). Fixed bug in pngvalid on early allocation failure; fixed type cast in pngmem.c; pngvalid would attempt to call png_error() if the allocation of a png_struct or png_info failed. This would probably have led to a @@ -4454,12 +4455,14 @@ Version 1.7.0beta01 [February 15, 2013] Enclosed the new png_get_palette_max in #ifdef PNG_GET_PALETTE_MAX_SUPPORTED block, and revised pnglibconf.h and pnglibconf.h.prebuilt accordingly. -Version 1.7.0beta02 [February 16, 2013] +Version 1.7.0beta02 [February 18, 2013] Fixed a race condition in the creation of the build 'scripts' directory while building with a parallel make. Use approved/supported Android method to check for NEON, use Linux/POSIX 1003.1 API to check /proc/self/auxv avoiding buffer allocation and other library calls (ported from libpng15). + Use parentheses more consistently in "#if defined(MACRO)" tests. + Folded long lines. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/LICENSE b/LICENSE index 02a775e36..c2ecd3e89 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.7.0beta02, February 15, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta02, February 18, 2013, are Copyright (c) 2004, 2006-2013 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 15, 2013 +February 18, 2013 diff --git a/README b/README index f9946e120..713b1ef8f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta02 - February 15, 2013 (shared library 17.0) +README for libpng version 1.7.0beta02 - February 18, 2013 (shared library 17.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 82c06de1a..5c6945b97 100644 --- a/arm/arm_init.c +++ b/arm/arm_init.c @@ -3,7 +3,7 @@ * * Copyright (c) 2013 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.5.14 [(PENDING RELEASE)] + * Last changed in libpng 1.5.15 [%RDATE%] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -20,7 +20,7 @@ * Andoid intends to define __ANDROID__, however there are bugs in their * toolchain; use -D__ANDROID__ to work round this. */ -#if defined __linux__ && defined __arm__ +#if defined(__linux__) && defined(__arm__) #define CHECK_NEON #include /* for sig_atomic_t */ diff --git a/libpng-manual.txt b/libpng-manual.txt index 595bf5555..c4126f4a7 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.7.0beta02 - February 17, 2013 + libpng version 1.7.0beta02 - February 18, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 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.7.0beta02 - February 17, 2013 + libpng versions 0.97, January 1998, through 1.7.0beta02 - February 18, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5184,7 +5184,7 @@ Other rules can be inferred by inspecting the libpng source. XVII. Y2K Compliance in libpng -February 17, 2013 +February 18, 2013 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 e0ffb0326..5d965b7b5 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "February 17, 2013" +.TH LIBPNG 3 "February 18, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta02 .SH SYNOPSIS @@ -494,7 +494,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.7.0beta02 - February 17, 2013 + libpng version 1.7.0beta02 - February 18, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -505,7 +505,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta02 - February 17, 2013 + libpng versions 0.97, January 1998, through 1.7.0beta02 - February 18, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5679,7 +5679,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVII. Y2K Compliance in libpng -February 17, 2013 +February 18, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5892,7 +5892,7 @@ the first widely used release: 1.5.7 15 10507 15.so.15.7[.0] 1.6.0beta01-37 16 10600 16.so.16.0[.0] 1.7.0alpha01-10 17 10700 17.so.17.0[.0] - 1.7.0beta01 17 10700 17.so.17.0[.0] + 1.7.0beta01-02 17 10700 17.so.17.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5949,7 +5949,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta02 - February 17, 2013: +Libpng version 1.7.0beta02 - February 18, 2013: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5972,7 +5972,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.7.0beta02, February 17, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta02, February 18, 2013, are Copyright (c) 2004,2006-2007 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 @@ -6071,7 +6071,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 17, 2013 +February 18, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 32e6e2dd9..bdee36c91 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "February 15, 2013" +.TH LIBPNGPF 3 "February 18, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta02 (private functions) diff --git a/png.5 b/png.5 index 26e0dc12d..1b7dcee1d 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "February 15, 2013" +.TH PNG 5 "February 18, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index ed86ad1eb..531dc65ee 100644 --- a/png.c +++ b/png.c @@ -691,13 +691,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta02 - February 17, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta02 - February 18, 2013" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2013 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.7.0beta02 - February 17, 2013\ + return "libpng version 1.7.0beta02 - February 18, 2013\ Copyright (c) 1998-2013 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 6b36f9f95..234975e59 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta02 - February 17, 2013 + * libpng version 1.7.0beta02 - February 18, 2013 * Copyright (c) 1998-2013 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.7.0beta02 - February 17, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.7.0beta02 - February 18, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -168,7 +168,7 @@ * 1.5.7 15 10507 15.so.15.7[.0] * 1.6.0beta01-37 16 10600 16.so.16.0[.0] * 1.7.0alpha01-10 17 10700 17.so.17.0[.0] - * 1.7.0beta01 17 10700 17.so.17.0[.0] + * 1.7.0beta01-02 17 10700 17.so.17.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -200,7 +200,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta02, February 17, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta02, February 18, 2013, are * Copyright (c) 2004, 2006-2013 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: @@ -312,7 +312,7 @@ * Y2K compliance in libpng: * ========================= * - * February 17, 2013 + * February 18, 2013 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -380,7 +380,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.7.0beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta02 - February 17, 2013\n" + " libpng version 1.7.0beta02 - February 18, 2013\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 diff --git a/pngconf.h b/pngconf.h index 02f8d4cc4..43c019009 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta02 - February 17, 2013 + * libpng version 1.7.0beta02 - February 18, 2013 * * Copyright (c) 1998-2013 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 e52621a31..53360b85e 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta02 - February 15, 2013 +libpng version 1.7.0beta02 - February 18, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 82983a5ac..0f3884956 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@