[libpng17] Imported from libpng-1.7.0beta63.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 5aa5820..1b9fdd4 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -815,7 +815,7 @@
png_set_filter_heuristics_fixed() APIs are retained but deprecated.
Version 1.7.0beta63 [June 6, 2015]
- Quieted Coverity issues in pngfix.c, png-fix-itxt.c, pngvalid.c,
+ Quieted some Coverity issues in pngfix.c, png-fix-itxt.c, pngvalid.c,
pngstest.c, and pngimage.c. Most seem harmless, but png-fix-itxt
would only work with iTXt chunks with length 255 or less.
Fixed cexcept.h in which GCC 5 reported that one of the auto
diff --git a/CHANGES b/CHANGES
index 07e1ce3..f643779 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5110,7 +5110,7 @@
png_set_filter_heuristics_fixed() APIs are retained but deprecated.
Version 1.7.0beta63 [June 6, 2015]
- Quieted Coverity issues in pngfix.c, png-fix-itxt.c, pngvalid.c,
+ Quieted some Coverity issues in pngfix.c, png-fix-itxt.c, pngvalid.c,
pngstest.c, and pngimage.c. Most seem harmless, but png-fix-itxt
would only work with iTXt chunks with length 255 or less.
Fixed cexcept.h in which GCC 5 reported that one of the auto
diff --git a/LICENSE b/LICENSE
index ab6a8b5..8a9e296 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.7.0beta63, June 1, 2015, are
+libpng versions 1.2.6, August 15, 2004, through 1.7.0beta63, June 6, 2015, are
Copyright (c) 2004, 2006-2015 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 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-June 1, 2015
+June 6, 2015
diff --git a/README b/README
index aea493b..0ec1881 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.7.0beta63 - June 1, 2015 (shared library 17.0)
+README for libpng version 1.7.0beta63 - June 6, 2015 (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/libtests/pngstest.c b/contrib/libtests/pngstest.c
index d92292c..744a007 100644
--- a/contrib/libtests/pngstest.c
+++ b/contrib/libtests/pngstest.c
@@ -3245,7 +3245,8 @@
if (image->opts & USE_STDIO)
{
- FILE *f = tmpfile();
+ char tmpfile[] = "pngstest-XXXXXX";
+ FILE *f = fopen(mktemp(tmpfile),"w+");
if (f != NULL)
{
diff --git a/libpng-manual.txt b/libpng-manual.txt
index 62cfef5..8d0bbbe 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.0beta63 - June 1, 2015
+ libpng version 1.7.0beta63 - June 6, 2015
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.0beta63 - June 1, 2015
+ libpng versions 0.97, January 1998, through 1.7.0beta63 - June 6, 2015
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -5353,7 +5353,7 @@
XVII. Y2K Compliance in libpng
-June 1, 2015
+June 6, 2015
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 1b38b75..b309ef3 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "June 1, 2015"
+.TH LIBPNG 3 "June 6, 2015"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta63
.SH SYNOPSIS
@@ -494,7 +494,7 @@
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.7.0beta63 - June 1, 2015
+ libpng version 1.7.0beta63 - June 6, 2015
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -505,7 +505,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.7.0beta63 - June 1, 2015
+ libpng versions 0.97, January 1998, through 1.7.0beta63 - June 6, 2015
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -5847,7 +5847,7 @@
.SH XVII. Y2K Compliance in libpng
-June 1, 2015
+June 6, 2015
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -6164,7 +6164,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.7.0beta63 - June 1, 2015:
+Libpng version 1.7.0beta63 - June 6, 2015:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -6187,7 +6187,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.7.0beta63, June 1, 2015, are
+libpng versions 1.2.6, August 15, 2004, through 1.7.0beta63, June 6, 2015, are
Copyright (c) 2004,2006-2015 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
@@ -6286,7 +6286,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-June 1, 2015
+June 6, 2015
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 3e65603..e6527d6 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "June 1, 2015"
+.TH LIBPNGPF 3 "June 6, 2015"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta63
(private functions)
diff --git a/png.5 b/png.5
index 005b1ea..6c485cd 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "June 1, 2015"
+.TH PNG 5 "June 6, 2015"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 8642abd..7aba77e 100644
--- a/png.c
+++ b/png.c
@@ -689,13 +689,13 @@
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.7.0beta63 - June 5, 2015" PNG_STRING_NEWLINE \
+ "libpng version 1.7.0beta63 - June 6, 2015" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2015 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.0beta63 - June 5, 2015\
+ return "libpng version 1.7.0beta63 - June 6, 2015\
Copyright (c) 1998-2015 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 34456eb..d3ad8da 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.7.0beta63, June 1, 2015
+ * libpng version 1.7.0beta63, June 6, 2015
*
* Copyright (c) 1998-2015 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.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- * libpng versions 0.97, January 1998, through 1.7.0beta63, June 1, 2015: Glenn
+ * libpng versions 0.97, January 1998, through 1.7.0beta63, June 6, 2015: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -248,7 +248,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta63, June 1, 2015, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta63, June 6, 2015, are
* Copyright (c) 2004, 2006-2015 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:
@@ -360,7 +360,7 @@
* Y2K compliance in libpng:
* =========================
*
- * June 1, 2015
+ * June 6, 2015
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -430,7 +430,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.7.0beta63"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.7.0beta63 - June 1, 2015\n"
+ " libpng version 1.7.0beta63 - June 6, 2015\n"
#define PNG_LIBPNG_VER_SONUM 17
#define PNG_LIBPNG_VER_DLLNUM 17
@@ -2981,7 +2981,7 @@
# define PNG_IMAGE_WARNING 1
# define PNG_IMAGE_ERROR 2
/*
- * The result is a two bit code such that a value more than 1 indicates
+ * The result is a two-bit code such that a value more than 1 indicates
* a failure in the API just called:
*
* 0 - no warning or error
diff --git a/pngconf.h b/pngconf.h
index 4e9b231..bfbc46f3 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.7.0beta63, June 1, 2015
+ * libpng version 1.7.0beta63, June 6, 2015
*
* Copyright (c) 1998-2015 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -216,6 +216,7 @@
# define PNGAPI _stdcall
# endif
# endif /* compiler/api */
+
/* NOTE: PNGCBAPI always defaults to PNGCAPI. */
# if defined(PNGAPI) && !defined(PNG_USER_PRIVATEBUILD)
@@ -363,6 +364,7 @@
# ifndef PNG_RESTRICT
# define PNG_RESTRICT __restrict
# endif
+
# elif defined(__GNUC__)
# ifndef PNG_USE_RESULT
# define PNG_USE_RESULT __attribute__((__warn_unused_result__))
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index afd784a..043cce5 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.7.0beta63 - June 1, 2015
+libpng version 1.7.0beta63 - June 6, 2015
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 83d678f..f19f888 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.0beta63 - June 1, 2015
+ * libpng version 1.7.0beta63 - June 6, 2015
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index 2f722d7..1d90cf8 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.7.0beta63 - June 1, 2015
+Makefiles for libpng version 1.7.0beta63 - June 6, 2015
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 5fe1e5d..e638acf 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.7.0beta63 - June 1, 2015 */
+/* Libpng version 1.7.0beta63 - June 6, 2015 */
/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */
