summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2014-08-02 18:06:34 -0500
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2014-08-02 21:28:14 -0500
commita243ec06b03058fca4b3d9df29a5b7054e11d8a9 (patch)
treee09ef7b74ef3750ae70531866cedc0f71e8ce51c
parent37c3b082a78c668a6e203999dfec09d9ebe6d192 (diff)
downloadlibpng-a243ec06b03058fca4b3d9df29a5b7054e11d8a9.tar.gz
[libpng16] Imported from libpng-1.6.13beta03.tarv1.6.13beta03
-rw-r--r--ANNOUNCE14
-rw-r--r--CHANGES4
-rw-r--r--CMakeLists.txt2
-rw-r--r--LICENSE4
-rw-r--r--README2
-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--pngread.c4
-rw-r--r--projects/vstudio/readme.txt2
-rw-r--r--projects/vstudio/zlib.props2
-rw-r--r--scripts/README.txt2
-rwxr-xr-xscripts/dfn.awk2
-rw-r--r--scripts/pnglibconf.h.prebuilt2
18 files changed, 36 insertions, 44 deletions
diff --git a/ANNOUNCE b/ANNOUNCE
index ada87f5d3..61100a3df 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.13beta03 - July 30, 2014
+Libpng 1.6.13beta03 - August 2, 2014
This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version.
@@ -43,8 +43,8 @@ Version 1.6.13beta02 [July 21, 2014]
Also fixed makefile.bc32, makefile.bor, makefile.msc, makefile.intel, and
makefile.tc3 similarly.
-Version 1.6.13beta03 [July 30, 2014]
- Removed scripts/makefile.elf. It has not worked since libpng-1.5.0beta14
+Version 1.6.13beta03 [August 2, 2014]
+ Removed scripts/makefile.elf. It has not worked since libpng-1.5.0beta14
due to elimination of the PNG_FUNCTION_EXPORT definition from pngconf.h.
Ensure that CMakeLists.txt makes the target "lib" directory before making
symbolic link into it (SourceForge bug report #226 by Rolf Timmermans).
@@ -56,11 +56,3 @@ to subscribe)
or to glennrp at users.sourceforge.net
Glenn R-P
-
-Send comments/corrections/commendations to png-mng-implement at lists.sf.net
-(subscription required; visit
-https://lists.sourceforge.net/lists/listinfo/png-mng-implement
-to subscribe)
-or to glennrp at users.sourceforge.net
-
-Glenn R-P
diff --git a/CHANGES b/CHANGES
index 5c760da0b..e378e4e12 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4958,8 +4958,8 @@ Version 1.6.13beta02 [July 21, 2014]
Also fixed makefile.bc32, makefile.bor, makefile.msc, makefile.intel, and
makefile.tc3 similarly.
-Version 1.6.13beta03 [July 30, 2014]
- Removed scripts/makefile.elf. It has not worked since libpng-1.5.0beta14
+Version 1.6.13beta03 [August 2, 2014]
+ Removed scripts/makefile.elf. It has not worked since libpng-1.5.0beta14
due to elimination of the PNG_FUNCTION_EXPORT definition from pngconf.h.
Ensure that CMakeLists.txt makes the target "lib" directory before making
symbolic link into it (SourceForge bug report #226 by Rolf Timmermans).
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6dc82d59b..6c9cb7c22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
# CMakeLists.txt
-# Copyright (C) 2007-2013 Glenn Randers-Pehrson
+# Copyright (C) 2007-2014 Glenn Randers-Pehrson
# This code is released under the libpng license.
# For conditions of distribution and use, see the disclaimer
diff --git a/LICENSE b/LICENSE
index 9211a9c8d..19f006ec5 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.13beta03, July 21, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.13beta03, August 2, 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
-July 21, 2014
+August 2, 2014
diff --git a/README b/README
index fcafe86eb..61df3084f 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.13beta03 - July 21, 2014 (shared library 16.0)
+README for libpng version 1.6.13beta03 - August 2, 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/libpng-manual.txt b/libpng-manual.txt
index 247288963..19ce8a62b 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.13beta03 - July 21, 2014
+ libpng version 1.6.13beta03 - August 2, 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.13beta03 - July 21, 2014
+ libpng versions 0.97, January 1998, through 1.6.13beta03 - August 2, 2014
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -5276,7 +5276,7 @@ Other rules can be inferred by inspecting the libpng source.
XVI. Y2K Compliance in libpng
-July 21, 2014
+August 2, 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 962557e84..d6ded55b8 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "July 21, 2014"
+.TH LIBPNG 3 "August 2, 2014"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.13beta03
.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.13beta03 - July 21, 2014
+ libpng version 1.6.13beta03 - August 2, 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.13beta03 - July 21, 2014
+ libpng versions 0.97, January 1998, through 1.6.13beta03 - August 2, 2014
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -5780,7 +5780,7 @@ Other rules can be inferred by inspecting the libpng source.
.SH XVI. Y2K Compliance in libpng
-July 21, 2014
+August 2, 2014
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -6082,7 +6082,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.6.13beta03 - July 21, 2014:
+Libpng version 1.6.13beta03 - August 2, 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).
@@ -6105,7 +6105,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.6.13beta03, July 21, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.13beta03, August 2, 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
@@ -6204,7 +6204,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-July 21, 2014
+August 2, 2014
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 4800bb330..426487790 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "July 21, 2014"
+.TH LIBPNGPF 3 "August 2, 2014"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.13beta03
(private functions)
diff --git a/png.5 b/png.5
index 2aab1869e..17a6f06ec 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "July 21, 2014"
+.TH PNG 5 "August 2, 2014"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index a9039fdb9..7b6553d11 100644
--- a/png.c
+++ b/png.c
@@ -773,13 +773,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.6.13beta03 - July 21, 2014" PNG_STRING_NEWLINE \
+ "libpng version 1.6.13beta03 - August 2, 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.13beta03 - July 21, 2014\
+ return "libpng version 1.6.13beta03 - August 2, 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 429fc3e71..9a5a20f74 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.6.13beta03 - July 21, 2014
+ * libpng version 1.6.13beta03 - August 2, 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.13beta03 - July 21, 2014: Glenn
+ * libpng versions 0.97, January 1998, through 1.6.13beta03 - August 2, 2014: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -232,7 +232,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.6.13beta03, July 21, 2014, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.6.13beta03, August 2, 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:
@@ -344,7 +344,7 @@
* Y2K compliance in libpng:
* =========================
*
- * July 21, 2014
+ * August 2, 2014
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -414,7 +414,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.13beta03"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.6.13beta03 - July 21, 2014\n"
+ " libpng version 1.6.13beta03 - August 2, 2014\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
diff --git a/pngconf.h b/pngconf.h
index d40086b68..6216155c4 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.6.13beta03 - July 21, 2014
+ * libpng version 1.6.13beta03 - August 2, 2014
*
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngread.c b/pngread.c
index 469e3ce91..845ff7b15 100644
--- a/pngread.c
+++ b/pngread.c
@@ -945,7 +945,7 @@ png_read_destroy(png_structrp png_ptr)
png_free(png_ptr, png_ptr->save_buffer);
#endif
-#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) &&\
+#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) && \
defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
png_free(png_ptr, png_ptr->unknown_chunk.data);
#endif
@@ -1220,7 +1220,7 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr,
# define P_LINEAR8 4 /* 8-bit linear: only from a file value */
/* Color-map processing: after libpng has run on the PNG image further
- * processing may be needed to conver the data to color-map indices.
+ * processing may be needed to convert the data to color-map indices.
*/
#define PNG_CMAP_NONE 0
#define PNG_CMAP_GA 1 /* Process GA data to a color-map with alpha */
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index 29d1c21ea..59e930339 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.6.13beta03 - July 21, 2014
+libpng version 1.6.13beta03 - August 2, 2014
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index a2badff3b..1040e9ae7 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.13beta03 - July 21, 2014
+ * libpng version 1.6.13beta03 - August 2, 2014
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index e85fa666a..d2d677909 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.6.13beta03 - July 21, 2014
+Makefiles for libpng version 1.6.13beta03 - August 2, 2014
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
diff --git a/scripts/dfn.awk b/scripts/dfn.awk
index afa498cb5..54a8ea3ca 100755
--- a/scripts/dfn.awk
+++ b/scripts/dfn.awk
@@ -1,7 +1,7 @@
#!/bin/awk -f
# scripts/dfn.awk - process a .dfn file
#
-# last changed in libpng version 1.5.19 - $RDATE%
+# last changed in libpng version 1.5.19 - (PENDING RELEASE)
#
# Copyright (c) 2013-2014 Glenn Randers-Pehrson
#
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 1ebb15529..eea8d439d 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.6.13beta03 - July 21, 2014 */
+/* Libpng version 1.6.13beta03 - August 2, 2014 */
/* Copyright (c) 1998-2014 Glenn Randers-Pehrson */