summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ANNOUNCE4
-rw-r--r--CHANGES2
-rw-r--r--LICENSE4
-rw-r--r--README2
-rwxr-xr-xcontrib/tools/reindent9
-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--pngrutil.c2
-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
17 files changed, 35 insertions, 32 deletions
diff --git a/ANNOUNCE b/ANNOUNCE
index 0d09b99c9..35c802c3c 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.24beta06 - July 15, 2016
+Libpng 1.6.24beta06 - July 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.
@@ -86,7 +86,7 @@ Version 1.6.24beta05 [July 13, 2016]
Fixed some indentation to comply with our coding style.
Added contrib/tools/reindent.
-Version 1.6.24beta06 [July 15, 2016]
+Version 1.6.24beta06 [July 18, 2016]
Fixed more indentation to comply with our coding style.
Eliminated unnecessary tests of boolean png_isaligned() vs 0.
diff --git a/CHANGES b/CHANGES
index 0f68bda61..4f119cc45 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5657,7 +5657,7 @@ Version 1.6.24beta05 [July 13, 2016]
Fixed some indentation to comply with our coding style.
Added contrib/tools/reindent.
-Version 1.6.24beta06 [July 15, 2016]
+Version 1.6.24beta06 [July 18, 2016]
Fixed more indentation to comply with our coding style.
Eliminated unnecessary tests of boolean png_isaligned() vs 0.
diff --git a/LICENSE b/LICENSE
index 1b6177a11..6c054e7dd 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.24beta06, July 14, 2016 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.24beta06, July 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
-July 14, 2016
+July 18, 2016
diff --git a/README b/README
index 9d1261625..41b9f1371 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.24beta06 - July 14, 2016 (shared library 16.0)
+README for libpng version 1.6.24beta06 - July 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/contrib/tools/reindent b/contrib/tools/reindent
index f9f580a81..f4df309b6 100755
--- a/contrib/tools/reindent
+++ b/contrib/tools/reindent
@@ -13,10 +13,13 @@
# Assumes that continued lines begin with indentation plus one space, and
# that continued comments begin with indentation plus " *".
#
-# eg, to change libpng coding style from 3-space indentation to 4-space
+# eg, to change libpng coding style from 3-space indentation with 4-space
+# continuations to 4-space indentation with 2-space continuations:
#
-# reindent 3 4 " " " " < example.c > example.c_reindented
+# reindent 3 4 "\t " " " < example.c > example.c_4_2
+# and to restore the file back to libpng coding style
+# reindent 4 3 " " " " < example.c_4_2 > example.c_3_4
unexpand --first-only --t $1 | \
- sed -e "/^ $3[^\*]/{s/ $3/ $4/}" | \
+ sed -e "/^ *$3[^\*]/{s/$3/$4/}" | \
expand -t $2
diff --git a/libpng-manual.txt b/libpng-manual.txt
index 21e9b9ec8..37ed10386 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.24beta06 - July 14, 2016
+ libpng version 1.6.24beta06 - July 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.24beta06 - July 14, 2016
+ libpng versions 0.97, January 1998, through 1.6.24beta06 - July 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 6acd5c53c..84ef5d324 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "July 14, 2016"
+.TH LIBPNG 3 "July 18, 2016"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta06
.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.24beta06 - July 14, 2016
+ libpng version 1.6.24beta06 - July 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.24beta06 - July 14, 2016
+ libpng versions 0.97, January 1998, through 1.6.24beta06 - July 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.24beta06 - July 14, 2016:
+Libpng version 1.6.24beta06 - July 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.24beta06, July 14, 2016 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.24beta06, July 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
-July 14, 2016
+July 18, 2016
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 760ae4e44..0b7f0c7c0 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "July 14, 2016"
+.TH LIBPNGPF 3 "July 18, 2016"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta06
(private functions)
diff --git a/png.5 b/png.5
index ec97e22d2..48e231f63 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "July 14, 2016"
+.TH PNG 5 "July 18, 2016"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 4c412669e..5564b6a72 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.24beta06 - July 15, 2016" PNG_STRING_NEWLINE \
+ "libpng version 1.6.24beta06 - July 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.24beta06 - July 15, 2016\
+ return "libpng version 1.6.24beta06 - July 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 e49f10218..fea4f8b20 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.6.24beta06, July 14, 2016
+ * libpng version 1.6.24beta06, July 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.24beta06, July 14, 2016:
+ * libpng versions 0.97, January 1998, through 1.6.24beta06, July 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.24beta06, July 14, 2016 are
+ * libpng versions 1.0.7, July 1, 2000 through 1.6.24beta06, July 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:
* =========================
*
- * July 14, 2016
+ * July 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.24beta06"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.24beta06 - July 14, 2016\n"
+#define PNG_HEADER_VERSION_STRING " libpng version 1.6.24beta06 - July 18, 2016\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
diff --git a/pngconf.h b/pngconf.h
index d17d8f243..efa86cf00 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.6.24beta06, July 14, 2016
+ * libpng version 1.6.24beta06, July 18, 2016
*
* Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrutil.c b/pngrutil.c
index 342da3fa5..b77528d74 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -90,7 +90,7 @@ png_get_int_32)(png_const_bytep buf)
uval = (uval ^ 0xffffffff) + 1; /* 2's complement: -x = ~x+1 */
if ((uval & 0x80000000) == 0) /* no overflow */
- return -(png_int_32)uval;
+ return -(png_int_32)uval;
/* The following has to be safe; this function only gets called on PNG data
* and if we get here that data is invalid. 0 is the most safe value and
* if not then an attacker would surely just generate a PNG with 0 instead.
diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt
index ab4f76de4..95beccc81 100644
--- a/projects/vstudio/README.txt
+++ b/projects/vstudio/README.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.6.24beta06 - July 14, 2016
+libpng version 1.6.24beta06 - July 18, 2016
Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 0c433ef11..f0ac1f18e 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.24beta06 - July 14, 2016
+ * libpng version 1.6.24beta06 - July 18, 2016
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index f6e91726f..210fa3c48 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.6.24beta06 - July 14, 2016
+Makefiles for libpng version 1.6.24beta06 - July 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 4926e1b5e..ebfd124ef 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.6.24beta06 - July 14, 2016 */
+/* Libpng version 1.6.24beta06 - July 18, 2016 */
/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */
View Lorry Controller Status