From 8f5846f86d2f0215414b1e14cca50f7219e16b40 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 31 Oct 2009 21:31:08 -0500 Subject: [PATCH] [devel] Imported from libpng-1.4.0beta89.tar --- INSTALL | 2 +- LICENSE | 4 ++-- README | 2 +- example.c | 2 +- libpng-1.4.0beta89.txt | 2 +- libpng.3 | 27 +++++++++++++++++++-------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 6 +++--- png.h | 10 +++++----- pngerror.c | 2 +- pngget.c | 2 +- pngmem.c | 2 +- pngpread.c | 2 +- pngpriv.h | 2 +- pngrio.c | 2 +- pngrtran.c | 2 +- pngtest.c | 2 +- pngtrans.c | 2 +- pngwio.c | 2 +- pngwtran.c | 2 +- pngwutil.c | 2 +- 22 files changed, 47 insertions(+), 36 deletions(-) diff --git a/INSTALL b/INSTALL index 6177260c9..da1e191d1 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.0beta89 - October 30, 2009 +Installing libpng version 1.4.0beta89 - November 1, 2009 On Unix/Linux and similar systems, you can simply type diff --git a/LICENSE b/LICENSE index 72a9f14ce..51fdb8847 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.0beta89, October 30, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta89, November 1, 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 -October 30, 2009 +November 1, 2009 diff --git a/README b/README index 46bb4d2b3..3cf84f81e 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.0beta89 - October 30, 2009 (shared library 14.0) +README for libpng version 1.4.0beta89 - November 1, 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 b0d7578a0..ae2d0d204 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 [October 30, 2009] + * Last changed in libpng 1.4.0 [November 1, 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.0beta89.txt b/libpng-1.4.0beta89.txt index 066fded72..11003ab92 100644 --- a/libpng-1.4.0beta89.txt +++ b/libpng-1.4.0beta89.txt @@ -421,7 +421,7 @@ where 0x7fffffffL means unlimited. You can retrieve this limit with chunk_cache_max = png_get_chunk_cache_max(png_ptr); This limit also applies to the number of buffers that can be allocated -by png_decompress_chunk(). +by png_decompress_chunk() while decompressing iTXt, zTXt, and iCCP chunks. The high-level read interface diff --git a/libpng.3 b/libpng.3 index 28274723a..f5ee0dbd2 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "October 30, 2009" +.TH LIBPNG 3 "November 1, 2009" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta89 .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.0beta89 - October 30, 2009 + libpng version 1.4.0beta89 - November 1, 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.0beta89 - October 30, 2009 + libpng versions 0.97, January 1998, through 1.4.0beta89 - November 1, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -1229,6 +1229,9 @@ where 0x7fffffffL means unlimited. You can retrieve this limit with chunk_cache_max = png_get_chunk_cache_max(png_ptr); +This limit also applies to the number of buffers that can be allocated +by png_decompress_chunk() while decompressing iTXt, zTXt, and iCCP chunks. + .SS The high-level read interface At this point there are two ways to proceed; through the high-level @@ -1501,6 +1504,10 @@ into the info_ptr is returned for any complex types. string for unknown). text_ptr[i].lang_key - keyword in UTF-8 (empty string for unknown). + Note that the itxt_length, lang, and lang_key + members of the text_ptr structure only exist + when the library is built with iTXt chunk support. + num_text - number of comments (same as num_comments; you can put NULL here to avoid the duplication) @@ -2740,6 +2747,10 @@ width, height, bit_depth, and color_type must be the same in each call. empty for unknown). text_ptr[i].translated_keyword - keyword in UTF-8 (NULL or empty for unknown). + Note that the itxt_length, lang, and lang_key + members of the text_ptr structure only exist + when the library is built with iTXt chunk support. + num_text - number of comments png_set_sPLT(png_ptr, info_ptr, &palette_ptr, @@ -4023,7 +4034,7 @@ source. .SH XIII. Y2K Compliance in libpng -October 30, 2009 +November 1, 2009 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -4199,7 +4210,7 @@ the first widely used release: 1.4.0beta15-36 14 10400 14.so.0.0[.0] 1.4.0beta37-87 14 10400 14.so.14.0[.0] 1.4.0rc01 14 10400 14.so.14.0[.0] - 1.4.0beta88 14 10400 14.so.14.0[.0] + 1.4.0beta88-89 14 10400 14.so.14.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4255,7 +4266,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.0beta89 - October 30, 2009: +Libpng version 1.4.0beta89 - November 1, 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). @@ -4278,7 +4289,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.0beta89, October 30, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta89, November 1, 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 @@ -4377,7 +4388,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -October 30, 2009 +November 1, 2009 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 4bf5dc00b..086f8db3a 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "October 30, 2009" +.TH LIBPNGPF 3 "November 1, 2009" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta89 (private functions) diff --git a/png.5 b/png.5 index fec8afc7c..3071fe66f 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "October 30, 2009" +.TH PNG 5 "November 1, 2009" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 955315678..39452866c 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 [October 30, 2009] + * Last changed in libpng 1.4.0 [November 1, 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.) @@ -547,13 +547,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version x 1.4.0beta89 - October 30, 2009" PNG_STRING_NEWLINE \ + "libpng version x 1.4.0beta89 - November 1, 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.0beta89 - October 30, 2009\ + return ((png_charp) "libpng version 1.4.0beta89 - November 1, 2009\ Copyright (c) 1998-2009 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 c8b444597..cfe4414f2 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.0beta89 - October 30, 2009 + * libpng version 1.4.0beta89 - November 1, 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.0beta89 - October 30, 2009: Glenn + * libpng versions 0.97, January 1998, through 1.4.0beta89 - November 1, 2009: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -131,7 +131,7 @@ * 1.4.0beta15-36 14 10400 14.so.0.0[.0] * 1.4.0beta37-87 14 10400 14.so.14.0[.0] * 1.4.0rc01 14 10400 14.so.14.0[.0] - * 1.4.0beta88 14 10400 14.so.14.0[.0] + * 1.4.0beta88-89 14 10400 14.so.14.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -163,7 +163,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta89, October 30, 2009, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta89, November 1, 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: @@ -339,7 +339,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.4.0beta89" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.0beta89 - October 30, 2009\n" + " libpng version 1.4.0beta89 - November 1, 2009\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 diff --git a/pngerror.c b/pngerror.c index 5d239df98..3692301f5 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 [October 30, 2009] + * Last changed in libpng 1.4.0 [November 1, 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 97ad5101c..c139328f7 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 [October 30, 2009] + * Last changed in libpng 1.4.0 [November 1, 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 7de4659f5..67ea5b8fd 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 [October 30, 2009] + * Last changed in libpng 1.4.0 [November 1, 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/pngpread.c b/pngpread.c index a0f14affb..59bdeacde 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.4.0 [October 30, 2009] + * Last changed in libpng 1.4.0 [November 1, 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 e4b0327c3..cdeb404ec 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.0beta89 - October 30, 2009 + * libpng version 1.4.0beta89 - November 1, 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/pngrio.c b/pngrio.c index 00a92fe0f..925b76d87 100644 --- a/pngrio.c +++ b/pngrio.c @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.4.0 [October 30, 2009] + * Last changed in libpng 1.4.0 [November 1, 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/pngrtran.c b/pngrtran.c index fbb9cb466..b5f705bf7 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.4.0 [October 30, 2009] + * Last changed in libpng 1.4.0 [November 1, 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 870888601..fe00f736e 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 [October 30, 2009] + * Last changed in libpng 1.4.0 [November 1, 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 e6d141d90..48e5b7fdd 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 [October 30, 2009] + * Last changed in libpng 1.4.0 [November 1, 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 627079e02..a4d66b9b4 100644 --- a/pngwio.c +++ b/pngwio.c @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.4.0 [October 30, 2009] + * Last changed in libpng 1.4.0 [November 1, 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 0c4fc45ed..48960867f 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 [October 30, 2009] + * Last changed in libpng 1.4.0 [November 1, 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 7d78a7a2b..30b600260 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 [October 30, 2009] + * Last changed in libpng 1.4.0 [November 1, 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.)