From fd3d717df5769162cb5970a957b1760f8d2449d0 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 3 Nov 2009 06:50:18 -0600 Subject: [PATCH] [master] Imported from libpng-1.2.41beta13.tar --- INSTALL | 2 +- LICENSE | 4 ++-- README | 2 +- Y2KINFO | 2 +- libpng-1.2.41beta13.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 6 +++--- png.h | 10 +++++----- pngconf.h | 2 +- pngerror.c | 2 +- pngget.c | 2 +- pngread.c | 5 ++--- pngrio.c | 2 +- pngrtran.c | 2 +- pngrutil.c | 2 +- pngset.c | 18 +++++++++--------- pngtest.c | 2 +- pngtrans.c | 2 +- pngwio.c | 2 +- pngwrite.c | 2 +- pngwtran.c | 2 +- pngwutil.c | 2 +- projects/wince.txt | 6 +++--- scripts/pngos2.def | 1 + 26 files changed, 52 insertions(+), 52 deletions(-) diff --git a/INSTALL b/INSTALL index 5ffdd613..5aa61faa 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.41beta13 - November 2, 2009 +Installing libpng version 1.2.41beta13 - November 3, 2009 On Unix/Linux and similar systems, you can simply type diff --git a/LICENSE b/LICENSE index 14de1df8..811d728e 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.2.41beta13, November 2, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.2.41beta13, November 3, 2009, are Copyright (c) 2004, 2006-2009 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 2, 2009 +November 3, 2009 diff --git a/README b/README index 7047ef16..d33820b8 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.41beta13 - November 2, 2009 (shared library 12.0) +README for libpng version 1.2.41beta13 - November 3, 2009 (shared library 12.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/Y2KINFO b/Y2KINFO index 7f6e2c01..236e089c 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,7 +1,7 @@ Y2K compliance in libpng: ========================= - November 2, 2009 + November 3, 2009 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng-1.2.41beta13.txt b/libpng-1.2.41beta13.txt index 11e4f97f..ffa93f1e 100644 --- a/libpng-1.2.41beta13.txt +++ b/libpng-1.2.41beta13.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.41beta13 - November 2, 2009 + libpng version 1.2.41beta13 - November 3, 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.2.41beta13 - November 2, 2009 + libpng versions 0.97, January 1998, through 1.2.41beta13 - November 3, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3209,7 +3209,7 @@ source. XIII. Y2K Compliance in libpng -November 2, 2009 +November 3, 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 47342e16..54996925 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "November 2, 2009" +.TH LIBPNG 3 "November 3, 2009" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.2.41beta13 .SH SYNOPSIS @@ -821,7 +821,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.2.41beta13 - November 2, 2009 + libpng version 1.2.41beta13 - November 3, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -832,7 +832,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.41beta13 - November 2, 2009 + libpng versions 0.97, January 1998, through 1.2.41beta13 - November 3, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -4030,7 +4030,7 @@ source. .SH XIII. Y2K Compliance in libpng -November 2, 2009 +November 3, 2009 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -4376,7 +4376,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.41beta13 - November 2, 2009: +Libpng version 1.2.41beta13 - November 3, 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). @@ -4399,7 +4399,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.2.41beta13, November 2, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.2.41beta13, November 3, 2009, are Copyright (c) 2004,2006-2008 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 @@ -4498,7 +4498,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 2, 2009 +November 3, 2009 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index a04b0ca9..a07471d5 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "November 2, 2009" +.TH LIBPNGPF 3 "November 3, 2009" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.2.41beta13 (private functions) diff --git a/png.5 b/png.5 index 15e457c8..acdfdf17 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "November 2, 2009" +.TH PNG 5 "November 3, 2009" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 43f5148f..a9160bac 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.2.41 [November 2, 2009] + * Last changed in libpng 1.2.41 [November 3, 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.) @@ -722,13 +722,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.2.41beta13 - November 2, 2009" PNG_STRING_NEWLINE \ + "libpng version 1.2.41beta13 - November 3, 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.2.41beta13 - November 2, 2009\ + return ((png_charp) "libpng version 1.2.41beta13 - November 3, 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 97e7af17..e944577e 100644 --- a/png.h +++ b/png.h @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.41beta13 - November 2, 2009 + * libpng version 1.2.41beta13 - November 3, 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.) @@ -10,7 +10,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.2.41beta13 - November 2, 2009: Glenn + * libpng versions 0.97, January 1998, through 1.2.41beta13 - November 3, 2009: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -277,7 +277,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.41beta13, November 2, 2009, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.41beta13, November 3, 2009, are * Copyright (c) 2004, 2006-2009 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: @@ -389,7 +389,7 @@ * Y2K compliance in libpng: * ========================= * - * November 2, 2009 + * November 3, 2009 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -453,7 +453,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.2.41beta13" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.41beta13 - November 2, 2009\n" + " libpng version 1.2.41beta13 - November 3, 2009\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 diff --git a/pngconf.h b/pngconf.h index fd6520f0..76d7c7fa 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.41beta13 - November 2, 2009 + * libpng version 1.2.41beta13 - November 3, 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/pngerror.c b/pngerror.c index 4ce69921..993a3bcb 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.2.41 [November 2, 2009] + * Last changed in libpng 1.2.41 [November 3, 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 6cbb6526..ba66b98e 100644 --- a/pngget.c +++ b/pngget.c @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.2.41 [November 2, 2009] + * Last changed in libpng 1.2.41 [November 3, 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/pngread.c b/pngread.c index 9e58f47e..7da0e212 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.2.41 [November 2, 2009] + * Last changed in libpng 1.2.41 [November 3, 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.) @@ -146,7 +146,7 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr, png_error(png_ptr, "Incompatible libpng version in application and library"); } - + #ifdef PNG_iTXt_SUPPORTED /* Any library mismatch is trouble for png_set_read() in * libpng-1.2.41 and later 1.2.x, so we store the caller's @@ -166,7 +166,6 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr, png_memcpy(png_ptr->user_png_ver, user_png_ver, length); #endif /* PNG_iTXt_SUPPORTED */ - } /* Initialize zbuf - compression buffer */ diff --git a/pngrio.c b/pngrio.c index 8d9123af..e3352507 100644 --- a/pngrio.c +++ b/pngrio.c @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.2.41 [November 2, 2009] + * Last changed in libpng 1.2.41 [November 3, 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 bbbe032d..1241224a 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.2.41 [November 2, 2009] + * Last changed in libpng 1.2.41 [November 3, 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 2bc397af..0e83884a 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.41 [November 2, 2009] + * Last changed in libpng 1.2.41 [November 3, 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/pngset.c b/pngset.c index 6298c955..2e6c6774 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.2.41 [November 2, 2009] + * Last changed in libpng 1.2.41 [November 3, 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.) @@ -766,14 +766,14 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr, if (caller_no_itxt == 0) { - if (text_ptr[i].lang != NULL) - lang_len = png_strlen(text_ptr[i].lang); - else - lang_len = 0; - if (text_ptr[i].lang_key != NULL) - lang_key_len = png_strlen(text_ptr[i].lang_key); - else - lang_key_len = 0; + if (text_ptr[i].lang != NULL) + lang_len = png_strlen(text_ptr[i].lang); + else + lang_len = 0; + if (text_ptr[i].lang_key != NULL) + lang_key_len = png_strlen(text_ptr[i].lang_key); + else + lang_key_len = 0; } else /* Caller does not support iTXt */ diff --git a/pngtest.c b/pngtest.c index 10b66762..5291ca8c 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.2.41 [November 2, 2009] + * Last changed in libpng 1.2.41 [November 3, 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 bf5f7da4..5ef2a539 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.2.41 [November 2, 2009] + * Last changed in libpng 1.2.41 [November 3, 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 a1b8a237..f949f733 100644 --- a/pngwio.c +++ b/pngwio.c @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.2.41 [November 2, 2009] + * Last changed in libpng 1.2.41 [November 3, 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 c3818541..66f58559 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.2.41 [November 2, 2009] + * Last changed in libpng 1.2.41 [November 3, 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 685b2bd4..05048c00 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.2.41 [November 2, 2009] + * Last changed in libpng 1.2.41 [November 3, 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 93830feb..741123ac 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.2.41 [November 2, 2009] + * Last changed in libpng 1.2.41 [November 3, 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/projects/wince.txt b/projects/wince.txt index a1a26c0b..fd5a3819 100644 --- a/projects/wince.txt +++ b/projects/wince.txt @@ -1,6 +1,6 @@ A set of project files is available for WinCE. Get -libpng-1.2.5-project-wince.zip from a libpng distribution -site such as http://libpng.sourceforge.net +libpng-1.2.41beta13-project-wince.zip from a libpng distribution +site such as http://libpng.sourceforge.net/index.html Put the zip file in this directory (projects) and then run -"unzip -a libpng-1.2.5-project-wince.zip" +"unzip -a libpng-1.2.41beta13-project-wince.zip" diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 5e7eb105..823c3c05 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -222,6 +222,7 @@ EXPORTS png_save_int_32 png_get_uint_31 png_set_expand_gray_1_2_4_to_8 + ; Added at version 1.2.41 png_write_sig png_benign_error