From 31462497f4cc8265526b4c3dc932da35dc10886f Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 18 Jun 2013 12:36:07 -0500 Subject: [PATCH] [libpng14] Imported from libpng-1.4.13beta03.tar --- ANNOUNCE | 4 ++-- CHANGES | 3 ++- INSTALL | 2 +- LICENSE | 4 ++-- README | 2 +- libpng-1.4.13beta03.txt | 8 ++++---- libpng.3 | 18 +++++++++--------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 +++++----- pngconf.h | 2 +- pngpriv.h | 2 +- pngset.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- 17 files changed, 36 insertions(+), 35 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 704d0e160..0653eb775 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.13beta03 - June 4, 2013 +Libpng 1.4.13beta03 - June 18, 2013 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. @@ -42,7 +42,7 @@ version 1.4.13beta02 [January 22, 2013] in configure.ac Changed default value of PNG_USER_CACHE_MAX from 0 to 32767 in pngconf.h. -version 1.4.13beta03 [June 4, 2013] +version 1.4.13beta03 [June 18, 2013] Avoid a possible memory leak in contrib/gregbook/readpng.c Removed a redundant test from png_set_IHDR(). diff --git a/CHANGES b/CHANGES index 0e6a66fbe..47efb137a 100644 --- a/CHANGES +++ b/CHANGES @@ -2884,9 +2884,10 @@ version 1.4.13beta02 [January 22, 2013] in configure.ac Changed default value of PNG_USER_CACHE_MAX from 0 to 32767 in pngconf.h. -version 1.4.13beta03 [June 4, 2013] +version 1.4.13beta03 [June 18, 2013] Avoid a possible memory leak in contrib/gregbook/readpng.c Removed a redundant test from png_set_IHDR(). + Revised libpng.3 so that "doclift" can process it. Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/INSTALL b/INSTALL index 436834f8e..e3bd088ec 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.13beta03 - January 22, 2013 +Installing libpng version 1.4.13beta03 - June 18, 2013 On Unix/Linux and similar systems, you can simply type diff --git a/LICENSE b/LICENSE index 53d1b9ce1..e06647751 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.13beta03, January 22, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.4.13beta03, June 18, 2013, 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 -January 22, 2013 +June 18, 2013 diff --git a/README b/README index 7ca2d8181..75c78ebfa 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.13beta03 - June 4, 2013 (shared library 14.0) +README for libpng version 1.4.13beta03 - June 18, 2013 (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.13beta03.txt b/libpng-1.4.13beta03.txt index 3c4beeee1..8c5d3da17 100644 --- a/libpng-1.4.13beta03.txt +++ b/libpng-1.4.13beta03.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.13beta03 - April 11, 2013 + libpng version 1.4.13beta03 - June 18, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 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.13beta03 - April 11, 2013 + libpng versions 0.97, January 1998, through 1.4.13beta03 - June 18, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -2877,7 +2877,7 @@ the message, "message" is the formatted string to be printed, and p1 and p2 are parameters that are to be embedded in the string according to printf-style formatting directives. For example, - png_debug1(2, "foo=%d\n", foo); + png_debug1(2, "foo=%d", foo); is expanded to @@ -3312,7 +3312,7 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -April 11, 2013 +June 18, 2013 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 7b1141cd7..515526473 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "April 11, 2013" +.TH LIBPNG 3 "June 18, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.13beta03 .SH SYNOPSIS @@ -887,7 +887,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.13beta03 - April 11, 2013 + libpng version 1.4.13beta03 - June 18, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -898,7 +898,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.13beta03 - April 11, 2013 + libpng versions 0.97, January 1998, through 1.4.13beta03 - June 18, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -3764,12 +3764,12 @@ the message, "message" is the formatted string to be printed, and p1 and p2 are parameters that are to be embedded in the string according to printf-style formatting directives. For example, - png_debug1(2, "foo=%d\n", foo); + png_debug1(2, "foo=%d", foo); is expanded to if(PNG_DEBUG > 2) - fprintf(PNG_DEBUG_FILE, "foo=%d\n", foo); + fprintf(PNG_DEBUG_FILE, "foo=%d\en", foo); When PNG_DEBUG is defined but is zero, the macros aren't defined, but you can still use PNG_DEBUG to control your own debugging: @@ -4199,7 +4199,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -April 11, 2013 +June 18, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -4470,7 +4470,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.13beta03 - April 11, 2013: +Libpng version 1.4.13beta03 - June 18, 2013: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4493,7 +4493,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.13beta03, April 11, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.4.13beta03, June 18, 2013, 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 @@ -4592,7 +4592,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 11, 2013 +June 18, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 5558d9972..9fbf73f73 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "January 22, 2013" +.TH LIBPNGPF 3 "June 18, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.13beta03 (private functions) diff --git a/png.5 b/png.5 index 45bbe995a..33619c53c 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "January 22, 2013" +.TH PNG 5 "June 18, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index c23b54b8d..71d8033af 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.13beta03 - January 22, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.4.13beta03 - June 18, 2013" 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.13beta03 - January 22, 2013\ + return ((png_charp) "libpng version 1.4.13beta03 - June 18, 2013\ 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 aaeb20bab..7b698996b 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.13beta03 - January 22, 2013 + * libpng version 1.4.13beta03 - June 18, 2013 * 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.13beta03 - January 22, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.4.13beta03 - June 18, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -202,7 +202,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.13beta03, January 22, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.13beta03, June 18, 2013, 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: @@ -314,7 +314,7 @@ * Y2K compliance in libpng: * ========================= * - * January 22, 2013 + * June 18, 2013 * * 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.4.13beta03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.13beta03 - January 22, 2013\n" + " libpng version 1.4.13beta03 - June 18, 2013\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 diff --git a/pngconf.h b/pngconf.h index 6751b0818..13bc17bfa 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.13beta03 - January 22, 2013 + * libpng version 1.4.13beta03 - June 18, 2013 * 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/pngpriv.h b/pngpriv.h index e84b32dd6..8fc367fd2 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.13beta03 - January 22, 2013 + * libpng version 1.4.13beta03 - June 18, 2013 * 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/pngset.c b/pngset.c index 27701ee3a..acfa0a13f 100644 --- a/pngset.c +++ b/pngset.c @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.4.13 [June 4, 2013] + * Last changed in libpng 1.4.13 [June 18, 2013] * Copyright (c) 1998-2013 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 75d1cd4dc..98f03fc22 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.13beta03 - January 22, 2013 +libpng version 1.4.13beta03 - June 18, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 67e2d9a94..5bfee2b55 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@