summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2014-12-14 12:22:54 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2014-12-14 12:38:35 -0600
commit86a7eef997bbd563dc8578f6dfcb840137156039 (patch)
tree4e9e6cf2048482cf5db78e4f67d969a43a10cb89
parent530eec311d7d52cc861acecfbd8bda038a467d31 (diff)
downloadlibpng-86a7eef997bbd563dc8578f6dfcb840137156039.tar.gz
[libpng16] Imported from libpng-1.6.16beta01.tarv1.6.16beta01
-rw-r--r--LICENSE4
-rw-r--r--README2
-rw-r--r--contrib/arm-neon/linux.c6
-rw-r--r--libpng-manual.txt6
-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.props2
-rw-r--r--scripts/README.txt2
-rw-r--r--scripts/pnglibconf.h.prebuilt2
-rw-r--r--scripts/sym.dfn2
15 files changed, 31 insertions, 31 deletions
diff --git a/LICENSE b/LICENSE
index 578aae20f..cf9e3e341 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.6.16beta01, November 21, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.16beta01, December 14, 2014, are
Copyright (c) 2004, 2006-2014 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 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-November 21, 2014
+December 14, 2014
diff --git a/README b/README
index b5630ba95..d788014a4 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.16beta01 - November 21, 2014 (shared library 16.0)
+README for libpng version 1.6.16beta01 - December 14, 2014 (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/contrib/arm-neon/linux.c b/contrib/arm-neon/linux.c
index 8cc948d5a..376709c34 100644
--- a/contrib/arm-neon/linux.c
+++ b/contrib/arm-neon/linux.c
@@ -2,7 +2,7 @@
*
* Copyright (c) 2014 Glenn Randers-Pehrson
* Written by John Bowler, 2014.
- * Last changed in libpng 1.6.15 [(PENDING RELEASE)]
+ * Last changed in libpng 1.6.16 [(PENDING RELEASE)]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -16,8 +16,8 @@
* png_have_neon implemented for Linux by reading the widely available
* pseudo-file /proc/cpuinfo.
*
- * This code is strict ANSI-C and is probably moderately portable, it does
- * however use <stdio.h> and assumes that /proc/cpuinfo is never localized.
+ * This code is strict ANSI-C and is probably moderately portable; it does
+ * however use <stdio.h> and it assumes that /proc/cpuinfo is never localized.
*/
#include <stdio.h>
diff --git a/libpng-manual.txt b/libpng-manual.txt
index 2bdc9a027..8218e215b 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.16beta01 - November 21, 2014
+ libpng version 1.6.16beta01 - December 14, 2014
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2014 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.16beta01 - November 21, 2014
+ libpng versions 0.97, January 1998, through 1.6.16beta01 - December 14, 2014
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -5277,7 +5277,7 @@ Other rules can be inferred by inspecting the libpng source.
XVI. Y2K Compliance in libpng
-November 21, 2014
+December 14, 2014
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 0430c4fa9..730d57f11 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "November 21, 2014"
+.TH LIBPNG 3 "December 14, 2014"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.16beta01
.SH SYNOPSIS
@@ -504,7 +504,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.16beta01 - November 21, 2014
+ libpng version 1.6.16beta01 - December 14, 2014
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
- libpng versions 0.97, January 1998, through 1.6.16beta01 - November 21, 2014
+ libpng versions 0.97, January 1998, through 1.6.16beta01 - December 14, 2014
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -5781,7 +5781,7 @@ Other rules can be inferred by inspecting the libpng source.
.SH XVI. Y2K Compliance in libpng
-November 21, 2014
+December 14, 2014
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -6093,7 +6093,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.6.16beta01 - November 21, 2014:
+Libpng version 1.6.16beta01 - December 14, 2014:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -6116,7 +6116,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.6.16beta01, November 21, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.16beta01, December 14, 2014, are
Copyright (c) 2004,2006-2014 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
@@ -6215,7 +6215,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-November 21, 2014
+December 14, 2014
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 46148f1b0..472e8e3af 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "November 21, 2014"
+.TH LIBPNGPF 3 "December 14, 2014"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.16beta01
(private functions)
diff --git a/png.5 b/png.5
index aa093da79..e3fa7c866 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "November 21, 2014"
+.TH PNG 5 "December 14, 2014"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 357d56e11..9ab52b83f 100644
--- a/png.c
+++ b/png.c
@@ -769,13 +769,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.6.16beta01 - November 21, 2014" PNG_STRING_NEWLINE \
+ "libpng version 1.6.16beta01 - December 14, 2014" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2014 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.16beta01 - November 21, 2014\
+ return "libpng version 1.6.16beta01 - December 14, 2014\
Copyright (c) 1998-2014 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 7ee98539e..e40554e85 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.6.16beta01, November 21, 2014
+ * libpng version 1.6.16beta01, December 14, 2014
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -11,7 +11,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.6.16beta01, November 21, 2014: Glenn
+ * libpng versions 0.97, January 1998, through 1.6.16beta01, December 14, 2014: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -241,7 +241,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.6.16beta01, November 21, 2014, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.6.16beta01, December 14, 2014, are
* Copyright (c) 2004, 2006-2014 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:
@@ -353,7 +353,7 @@
* Y2K compliance in libpng:
* =========================
*
- * November 21, 2014
+ * December 14, 2014
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -423,7 +423,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.16beta01"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.6.16beta01 - November 21, 2014\n"
+ " libpng version 1.6.16beta01 - December 14, 2014\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
diff --git a/pngconf.h b/pngconf.h
index efb830a55..cb310c64c 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.6.16beta01,November 21, 2014
+ * libpng version 1.6.16beta01,December 14, 2014
*
* Copyright (c) 1998-2014 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 0869b8f13..301cbebe9 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.6.16beta01 - November 21, 2014
+libpng version 1.6.16beta01 - December 14, 2014
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index b216c2c7f..ae53d14e5 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
- * libpng version 1.6.16beta01 - November 21, 2014
+ * libpng version 1.6.16beta01 - December 14, 2014
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index cca2b7526..495ab226c 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.6.16beta01 - November 21, 2014
+Makefiles for libpng version 1.6.16beta01 - December 14, 2014
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 9f21c52a6..c866a34d7 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.6.16beta01 - November 21, 2014 */
+/* Libpng version 1.6.16beta01 - December 14, 2014 */
/* Copyright (c) 1998-2014 Glenn Randers-Pehrson */
diff --git a/scripts/sym.dfn b/scripts/sym.dfn
index 9ccd810fd..ee9fba25b 100644
--- a/scripts/sym.dfn
+++ b/scripts/sym.dfn
@@ -12,4 +12,4 @@
#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
PNG_DFN "@" SYMBOL_PREFIX "@@" name "@"
-#include "../png.h"
+#include "png.h"