From e473ba152495dadd43ac4a2cea1a68dadb561ac6 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 19 Dec 2012 16:22:53 -0600 Subject: [PATCH] [libpng15] Imported from libpng-1.5.14beta04.tar --- ANNOUNCE | 7 ++++--- CHANGES | 7 ++++--- LICENSE | 4 ++-- README | 2 +- libpng-manual.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 14 ++------------ 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, 36 insertions(+), 44 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index ef27fa7c4..b65966084 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -51,11 +51,12 @@ Version 1.5.14beta03 [December 15, 2012] Version 1.5.14beta04 [December 19, 2012] Cleaned up whitespace in the synopsis portion of the manpage "libpng.3" Disassembled the version number in scripts/options.awk (necessary for - building on SunOs) + building on SunOs). =========================================================================== - NOTICE: The location of the git repository at SourceForge has changed. - visit http://libpng.sf.net/ for details. + NOTICE November 17, 2012: + The location of the git repository at SourceForge has changed. + Visit http://libpng.sf.net/ for details. =========================================================================== Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/CHANGES b/CHANGES index cff8ba778..6fb4eff41 100644 --- a/CHANGES +++ b/CHANGES @@ -3944,11 +3944,12 @@ Version 1.5.14beta03 [December 15, 2012] Version 1.5.14beta04 [December 19, 2012] Cleaned up whitespace in the synopsis portion of the manpage "libpng.3" Disassembled the version number in scripts/options.awk (necessary for - building on SunOs) + building on SunOs). =========================================================================== - NOTICE: The location of the git repository at SourceForge has changed. - visit http://libpng.sf.net/ for details. + NOTICE November 17, 2012: + The location of the git repository at SourceForge has changed. + Visit http://libpng.sf.net/ for details. =========================================================================== Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/LICENSE b/LICENSE index d3986f2dd..40f5bdb8b 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.5.14beta04, December 15, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.14beta04, December 19, 2012, are Copyright (c) 2004, 2006-2012 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 15, 2012 +December 19, 2012 diff --git a/README b/README index 2b09e56b2..20db27dd9 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.14beta04 - December 15, 2012 (shared library 15.0) +README for libpng version 1.5.14beta04 - December 19, 2012 (shared library 15.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 7ed54b2f0..2f2ae8365 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.5.14beta04 - December 18, 2012 + libpng version 1.5.14beta04 - December 19, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2012 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.5.14beta04 - December 18, 2012 + libpng versions 0.97, January 1998, through 1.5.14beta04 - December 19, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2012 Glenn Randers-Pehrson @@ -4612,7 +4612,7 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -December 18, 2012 +December 19, 2012 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 d975c6b0e..59b805144 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "December 18, 2012" +.TH LIBPNG 3 "December 19, 2012" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.14beta04 .SH SYNOPSIS @@ -492,7 +492,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.5.14beta04 - December 18, 2012 + libpng version 1.5.14beta04 - December 19, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2012 Glenn Randers-Pehrson @@ -503,7 +503,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.14beta04 - December 18, 2012 + libpng versions 0.97, January 1998, through 1.5.14beta04 - December 19, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2012 Glenn Randers-Pehrson @@ -5105,7 +5105,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -December 18, 2012 +December 19, 2012 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5388,7 +5388,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.14beta04 - December 18, 2012: +Libpng version 1.5.14beta04 - December 19, 2012: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5411,7 +5411,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.14beta04, December 18, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.14beta04, December 19, 2012, 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 @@ -5510,7 +5510,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 18, 2012 +December 19, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index a2a874770..046af4440 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,21 +1,11 @@ -.TH LIBPNGPF 3 "December 15, 2012" +.TH LIBPNGPF 3 "December 19, 2012" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.14beta04 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" -\fI\fB - -\fBAs of libpng version \fP\fI1.5.1\fP\fB, this section is no longer \fP\fImaintained\fP\fB, now \fIthat - -\fBthe private function prototypes are hidden in pngpriv.h and not \fIaccessible - -\fBto applications. Look in pngpriv.h for the prototypes and a short \fIdescription - -\fBof each \fIfunction. - -\fI\fB +\fBAs of libpng version \fP\fI1.5.1\fP\fB, this section is no longer \fP\fImaintained\fP\fB, now that the private function prototypes are hidden in pngpriv.h and not accessible to applications. Look in pngpriv.h for the prototypes and a short description of each \fIfunction. .SH DESCRIPTION The functions previously listed here are used privately by libpng diff --git a/png.5 b/png.5 index 94159168f..3e587aa82 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "December 15, 2012" +.TH PNG 5 "December 19, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 719e8a6b5..761719e4f 100644 --- a/png.c +++ b/png.c @@ -658,13 +658,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.14beta04 - December 15, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.5.14beta04 - December 19, 2012" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2012 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.5.14beta04 - December 15, 2012\ + return "libpng version 1.5.14beta04 - December 19, 2012\ Copyright (c) 1998-2012 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 0532c5f18..def7babed 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.14beta04 - December 15, 2012 + * libpng version 1.5.14beta04 - December 19, 2012 * Copyright (c) 1998-2012 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.5.14beta04 - December 15, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.5.14beta04 - December 19, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -213,7 +213,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.14beta04, December 15, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.14beta04, December 19, 2012, are * Copyright (c) 2004, 2006-2012 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: @@ -325,7 +325,7 @@ * Y2K compliance in libpng: * ========================= * - * December 15, 2012 + * December 19, 2012 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -392,7 +392,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.5.14beta04" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.14beta04 - December 15, 2012\n" + " libpng version 1.5.14beta04 - December 19, 2012\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 diff --git a/pngconf.h b/pngconf.h index 708ccf26f..91be5a0c1 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.14beta04 - December 15, 2012 + * libpng version 1.5.14beta04 - December 19, 2012 * * Copyright (c) 1998-2012 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 17ff304e8..209aa6523 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.14beta04 - December 15, 2012 +libpng version 1.5.14beta04 - December 19, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 469529e24..737f3a6a7 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@