diff --git a/CHANGES b/CHANGES index 478e21873..819c49e36 100644 --- a/CHANGES +++ b/CHANGES @@ -2102,7 +2102,7 @@ Version 1.4.0beta24 [July 25, 2008] png_decompress_chunk(), and remove "chunkdata" from parameter list. Put a call to png_check_chunk_name() in png_read_chunk_header(). Revised png_check_chunk_name() to reject a name with a lowercase 3rd byte. - Removed two calls to png_check_chunk_name() occuring later in the process. + Removed two calls to png_check_chunk_name() occurring later in the process. Define PNG_NO_ERROR_NUMBERS by default in pngconf.h Version 1.4.0beta25 [July 30, 2008] diff --git a/png.h b/png.h index 40314d344..9db5b1c9a 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 6, 2015 + * libpng version 1.6.17rc02, March 7, 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 6, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.6.17rc02, March 7, 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 6, 2015, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.17rc02, March 7, 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 6, 2015 + * March 7, 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 6, 2015\n" + " libpng version 1.6.17rc02 - March 7, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -1824,7 +1824,7 @@ PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structrp)); * * The integer return from the callback function is interpreted thus: * - * negative: An error occured, png_chunk_error will be called. + * negative: An error occurred; png_chunk_error will be called. * zero: The chunk was not handled, the chunk will be saved. A critical * chunk will cause an error at this point unless it is to be saved. * positive: The chunk was handled, libpng will ignore/discard it. diff --git a/pngrutil.c b/pngrutil.c index b18ddb8ca..f4716637c 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -2808,7 +2808,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr, &png_ptr->unknown_chunk); /* ret is: - * negative: An error occured, png_chunk_error will be called. + * negative: An error occurred; png_chunk_error will be called. * zero: The chunk was not handled, the chunk will be discarded * unless png_set_keep_unknown_chunks has been used to set * a 'keep' behavior for this particular chunk, in which diff --git a/scripts/dfn.awk b/scripts/dfn.awk index 675829d47..346b9db7d 100755 --- a/scripts/dfn.awk +++ b/scripts/dfn.awk @@ -17,7 +17,7 @@ BEGIN{ out="/dev/null" # as a flag out_count=0 # count of output lines - err=0 # set if an error occured + err=0 # set if an error occurred sort=0 # sort the output array[""]="" }