summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2014-02-22 23:02:54 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2014-02-22 23:12:02 -0600
commit78c28fea51ca0071f8605764c09ccaabc7f15216 (patch)
tree07e4b1c91aecb2c7900f1b60f02ad9ccad292a44
parent45625eceb4bddc69852b0fb76e8482824557558c (diff)
downloadlibpng-1.6.10beta02.tar.gz
[libpng16] Imported from libpng-1.6.10beta02.tarv1.6.10beta02
-rw-r--r--LICENSE4
-rw-r--r--README2
-rw-r--r--arm/arm_init.c4
-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.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
-rwxr-xr-xscripts/pnglibconf.dfa5
-rw-r--r--scripts/pnglibconf.h.prebuilt2
14 files changed, 30 insertions, 29 deletions
diff --git a/LICENSE b/LICENSE
index 2b88f2644..91bf7164d 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.10beta02, February 9, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.10beta02, February 23, 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
-February 9, 2014
+February 23, 2014
diff --git a/README b/README
index 3863c3f06..479ccad82 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.10beta02 - February 9, 2014 (shared library 16.0)
+README for libpng version 1.6.10beta02 - February 23, 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/arm/arm_init.c b/arm/arm_init.c
index 7f73f8f59..580053016 100644
--- a/arm/arm_init.c
+++ b/arm/arm_init.c
@@ -1,9 +1,9 @@
/* arm_init.c - NEON optimised filter functions
*
- * Copyright (c) 2013 Glenn Randers-Pehrson
+ * Copyright (c) 2014 Glenn Randers-Pehrson
* Written by Mans Rullgard, 2011.
- * Last changed in libpng 1.6.8 [December 19, 2013]
+ * Last changed in libpng 1.6.10 [(PENDING RELEASE)]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
diff --git a/libpng-manual.txt b/libpng-manual.txt
index 3c88c3497..0e160a5c8 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.10beta02 - February 9, 2014
+ libpng version 1.6.10beta02 - February 23, 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.10beta02 - February 9, 2014
+ libpng versions 0.97, January 1998, through 1.6.10beta02 - February 23, 2014
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -5238,7 +5238,7 @@ Other rules can be inferred by inspecting the libpng source.
XVI. Y2K Compliance in libpng
-February 9, 2014
+February 23, 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 7b4426367..35b1ad664 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "February 9, 2014"
+.TH LIBPNG 3 "February 23, 2014"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.10beta02
.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.10beta02 - February 9, 2014
+ libpng version 1.6.10beta02 - February 23, 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.10beta02 - February 9, 2014
+ libpng versions 0.97, January 1998, through 1.6.10beta02 - February 23, 2014
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -5743,7 +5743,7 @@ Other rules can be inferred by inspecting the libpng source.
.SH XVI. Y2K Compliance in libpng
-February 9, 2014
+February 23, 2014
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -6037,7 +6037,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.6.10beta02 - February 9, 2014:
+Libpng version 1.6.10beta02 - February 23, 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).
@@ -6060,7 +6060,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.6.10beta02, February 9, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.10beta02, February 23, 2014, are
Copyright (c) 2004,2006-2007 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
@@ -6159,7 +6159,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-February 9, 2014
+February 23, 2014
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 459f1066a..b2b6d7782 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "February 9, 2014"
+.TH LIBPNGPF 3 "February 23, 2014"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.10beta02
(private functions)
diff --git a/png.5 b/png.5
index 8193825d1..d1f0faf84 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "February 9, 2014"
+.TH PNG 5 "February 23, 2014"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.h b/png.h
index f23c95f11..135f29ae0 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.6.10beta02 - February 16, 2014
+ * libpng version 1.6.10beta02 - February 23, 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.10beta02 - February 16, 2014: Glenn
+ * libpng versions 0.97, January 1998, through 1.6.10beta02 - February 23, 2014: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -224,7 +224,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.6.10beta02, February 16, 2014, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.6.10beta02, February 23, 2014, are
* Copyright (c) 2004, 2006-2013 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:
@@ -336,7 +336,7 @@
* Y2K compliance in libpng:
* =========================
*
- * February 16, 2014
+ * February 23, 2014
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -404,7 +404,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.10beta02"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.6.10beta02 - February 16, 2014\n"
+ " libpng version 1.6.10beta02 - February 23, 2014\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
diff --git a/pngconf.h b/pngconf.h
index 3c26c7963..cd0113bf7 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.6.10beta02 - February 20, 2014
+ * libpng version 1.6.10beta02 - February 23, 2014
*
* Copyright (c) 1998-2013 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 45a9d8b6a..0ed67b1cc 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.6.10beta02 - February 9, 2014
+libpng version 1.6.10beta02 - February 23, 2014
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 861bf1fe3..d2f7fe2eb 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.10beta02 - February 9, 2014
+ * libpng version 1.6.10beta02 - February 23, 2014
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index 5f96a522b..88c1c8989 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.6.10beta02 - February 9, 2014
+Makefiles for libpng version 1.6.10beta02 - February 23, 2014
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa
index b173bb19c..44e2e07e4 100755
--- a/scripts/pnglibconf.dfa
+++ b/scripts/pnglibconf.dfa
@@ -578,8 +578,9 @@ option GAMMA disabled
option COLORSPACE enables GAMMA disabled
# When an ICC profile is read, or png_set, it will be checked for a match
-# against known sRGB profiles if the sRGB handling is enabled. This
-# setting controls how much work is done during the check:
+# against known sRGB profiles if the sRGB handling is enabled. The
+# PNG_sRGB_PROFILE_CHECKS setting controls how much work is done during the
+# check:
#
# 0: Just validate the profile MD5 signature if present, otherwise use
# the checks in option 1.
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index e1d68c355..3a792c498 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.6.10beta02 - February 9, 2014 */
+/* Libpng version 1.6.10beta02 - February 23, 2014 */
/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */