From 5b3b54e3f6f4410b8c30f6bb18c6a8a3ae4d5c96 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 12 Oct 2011 06:36:56 -0500 Subject: [PATCH] [libpng15] Imported from libpng-1.5.6beta05.tar --- ANNOUNCE | 4 ++-- 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 +- pngwutil.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index d56be2ea8..5f0f02f05 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.6beta05 - October 11, 2011 +Libpng 1.5.6beta05 - October 12, 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. @@ -55,7 +55,7 @@ Version 1.5.6beta03 [September 28, 2011] Version 1.5.6beta04 [October 5, 2011] Fixed typo in Makefile.in and Makefile.am ("-M Wl" should be "-M -Wl")." -Version 1.5.6beta05 [October 11, 2011] +Version 1.5.6beta05 [October 12, 2011] Speed up png_combine_row() for interlaced images. This reduces the generality of the code, allowing it to be optimized for Adam7 interlace. The masks passed to png_combine_row() are now generated internally, avoiding diff --git a/CHANGES b/CHANGES index 2923d1d80..6f7979c28 100644 --- a/CHANGES +++ b/CHANGES @@ -3616,7 +3616,7 @@ Version 1.5.6beta03 [September 28, 2011] Version 1.5.6beta04 [October 5, 2011] Fixed typo in Makefile.in and Makefile.am ("-M Wl" should be "-M -Wl")." -Version 1.5.6beta05 [October 11, 2011] +Version 1.5.6beta05 [October 12, 2011] Speed up png_combine_row() for interlaced images. This reduces the generality of the code, allowing it to be optimized for Adam7 interlace. The masks passed to png_combine_row() are now generated internally, avoiding diff --git a/LICENSE b/LICENSE index 0ba5fbd57..35b0d587c 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.6beta05, October 5, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.6beta05, October 12, 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 -October 5, 2011 +October 12, 2011 diff --git a/README b/README index 7675cef11..f241cedd8 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.6beta05 - October 5, 2011 (shared library 15.0) +README for libpng version 1.5.6beta05 - October 12, 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 4a0d71cdb..60ac9ce54 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.6beta05 - October 5, 2011 + libpng version 1.5.6beta05 - October 12, 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.6beta05 - October 5, 2011 + libpng versions 0.97, January 1998, through 1.5.6beta05 - October 12, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4563,7 +4563,7 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -October 5, 2011 +October 12, 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 cecc4a1a7..76e20b069 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "October 5, 2011" +.TH LIBPNG 3 "October 12, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.6beta05 .SH SYNOPSIS @@ -977,7 +977,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.6beta05 - October 5, 2011 + libpng version 1.5.6beta05 - October 12, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -988,7 +988,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.6beta05 - October 5, 2011 + libpng versions 0.97, January 1998, through 1.5.6beta05 - October 12, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5541,7 +5541,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -October 5, 2011 +October 12, 2011 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5803,7 +5803,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.6beta05 - October 5, 2011: +Libpng version 1.5.6beta05 - October 12, 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). @@ -5826,7 +5826,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.6beta05, October 5, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.6beta05, October 12, 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 @@ -5925,7 +5925,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -October 5, 2011 +October 12, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index b6e960457..c0b8eea76 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "October 5, 2011" +.TH LIBPNGPF 3 "October 12, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.6beta05 (private functions) diff --git a/png.5 b/png.5 index dab515912..16995ec50 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "October 5, 2011" +.TH PNG 5 "October 12, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 1b12aa2cd..a9ee516a9 100644 --- a/png.c +++ b/png.c @@ -645,13 +645,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.6beta05 - October 5, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.5.6beta05 - October 12, 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.6beta05 - October 5, 2011\ + return "libpng version 1.5.6beta05 - October 12, 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 42694385a..d1d17e23c 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.6beta05 - October 11, 2011 + * libpng version 1.5.6beta05 - October 12, 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.6beta05 - October 11, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.5.6beta05 - October 12, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -192,7 +192,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.6beta05, October 11, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.6beta05, October 12, 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: @@ -304,7 +304,7 @@ * Y2K compliance in libpng: * ========================= * - * October 11, 2011 + * October 12, 2011 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -367,7 +367,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.5.6beta05" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.6beta05 - October 11, 2011\n" + " libpng version 1.5.6beta05 - October 12, 2011\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 diff --git a/pngconf.h b/pngconf.h index 25b1cee45..5ba26c88c 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.6beta05 - October 5, 2011 + * libpng version 1.5.6beta05 - October 12, 2011 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwutil.c b/pngwutil.c index 8340d382e..2554d51ec 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -92,7 +92,7 @@ png_write_chunk_header(png_structp png_ptr, png_uint_32 chunk_name, { png_byte buf[8]; -#ifdef PNG_DEBUG +#if defined(PNG_DEBUG) && (PNG_DEBUG > 0) PNG_CSTRING_FROM_CHUNK(buf, chunk_name); png_debug2(0, "Writing %s chunk, length = %lu", buf, (unsigned long)length); #endif diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 267be05e7..da64ec508 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.6beta05 - October 5, 2011 +libpng version 1.5.6beta05 - October 12, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 1e860a0c1..27856ccfa 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@