[libpng17] Imported from libpng-1.7.0beta83.tar
diff --git a/INSTALL b/INSTALL
index 15c9817..90cfbd7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -79,7 +79,7 @@
Before installing libpng, you must first install zlib, if it
is not already on your system. zlib can usually be found
wherever you got libpng; otherwise go to http://zlib.net. You can place
-zlib in in the same directory as libpng or in another directory.
+zlib in the same directory as libpng or in another directory.
If your system already has a preinstalled zlib you will still need
to have access to the zlib.h and zconf.h include files that
diff --git a/LICENSE b/LICENSE
index 82f73a6..d5ac373 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@
This code is released under the libpng license.
-libpng versions 1.0.7, July 1, 2000, through 1.7.0beta83, July 4, 2016, are
+libpng versions 1.0.7, July 1, 2000, through 1.7.0beta83, July 23, 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
@@ -109,4 +109,4 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-July 4, 2016
+July 23, 2016
diff --git a/README b/README
index 1efe7fc..8736091 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.7.0beta83 - July 4, 2016 (shared library 17.0)
+README for libpng version 1.7.0beta83 - July 23, 2016 (shared library 17.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/tools/chkfmt b/contrib/tools/chkfmt
index 9da6475..a1b88cc 100755
--- a/contrib/tools/chkfmt
+++ b/contrib/tools/chkfmt
@@ -1,4 +1,11 @@
#!/bin/sh
+
+# chkfmt
+#
+# COPYRIGHT: Written by John Cunningham Bowler, 2010.
+# To the extent possible under law, the author has waived all copyright and
+# related or neighboring rights to this work. This work is published from:
+# United States.
#
# Check the format of the source files in the current directory - checks for a
# line length of 80 characters max and no tab characters.
diff --git a/contrib/tools/reindent b/contrib/tools/reindent
new file mode 100644
index 0000000..f4df309
--- /dev/null
+++ b/contrib/tools/reindent
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# reindent a libpng C source
+
+# COPYRIGHT: Written by Glenn Randers-Pehrson, 2016.
+# To the extent possible under law, the author has waived all copyright and
+# related or neighboring rights to this work. This work is published from:
+# United States.
+
+# Usage:
+# reindent inputtabsize outputtabsize inputcontinuestring outputcontinuestring
+#
+# Assumes that continued lines begin with indentation plus one space, and
+# that continued comments begin with indentation plus " *".
+#
+# eg, to change libpng coding style from 3-space indentation with 4-space
+# continuations to 4-space indentation with 2-space continuations:
+#
+# reindent 3 4 "\t " " " < example.c > example.c_4_2
+# and to restore the file back to libpng coding style
+# reindent 4 3 " " " " < example.c_4_2 > example.c_3_4
+
+unexpand --first-only --t $1 | \
+ sed -e "/^ *$3[^\*]/{s/$3/$4/}" | \
+ expand -t $2
diff --git a/libpng-manual.txt b/libpng-manual.txt
index b9f021b..6ad619a 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.7.0beta83 - July 4, 2016
+ libpng version 1.7.0beta83 - July 23, 2016
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.7.0beta83 - July 4, 2016
+ libpng versions 0.97, January 1998, through 1.7.0beta83 - July 23, 2016
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -5247,6 +5247,19 @@
*/
statement;
+%17+%Linus Torvalds recomends putting the leading "/*" in multiple-line
+%17+%comments on a separate line:
+%17+%
+%17+% /*
+%17+% * This is a multiple-line
+%17+% * comment.
+%17+% */
+%17+% statement;
+%17+%
+%17+%See
+%17+%https://developers.slashdot.org/story/16/07/12/2036201
+%17+%/linus-torvalds-in-sweary-rant-about-punctuation-in-kernel-comments
+%17+%
Very short comments can be placed after the end of the statement
to which they pertain:
diff --git a/libpng.3 b/libpng.3
index a315c66..eed2a2e 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "July 4, 2016"
+.TH LIBPNG 3 "July 23, 2016"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta83
.SH SYNOPSIS
@@ -500,7 +500,7 @@
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.7.0beta83 - July 4, 2016
+ libpng version 1.7.0beta83 - July 23, 2016
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -511,7 +511,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.7.0beta83 - July 4, 2016
+ libpng versions 0.97, January 1998, through 1.7.0beta83 - July 23, 2016
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -5747,6 +5747,19 @@
*/
statement;
+%17+%Linus Torvalds recomends putting the leading "/*" in multiple-line
+%17+%comments on a separate line:
+%17+%
+%17+% /*
+%17+% * This is a multiple-line
+%17+% * comment.
+%17+% */
+%17+% statement;
+%17+%
+%17+%See
+%17+%https://developers.slashdot.org/story/16/07/12/2036201
+%17+%/linus-torvalds-in-sweary-rant-about-punctuation-in-kernel-comments
+%17+%
Very short comments can be placed after the end of the statement
to which they pertain:
@@ -6003,7 +6016,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.7.0beta83 - July 4, 2016:
+Libpng version 1.7.0beta83 - July 23, 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).
@@ -6028,7 +6041,7 @@
This code is released under the libpng license.
-libpng versions 1.0.7, July 1, 2000, through 1.7.0beta83, July 4, 2016, are
+libpng versions 1.0.7, July 1, 2000, through 1.7.0beta83, July 23, 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
@@ -6127,7 +6140,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-July 4, 2016
+July 23, 2016
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index c416d57..c14e0c6 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "July 4, 2016"
+.TH LIBPNGPF 3 "July 23, 2016"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta83
(private functions)
diff --git a/png.5 b/png.5
index 3d86a4a..ed49100 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "July 4, 2016"
+.TH PNG 5 "July 23, 2016"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 81b8606..c58db2f 100644
--- a/png.c
+++ b/png.c
@@ -704,14 +704,14 @@
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.7.0beta83 - July 15, 2016" PNG_STRING_NEWLINE \
+ "libpng version 1.7.0beta83 - July 23, 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.7.0beta83 - July 15, 2016\
+ return "libpng version 1.7.0beta83 - July 23, 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 e3cca95..a38c31e 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.7.0beta83, July 4, 2016
+ * libpng version 1.7.0beta83, July 23, 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.7.0beta83, July 4, 2016:
+ * libpng versions 0.97, January 1998, through 1.7.0beta83, July 23, 2016:
* Glenn Randers-Pehrson.
* See also "Contributing Authors", below.
*/
@@ -25,7 +25,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta83, July 4, 2016, are
+ * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta83, July 23, 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
@@ -217,7 +217,7 @@
* Y2K compliance in libpng:
* =========================
*
- * July 4, 2016
+ * July 23, 2016
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -286,7 +286,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.7.0beta83"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.7.0beta83 - July 4, 2016\n"
+#define PNG_HEADER_VERSION_STRING " libpng version 1.7.0beta83 - July 23, 2016\n"
#define PNG_LIBPNG_VER_SONUM 17
#define PNG_LIBPNG_VER_DLLNUM 17
diff --git a/pngconf.h b/pngconf.h
index cd5a6eb..a44f758 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.7.0beta83, July 4, 2016
+ * libpng version 1.7.0beta83, July 23, 2016
*
* 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 f1698f9..2feb3a4 100644
--- a/projects/vstudio/README.txt
+++ b/projects/vstudio/README.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.7.0beta83 - July 4, 2016
+libpng version 1.7.0beta83 - July 23, 2016
Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 3eda139..e40dc2e 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
- * libpng version 1.7.0beta83 - July 4, 2016
+ * libpng version 1.7.0beta83 - July 23, 2016
*
* Copyright (c) 2011,2013,2014 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index 9e17180..ae8effc 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.7.0beta83 - July 4, 2016
+Makefiles for libpng version 1.7.0beta83 - July 23, 2016
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 66f4877..a31c0a6 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
/* pnglibconf.h - library build configuration */
-/* libpng version 1.7.0beta83, July 4, 2016 */
+/* libpng version 1.7.0beta83, July 23, 2016 */
/* Copyright (c) 1998-2016 Glenn Randers-Pehrson */
