diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-11-02 07:32:00 -0600 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-11-02 07:36:15 -0600 |
commit | d6ea40a7f024ed0d35d39bf7e9251c7a8896a6a1 (patch) | |
tree | 698242943f8b536688725ebd085152129ce6e3f3 | |
parent | 99106deaa2f72558bdf0a8d5e6fb0b75bdfb5a0a (diff) | |
download | libpng-d6ea40a7f024ed0d35d39bf7e9251c7a8896a6a1.tar.gz |
[devel] Imported from libpng-1.4.0beta90.tarv1.4.0beta90
-rw-r--r-- | ANNOUNCE | 4 | ||||
-rw-r--r-- | CHANGES | 4 | ||||
-rw-r--r-- | INSTALL | 2 | ||||
-rw-r--r-- | LICENSE | 4 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | example.c | 2 | ||||
-rw-r--r-- | libpng-1.4.0beta90.txt | 11 | ||||
-rw-r--r-- | libpng.3 | 19 | ||||
-rw-r--r-- | libpngpf.3 | 2 | ||||
-rw-r--r-- | png.5 | 2 | ||||
-rw-r--r-- | png.c | 6 | ||||
-rw-r--r-- | png.h | 8 | ||||
-rw-r--r-- | pngconf.h | 4 | ||||
-rw-r--r-- | pngerror.c | 2 | ||||
-rw-r--r-- | pngget.c | 2 | ||||
-rw-r--r-- | pngmem.c | 2 | ||||
-rw-r--r-- | pngpread.c | 2 | ||||
-rw-r--r-- | pngpriv.h | 2 | ||||
-rw-r--r-- | pngread.c | 2 | ||||
-rw-r--r-- | pngrio.c | 2 | ||||
-rw-r--r-- | pngrtran.c | 2 | ||||
-rw-r--r-- | pngrutil.c | 2 | ||||
-rw-r--r-- | pngset.c | 6 | ||||
-rw-r--r-- | pngtest.c | 2 | ||||
-rw-r--r-- | pngtrans.c | 2 | ||||
-rw-r--r-- | pngwio.c | 2 | ||||
-rw-r--r-- | pngwrite.c | 2 | ||||
-rw-r--r-- | pngwtran.c | 2 | ||||
-rw-r--r-- | pngwutil.c | 2 |
29 files changed, 55 insertions, 51 deletions
@@ -1,5 +1,5 @@ -Libpng 1.4.0beta90 - November 1, 2009 +Libpng 1.4.0beta90 - November 2, 2009 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. @@ -594,7 +594,7 @@ version 1.4.0beta89 [November 1, 2009] Apply png_user_chunk_cache_max within png_decompress_chunk(). Merged libpng-1.2.41.txt with libpng-1.4.0.txt where appropriate. -version 1.4.0beta90 [November 1, 2009] +version 1.4.0beta90 [November 2, 2009] Removed all remaining WIN32_WCE #ifdefs except those involving the time.h "tm" structure @@ -2280,9 +2280,9 @@ version 1.4.0beta89 [November 1, 2009] Apply png_user_chunk_cache_max within png_decompress_chunk(). Merged libpng-1.2.41.txt with libpng-1.4.0.txt where appropriate. -version 1.4.0beta90 [November 1, 2009] +version 1.4.0beta90 [November 2, 2009] Removed all remaining WIN32_WCE #ifdefs except those involving the - time "tm" structure + time.h "tm" structure Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -1,5 +1,5 @@ -Installing libpng version 1.4.0beta90 - November 1, 2009 +Installing libpng version 1.4.0beta90 - November 2, 2009 On Unix/Linux and similar systems, you can simply type @@ -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.0beta90, November 1, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta90, November 2, 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 -November 1, 2009 +November 2, 2009 @@ -1,4 +1,4 @@ -README for libpng version 1.4.0beta90 - November 1, 2009 (shared library 14.0) +README for libpng version 1.4.0beta90 - November 2, 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. @@ -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 [November 1, 2009] + * Last changed in libpng 1.4.0 [November 2, 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.0beta90.txt b/libpng-1.4.0beta90.txt index 526c87953..d8aaf9c41 100644 --- a/libpng-1.4.0beta90.txt +++ b/libpng-1.4.0beta90.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.0beta90 - November 1, 2009 + libpng version 1.4.0beta90 - November 2, 2009 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.0beta90 - November 1, 2009 + libpng versions 0.97, January 1998, through 1.4.0beta90 - November 2, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -2916,6 +2916,9 @@ accomplish this, the functions png_create_read_struct_2(), png_create_write_struct_2(), png_set_mem_fn(), png_get_mem_ptr(), png_malloc_default(), and png_free_default() were added. +Support for the iTXt chunk has been enabled by default as of +version 1.2.41. + Support for certain MNG features was enabled. Support for numbered error messages was added. However, we never got @@ -3039,8 +3042,6 @@ IX. Changes to Libpng from version 1.0.x/1.2.x to 1.4.x Private libpng prototypes and macro definitions were moved from png.h and pngconf.h into a new pngpriv.h header file. -Support for the iTXt chunk has been enabled by default. - Support for global arrays was removed. Some obsolete/deprecated macros and functions have been removed. @@ -3225,7 +3226,7 @@ source. XIII. Y2K Compliance in libpng -November 1, 2009 +November 2, 2009 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "November 1, 2009" +.TH LIBPNG 3 "November 2, 2009" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta90 .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.0beta90 - November 1, 2009 + libpng version 1.4.0beta90 - November 2, 2009 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.0beta90 - November 1, 2009 + libpng versions 0.97, January 1998, through 1.4.0beta90 - November 2, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3725,6 +3725,9 @@ accomplish this, the functions png_create_read_struct_2(), png_create_write_struct_2(), png_set_mem_fn(), png_get_mem_ptr(), png_malloc_default(), and png_free_default() were added. +Support for the iTXt chunk has been enabled by default as of +version 1.2.41. + Support for certain MNG features was enabled. Support for numbered error messages was added. However, we never got @@ -3848,8 +3851,6 @@ Checking for and reporting of errors in the IHDR chunk is more thorough. Private libpng prototypes and macro definitions were moved from png.h and pngconf.h into a new pngpriv.h header file. -Support for the iTXt chunk has been enabled by default. - Support for global arrays was removed. Some obsolete/deprecated macros and functions have been removed. @@ -4034,7 +4035,7 @@ source. .SH XIII. Y2K Compliance in libpng -November 1, 2009 +November 2, 2009 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -4266,7 +4267,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.0beta90 - November 1, 2009: +Libpng version 1.4.0beta90 - November 2, 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). @@ -4289,7 +4290,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.0beta90, November 1, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta90, November 2, 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 @@ -4388,7 +4389,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 1, 2009 +November 2, 2009 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index adb34572e..db7d9c551 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "November 1, 2009" +.TH LIBPNGPF 3 "November 2, 2009" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta90 (private functions) @@ -1,4 +1,4 @@ -.TH PNG 5 "November 1, 2009" +.TH PNG 5 "November 2, 2009" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.4.0 [November 1, 2009] + * Last changed in libpng 1.4.0 [November 2, 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.0beta90 - November 1, 2009" PNG_STRING_NEWLINE \ + "libpng version 1.4.0beta90 - November 2, 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.0beta90 - November 1, 2009\ + return ((png_charp) "libpng version 1.4.0beta90 - November 2, 2009\ Copyright (c) 1998-2009 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.0beta90 - November 1, 2009 + * libpng version 1.4.0beta90 - November 2, 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.0beta90 - November 1, 2009: Glenn + * libpng versions 0.97, January 1998, through 1.4.0beta90 - November 2, 2009: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -163,7 +163,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta90, November 1, 2009, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta90, November 2, 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.0beta90" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.0beta90 - November 1, 2009\n" + " libpng version 1.4.0beta90 - November 2, 2009\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.0beta90 - November 1, 2009 + * libpng version 1.4.0beta90 - November 2, 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) @@ -999,6 +999,8 @@ #endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */ +#define PNG_CONVERT_tIME_SUPPORTED (PNG_tIME_SUPPORTED && !WIN32_WCE) + #if !defined(PNG_NO_WRITE_FILTER) && !defined(PNG_WRITE_FILTER_SUPPORTED) # define PNG_WRITE_FILTER_SUPPORTED #endif diff --git a/pngerror.c b/pngerror.c index 3692301f5..56e3f4793 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 [November 1, 2009] + * Last changed in libpng 1.4.0 [November 2, 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.) @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.4.0 [November 1, 2009] + * Last changed in libpng 1.4.0 [November 2, 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.) @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.4.0 [November 1, 2009] + * Last changed in libpng 1.4.0 [November 2, 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 59bdeacde..e6f27e1d8 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 [November 1, 2009] + * Last changed in libpng 1.4.0 [November 2, 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.) @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.0beta90 - November 1, 2009 + * libpng version 1.4.0beta90 - November 2, 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) @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.4.0 [November 1, 2009] + * Last changed in libpng 1.4.0 [November 2, 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.) @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.4.0 [November 1, 2009] + * Last changed in libpng 1.4.0 [November 2, 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 f72a14013..60fa8e786 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 [November 1, 2009] + * Last changed in libpng 1.4.0 [November 2, 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 6fb99a593..05be746dc 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 [November 1, 2009] + * Last changed in libpng 1.4.0 [November 2, 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.) @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.4.0 [November 1, 2009] + * Last changed in libpng 1.4.0 [November 2, 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.) @@ -701,6 +701,7 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr, #ifdef PNG_iTXt_SUPPORTED { /* Set iTXt data */ + if (text_ptr[i].lang != NULL) lang_len = png_strlen(text_ptr[i].lang); else @@ -710,8 +711,7 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr, else lang_key_len = 0; } - -#else +#else /* PNG_iTXt_SUPPORTED */ { png_warning(png_ptr, "iTXt chunk not supported"); continue; @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.4.0 [November 1, 2009] + * Last changed in libpng 1.4.0 [November 2, 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 48e5b7fdd..b1a289c95 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 [November 1, 2009] + * Last changed in libpng 1.4.0 [November 2, 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.) @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.4.0 [November 1, 2009] + * Last changed in libpng 1.4.0 [November 2, 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/pngwrite.c b/pngwrite.c index 5041c7fb5..28ed5653c 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.4.0 [November 1, 2009] + * Last changed in libpng 1.4.0 [November 2, 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 48960867f..479d8dda0 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 [November 1, 2009] + * Last changed in libpng 1.4.0 [November 2, 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 30b600260..6393d7529 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 [November 1, 2009] + * Last changed in libpng 1.4.0 [November 2, 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.) |