diff --git a/INSTALL b/INSTALL index 0e7530709..a294ffe63 100644 --- a/INSTALL +++ b/INSTALL @@ -189,7 +189,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 23e866a59..d03775280 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.6.17rc02, March 6, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.6.17rc02, 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 64cb5ae01..9313c03ce 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.17rc02 - March 6, 2015 (shared library 16.0) +README for libpng version 1.6.17rc02 - March 9, 2015 (shared library 16.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/contrib/libtests/pngunknown.c b/contrib/libtests/pngunknown.c index b8c4899de..309ee604e 100644 --- a/contrib/libtests/pngunknown.c +++ b/contrib/libtests/pngunknown.c @@ -1242,4 +1242,4 @@ main(void) /* So the test is skipped: */ return 77; } -#endif /* SET_UNKNOWN_CHUNKS && READ*/ +#endif /* SET_UNKNOWN_CHUNKS && READ */ diff --git a/contrib/tools/pngfix.c b/contrib/tools/pngfix.c index fce56debb..f788f0b46 100644 --- a/contrib/tools/pngfix.c +++ b/contrib/tools/pngfix.c @@ -2138,7 +2138,7 @@ zlib_end(struct zlib *zlib) * * z-rc is the zlib failure code; message is the error message with * spaces replaced by '-'. The compressed byte count indicates where - * in the zlib stream the error occured. + * in the zlib stream the error occurred. */ type_name(zlib->chunk->chunk_type, stdout); printf(" SKP %s %d %s ", zlib_flevel(zlib), zlib->file_bits, @@ -3757,7 +3757,7 @@ usage(const char *prog) " non-zero code is returned).", " 0x10: The file could not be read, even with corrections.", " 0x20: The output file could not be written.", -" 0x40: An unexpected, potentially internal, error occured.", +" 0x40: An unexpected, potentially internal, error occurred.", " If the command line arguments are incorrect the program exits with exit", " 255. Some older operating systems only support 7-bit exit codes, on those", " systems it is suggested that this program is first tested by supplying", diff --git a/libpngpf.3 b/libpngpf.3 index 44ec465be..ff0577f60 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.6.17rc02 (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 9db5b1c9a..51817c9f2 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.17rc02, March 7, 2015 + * libpng version 1.6.17rc02, 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.6.17rc02, March 7, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.6.17rc02, March 9, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -246,7 +246,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.17rc02, March 7, 2015, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.17rc02, 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: @@ -358,7 +358,7 @@ * Y2K compliance in libpng: * ========================= * - * March 7, 2015 + * March 9, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -428,7 +428,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.17rc02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.17rc02 - March 7, 2015\n" + " libpng version 1.6.17rc02 - March 9, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index d95f975f3..4cac8aa2e 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.17rc02 - March 6, 2015 +libpng version 1.6.17rc02 - March 9, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 9d5c79b63..ef3f5c2c4 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@