[libpng17] Imported from libpng-1.7.0beta54.tar
diff --git a/LICENSE b/LICENSE
index d84ce4a..0c10347 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.7.0beta54, February 25, 2015, are
+libpng versions 1.2.6, August 15, 2004, through 1.7.0beta54, March 4, 2015, are
Copyright (c) 2004, 2006-2015 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 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-February 25, 2015
+March 4, 2015
diff --git a/README b/README
index a874044..c53ccdb 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.7.0beta54 - February 25, 2015 (shared library 17.0)
+README for libpng version 1.7.0beta54 - March 4, 2015 (shared library 17.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 4fd51a5..88740dd 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.7.0beta54 - February 25, 2015
+ libpng version 1.7.0beta54 - March 4, 2015
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.7.0beta54 - February 25, 2015
+ libpng versions 0.97, January 1998, through 1.7.0beta54 - March 4, 2015
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -5332,7 +5332,7 @@
XVII. Y2K Compliance in libpng
-February 25, 2015
+March 4, 2015
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 59adb9c..1183bb4 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "February 25, 2015"
+.TH LIBPNG 3 "March 4, 2015"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta54
.SH SYNOPSIS
@@ -494,7 +494,7 @@
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.7.0beta54 - February 25, 2015
+ libpng version 1.7.0beta54 - March 4, 2015
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -505,7 +505,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.7.0beta54 - February 25, 2015
+ libpng versions 0.97, January 1998, through 1.7.0beta54 - March 4, 2015
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -5826,7 +5826,7 @@
.SH XVII. Y2K Compliance in libpng
-February 25, 2015
+March 4, 2015
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -6096,7 +6096,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.7.0beta54 - February 25, 2015:
+Libpng version 1.7.0beta54 - March 4, 2015:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -6119,7 +6119,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.7.0beta54, February 25, 2015, are
+libpng versions 1.2.6, August 15, 2004, through 1.7.0beta54, March 4, 2015, 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
@@ -6218,7 +6218,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-February 25, 2015
+March 4, 2015
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 8b0b150..0f7f0e8 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "February 25, 2015"
+.TH LIBPNGPF 3 "March 4, 2015"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta54
(private functions)
diff --git a/png.5 b/png.5
index ab6cba6..f021413 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "February 25, 2015"
+.TH PNG 5 "March 4, 2015"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index bbe8dff..c6944e1 100644
--- a/png.c
+++ b/png.c
@@ -694,13 +694,13 @@
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.7.0beta54 - February 25, 2015" PNG_STRING_NEWLINE \
+ "libpng version 1.7.0beta54 - March 4, 2015" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2015 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.7.0beta54 - February 25, 2015\
+ return "libpng version 1.7.0beta54 - March 4, 2015\
Copyright (c) 1998-2015 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 84c3f42..2976841 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,8 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.7.0beta54 - February 28, 2015
+ * libpng version 1.7.0beta54, March 4, 2015
+ *
* Copyright (c) 1998-2015 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 +12,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.7.0beta54 - February 28, 2015: Glenn
+ * libpng versions 0.97, January 1998, through 1.7.0beta54, March 4, 2015: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -200,7 +201,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta54, February 28, 2015, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta54, March 4, 2015, are
* Copyright (c) 2004, 2006-2015 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:
@@ -312,7 +313,7 @@
* Y2K compliance in libpng:
* =========================
*
- * February 28, 2015
+ * March 4, 2015
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -382,7 +383,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.7.0beta54"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.7.0beta54 - February 28, 2015\n"
+ " libpng version 1.7.0beta54 - March 4, 2015\n"
#define PNG_LIBPNG_VER_SONUM 17
#define PNG_LIBPNG_VER_DLLNUM 17
diff --git a/pngconf.h b/pngconf.h
index fbf091b..7e58539 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.7.0beta54 - February 25, 2015
+ * libpng version 1.7.0beta54, March 4, 2015
*
* Copyright (c) 1998-2015 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -11,9 +11,7 @@
* For conditions of distribution and use, see the disclaimer
* and license in png.h
*
- */
-
-/* Any machine specific code is near the front of this file, so if you
+ * Any machine specific code is near the front of this file, so if you
* are configuring libpng for a machine, you may want to read the section
* starting here down to where it starts to typedef png_color, png_text,
* and png_info.
diff --git a/pngwutil.c b/pngwutil.c
index 776edec..2dde62c 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -334,6 +334,7 @@
if (owner == png_IDAT)
{
+#ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
if ((png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY) != 0)
strategy = png_ptr->zlib_strategy;
@@ -341,6 +342,7 @@
strategy = PNG_Z_DEFAULT_STRATEGY;
else
+#endif
strategy = PNG_Z_DEFAULT_NOFILTER_STRATEGY;
}
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index b8e571b..c5c5ee7 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.7.0beta54 - February 25, 2015
+libpng version 1.7.0beta54 - March 4, 2015
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index dd714dc..fe6d0a7 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
- * libpng version 1.7.0beta54 - February 25, 2015
+ * libpng version 1.7.0beta54 - March 4, 2015
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index 43c139e..6cd33ba 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.7.0beta54 - February 25, 2015
+Makefiles for libpng version 1.7.0beta54 - March 4, 2015
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index dad263a..dcd1dfc 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.7.0beta54 - February 25, 2015 */
+/* Libpng version 1.7.0beta54 - March 4, 2015 */
/* Copyright (c) 1998-2014 Glenn Randers-Pehrson */
