From 364450bf8d8e7acdc624d13137f98a9e8432a714 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 21 Feb 2017 20:37:11 -0600 Subject: [PATCH] [libpng16] Imported from libpng-1.6.29beta02.tar --- LICENSE | 4 ++-- TODO | 1 + libpng-manual.txt | 4 ++-- libpng.3 | 12 ++++++------ libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- pngconf.h | 2 +- projects/vstudio/README.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 12 files changed, 20 insertions(+), 19 deletions(-) diff --git a/LICENSE b/LICENSE index 9daa4fa87..88693170e 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.29beta02, January 12, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.29beta02, February 22, 2017 are Copyright (c) 2000-2002, 2004, 2006-2017 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 @@ -129,4 +129,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 12, 2017 +February 22, 2017 diff --git a/TODO b/TODO index fe9de4bf0..36d6092a2 100644 --- a/TODO +++ b/TODO @@ -25,5 +25,6 @@ Use greater precision when changing to linear gamma for compositing against Investigate pre-incremented loop counters and other loop constructions. Add interpolated method of handling interlacing. Extend pngvalid.c to validate more of the libpng transformations. +Refactor preprocessor conditionals to compile entire statements */ diff --git a/libpng-manual.txt b/libpng-manual.txt index 45cabc4c2..b06f3587f 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.29beta02 - January 12, 2017 + libpng version 1.6.29beta02 - February 22, 2017 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.29beta02 - January 12, 2017 + libpng versions 0.97, January 1998, through 1.6.29beta02 - February 22, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson diff --git a/libpng.3 b/libpng.3 index 727b17c31..cd8ab096c 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "January 12, 2017" +.TH LIBPNG 3 "February 22, 2017" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.29beta02 .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.29beta02 - January 12, 2017 + libpng version 1.6.29beta02 - February 22, 2017 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.29beta02 - January 12, 2017 + libpng versions 0.97, January 1998, through 1.6.29beta02 - February 22, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -6023,7 +6023,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.29beta02 - January 12, 2017: +Libpng version 1.6.29beta02 - February 22, 2017: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6048,7 +6048,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.29beta02, January 12, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.29beta02, February 22, 2017 are Copyright (c) 2000-2002, 2004, 2006-2017 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 @@ -6175,7 +6175,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 12, 2017 +February 22, 2017 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index a1626d904..58e867b5a 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "January 12, 2017" +.TH LIBPNGPF 3 "February 22, 2017" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.29beta02 (private functions) diff --git a/png.5 b/png.5 index db5cf4302..e3f9eac26 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "January 12, 2017" +.TH PNG 5 "February 22, 2017" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 71839ddda..0bcbda160 100644 --- a/png.c +++ b/png.c @@ -776,14 +776,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.29beta02 - January 12, 2017" PNG_STRING_NEWLINE \ + "libpng version 1.6.29beta02 - February 22, 2017" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2017 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.29beta02 - January 12, 2017\ + return "libpng version 1.6.29beta02 - February 22, 2017\ Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; diff --git a/pngconf.h b/pngconf.h index 17b51e152..dce41604d 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.29beta02, January 12, 2017 + * libpng version 1.6.29beta02, February 22, 2017 * * Copyright (c) 1998-2002,2004,2006-2016 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 3294497d3..1c0c7d32d 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.29beta02 - January 12, 2017 +libpng version 1.6.29beta02 - February 22, 2017 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index ebe855b80..bfc645787 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@