From 416976fffd58f9607b58dd19f9991cad023d6000 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 27 Jul 2009 22:16:09 -0500 Subject: [PATCH] [devel] Imported from libpng-1.4.0beta70.tar --- INSTALL | 2 +- LICENSE | 4 ++-- README | 2 +- example.c | 2 +- libpng-1.4.0beta70.txt | 18 ++++++++++++------ libpng.3 | 26 ++++++++++++++++---------- libpngpf.3 | 6 +++++- png.5 | 2 +- png.c | 9 +++------ png.h | 8 ++++---- pngconf.h | 2 +- pngerror.c | 2 +- pngget.c | 2 +- pngmem.c | 2 +- pngpriv.h | 10 +++++++++- pngrio.c | 2 +- pngrutil.c | 2 +- pngtest.c | 2 +- pngtrans.c | 2 +- pngwio.c | 2 +- pngwtran.c | 2 +- pngwutil.c | 2 +- 22 files changed, 66 insertions(+), 45 deletions(-) diff --git a/INSTALL b/INSTALL index 603a14c23..ecbcd5070 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.0beta70 - July 25, 2009 +Installing libpng version 1.4.0beta70 - July 28, 2009 On Unix/Linux and similar systems, you can simply type diff --git a/LICENSE b/LICENSE index 7bd090427..8ea62f72d 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.0beta70, July 25, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta70, July 28, 2009, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 25, 2009 +July 28, 2009 diff --git a/README b/README index 00fc6a1e3..c4a1113c2 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.0beta70 - July 25, 2009 (shared library 14.0) +README for libpng version 1.4.0beta70 - July 28, 2009 (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/example.c b/example.c index 906b1f755..8cf3a0b8e 100644 --- a/example.c +++ b/example.c @@ -2,7 +2,7 @@ #if 0 /* in case someone actually tries to compile this */ /* example.c - an example of using libpng - * Last changed in libpng 1.4.0 [July 25, 2009] + * Last changed in libpng 1.4.0 [July 28, 2009] * This file has been placed in the public domain by the authors. * Maintained 1998-2009 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) diff --git a/libpng-1.4.0beta70.txt b/libpng-1.4.0beta70.txt index 1a8a6b7a5..063bbee2b 100644 --- a/libpng-1.4.0beta70.txt +++ b/libpng-1.4.0beta70.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.0beta70 - July 25, 2009 + libpng version 1.4.0beta70 - July 28, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 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.0beta70 - July 25, 2009 + libpng versions 0.97, January 1998, through 1.4.0beta70 - July 28, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3126,7 +3126,10 @@ exported functions are marked with PNGAPI: body; } -The prototypes for all exported functions appear in png.h. +The prototypes for all exported functions appear in png.h, +above the comment that says + + /* Maintainer: Put new public prototypes here ... */ We mark all non-exported functions with "/* PRIVATE */"": @@ -3136,9 +3139,12 @@ We mark all non-exported functions with "/* PRIVATE */"": body; } -The prototypes for non-exported functions can appear in +The prototypes for non-exported functions (except for those in +pngtest) appear in pngpriv.h -or in the file where the function is located. +above the comment that says + + /* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */ The names of all exported functions and variables begin with "png_", and all publicly visible C preprocessor @@ -3162,7 +3168,7 @@ source. XIII. Y2K Compliance in libpng -July 25, 2009 +July 28, 2009 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 ade505148..3cd5b272e 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "July 25, 2009" +.TH LIBPNG 3 "July 28, 2009" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta70 .SH SYNOPSIS @@ -809,7 +809,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.4.0beta70 - July 25, 2009 + libpng version 1.4.0beta70 - July 28, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -820,7 +820,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.0beta70 - July 25, 2009 + libpng versions 0.97, January 1998, through 1.4.0beta70 - July 28, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3935,7 +3935,10 @@ exported functions are marked with PNGAPI: body; } -The prototypes for all exported functions appear in png.h. +The prototypes for all exported functions appear in png.h, +above the comment that says + + /* Maintainer: Put new public prototypes here ... */ We mark all non-exported functions with "/* PRIVATE */"": @@ -3945,9 +3948,12 @@ We mark all non-exported functions with "/* PRIVATE */"": body; } -The prototypes for non-exported functions can appear in +The prototypes for non-exported functions (except for those in +pngtest) appear in pngpriv.h -or in the file where the function is located. +above the comment that says + + /* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */ The names of all exported functions and variables begin with "png_", and all publicly visible C preprocessor @@ -3971,7 +3977,7 @@ source. .SH XIII. Y2K Compliance in libpng -July 25, 2009 +July 28, 2009 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -4201,7 +4207,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.0beta70 - July 25, 2009: +Libpng version 1.4.0beta70 - July 28, 2009: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4224,7 +4230,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.0beta70, July 25, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta70, July 28, 2009, 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 @@ -4323,7 +4329,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 25, 2009 +July 28, 2009 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 52f18db98..a5d323631 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "July 25, 2009" +.TH LIBPNGPF 3 "July 28, 2009" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta70 (private functions) @@ -7,6 +7,10 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta70 \fI\fB +\fBvoid png_64bit_product (long \fP\fIv1\fP\fB, long \fP\fIv2\fP\fB, unsigned long \fI*hi_product, + +\fBunsigned long \fI*lo_product\fP\fB);\fP + \fI\fB \fBvoid png_build_gamma_table (png_structp \fIpng_ptr\fP\fB);\fP diff --git a/png.5 b/png.5 index 9907368df..b0b2cd6d5 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "July 25, 2009" +.TH PNG 5 "July 28, 2009" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index c33eeb8e8..f5046bd13 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.4.0 [July 25, 2009] + * Last changed in libpng 1.4.0 [July 28, 2009] * Copyright (c) 1998-2009 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.) @@ -652,13 +652,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version x 1.4.0beta70 - July 25, 2009" PNG_STRING_NEWLINE \ + "libpng version x 1.4.0beta70 - July 28, 2009" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2009 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.0beta70 - July 25, 2009\ + return ((png_charp) "libpng version 1.4.0beta70 - July 28, 2009\ Copyright (c) 1998-2009 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); @@ -776,9 +776,6 @@ png_convert_size(size_t size) * A and D, and X || Y is (X << 16) + Y. */ -void /* PRIVATE */ -png_64bit_product (long v1, long v2, unsigned long *hi_product, - unsigned long *lo_product); void /* PRIVATE */ png_64bit_product (long v1, long v2, unsigned long *hi_product, unsigned long *lo_product) diff --git a/png.h b/png.h index 6727f54db..949656d98 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.0beta70 - July 25, 2009 + * libpng version 1.4.0beta70 - July 28, 2009 * Copyright (c) 1998-2009 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.0beta70 - July 25, 2009: Glenn + * libpng versions 0.97, January 1998, through 1.4.0beta70 - July 28, 2009: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -161,7 +161,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta70, July 25, 2009, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta70, July 28, 2009, 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: @@ -337,7 +337,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.4.0beta70" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.0beta70 - July 25, 2009\n" + " libpng version 1.4.0beta70 - July 28, 2009\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 diff --git a/pngconf.h b/pngconf.h index bd73b245e..f55a8ee22 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.0beta70 - July 25, 2009 + * libpng version 1.4.0beta70 - July 28, 2009 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index f9e944047..2ac552bc7 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.4.0 [July 25, 2009] + * Last changed in libpng 1.4.0 [July 28, 2009] * Copyright (c) 1998-2009 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/pngget.c b/pngget.c index 82584e7d6..e76903b30 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.0 [July 25, 2009] + * Last changed in libpng 1.4.0 [July 28, 2009] * Copyright (c) 1998-2009 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 07baafda7..46f020fa3 100644 --- a/pngmem.c +++ b/pngmem.c @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.4.0 [July 25, 2009] + * Last changed in libpng 1.4.0 [July 28, 2009] * Copyright (c) 1998-2009 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 a82197d60..958d56ec4 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.0beta70 - July 25, 2009 + * libpng version 1.4.0beta70 - July 28, 2009 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -851,6 +851,14 @@ PNG_EXTERN int png_check_cHRM_fixed PNGARG((png_structp png_ptr, png_fixed_point int_blue_y)); #endif +#if defined(PNG_cHRM_SUPPORTED) +#if !defined(PNG_NO_CHECK_cHRM) +/* Added at libpng version 1.2.34 and 1.4.0 */ +PNG_EXTERN void png_64bit_product (long v1, long v2, unsigned long *hi_product, + unsigned long *lo_product); +#endif +#endif + /* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */ #ifdef __cplusplus diff --git a/pngrio.c b/pngrio.c index c81d57820..f52e5a603 100644 --- a/pngrio.c +++ b/pngrio.c @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.4.0 [July 25, 2009] + * Last changed in libpng 1.4.0 [July 28, 2009] * Copyright (c) 1998-2009 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/pngrutil.c b/pngrutil.c index 5eb9a45bc..47f46b13f 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.4.0 [July 25, 2009] + * Last changed in libpng 1.4.0 [July 28, 2009] * Copyright (c) 1998-2009 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/pngtest.c b/pngtest.c index 501b55844..2173b27f3 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.4.0 [July 25, 2009] + * Last changed in libpng 1.4.0 [July 28, 2009] * Copyright (c) 1998-2009 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/pngtrans.c b/pngtrans.c index 9abc9081b..d71e02928 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.0 [July 25, 2009] + * Last changed in libpng 1.4.0 [July 28, 2009] * Copyright (c) 1998-2009 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/pngwio.c b/pngwio.c index c4c1af140..d0feec21c 100644 --- a/pngwio.c +++ b/pngwio.c @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.4.0 [July 25, 2009] + * Last changed in libpng 1.4.0 [July 28, 2009] * Copyright (c) 1998-2009 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/pngwtran.c b/pngwtran.c index 36990bacc..f2a38d21a 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * Last changed in libpng 1.4.0 [July 25, 2009] + * Last changed in libpng 1.4.0 [July 28, 2009] * Copyright (c) 1998-2009 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/pngwutil.c b/pngwutil.c index 84b3c3775..d5947a0d9 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.4.0 [July 25, 2009] + * Last changed in libpng 1.4.0 [July 28, 2009] * Copyright (c) 1998-2009 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.)