From 7b26920d9babad0502f14ded22b97793a13963b7 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 15 Dec 2012 07:48:43 -0600 Subject: [PATCH] [libpng16] Imported from libpng-1.6.0beta33.tar --- 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 +- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/LICENSE b/LICENSE index b2ba17a1d..3d96d587e 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.0beta33, December 10, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta33, December 15, 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 10, 2012 +December 15, 2012 diff --git a/README b/README index 84a7d41cd..4990983b9 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.0beta33 - December 10, 2012 (shared library 16.0) +README for libpng version 1.6.0beta33 - December 15, 2012 (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/libpng-manual.txt b/libpng-manual.txt index d0986c9e9..da76fcfc8 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.0beta33 - December 10, 2012 + libpng version 1.6.0beta33 - December 15, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 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.0beta33 - December 10, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta33 - December 15, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5126,7 +5126,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -December 10, 2012 +December 15, 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 b3ff0bbe1..0de271c29 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "December 10, 2012" +.TH LIBPNG 3 "December 15, 2012" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta33 .SH SYNOPSIS @@ -997,7 +997,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.0beta33 - December 10, 2012 + libpng version 1.6.0beta33 - December 15, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -1008,7 +1008,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.0beta33 - December 10, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta33 - December 15, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -6124,7 +6124,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -December 10, 2012 +December 15, 2012 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6392,7 +6392,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.0beta33 - December 10, 2012: +Libpng version 1.6.0beta33 - December 15, 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). @@ -6415,7 +6415,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0beta33, December 10, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta33, December 15, 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 @@ -6514,7 +6514,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 10, 2012 +December 15, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 4e0fa66ed..027902908 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "December 10, 2012" +.TH LIBPNGPF 3 "December 15, 2012" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta33 (private functions) diff --git a/png.5 b/png.5 index 016082a06..94159168f 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "December 10, 2012" +.TH PNG 5 "December 15, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index ab8725875..df32bc9d9 100644 --- a/png.c +++ b/png.c @@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.0beta33 - December 10, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.6.0beta33 - December 15, 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.6.0beta33 - December 10, 2012\ + return "libpng version 1.6.0beta33 - December 15, 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 5807e817f..50f65a5c1 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.0beta33 - December 10, 2012 + * libpng version 1.6.0beta33 - December 15, 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.6.0beta33 - December 10, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.6.0beta33 - December 15, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -198,7 +198,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta33, December 10, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta33, December 15, 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: @@ -310,7 +310,7 @@ * Y2K compliance in libpng: * ========================= * - * December 10, 2012 + * December 15, 2012 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -378,7 +378,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.0beta33" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.0beta33 - December 10, 2012\n" + " libpng version 1.6.0beta33 - December 15, 2012\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index b9c76c288..5d7c8c38f 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.0beta33 - December 10, 2012 + * libpng version 1.6.0beta33 - December 15, 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 f1bb3b755..82cea502a 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.0beta33 - December 10, 2012 +libpng version 1.6.0beta33 - December 15, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index c0b1c5dbb..b8feab641 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@