From 3efbecab92aa781e50b34f1dae18a5c62b5bfd64 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 21 Jul 2014 16:57:30 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.13beta02.tar --- LICENSE | 4 ++-- README | 2 +- libpng-manual.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 12 ++++++------ png.h | 10 +++++----- pngconf.h | 2 +- pngread.c | 12 ++++++------ pngrutil.c | 8 ++++---- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 15 files changed, 41 insertions(+), 41 deletions(-) diff --git a/LICENSE b/LICENSE index 167f5c7c0..64e150b19 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.13beta02, July 4, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.13beta02, July 21, 2014, are Copyright (c) 2004, 2006-2014 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 -July 4, 2014 +July 21, 2014 diff --git a/README b/README index 487162ab2..605834ac1 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.13beta02 - July 4, 2014 (shared library 16.0) +README for libpng version 1.6.13beta02 - July 21, 2014 (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/libpng-manual.txt b/libpng-manual.txt index 971cdb52e..6fa91f204 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.6.13beta02 - July 4, 2014 + libpng version 1.6.13beta02 - July 21, 2014 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.6.13beta02 - July 4, 2014 + libpng versions 0.97, January 1998, through 1.6.13beta02 - July 21, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5276,7 +5276,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -July 4, 2014 +July 21, 2014 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 c0ed53329..98dbd1ab1 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "July 4, 2014" +.TH LIBPNG 3 "July 21, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.13beta02 .SH SYNOPSIS @@ -504,7 +504,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.6.13beta02 - July 4, 2014 + libpng version 1.6.13beta02 - July 21, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.13beta02 - July 4, 2014 + libpng versions 0.97, January 1998, through 1.6.13beta02 - July 21, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5780,7 +5780,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -July 4, 2014 +July 21, 2014 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6082,7 +6082,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.13beta02 - July 4, 2014: +Libpng version 1.6.13beta02 - July 21, 2014: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6105,7 +6105,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.13beta02, July 4, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.13beta02, July 21, 2014, are Copyright (c) 2004,2006-2014 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 @@ -6204,7 +6204,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 4, 2014 +July 21, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index e245dc531..b194b1e7b 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "July 4, 2014" +.TH LIBPNGPF 3 "July 21, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.13beta02 (private functions) diff --git a/png.5 b/png.5 index d8c9c2abb..2aab1869e 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "July 4, 2014" +.TH PNG 5 "July 21, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 61d34458a..b233daf61 100644 --- a/png.c +++ b/png.c @@ -773,13 +773,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.13beta02 - July 4, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.13beta02 - July 21, 2014" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 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.6.13beta02 - July 4, 2014\ + return "libpng version 1.6.13beta02 - July 21, 2014\ Copyright (c) 1998-2014 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -2293,8 +2293,8 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr, */ else if (!png_sRGB_checks[i].have_md5) { - png_chunk_report(png_ptr, - "out-of-date sRGB profile with no signature", + png_chunk_report(png_ptr, "out-of-date sRGB profile with" + " no signature", PNG_CHUNK_WARNING); } @@ -2307,8 +2307,8 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr, * way. This probably indicates a data error or uninformed hacking. * Fall through to "no match". */ - png_chunk_report(png_ptr, - "Not recognizing known sRGB profile that has been edited", + png_chunk_report(png_ptr, "Not recognizing known sRGB profile that" + " has been edited", PNG_CHUNK_WARNING); break; # endif diff --git a/png.h b/png.h index d72d4e579..eb8b2559c 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.13beta02 - July 4, 2014 + * libpng version 1.6.13beta02 - July 21, 2014 * Copyright (c) 1998-2014 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.6.13beta02 - July 4, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.13beta02 - July 21, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -232,7 +232,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.13beta02, July 4, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.13beta02, July 21, 2014, are * Copyright (c) 2004, 2006-2014 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: @@ -344,7 +344,7 @@ * Y2K compliance in libpng: * ========================= * - * July 4, 2014 + * July 21, 2014 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -414,7 +414,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.13beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.13beta02 - July 4, 2014\n" + " libpng version 1.6.13beta02 - July 21, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index 9b94fff56..852b183f3 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.13beta02 - July 4, 2014 + * libpng version 1.6.13beta02 - July 21, 2014 * * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngread.c b/pngread.c index 356ac76a4..469e3ce91 100644 --- a/pngread.c +++ b/pngread.c @@ -1220,7 +1220,7 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr, # define P_LINEAR8 4 /* 8-bit linear: only from a file value */ /* Color-map processing: after libpng has run on the PNG image further - * processing may be needed to conver the data to color-map indicies. + * processing may be needed to conver the data to color-map indices. */ #define PNG_CMAP_NONE 0 #define PNG_CMAP_GA 1 /* Process GA data to a color-map with alpha */ @@ -2187,7 +2187,7 @@ png_image_read_colormap(png_voidp argument) data_encoding = P_FILE; /* The rows from libpng, while technically gray values, are now also - * color-map indicies; however, they may need to be expanded to 1 + * color-map indices; however, they may need to be expanded to 1 * byte per pixel. This is what png_set_packing does (i.e., it * unpacks the bit values into bytes.) */ @@ -2273,8 +2273,8 @@ png_image_read_colormap(png_voidp argument) * 8-bit GA and it has to be processing to single byte color-map * values. Entry 254 is replaced by either a completely * transparent entry or by the background color at full - * precision (and the background color is not a simple gray leve - * in this case.) + * precision (and the background color is not a simple gray + * level in this case.) */ expand_tRNS = 1; output_processing = PNG_CMAP_TRANS; @@ -2752,7 +2752,7 @@ png_image_read_colormap(png_voidp argument) num_trans = 0; output_processing = PNG_CMAP_NONE; - data_encoding = P_FILE; /* Don't change from color-map indicies */ + data_encoding = P_FILE; /* Don't change from color-map indices */ cmap_entries = png_ptr->num_palette; if (cmap_entries > 256) cmap_entries = 256; @@ -2792,7 +2792,7 @@ png_image_read_colormap(png_voidp argument) i < num_trans ? trans[i] : 255U, P_FILE/*8-bit*/); } - /* The PNG data may have indicies packed in fewer than 8 bits, it + /* The PNG data may have indices packed in fewer than 8 bits, it * must be expanded if so. */ if (png_ptr->bit_depth < 8) diff --git a/pngrutil.c b/pngrutil.c index fd7af3850..3f415bf7d 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1319,9 +1319,9 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) * chunk is just ignored, so does not invalidate the color space. An * alternative is to set the 'invalid' flags at the start of this routine * and only clear them in they were not set before and all the tests pass. - * The minimum 'deflate' stream is assumed to be just the 2 byte header and 4 - * byte checksum. The keyword must be one character and there is a - * terminator (0) byte and the compression method. + * The minimum 'deflate' stream is assumed to be just the 2 byte header and + * 4 byte checksum. The keyword must be at least one character and there is + * a terminator (0) byte and the compression method. */ if (length < 9) { @@ -2640,7 +2640,7 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) /* prefix_length should now be at the trailing '\0' of the translated * keyword, but it may already be over the end. None of this arithmetic * can overflow because chunks are at most 2^31 bytes long, but on 16-bit - * systems the available allocaton may overflow. + * systems the available allocation may overflow. */ ++prefix_length; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 938da26dd..1617d2313 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.13beta02 - July 4, 2014 +libpng version 1.6.13beta02 - July 21, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 5e2659b50..556aee8c1 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@