summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2013-02-04 20:13:16 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2013-02-04 20:21:37 -0600
commit11be27ed2cdc3f240f411e3a15f6b8d8418cd0be (patch)
treeaeb833aa5b6c4f6845872b0a1bbf7fb6916716fd
parent041f4465d002af923666994153bd33acef95c6f2 (diff)
downloadlibpng-11be27ed2cdc3f240f411e3a15f6b8d8418cd0be.tar.gz
[libpng15] Imported from libpng-1.5.15beta01.tarv1.5.15beta01
-rw-r--r--LICENSE4
-rw-r--r--README2
-rw-r--r--contrib/libtests/pngvalid.c2
-rw-r--r--libpngpf.32
-rw-r--r--png.52
-rw-r--r--png.c4
-rw-r--r--png.h16
-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
12 files changed, 22 insertions, 20 deletions
diff --git a/LICENSE b/LICENSE
index 2d20c8e77..29278820a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.5.15beta01, January 24, 2013, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.15beta01, February 5, 2013, are
Copyright (c) 2004, 2006-2012 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 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-January 24, 2013
+February 5, 2013
diff --git a/README b/README
index 42e75f1c5..35f964638 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.5.15beta01 - January 24, 2013 (shared library 15.0)
+README for libpng version 1.5.15beta01 - February 5, 2013 (shared library 15.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/libtests/pngvalid.c b/contrib/libtests/pngvalid.c
index fa13ad1f6..81477ef8b 100644
--- a/contrib/libtests/pngvalid.c
+++ b/contrib/libtests/pngvalid.c
@@ -1,7 +1,7 @@
/* pngvalid.c - validate libpng by constructing then reading png files.
*
- * Last changed in libpng 1.5.14 [January 24, 2013]
+ * Last changed in libpng 1.5.14 [%RDATE%]
* Copyright (c) 2013 Glenn Randers-Pehrson
* Written by John Cunningham Bowler
*
diff --git a/libpngpf.3 b/libpngpf.3
index 10351e56d..efa9863bc 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "January 24, 2013"
+.TH LIBPNGPF 3 "February 5, 2013"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.15beta01
(private functions)
diff --git a/png.5 b/png.5
index 5d0fea06a..b571ef7db 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "January 24, 2013"
+.TH PNG 5 "February 5, 2013"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 02e0f4c87..6e83d8de9 100644
--- a/png.c
+++ b/png.c
@@ -658,13 +658,13 @@ png_get_copyright(png_const_structp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.5.15beta01 - January 24, 2013" PNG_STRING_NEWLINE \
+ "libpng version 1.5.15beta01 - February 5, 2013" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2013 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.5.15beta01 - January 24, 2013\
+ return "libpng version 1.5.15beta01 - February 5, 2013\
Copyright (c) 1998-2013 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 10ee2fc99..8f714c9e4 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.5.15beta01 - January 24, 2013
+ * libpng version 1.5.15beta01 - February 5, 2013
* Copyright (c) 1998-2013 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 +11,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.5.15beta01 - January 24, 2013: Glenn
+ * libpng versions 0.97, January 1998, through 1.5.15beta01 - February 5, 2013: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -216,7 +216,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.5.15beta01, January 24, 2013, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.5.15beta01, February 5, 2013, are
* Copyright (c) 2004, 2006-2013 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:
@@ -328,7 +328,7 @@
* Y2K compliance in libpng:
* =========================
*
- * January 24, 2013
+ * February 5, 2013
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -395,7 +395,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.5.15beta01"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.5.15beta01 - January 24, 2013\n"
+ " libpng version 1.5.15beta01 - February 5, 2013\n"
#define PNG_LIBPNG_VER_SONUM 15
#define PNG_LIBPNG_VER_DLLNUM 15
@@ -467,7 +467,7 @@
/* Machine specific configuration. */
# include "pngconf.h"
-#endif
+#endif /* PNG_VERSION_INFO_ONLY */
/*
* Added at libpng-1.2.8
@@ -2655,6 +2655,8 @@ PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)
PNG_EXPORT(234, void, png_set_check_for_invalid_index, (png_structp png_ptr,
int allowed));
+PNG_EXPORT(235, void, png_get_palette_max, (png_structp png_ptr,
+ png_const_infop info_ptr));
#endif
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project
@@ -2666,7 +2668,7 @@ PNG_EXPORT(234, void, png_set_check_for_invalid_index, (png_structp png_ptr,
* scripts/symbols.def as well.
*/
#ifdef PNG_EXPORT_LAST_ORDINAL
- PNG_EXPORT_LAST_ORDINAL(234);
+ PNG_EXPORT_LAST_ORDINAL(235);
#endif
#ifdef __cplusplus
diff --git a/pngconf.h b/pngconf.h
index f3edae3e2..ddce2f245 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.5.15beta01 - January 24, 2013
+ * libpng version 1.5.15beta01 - February 5, 2013
*
* Copyright (c) 1998-2013 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 1480ec27b..0912a667c 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.5.15beta01 - January 24, 2013
+libpng version 1.5.15beta01 - February 5, 2013
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 54410b5c0..13f4359fb 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
- * libpng version 1.5.15beta01 - January 24, 2013
+ * libpng version 1.5.15beta01 - February 5, 2013
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index 049a45877..0c76ca340 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.5.15beta01 - January 24, 2013
+Makefiles for libpng version 1.5.15beta01 - February 5, 2013
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index ba86a5fa7..f3c13b2e0 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -3,7 +3,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng 1.5.15beta01 - January 24, 2013 */
+/* Libpng 1.5.15beta01 - February 5, 2013 */
/* Copyright (c) 1998-2012 Glenn Randers-Pehrson */