From b1876ab6e27f27da66793f1a7e7dbf8b6a141e6d Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 26 Apr 2013 08:33:44 -0500 Subject: [PATCH] [libpng17] Imported from libpng-1.7.0beta11.tar --- ANNOUNCE | 2 +- CHANGES | 2 +- LICENSE | 4 ++-- README | 2 +- 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 +- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 6520ecb79..4efd4bb7c 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -266,7 +266,7 @@ Version 1.7.0beta10 [April 24, 2013] Attempt to fix the PNG_ARM_NEON configuration mess. Version 1.7.0beta11 [April 26, 2013] - Test for 'arm*' not just 'arm' in the host_cpu configure variable. + Test for 'arm*', not just 'arm' in the host_cpu configure variable. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index c80ea73a8..f63dcd820 100644 --- a/CHANGES +++ b/CHANGES @@ -4554,7 +4554,7 @@ Version 1.7.0beta10 [April 24, 2013] Attempt to fix the PNG_ARM_NEON configuration mess. Version 1.7.0beta11 [April 26, 2013] - Test for 'arm*' not just 'arm' in the host_cpu configure variable. + Test for 'arm*', not just 'arm' in the host_cpu configure variable. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/LICENSE b/LICENSE index 04208dd47..73e263ee9 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.0beta11, April 24, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta11, April 26, 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 -April 24, 2013 +April 26, 2013 diff --git a/README b/README index 731881882..4007d60f6 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta11 - April 24, 2013 (shared library 17.0) +README for libpng version 1.7.0beta11 - April 26, 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/libpng-manual.txt b/libpng-manual.txt index d62cbad4e..e28279657 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.0beta11 - April 24, 2013 + libpng version 1.7.0beta11 - April 26, 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.0beta11 - April 24, 2013 + libpng versions 0.97, January 1998, through 1.7.0beta11 - April 26, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5196,7 +5196,7 @@ Other rules can be inferred by inspecting the libpng source. XVII. Y2K Compliance in libpng -April 24, 2013 +April 26, 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 6bfb96c66..cb133f72c 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "April 24, 2013" +.TH LIBPNG 3 "April 26, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta11 .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.0beta11 - April 24, 2013 + libpng version 1.7.0beta11 - April 26, 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.0beta11 - April 24, 2013 + libpng versions 0.97, January 1998, through 1.7.0beta11 - April 26, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5691,7 +5691,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVII. Y2K Compliance in libpng -April 24, 2013 +April 26, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5961,7 +5961,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta11 - April 24, 2013: +Libpng version 1.7.0beta11 - April 26, 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). @@ -5984,7 +5984,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.7.0beta11, April 24, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta11, April 26, 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 @@ -6083,7 +6083,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 24, 2013 +April 26, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index d4693fe71..83af2b217 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "April 24, 2013" +.TH LIBPNGPF 3 "April 26, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta11 (private functions) diff --git a/png.5 b/png.5 index d896d6d6b..1854ad704 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "April 24, 2013" +.TH PNG 5 "April 26, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index ecd8bd419..24752f972 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.0beta11 - April 24, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta11 - April 26, 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.0beta11 - April 24, 2013\ + return "libpng version 1.7.0beta11 - April 26, 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 13c6ba1cc..2082c9a17 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta11 - April 24, 2013 + * libpng version 1.7.0beta11 - April 26, 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.0beta11 - April 24, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.7.0beta11 - April 26, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -200,7 +200,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta11, April 24, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta11, April 26, 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: * ========================= * - * April 24, 2013 + * April 26, 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.0beta11" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta11 - April 24, 2013\n" + " libpng version 1.7.0beta11 - April 26, 2013\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 diff --git a/pngconf.h b/pngconf.h index 878325b17..b4bcae20a 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta11 - April 24, 2013 + * libpng version 1.7.0beta11 - April 26, 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 39d2134f4..1a27cae50 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta11 - April 24, 2013 +libpng version 1.7.0beta11 - April 26, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index af4cc86f9..c8f902e6f 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@