[libpng17] Imported from libpng-1.7.0beta56.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 0031da4..9c2cc25 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -748,7 +748,7 @@
Version 1.7.0beta56 [March 11, 2015]
Updated CMakeLists.txt to add OSX framework, change YES/NO to ON/OFF
- for consistency (Alexey Petruchik).
+ for consistency, and remove some useless tests (Alexey Petruchik).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 764f4f6..5f2f600 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5038,7 +5038,7 @@
Version 1.7.0beta56 [March 11, 2015]
Updated CMakeLists.txt to add OSX framework, change YES/NO to ON/OFF
- for consistency (Alexey Petruchik).
+ for consistency, and remove some useless tests (Alexey Petruchik).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80e6e3e..91613ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,8 +30,7 @@
PATHS /usr/lib /usr/local/lib
)
if(NOT M_LIBRARY)
- message(STATUS
- "math library 'libm' not found - floating point support disabled")
+ message(STATUS "math lib 'libm' not found; floating point support disabled")
endif()
else()
# not needed on windows
@@ -39,30 +38,14 @@
endif()
# COMMAND LINE OPTIONS
-if(DEFINED PNG_SHARED)
- option(PNG_SHARED "Build shared lib" ${PNG_SHARED})
-else()
- option(PNG_SHARED "Build shared lib" ON)
-endif()
-if(DEFINED PNG_STATIC)
- option(PNG_STATIC "Build static lib" ${PNG_STATIC})
-else()
- option(PNG_STATIC "Build static lib" ON)
-endif()
-if(DEFINED PNG_FRAMEWORK)
- option(PNG_FRAMEWORK "Build OS X framework" ${PNG_FRAMEWORK})
-else()
- option(PNG_FRAMEWORK "Build OS X framework" OFF)
-endif()
-if(DEFINED PNG_TESTS)
- option(PNG_TESTS "Build libpng tests" ${PNG_TESTS})
-else()
- option(PNG_TESTS "Build libpng tests" ON)
-endif()
+option(PNG_SHARED "Build shared lib" ON)
+option(PNG_STATIC "Build static lib" ON)
+option(PNG_TESTS "Build libpng tests" ON)
# Many more configuration options could be added here
-option(PNG_DEBUG "Build with debug output" OFF)
-option(PNGARG "Disable ANSI-C prototypes" OFF)
+option(PNG_FRAMEWORK "Build OS X framework" OFF)
+option(PNG_DEBUG "Build with debug output" OFF)
+option(PNGARG "Disable ANSI-C prototypes" OFF)
# SET LIBNAME
set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
diff --git a/LICENSE b/LICENSE
index cbb377a..468b57f 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.0beta56, March 9, 2015, are
+libpng versions 1.2.6, August 15, 2004, through 1.7.0beta56, March 11, 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
-March 9, 2015
+March 11, 2015
diff --git a/README b/README
index 0ea13cd..d605d19 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.7.0beta56 - March 9, 2015 (shared library 17.0)
+README for libpng version 1.7.0beta56 - March 11, 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 f1fb018..da12991 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.0beta56 - March 9, 2015
+ libpng version 1.7.0beta56 - March 11, 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.0beta56 - March 9, 2015
+ libpng versions 0.97, January 1998, through 1.7.0beta56 - March 11, 2015
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -5336,7 +5336,7 @@
XVII. Y2K Compliance in libpng
-March 9, 2015
+March 11, 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 bd49ba9..4283f4a 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "March 9, 2015"
+.TH LIBPNG 3 "March 11, 2015"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta56
.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.0beta56 - March 9, 2015
+ libpng version 1.7.0beta56 - March 11, 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.0beta56 - March 9, 2015
+ libpng versions 0.97, January 1998, through 1.7.0beta56 - March 11, 2015
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -5830,7 +5830,7 @@
.SH XVII. Y2K Compliance in libpng
-March 9, 2015
+March 11, 2015
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -6147,7 +6147,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.7.0beta56 - March 9, 2015:
+Libpng version 1.7.0beta56 - March 11, 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).
@@ -6170,7 +6170,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.7.0beta56, March 9, 2015, are
+libpng versions 1.2.6, August 15, 2004, through 1.7.0beta56, March 11, 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
@@ -6269,7 +6269,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-March 9, 2015
+March 11, 2015
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index bca26fd..9e52a8f 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "March 9, 2015"
+.TH LIBPNGPF 3 "March 11, 2015"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta56
(private functions)
diff --git a/png.5 b/png.5
index b5dc685..0374b7f 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "March 9, 2015"
+.TH PNG 5 "March 11, 2015"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 9a14272..66bd633 100644
--- a/png.c
+++ b/png.c
@@ -688,13 +688,13 @@
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.7.0beta56 - March 9, 2015" PNG_STRING_NEWLINE \
+ "libpng version 1.7.0beta56 - March 11, 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.0beta56 - March 9, 2015\
+ return "libpng version 1.7.0beta56 - March 11, 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 61d64f1..d02002c 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.7.0beta56, March 9, 2015
+ * libpng version 1.7.0beta56, March 11, 2015
*
* Copyright (c) 1998-2015 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.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- * libpng versions 0.97, January 1998, through 1.7.0beta56, March 9, 2015: Glenn
+ * libpng versions 0.97, January 1998, through 1.7.0beta56, March 11, 2015: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -248,7 +248,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta56, March 9, 2015, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta56, March 11, 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:
@@ -360,7 +360,7 @@
* Y2K compliance in libpng:
* =========================
*
- * March 9, 2015
+ * March 11, 2015
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -430,7 +430,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.7.0beta56"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.7.0beta56 - March 9, 2015\n"
+ " libpng version 1.7.0beta56 - March 11, 2015\n"
#define PNG_LIBPNG_VER_SONUM 17
#define PNG_LIBPNG_VER_DLLNUM 17
diff --git a/pngconf.h b/pngconf.h
index cba11d7..9fc4678 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.7.0beta56, March 9, 2015
+ * libpng version 1.7.0beta56, March 11, 2015
*
* Copyright (c) 1998-2015 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 4f02caa..e8bf762 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.7.0beta56 - March 9, 2015
+libpng version 1.7.0beta56 - March 11, 2015
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index e8bba29..e3c3039 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.0beta56 - March 9, 2015
+ * libpng version 1.7.0beta56 - March 11, 2015
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index 06a9ea2..02dd148 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.7.0beta56 - March 9, 2015
+Makefiles for libpng version 1.7.0beta56 - March 11, 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 60550f6..797f50f 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.7.0beta56 - March 9, 2015 */
+/* Libpng version 1.7.0beta56 - March 11, 2015 */
/* Copyright (c) 1998-2014 Glenn Randers-Pehrson */
