diff --git a/INSTALL b/INSTALL index 44e4383d7..0995361fe 100644 --- a/INSTALL +++ b/INSTALL @@ -184,7 +184,7 @@ run "make install". VIII. Configuring libpng for 16-bit platforms You will want to look into zconf.h to tell zlib (and thus libpng) that -it cannot allocate more then 64K at a time. Even if you can, the memory +it cannot allocate more than 64K at a time. Even if you can, the memory won't be accessible. So limit zlib and libpng to 64K by defining MAXSEG_64K. IX. Configuring for DOS diff --git a/LICENSE b/LICENSE index d51a8f5ff..dfd2acd47 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.22rc02, March 6, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.5.22rc02, March 9, 2015, are Copyright (c) 2004, 2006-2015 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 -March 6, 2015 +March 9, 2015 diff --git a/README b/README index 577ee69fd..9583c53c6 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.22rc02 - March 6, 2015 (shared library 15.0) +README for libpng version 1.5.22rc02 - March 9, 2015 (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 a9fa148eb..fc48ffa0c 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.22rc02 - March 6, 2015 + libpng version 1.5.22rc02 - March 9, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.22rc02 - March 6, 2015 + libpng versions 0.97, January 1998, through 1.5.22rc02 - March 9, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -1787,7 +1787,7 @@ value when you call it in this position: png_set_gamma(png_ptr, screen_gamma, 0.45455); If you need to reduce an RGB file to a paletted file, or if a paletted -file has more entries then will fit on your screen, png_set_quantize() +file has more entries than will fit on your screen, png_set_quantize() will do that. Note that this is a simple match quantization that merely finds the closest color available. This should work fairly well with optimized palettes, but fairly badly with linear color cubes. If you @@ -2332,7 +2332,7 @@ png_infop info_ptr; 64K. The library seems to run fine with sizes of 4K. Although you can give it much less if necessary (I assume you can give it chunks of - 1 byte, I haven't tried less then 256 bytes + 1 byte, I haven't tried less than 256 bytes yet). When this function returns, you may want to display any rows that were generated in the row callback if you don't already do @@ -4535,7 +4535,7 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -March 6, 2015 +March 9, 2015 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 e4af1e4e7..7017c3197 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "March 6, 2015" +.TH LIBPNG 3 "March 9, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.22rc02 .SH SYNOPSIS @@ -492,7 +492,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.22rc02 - March 6, 2015 + libpng version 1.5.22rc02 - March 9, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -503,7 +503,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.22rc02 - March 6, 2015 + libpng versions 0.97, January 1998, through 1.5.22rc02 - March 9, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -2279,7 +2279,7 @@ value when you call it in this position: png_set_gamma(png_ptr, screen_gamma, 0.45455); If you need to reduce an RGB file to a paletted file, or if a paletted -file has more entries then will fit on your screen, png_set_quantize() +file has more entries than will fit on your screen, png_set_quantize() will do that. Note that this is a simple match quantization that merely finds the closest color available. This should work fairly well with optimized palettes, but fairly badly with linear color cubes. If you @@ -2824,7 +2824,7 @@ png_infop info_ptr; 64K. The library seems to run fine with sizes of 4K. Although you can give it much less if necessary (I assume you can give it chunks of - 1 byte, I haven't tried less then 256 bytes + 1 byte, I haven't tried less than 256 bytes yet). When this function returns, you may want to display any rows that were generated in the row callback if you don't already do @@ -5027,7 +5027,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -March 6, 2015 +March 9, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5335,7 +5335,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.22rc02 - March 6, 2015: +Libpng version 1.5.22rc02 - March 9, 2015: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5358,7 +5358,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.22rc02, March 6, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.5.22rc02, March 9, 2015, are Copyright (c) 2004,2006-20014 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 @@ -5457,7 +5457,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 6, 2015 +March 9, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index b4558e05c..83d2f50e6 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "March 6, 2015" +.TH LIBPNGPF 3 "March 9, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.22rc02 (private functions) diff --git a/png.5 b/png.5 index 8bee2f78c..1ae3ec63c 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "March 6, 2015" +.TH PNG 5 "March 9, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.h b/png.h index 834a80ee6..54fe05bab 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.22rc02, March 6, 2015 + * libpng version 1.5.22rc02, March 9, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,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.22rc02, March 6, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.5.22rc02, March 9, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -239,7 +239,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.22rc02, March 6, 2015, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.22rc02, March 9, 2015, are * Copyright (c) 2004, 2006-2015 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: @@ -351,7 +351,7 @@ * Y2K compliance in libpng: * ========================= * - * March 6, 2015 + * March 9, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -420,7 +420,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.5.22rc02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.22rc02 - March 6, 2015\n" + " libpng version 1.5.22rc02 - March 9, 2015\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 diff --git a/pngconf.h b/pngconf.h index 1f43344fd..7fc83ef48 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.22rc02, March 6, 2015 + * libpng version 1.5.22rc02, March 9, 2015 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngmem.c b/pngmem.c index f885533fb..6f4dea958 100644 --- a/pngmem.c +++ b/pngmem.c @@ -102,7 +102,7 @@ png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn, } /* Allocate memory. For reasonable files, size should never exceed - * 64K. However, zlib may allocate more then 64K if you don't tell + * 64K. However, zlib may allocate more than 64K if you don't tell * it not to. See zconf.h and png.h for more information. zlib does * need to allocate exactly 64K, so whatever you call here must * have the ability to do that. @@ -475,7 +475,7 @@ png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn, } /* Allocate memory. For reasonable files, size should never exceed - * 64K. However, zlib may allocate more then 64K if you don't tell + * 64K. However, zlib may allocate more than 64K if you don't tell * it not to. See zconf.h and png.h for more information. zlib does * need to allocate exactly 64K, so whatever you call here must * have the ability to do that. diff --git a/pngrio.c b/pngrio.c index e9c381c5b..270817d83 100644 --- a/pngrio.c +++ b/pngrio.c @@ -26,7 +26,7 @@ * reads from a file pointer. Note that this routine sometimes gets called * with very small lengths, so you should implement some kind of simple * buffering if you are using unbuffered reads. This should never be asked - * to read more then 64K on a 16 bit machine. + * to read more than 64K on a 16 bit machine. */ void /* PRIVATE */ png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) diff --git a/pngtest.c b/pngtest.c index 50554c5ac..0f22d85e6 100644 --- a/pngtest.c +++ b/pngtest.c @@ -468,7 +468,7 @@ pngtest_error(png_structp png_ptr, png_const_charp message) #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG /* Allocate memory. For reasonable files, size should never exceed - * 64K. However, zlib may allocate more then 64K if you don't tell + * 64K. However, zlib may allocate more than 64K if you don't tell * it not to. See zconf.h and png.h for more information. zlib does * need to allocate exactly 64K, so whatever you call here must * have the ability to do that. diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 368043367..49fc84bdb 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.22rc02 - March 6, 2015 +libpng version 1.5.22rc02 - March 9, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 4249fd30d..474892e96 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@