summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2016-01-07 09:00:51 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2016-01-07 13:06:57 -0600
commitdf4568f84b01e00ad63868ec4e44cc348e63771e (patch)
tree4ca3855c0f414277bd24d902c8720902c3e3faa6
parent6d5f00571da282f65c4f840bff4b43eca27c489f (diff)
downloadlibpng-df4568f84b01e00ad63868ec4e44cc348e63771e.tar.gz
[libpng17] Imported from libpng-1.7.0beta76.tarv1.7.0beta76
-rw-r--r--LICENSE6
-rw-r--r--README2
-rw-r--r--contrib/examples/pngcp.c2
-rw-r--r--contrib/libtests/pngimage.c2
-rw-r--r--example.c2
-rw-r--r--libpng-manual.txt4
-rw-r--r--libpng.314
-rw-r--r--libpngpf.32
-rw-r--r--png.52
-rw-r--r--png.c4
-rw-r--r--png.h10
-rw-r--r--pngconf.h2
-rw-r--r--projects/vstudio/README.txt2
-rw-r--r--projects/vstudio/zlib.props4
-rw-r--r--scripts/README.txt2
-rw-r--r--scripts/pnglibconf.h.prebuilt4
16 files changed, 32 insertions, 32 deletions
diff --git a/LICENSE b/LICENSE
index 690b0fee2..3e7e2c023 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,8 +10,8 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.0.7, July 1, 2000, through 1.7.0beta76, December 25, 2015, are
-Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are
+libpng versions 1.0.7, July 1, 2000, through 1.7.0beta76, January 7, 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
added to the list of Contributing Authors:
@@ -109,4 +109,4 @@ the additional disclaimers inserted at version 1.0.7.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-December 25, 2015
+January 7, 2016
diff --git a/README b/README
index 9564ce53a..4ec52fb56 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.7.0beta76 - December 25, 2015 (shared library 17.0)
+README for libpng version 1.7.0beta76 - January 7, 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/examples/pngcp.c b/contrib/examples/pngcp.c
index 2bbec1d6b..c9c051287 100644
--- a/contrib/examples/pngcp.c
+++ b/contrib/examples/pngcp.c
@@ -1,6 +1,6 @@
/* pngcp.c
*
- * Copyright (c) 2015 John Cunningham Bowler
+ * Copyright (c) 2016 John Cunningham Bowler
*
* Last changed in libpng 1.7.0 [(PENDING RELEASE)]
*
diff --git a/contrib/libtests/pngimage.c b/contrib/libtests/pngimage.c
index ff0b89ecf..442b2f430 100644
--- a/contrib/libtests/pngimage.c
+++ b/contrib/libtests/pngimage.c
@@ -2,7 +2,7 @@
*
* Copyright (c) 2015 John Cunningham Bowler
*
- * Last changed in libpng 1.6.18 [July 23, 2015]
+ * Last changed in libpng 1.6.20 [December 3, 2015]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
diff --git a/example.c b/example.c
index b762b8ad4..96c829b84 100644
--- a/example.c
+++ b/example.c
@@ -3,7 +3,7 @@
/* example.c - an example of using libpng
* Last changed in libpng 1.7.0 [(PENDING RELEASE)]
- * Maintained 1998-2015 Glenn Randers-Pehrson
+ * Maintained 1998-2016 Glenn Randers-Pehrson
* Maintained 1996, 1997 Andreas Dilger)
* Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
* To the extent possible under law, the authors have waived
diff --git a/libpng-manual.txt b/libpng-manual.txt
index 880177a9d..09d56075a 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.0beta76 - December 30, 2015
+ libpng version 1.7.0beta76 - January 7, 2016
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2015 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.7.0beta76 - December 30, 2015
+ libpng versions 0.97, January 1998, through 1.7.0beta76 - January 7, 2016
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2015 Glenn Randers-Pehrson
diff --git a/libpng.3 b/libpng.3
index 4a50ff77a..95a26732d 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "December 30, 2015"
+.TH LIBPNG 3 "January 7, 2016"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta76
.SH SYNOPSIS
@@ -498,7 +498,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.7.0beta76 - December 30, 2015
+ libpng version 1.7.0beta76 - January 7, 2016
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -509,7 +509,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
- libpng versions 0.97, January 1998, through 1.7.0beta76 - December 30, 2015
+ libpng versions 0.97, January 1998, through 1.7.0beta76 - January 7, 2016
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -5991,7 +5991,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.7.0beta76 - December 30, 2015:
+Libpng version 1.7.0beta76 - January 7, 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).
@@ -6016,8 +6016,8 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.0.7, July 1, 2000, through 1.7.0beta76, December 30, 2015, are
-Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are
+libpng versions 1.0.7, July 1, 2000, through 1.7.0beta76, January 7, 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
added to the list of Contributing Authors:
@@ -6115,7 +6115,7 @@ the additional disclaimers inserted at version 1.0.7.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-December 30, 2015
+January 7, 2016
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index bfd2d360d..2ee8c6cd7 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "December 25, 2015"
+.TH LIBPNGPF 3 "January 7, 2016"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta76
(private functions)
diff --git a/png.5 b/png.5
index b2450f87f..6bf426e27 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "December 25, 2015"
+.TH PNG 5 "January 7, 2016"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index d38201b3d..5d067a362 100644
--- a/png.c
+++ b/png.c
@@ -705,14 +705,14 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.7.0beta76 - January 2, 2016" PNG_STRING_NEWLINE \
+ "libpng version 1.7.0beta76 - January 7, 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.0beta76 - January 2, 2016\
+ return "libpng version 1.7.0beta76 - January 7, 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 632552a8f..0079b26c6 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.7.0beta76, January 2, 2016
+ * libpng version 1.7.0beta76, January 7, 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.0beta76, January 2, 2016:
+ * libpng versions 0.97, January 1998, through 1.7.0beta76, January 7, 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.0beta76, January 2, 2016, are
+ * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta76, January 7, 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
@@ -218,7 +218,7 @@
* Y2K compliance in libpng:
* =========================
*
- * January 2, 2016
+ * January 7, 2016
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -288,7 +288,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.7.0beta76"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.7.0beta76 - January 2, 2016\n"
+ " libpng version 1.7.0beta76 - January 7, 2016\n"
#define PNG_LIBPNG_VER_SONUM 17
#define PNG_LIBPNG_VER_DLLNUM 17
diff --git a/pngconf.h b/pngconf.h
index d12fe64af..13267af9e 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.7.0beta76, January 2, 2016
+ * libpng version 1.7.0beta76, January 7, 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 7391907c0..19e622360 100644
--- a/projects/vstudio/README.txt
+++ b/projects/vstudio/README.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.7.0beta76 - December 28, 2015
+libpng version 1.7.0beta76 - January 7, 2016
Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index eec4db36b..0ded124de 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,9 +2,9 @@
<!--
* zlib.props - location of zlib source
*
- * libpng version 1.7.0beta76 - December 25, 2015
+ * libpng version 1.7.0beta76 - January 7, 2016
*
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
+ * Copyright (c) 2011,2013,2014 Glenn Randers-Pehrson
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
diff --git a/scripts/README.txt b/scripts/README.txt
index 3a8948966..2f41f4685 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.7.0beta76 - December 25, 2015
+Makefiles for libpng version 1.7.0beta76 - January 7, 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 b025152e9..61eeda48a 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,9 +2,9 @@
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.7.0beta76, December 25, 2015 */
+/* Libpng version 1.7.0beta76, January 7, 2016 */
-/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */
+/* Copyright (c) 1998-2016 Glenn Randers-Pehrson */
/* This code is released under the libpng license. */
/* For conditions of distribution and use, see the disclaimer */