[libpng16] Bump version to 1.6.33beta01
diff --git a/ANNOUNCE b/ANNOUNCE
index 11b301a..78a6faf 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -26,6 +26,7 @@
Changes since the last public release (1.6.32):
Added PNGMINUS_UNUSED macro to contrib/pngminus/p*.c and added missing
parenthesis in contrib/pngminus/pnm2png.c (bug report by Christian Hesse).
+ Free row_ptr in PNG_CLEANUP macro in contrib/oss-fuzz/libpng_read_fuzzer.cc
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 521d89d..612577b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5997,6 +5997,7 @@
Version 1.6.33beta01 [August 28, 2017]
Added PNGMINUS_UNUSED macro to contrib/pngminus/p*.c and added missing
parenthesis in contrib/pngminus/pnm2png.c (bug report by Christian Hesse).
+ Free row_ptr in PNG_CLEANUP macro in contrib/oss-fuzz/libpng_read_fuzzer.cc
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/LICENSE b/LICENSE
index f2d8439..fd38590 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@
This code is released under the libpng license.
-libpng versions 1.0.7, July 1, 2000 through 1.6.33beta01, August 25, 2017 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.33beta01, August 28, 2017 are
Copyright (c) 2000-2002, 2004, 2006-2017 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
diff --git a/README b/README
index a602846..c8f412a 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.33beta01 - August 25, 2017 (shared library 16.0)
+README for libpng version 1.6.33beta01 - August 28, 2017 (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/oss-fuzz/README.txt b/contrib/oss-fuzz/README.txt
index 2b21efe..adc5501 100644
--- a/contrib/oss-fuzz/README.txt
+++ b/contrib/oss-fuzz/README.txt
@@ -23,10 +23,14 @@
Original
Filename or derived Copyright License
========================= ========== ================ ==========
- build.sh derived 2017, Glenn R-P Apache 2.0
+ build.sh* derived 2017, Glenn R-P Apache 2.0
libpng_read_fuzzer.cc derived 2017, Glenn R-P Chromium
libpng_read_fuzzer.options original 2015, Chrome Devs Chromium
png.dict original 2015, Chrome Devs Chromium
- README.txt (this file) original 2017, GLenn R-P libpng
+ README.txt (this file) original 2017, Glenn R-P libpng
-To do: exercise the progressive reader.
+ * build.sh is a copy of the file used by oss-fuzz. png.dict and
+ libpng_read_fuzzer.* are the actual files used by oss-fuzz, which
+ retrieves them from the libpng repository at Github.
+
+To do: exercise the progressive reader and the png encoder.
diff --git a/contrib/oss-fuzz/build.sh b/contrib/oss-fuzz/build.sh
index 29901fa..7b8150f 100755
--- a/contrib/oss-fuzz/build.sh
+++ b/contrib/oss-fuzz/build.sh
@@ -38,13 +38,13 @@
# build libpng_read_fuzzer.
$CXX $CXXFLAGS -std=c++11 -I. \
- $SRC/libpng/contrib/oss-fuzz/libpng_read_fuzzer.cc -o \
- $OUT/libpng_read_fuzzer \
+ $SRC/libpng/contrib/oss-fuzz/libpng_read_fuzzer.cc \
+ -o $OUT/libpng_read_fuzzer \
-lFuzzingEngine .libs/libpng16.a -lz
# add seed corpus.
-find $SRC/libpng/contrib/pngsuite -name "*.png" | \
- xargs zip $OUT/libpng_read_fuzzer_seed_corpus.zip
+find $SRC/libpng -name "*.png" | \
+ xargs zip $OUT/libpng_read_fuzzer_seed_corpus.zip
-cp $SRC/libpng/contrib/oss-fuzz*.dict \
- $SRC/libpng/contrib/oss-fuzz/*.options $OUT/
+cp $SRC/libpng/contrib/oss-fuzz/*.dict \
+ $SRC/libpng/contrib/oss-fuzz/*.options $OUT/
diff --git a/libpng-manual.txt b/libpng-manual.txt
index acae018..3fed14e 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.33beta01 - August 25, 2017
+ libpng version 1.6.33beta01 - August 28, 2017
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2017 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.6.33beta01 - August 25, 2017
+ libpng versions 0.97, January 1998, through 1.6.33beta01 - August 28, 2017
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2017 Glenn Randers-Pehrson
diff --git a/libpng.3 b/libpng.3
index dc2dc45..e661517 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "August 25, 2017"
+.TH LIBPNG 3 "August 28, 2017"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.33beta01
.SH SYNOPSIS
@@ -518,7 +518,7 @@
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.6.33beta01 - August 25, 2017
+ libpng version 1.6.33beta01 - August 28, 2017
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2017 Glenn Randers-Pehrson
@@ -529,7 +529,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.6.33beta01 - August 25, 2017
+ libpng versions 0.97, January 1998, through 1.6.33beta01 - August 28, 2017
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2017 Glenn Randers-Pehrson
@@ -6081,7 +6081,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.6.33beta01 - August 25, 2017:
+Libpng version 1.6.33beta01 - August 28, 2017:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -6106,7 +6106,7 @@
This code is released under the libpng license.
-libpng versions 1.0.7, July 1, 2000 through 1.6.33beta01, August 25, 2017 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.33beta01, August 28, 2017 are
Copyright (c) 2000-2002, 2004, 2006-2017 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
@@ -6234,7 +6234,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-August 25, 2017
+August 28, 2017
.\" end of man page
diff --git a/png.c b/png.c
index 7d72f1a..271e159 100644
--- a/png.c
+++ b/png.c
@@ -816,14 +816,14 @@
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.6.33beta01 - August 25, 2017" PNG_STRING_NEWLINE \
+ "libpng version 1.6.33beta01 - August 28, 2017" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2002,2004,2006-2017 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.33beta01 - August 25, 2017\
+ return "libpng version 1.6.33beta01 - August 28, 2017\
Copyright (c) 1998-2002,2004,2006-2017 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 423c290..2ee900b 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.6.33beta01, August 25, 2017
+ * libpng version 1.6.33beta01, August 28, 2017
*
* Copyright (c) 1998-2002,2004,2006-2017 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.33beta01, August 25, 2017:
+ * libpng versions 0.97, January 1998, through 1.6.33beta01, August 28, 2017:
* Glenn Randers-Pehrson.
* See also "Contributing Authors", below.
*/
@@ -25,7 +25,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.0.7, July 1, 2000 through 1.6.33beta01, August 25, 2017 are
+ * libpng versions 1.0.7, July 1, 2000 through 1.6.33beta01, August 28, 2017 are
* Copyright (c) 2000-2002, 2004, 2006-2017 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
@@ -241,7 +241,7 @@
* Y2K compliance in libpng:
* =========================
*
- * August 25, 2017
+ * August 28, 2017
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -310,7 +310,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.33beta01"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.33beta01 - August 25, 2017\n"
+#define PNG_HEADER_VERSION_STRING " libpng version 1.6.33beta01 - August 28, 2017\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
diff --git a/pngconf.h b/pngconf.h
index c64878b..934ba7b 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.6.33beta01, August 25, 2017
+ * libpng version 1.6.33beta01, August 28, 2017
*
* 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 a013ab2..b47cac4 100644
--- a/projects/vstudio/README.txt
+++ b/projects/vstudio/README.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.6.33beta01 - August 25, 2017
+libpng version 1.6.33beta01 - August 28, 2017
Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 1034ad8..32aedf3 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.33beta01 - August 25, 2017
+ * libpng version 1.6.33beta01 - August 28, 2017
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index 6ba2a71..b1a9885 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.6.33beta01 - August 25, 2017
+Makefiles for libpng version 1.6.33beta01 - August 28, 2017
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 04365f2..b353d45 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.6.33beta01 - August 25, 2017 */
+/* Libpng version 1.6.33beta01 - August 28, 2017 */
/* Copyright (c) 1998-2017 Glenn Randers-Pehrson */
