summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ANNOUNCE4
-rw-r--r--CHANGES2
-rw-r--r--LICENSE4
-rw-r--r--README2
-rw-r--r--TODO4
-rw-r--r--libpng-manual.txt4
-rw-r--r--libpng.312
-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
16 files changed, 31 insertions, 29 deletions
diff --git a/ANNOUNCE b/ANNOUNCE
index fe77f8bd9..b730960e1 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.25beta02 - August 17, 2016
+Libpng 1.6.25beta02 - August 18, 2016
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.
@@ -30,7 +30,7 @@ Version 1.6.25beta01 [August 12, 2016]
Cleaned up PNG_DEBUG compile of pngtest.c.
Conditionally compile png_inflate().
-Version 1.6.25beta02 [August 17, 2016]
+Version 1.6.25beta02 [August 18, 2016]
Don't install pngcp; it conflicts with pngcp in the pngtools package.
Minor editing of INSTALL, (whitespace, added copyright line)
diff --git a/CHANGES b/CHANGES
index 0721aae84..4371cdc5c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5680,7 +5680,7 @@ Version 1.6.25beta01 [August 12, 2016]
Cleaned up PNG_DEBUG compile of pngtest.c.
Conditionally compile png_inflate().
-Version 1.6.25beta02 [August 17, 2016]
+Version 1.6.25beta02 [August 18, 2016]
Don't install pngcp; it conflicts with pngcp in the pngtools package.
Minor editing of INSTALL, (whitespace, added copyright line)
diff --git a/LICENSE b/LICENSE
index 5db8350a8..fba2d4356 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.0.7, July 1, 2000 through 1.6.25beta02, August 12, 2016 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.25beta02, August 18, 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
@@ -127,4 +127,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-August 12, 2016
+August 18, 2016
diff --git a/README b/README
index 7974472bd..b0f966cd4 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.25beta02 - August 12, 2016 (shared library 16.0)
+README for libpng version 1.6.25beta02 - August 18, 2016 (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/TODO b/TODO
index 0b3b65137..cdb9e1fa8 100644
--- a/TODO
+++ b/TODO
@@ -5,7 +5,9 @@ Final bug fixes.
Better C++ wrapper/full C++ implementation?
Fix problem with C++ and EXTERN "C".
cHRM transformation.
-Remove setjmp/longjmp usage in favor of returning error codes.
+Remove setjmp/longjmp usage in favor of returning error codes. As a start on
+ this, minimize the use of png_error(), replacing them with
+ png_warning(); return(0; or similar.
Palette creation.
Add "grayscale->palette" transformation and "palette->grayscale" detection.
Improved dithering.
diff --git a/libpng-manual.txt b/libpng-manual.txt
index 887c9bfbd..3cf0cec52 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.25beta02 - August 12, 2016
+ libpng version 1.6.25beta02 - August 18, 2016
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2016 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.25beta02 - August 12, 2016
+ libpng versions 0.97, January 1998, through 1.6.25beta02 - August 18, 2016
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2016 Glenn Randers-Pehrson
diff --git a/libpng.3 b/libpng.3
index bfb3f3b6d..ebbf242de 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "August 12, 2016"
+.TH LIBPNG 3 "August 18, 2016"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.25beta02
.SH SYNOPSIS
@@ -510,7 +510,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.25beta02 - August 12, 2016
+ libpng version 1.6.25beta02 - August 18, 2016
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2016 Glenn Randers-Pehrson
@@ -521,7 +521,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
- libpng versions 0.97, January 1998, through 1.6.25beta02 - August 12, 2016
+ libpng versions 0.97, January 1998, through 1.6.25beta02 - August 18, 2016
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2016 Glenn Randers-Pehrson
@@ -6018,7 +6018,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.6.25beta02 - August 12, 2016:
+Libpng version 1.6.25beta02 - August 18, 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).
@@ -6043,7 +6043,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.0.7, July 1, 2000 through 1.6.25beta02, August 12, 2016 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.25beta02, August 18, 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
@@ -6168,7 +6168,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-August 12, 2016
+August 18, 2016
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 3e430895b..f101c4603 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "August 12, 2016"
+.TH LIBPNGPF 3 "August 18, 2016"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.25beta02
(private functions)
diff --git a/png.5 b/png.5
index 498c98e49..a6fa02621 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "August 12, 2016"
+.TH PNG 5 "August 18, 2016"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 47e6512fc..d2466aa10 100644
--- a/png.c
+++ b/png.c
@@ -775,14 +775,14 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.6.25beta02 - August 12, 2016" PNG_STRING_NEWLINE \
+ "libpng version 1.6.25beta02 - August 18, 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.6.25beta02 - August 12, 2016\
+ return "libpng version 1.6.25beta02 - August 18, 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 b5db364e9..96c9f78b6 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.6.25beta02, August 12, 2016
+ * libpng version 1.6.25beta02, August 18, 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.6.25beta02, August 12, 2016:
+ * libpng versions 0.97, January 1998, through 1.6.25beta02, August 18, 2016:
* Glenn Randers-Pehrson.
* See also "Contributing Authors", below.
*/
@@ -29,7 +29,7 @@
* files that are distributed with libpng have other copyright owners and
* are released under other open source licenses.
*
- * libpng versions 1.0.7, July 1, 2000 through 1.6.25beta02, August 12, 2016 are
+ * libpng versions 1.0.7, July 1, 2000 through 1.6.25beta02, August 18, 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
@@ -245,7 +245,7 @@
* Y2K compliance in libpng:
* =========================
*
- * August 12, 2016
+ * August 18, 2016
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -314,7 +314,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.25beta02"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.25beta02 - August 12, 2016\n"
+#define PNG_HEADER_VERSION_STRING " libpng version 1.6.25beta02 - August 18, 2016\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
diff --git a/pngconf.h b/pngconf.h
index 7b32af3fc..171fbf427 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.6.25beta02, August 12, 2016
+ * libpng version 1.6.25beta02, August 18, 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 b30c0e577..49d6acaca 100644
--- a/projects/vstudio/README.txt
+++ b/projects/vstudio/README.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.6.25beta02 - August 12, 2016
+libpng version 1.6.25beta02 - August 18, 2016
Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index e6b462d67..7a88a5d24 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.25beta02 - August 12, 2016
+ * libpng version 1.6.25beta02 - August 18, 2016
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index 399c5a331..6a16efad5 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.6.25beta02 - August 12, 2016
+Makefiles for libpng version 1.6.25beta02 - August 18, 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 006b29fac..026302945 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.6.25beta02 - August 12, 2016 */
+/* Libpng version 1.6.25beta02 - August 18, 2016 */
/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */