From 97eb073189239749c93f3b7ff3bf5b6531c9c366 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 6 Apr 2011 07:05:06 -0500 Subject: [PATCH] [master] Imported from libpng-1.4.6rc02.tar --- INSTALL | 2 +- LICENSE | 4 ++-- README | 2 +- libpng-1.4.6rc02.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 +++++----- pngconf.h | 2 +- pngget.c | 2 +- pngmem.c | 2 +- pngpriv.h | 2 +- pngtrans.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/INSTALL b/INSTALL index e95642a78..15169fbb5 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.6rc02 - April 3, 2011 +Installing libpng version 1.4.6rc02 - April 6, 2011 On Unix/Linux and similar systems, you can simply type diff --git a/LICENSE b/LICENSE index f23465a91..43632cd84 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.4.6rc02, April 3, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.4.6rc02, April 6, 2011, are Copyright (c) 2004, 2006-2010 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 3, 2011 +April 6, 2011 diff --git a/README b/README index 513b5316f..187eb7ef6 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.6rc02 - April 3, 2011 (shared library 14.0) +README for libpng version 1.4.6rc02 - April 6, 2011 (shared library 14.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-1.4.6rc02.txt b/libpng-1.4.6rc02.txt index 73c8c5658..61a9a83a2 100644 --- a/libpng-1.4.6rc02.txt +++ b/libpng-1.4.6rc02.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.6rc02 - April 3, 2011 + libpng version 1.4.6rc02 - April 6, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.6rc02 - April 3, 2011 + libpng versions 0.97, January 1998, through 1.4.6rc02 - April 6, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -3307,7 +3307,7 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -April 3, 2011 +April 6, 2011 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 cceabb071..9908c37e1 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "April 3, 2011" +.TH LIBPNG 3 "April 6, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6rc02 .SH SYNOPSIS @@ -895,7 +895,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.4.6rc02 - April 3, 2011 + libpng version 1.4.6rc02 - April 6, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -906,7 +906,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.6rc02 - April 3, 2011 + libpng versions 0.97, January 1998, through 1.4.6rc02 - April 6, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -4202,7 +4202,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -April 3, 2011 +April 6, 2011 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -4457,7 +4457,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.6rc02 - April 3, 2011: +Libpng version 1.4.6rc02 - April 6, 2011: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4480,7 +4480,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.6rc02, April 3, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.4.6rc02, April 6, 2011, 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 @@ -4579,7 +4579,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 3, 2011 +April 6, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index eb4ef328c..3be37be23 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "April 3, 2011" +.TH LIBPNGPF 3 "April 6, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6rc02 (private functions) diff --git a/png.5 b/png.5 index 37015c7c2..519aceaad 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "April 3, 2011" +.TH PNG 5 "April 6, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 2b8789a74..4b263f950 100644 --- a/png.c +++ b/png.c @@ -547,13 +547,13 @@ png_get_copyright(png_const_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.6rc02 - April 3, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.4.6rc02 - April 6, 2011" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2010 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 ((png_charp) "libpng version 1.4.6rc02 - April 3, 2011\ + return ((png_charp) "libpng version 1.4.6rc02 - April 6, 2011\ Copyright (c) 1998-2010 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 c5e712d74..9f5be1a29 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.6rc02 - April 3, 2011 + * libpng version 1.4.6rc02 - April 6, 2011 * Copyright (c) 1998-2011 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.4.6rc02 - April 3, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.4.6rc02 - April 6, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -186,7 +186,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.6rc02, April 3, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.6rc02, April 6, 2011, are * Copyright (c) 2004, 2006-2010 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: @@ -298,7 +298,7 @@ * Y2K compliance in libpng: * ========================= * - * April 3, 2011 + * April 6, 2011 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -362,7 +362,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.4.6rc02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.6rc02 - April 3, 2011\n" + " libpng version 1.4.6rc02 - April 6, 2011\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 diff --git a/pngconf.h b/pngconf.h index 6b20c357c..71752ba51 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.6rc02 - April 3, 2011 + * libpng version 1.4.6rc02 - April 6, 2011 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngget.c b/pngget.c index 466b1f551..d4d95841f 100644 --- a/pngget.c +++ b/pngget.c @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.4.6 [April 3, 2011] + * Last changed in libpng 1.4.6 [April 6, 2011] * Copyright (c) 1998-2011 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.) diff --git a/pngmem.c b/pngmem.c index ed3868c51..c5cda4df6 100644 --- a/pngmem.c +++ b/pngmem.c @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.4.6 [April 3, 2011] + * Last changed in libpng 1.4.6 [April 6, 2011] * Copyright (c) 1998-2011 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.) diff --git a/pngpriv.h b/pngpriv.h index 134f58a69..ac34b7b57 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.6rc02 - April 3, 2011 + * libpng version 1.4.6rc02 - April 6, 2011 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtrans.c b/pngtrans.c index 137adf032..02506e948 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.4.6 [April 3, 2011] + * Last changed in libpng 1.4.6 [April 6, 2011] * Copyright (c) 1998-2011 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.) diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index c3b4c35fe..42f7bee0f 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.6rc02 - April 3, 2011 +libpng version 1.4.6rc02 - April 6, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 1c1a4b451..5d6788f7a 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@