From d9940f620723cf4b032c8ac186a176b472465240 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 8 Jul 2016 08:43:30 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.24beta04.tar --- ANNOUNCE | 2 +- CHANGES | 2 +- INSTALL | 4 ++-- LICENSE | 4 ++-- README | 2 +- libpng-manual.txt | 4 ++-- libpng.3 | 12 ++++++------ libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 +++++----- pngconf.h | 2 +- projects/vstudio/README.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 159c91a07..8c6d764cb 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -80,7 +80,7 @@ Version 1.6.24beta03 [July 4, 2016] Version 1.6.24beta04 [July 8, 2016] Avoid filter-selection heuristic sum calculations in cases where only one filter is a candidate for selection. This trades off code size (added - png_setup_*_row_only() functions) for speed. + private png_setup_*_row_only() functions) for speed. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 9976f13b1..8ffd34401 100644 --- a/CHANGES +++ b/CHANGES @@ -5651,7 +5651,7 @@ Version 1.6.24beta03 [July 4, 2016] Version 1.6.24beta04 [July 8, 2016] Avoid filter-selection heuristic sum calculations in cases where only one filter is a candidate for selection. This trades off code size (added - png_setup_*_row_only() functions) for speed. + private png_setup_*_row_only() functions) for speed. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/INSTALL b/INSTALL index 663ac25ed..e9c31e832 100644 --- a/INSTALL +++ b/INSTALL @@ -119,8 +119,8 @@ or "zlib128") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: - .. (the parent directory) - libpng (this directory) + .. (the parent directory) + libpng (this directory) INSTALL (this file) README *.h, *.c => libpng source files diff --git a/LICENSE b/LICENSE index 03886596a..daa5d2ba6 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.24beta04, July 4, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.24beta04, July 8, 2016 are Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -127,4 +127,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 4, 2016 +July 8, 2016 diff --git a/README b/README index b0435dc00..7f88de528 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.24beta04 - July 4, 2016 (shared library 16.0) +README for libpng version 1.6.24beta04 - July 8, 2016 (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 effdc87a4..88eeab58a 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.24beta04 - July 4, 2016 + libpng version 1.6.24beta04 - July 8, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 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.24beta04 - July 4, 2016 + libpng versions 0.97, January 1998, through 1.6.24beta04 - July 8, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson diff --git a/libpng.3 b/libpng.3 index 027ebd041..f352130f1 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "July 4, 2016" +.TH LIBPNG 3 "July 8, 2016" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta04 .SH SYNOPSIS @@ -510,7 +510,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.24beta04 - July 4, 2016 + libpng version 1.6.24beta04 - July 8, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -521,7 +521,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.24beta04 - July 4, 2016 + libpng versions 0.97, January 1998, through 1.6.24beta04 - July 8, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -6018,7 +6018,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.24beta04 - July 4, 2016: +Libpng version 1.6.24beta04 - July 8, 2016: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6043,7 +6043,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.24beta04, July 4, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.24beta04, July 8, 2016 are Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -6168,7 +6168,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 4, 2016 +July 8, 2016 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index a1a07e0fe..690bfa61d 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "July 4, 2016" +.TH LIBPNGPF 3 "July 8, 2016" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta04 (private functions) diff --git a/png.5 b/png.5 index 912d8e7df..287e0cd46 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "July 4, 2016" +.TH PNG 5 "July 8, 2016" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index d6c5e392a..433062f04 100644 --- a/png.c +++ b/png.c @@ -775,14 +775,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.24beta04 - July 4, 2016" PNG_STRING_NEWLINE \ + "libpng version 1.6.24beta04 - July 8, 2016" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2016 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.24beta04 - July 4, 2016\ + return "libpng version 1.6.24beta04 - July 8, 2016\ Copyright (c) 1998-2002,2004,2006-2016 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 0569caaa3..7e94725b1 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.24beta04, July 4, 2016 + * libpng version 1.6.24beta04, July 8, 2016 * * Copyright (c) 1998-2002,2004,2006-2016 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.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.24beta04, July 4, 2016: + * libpng versions 0.97, January 1998, through 1.6.24beta04, July 8, 2016: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -29,7 +29,7 @@ * files that are distributed with libpng have other copyright owners and * are released under other open source licenses. * - * libpng versions 1.0.7, July 1, 2000 through 1.6.24beta04, July 4, 2016 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.24beta04, July 8, 2016 are * Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are * derived from libpng-1.0.6, and are distributed according to the same * disclaimer and license as libpng-1.0.6 with the following individuals @@ -245,7 +245,7 @@ * Y2K compliance in libpng: * ========================= * - * July 4, 2016 + * July 8, 2016 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -315,7 +315,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.24beta04" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.24beta04 - July 4, 2016\n" + " libpng version 1.6.24beta04 - July 8, 2016\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index 4ef8cebea..5314b6ad1 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.24beta04, July 4, 2016 + * libpng version 1.6.24beta04, July 8, 2016 * * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 14a8aac05..3c1156e36 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.24beta04 - July 4, 2016 +libpng version 1.6.24beta04 - July 8, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 034c89a65..28e9002ca 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@