From 38734eeb45276c429e1c98d8394dbfcc2b79cc16 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 3 Mar 2011 06:23:31 -0600 Subject: [PATCH] [devel] Imported from libpng-1.5.2beta03.tar --- LICENSE | 4 ++-- README | 2 +- libpng-manual.txt | 11 ++++++++--- libpng.3 | 19 ++++++++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 +++++----- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- 11 files changed, 35 insertions(+), 25 deletions(-) diff --git a/LICENSE b/LICENSE index c7f137948..eb4ad6202 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.5.2beta03, February 19, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.2beta03, March 3, 2011, are Copyright (c) 2004, 2006-2011 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 -February 19, 2011 +March 3, 2011 diff --git a/README b/README index 96cca88ec..3eb805959 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.2beta03 - February 19, 2011 (shared library 15.0) +README for libpng version 1.5.2beta03 - March 3, 2011 (shared library 15.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-manual.txt b/libpng-manual.txt index d31d13071..8d2c2041b 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.2beta03 - February 19, 2011 + libpng version 1.5.2beta03 - March 3, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.2beta03 - February 19, 2011 + libpng versions 0.97, January 1998, through 1.5.2beta03 - March 3, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -2295,6 +2295,8 @@ which changes how much time zlib spends on trying to compress the image data. See the Compression Library (zlib.h and algorithm.txt, distributed with zlib) for details on the compression levels. + #include zlib.h + /* set the zlib compression level */ png_set_compression_level(png_ptr, Z_BEST_COMPRESSION); @@ -3284,6 +3286,7 @@ specify no compression (Z_NO_COMPRESSION = 0), but this would create files larger than just storing the raw bitmap. You can specify the compression level by calling: + #include zlib.h png_set_compression_level(png_ptr, level); Another useful one is to reduce the memory level used by the library. @@ -3294,12 +3297,14 @@ other things, lower levels will result in sections of incompressible data being emitted in smaller stored blocks, with a correspondingly larger relative overhead of up to 15% in the worst case. + #include zlib.h png_set_compression_mem_level(png_ptr, level); The other functions are for configuring zlib. They are not recommended for normal use and may result in writing an invalid PNG file. See zlib.h for more information on what these mean. + #include zlib.h png_set_compression_strategy(png_ptr, strategy); @@ -4156,7 +4161,7 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -February 19, 2011 +March 3, 2011 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 d4565c353..c04a23f1e 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "February 19, 2011" +.TH LIBPNG 3 "March 3, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.2beta03 .SH SYNOPSIS @@ -923,7 +923,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.2beta03 - February 19, 2011 + libpng version 1.5.2beta03 - March 3, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -934,7 +934,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.2beta03 - February 19, 2011 + libpng versions 0.97, January 1998, through 1.5.2beta03 - March 3, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -3218,6 +3218,8 @@ which changes how much time zlib spends on trying to compress the image data. See the Compression Library (zlib.h and algorithm.txt, distributed with zlib) for details on the compression levels. + #include zlib.h + /* set the zlib compression level */ png_set_compression_level(png_ptr, Z_BEST_COMPRESSION); @@ -4207,6 +4209,7 @@ specify no compression (Z_NO_COMPRESSION = 0), but this would create files larger than just storing the raw bitmap. You can specify the compression level by calling: + #include zlib.h png_set_compression_level(png_ptr, level); Another useful one is to reduce the memory level used by the library. @@ -4217,12 +4220,14 @@ other things, lower levels will result in sections of incompressible data being emitted in smaller stored blocks, with a correspondingly larger relative overhead of up to 15% in the worst case. + #include zlib.h png_set_compression_mem_level(png_ptr, level); The other functions are for configuring zlib. They are not recommended for normal use and may result in writing an invalid PNG file. See zlib.h for more information on what these mean. + #include zlib.h png_set_compression_strategy(png_ptr, strategy); @@ -5079,7 +5084,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -February 19, 2011 +March 3, 2011 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5328,7 +5333,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.2beta03 - February 19, 2011: +Libpng version 1.5.2beta03 - March 3, 2011: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5351,7 +5356,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.2beta03, February 19, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.2beta03, March 3, 2011, 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 @@ -5450,7 +5455,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 19, 2011 +March 3, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 3eef05d62..a4b77ab37 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "February 19, 2011" +.TH LIBPNGPF 3 "March 3, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.2beta03 (private functions) diff --git a/png.5 b/png.5 index 8a5fdea7a..93e5760a6 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "February 19, 2011" +.TH PNG 5 "March 3, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 3a16b8bf6..b992850e3 100644 --- a/png.c +++ b/png.c @@ -555,13 +555,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.2beta03 - February 19, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.5.2beta03 - March 3, 2011" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2011 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 "libpng version 1.5.2beta03 - February 19, 2011\ + return "libpng version 1.5.2beta03 - March 3, 2011\ Copyright (c) 1998-2011 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 82b4d7935..c5e869ad8 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.2beta03 - February 19, 2011 + * libpng version 1.5.2beta03 - March 3, 2011 * 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.5.2beta03 - February 19, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.5.2beta03 - March 3, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -179,7 +179,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.2beta03, February 19, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.2beta03, March 3, 2011, are * Copyright (c) 2004, 2006-2011 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: @@ -291,7 +291,7 @@ * Y2K compliance in libpng: * ========================= * - * February 19, 2011 + * March 3, 2011 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -355,7 +355,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.5.2beta03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.2beta03 - February 19, 2011\n" + " libpng version 1.5.2beta03 - March 3, 2011\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 8d7367845..42aab5a17 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.2beta03 - February 19, 2011 +libpng version 1.5.2beta03 - March 3, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index c73207495..54712b66c 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@