From 03d6b482b5d9a5f4731aa5755e7d6c7b6557ae65 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 27 Jul 2011 12:26:24 -0500 Subject: [PATCH] [devel] Imported from libpng-1.5.5beta03.tar --- ANNOUNCE | 5 +++-- CHANGES | 3 ++- LICENSE | 4 ++-- README | 2 +- libpng-manual.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 6 +++--- png.h | 10 +++++----- pngconf.h | 4 ++-- pngrutil.c | 2 +- pngvalid.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- 16 files changed, 35 insertions(+), 33 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 581786481..33ea88321 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.5beta03 - July 26, 2011 +Libpng 1.5.5beta03 - July 27, 2011 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. @@ -34,10 +34,11 @@ Version 1.5.5beta02 [July 14, 2011] Revised Makefile.am and Makefile.in to look in the right directory for pnglibconf.h.prebuilt -Version 1.5.5beta03 [July 26, 2011] +Version 1.5.5beta03 [July 27, 2011] Enabled compilation with g++ compiler. This compiler does not recognize the file extension, so it always compiles with C++ rules. Made minor changes to pngrutil.c to cast results where C++ expects it but C does not. + Minor editing of libpng.3 and libpng-manual.txt. Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit diff --git a/CHANGES b/CHANGES index bbbda62fe..95609bbd2 100644 --- a/CHANGES +++ b/CHANGES @@ -3518,10 +3518,11 @@ Version 1.5.5beta02 [July 14, 2011] Revised Makefile.am and Makefile.in to look in the right directory for pnglibconf.h.prebuilt -Version 1.5.5beta03 [July 26, 2011] +Version 1.5.5beta03 [July 27, 2011] Enabled compilation with g++ compiler. This compiler does not recognize the file extension, so it always compiles with C++ rules. Made minor changes to pngrutil.c to cast results where C++ expects it but C does not. + Minor editing of libpng.3 and libpng-manual.txt. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/LICENSE b/LICENSE index 9605626f6..2a35a8bd4 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.5beta03, July 14, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.5beta03, July 27, 2011, are Copyright (c) 2004, 2006-2011 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 -July 14, 2011 +July 27, 2011 diff --git a/README b/README index bb8ae1b6a..35ae76c1d 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.5beta03 - July 14, 2011 (shared library 15.0) +README for libpng version 1.5.5beta03 - July 27, 2011 (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 d758ea554..d44f753bb 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.5beta03 - July 26, 2011 + libpng version 1.5.5beta03 - July 27, 2011 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.5.5beta03 - July 26, 2011 + libpng versions 0.97, January 1998, through 1.5.5beta03 - July 27, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4500,7 +4500,7 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -July 26, 2011 +July 27, 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 dab4e9313..7abd6b1a1 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "July 26, 2011" +.TH LIBPNG 3 "July 27, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.5beta03 .SH SYNOPSIS @@ -955,7 +955,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.5beta03 - July 26, 2011 + libpng version 1.5.5beta03 - July 27, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -966,7 +966,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.5beta03 - July 26, 2011 + libpng versions 0.97, January 1998, through 1.5.5beta03 - July 27, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5456,7 +5456,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -July 26, 2011 +July 27, 2011 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5715,7 +5715,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.5beta03 - July 26, 2011: +Libpng version 1.5.5beta03 - July 27, 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). @@ -5738,7 +5738,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.5beta03, July 26, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.5beta03, July 27, 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 @@ -5837,7 +5837,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 26, 2011 +July 27, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index c79c788e1..5a31db75d 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "July 14, 2011" +.TH LIBPNGPF 3 "July 27, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.5beta03 (private functions) diff --git a/png.5 b/png.5 index 9fa75c2b9..16e1141eb 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "July 14, 2011" +.TH PNG 5 "July 27, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 8c4e2a587..0c236c8b6 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.5.4 [July 7, 2011] + * Last changed in libpng 1.5.5 [(PENDING RELEASE)] * 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.) @@ -617,13 +617,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.5beta03 - July 14, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.5.5beta03 - July 27, 2011" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2011 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.5beta03 - July 14, 2011\ + return "libpng version 1.5.5beta03 - July 27, 2011\ Copyright (c) 1998-2011 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 ec5c3cd9a..bf256f7f7 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.5beta03 - July 14, 2011 + * libpng version 1.5.5beta03 - July 27, 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.5.5beta03 - July 14, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.5.5beta03 - July 27, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -189,7 +189,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.5beta03, July 14, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.5beta03, July 27, 2011, are * Copyright (c) 2004, 2006-2011 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: @@ -301,7 +301,7 @@ * Y2K compliance in libpng: * ========================= * - * July 14, 2011 + * July 27, 2011 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -364,7 +364,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.5.5beta03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.5beta03 - July 14, 2011\n" + " libpng version 1.5.5beta03 - July 27, 2011\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 diff --git a/pngconf.h b/pngconf.h index d3934c53f..12c701d0c 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.5beta03 - July 14, 2011 + * libpng version 1.5.5beta03 - July 27, 2011 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -385,7 +385,7 @@ # define PNG_NORETURN __declspec(noreturn) # endif # ifndef PNG_ALLOCATED -# if (_MSC_VER >= 1400) +# if defined(_MSC_VER) && (_MSC_VER >= 1300) # define PNG_ALLOCATED __declspec(restrict) # endif # endif diff --git a/pngrutil.c b/pngrutil.c index 34031b21d..997bb6296 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.5.4 [July 7, 2011] + * Last changed in libpng 1.5.5 [(PENDING RELEASE)] * 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/pngvalid.c b/pngvalid.c index 32a3aa969..138bfd0cb 100644 --- a/pngvalid.c +++ b/pngvalid.c @@ -1,7 +1,7 @@ /* pngvalid.c - validate libpng by constructing then reading png files. * - * Last changed in libpng 1.5.4 [July 7, 2011] + * Last changed in libpng 1.5.5 [(PENDING RELEASE)] * Copyright (c) 2011 Glenn Randers-Pehrson * Written by John Cunningham Bowler * diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 34457814e..6efedd1cf 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.5beta03 - July 14, 2011 +libpng version 1.5.5beta03 - July 27, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index ba687ad91..22edf5319 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@