summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2014-10-07 18:46:53 -0500
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2014-10-07 18:57:21 -0500
commit25d240dc6ea3f259eb29b169cba9d879a6d2ab9c (patch)
tree331a11b0f9cb572d1aa5ec7f3a643e3d89f7b844
parent470d64c2dd035156ceac181470ffff6474f556d1 (diff)
downloadlibpng-25d240dc6ea3f259eb29b169cba9d879a6d2ab9c.tar.gz
[libpng16] Imported from libpng-1.6.14beta07.tarv1.6.14beta07
-rw-r--r--ANNOUNCE4
-rw-r--r--CHANGES2
-rw-r--r--LICENSE4
-rw-r--r--README2
-rw-r--r--libpng-manual.txt6
-rw-r--r--libpng.314
-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--pngpread.c10
-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
16 files changed, 35 insertions, 35 deletions
diff --git a/ANNOUNCE b/ANNOUNCE
index e66f1bd45..3bfe3e644 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.14beta07 - October 5, 2014
+Libpng 1.6.14beta07 - October 7, 2014
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.
@@ -64,7 +64,7 @@ Version 1.6.14beta06 [October 5, 2014]
Removed "option READ_COMPRESSED_TEXT enables READ_TEXT" from pnglibconf.dfa,
to make it possible to configure a libpng that supports iCCP but not TEXT.
-Version 1.6.14beta07 [October 5, 2014]
+Version 1.6.14beta07 [October 7, 2014]
Removed "option WRITE_COMPRESSED_TEXT enables WRITE_TEXT" from pnglibconf.dfa
Only mark text chunks as written after successfully writing them.
diff --git a/CHANGES b/CHANGES
index 329da13bb..3eb4ee91d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5017,7 +5017,7 @@ Version 1.6.14beta06 [October 5, 2014]
Removed "option READ_COMPRESSED_TEXT enables READ_TEXT" from pnglibconf.dfa,
to make it possible to configure a libpng that supports iCCP but not TEXT.
-Version 1.6.14beta07 [October 5, 2014]
+Version 1.6.14beta07 [October 7, 2014]
Removed "option WRITE_COMPRESSED_TEXT enables WRITE_TEXT" from pnglibconf.dfa
Only mark text chunks as written after successfully writing them.
diff --git a/LICENSE b/LICENSE
index f061484db..1a1a92fe8 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.6.14beta07, October 5, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.14beta07, October 7, 2014, are
Copyright (c) 2004, 2006-2014 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
-October 5, 2014
+October 7, 2014
diff --git a/README b/README
index a99e43b98..1e29ba57e 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.14beta07 - October 5, 2014 (shared library 16.0)
+README for libpng version 1.6.14beta07 - October 7, 2014 (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/libpng-manual.txt b/libpng-manual.txt
index 1e3fa18d0..dfd62563b 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.14beta07 - October 5, 2014
+ libpng version 1.6.14beta07 - October 7, 2014
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2014 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.14beta07 - October 5, 2014
+ libpng versions 0.97, January 1998, through 1.6.14beta07 - October 7, 2014
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -5277,7 +5277,7 @@ Other rules can be inferred by inspecting the libpng source.
XVI. Y2K Compliance in libpng
-October 5, 2014
+October 7, 2014
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 20e7d6c89..fd40d5b66 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "October 5, 2014"
+.TH LIBPNG 3 "October 7, 2014"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.14beta07
.SH SYNOPSIS
@@ -504,7 +504,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.14beta07 - October 5, 2014
+ libpng version 1.6.14beta07 - October 7, 2014
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
- libpng versions 0.97, January 1998, through 1.6.14beta07 - October 5, 2014
+ libpng versions 0.97, January 1998, through 1.6.14beta07 - October 7, 2014
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -5781,7 +5781,7 @@ Other rules can be inferred by inspecting the libpng source.
.SH XVI. Y2K Compliance in libpng
-October 5, 2014
+October 7, 2014
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -6086,7 +6086,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.6.14beta07 - October 5, 2014:
+Libpng version 1.6.14beta07 - October 7, 2014:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -6109,7 +6109,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.6.14beta07, October 5, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.14beta07, October 7, 2014, are
Copyright (c) 2004,2006-2014 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
@@ -6208,7 +6208,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-October 5, 2014
+October 7, 2014
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index fc5a12417..08b6c92a0 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "October 5, 2014"
+.TH LIBPNGPF 3 "October 7, 2014"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.14beta07
(private functions)
diff --git a/png.5 b/png.5
index 918ccfaf5..834b401ee 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "October 5, 2014"
+.TH PNG 5 "October 7, 2014"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 7b755d2c0..ee3e03f5f 100644
--- a/png.c
+++ b/png.c
@@ -773,13 +773,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.6.14beta07 - October 5, 2014" PNG_STRING_NEWLINE \
+ "libpng version 1.6.14beta07 - October 7, 2014" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2014 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.14beta07 - October 5, 2014\
+ return "libpng version 1.6.14beta07 - October 7, 2014\
Copyright (c) 1998-2014 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 9aceea457..47da7e0c6 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.6.14beta07 - October 5, 2014
+ * libpng version 1.6.14beta07 - October 7, 2014
* Copyright (c) 1998-2014 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.6.14beta07 - October 5, 2014: Glenn
+ * libpng versions 0.97, January 1998, through 1.6.14beta07 - October 7, 2014: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -235,7 +235,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.6.14beta07, October 5, 2014, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.6.14beta07, October 7, 2014, are
* Copyright (c) 2004, 2006-2014 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:
@@ -347,7 +347,7 @@
* Y2K compliance in libpng:
* =========================
*
- * October 5, 2014
+ * October 7, 2014
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -417,7 +417,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.14beta07"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.6.14beta07 - October 5, 2014\n"
+ " libpng version 1.6.14beta07 - October 7, 2014\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
diff --git a/pngconf.h b/pngconf.h
index a92ffd276..3a2f80cdf 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.6.14beta07 - October 5, 2014
+ * libpng version 1.6.14beta07 - October 7, 2014
*
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngpread.c b/pngpread.c
index b1926a9cd..f162d1e4b 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -29,7 +29,7 @@
#define PNG_PUSH_SAVE_BUFFER_IF_FULL \
if (png_ptr->push_length + 4 > png_ptr->buffer_size) \
{ png_push_save_buffer(png_ptr); return; }
-#define PNG_PUSH_SAVE_BUFFER_IF_LT_N(N) \
+#define PNG_PUSH_SAVE_BUFFER_IF_LT(N) \
if (png_ptr->buffer_size < N) \
{ png_push_save_buffer(png_ptr); return; }
@@ -207,7 +207,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
png_byte chunk_length[4];
png_byte chunk_tag[4];
- PNG_PUSH_SAVE_BUFFER_IF_LT_N(8)
+ PNG_PUSH_SAVE_BUFFER_IF_LT(8)
png_push_fill_buffer(png_ptr, chunk_length, 4);
png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
png_reset_crc(png_ptr);
@@ -496,7 +496,7 @@ png_push_crc_finish(png_structrp png_ptr)
}
if (!png_ptr->skip_length)
{
- PNG_PUSH_SAVE_BUFFER_IF_LT_N(4)
+ PNG_PUSH_SAVE_BUFFER_IF_LT(4)
png_crc_finish(png_ptr, 0);
png_ptr->process_mode = PNG_READ_CHUNK_MODE;
}
@@ -621,7 +621,7 @@ png_push_read_IDAT(png_structrp png_ptr)
png_byte chunk_tag[4];
/* TODO: this code can be commoned up with the same code in push_read */
- PNG_PUSH_SAVE_BUFFER_IF_LT_N(8)
+ PNG_PUSH_SAVE_BUFFER_IF_LT(8)
png_push_fill_buffer(png_ptr, chunk_length, 4);
png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
png_reset_crc(png_ptr);
@@ -696,7 +696,7 @@ png_push_read_IDAT(png_structrp png_ptr)
}
if (!png_ptr->idat_size)
{
- PNG_PUSH_SAVE_BUFFER_IF_LT_N(4)
+ PNG_PUSH_SAVE_BUFFER_IF_LT(4)
png_crc_finish(png_ptr, 0);
png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
png_ptr->mode |= PNG_AFTER_IDAT;
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index 4c5d7d8fb..58e5629c2 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.6.14beta07 - October 5, 2014
+libpng version 1.6.14beta07 - October 7, 2014
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 77c6e140a..7ae09edad 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.14beta07 - October 5, 2014
+ * libpng version 1.6.14beta07 - October 7, 2014
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index bd32a5f95..dd8baa5dd 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.6.14beta07 - October 5, 2014
+Makefiles for libpng version 1.6.14beta07 - October 7, 2014
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 85e81bc41..f32c9123e 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.6.14beta07 - October 5, 2014 */
+/* Libpng version 1.6.14beta07 - October 7, 2014 */
/* Copyright (c) 1998-2014 Glenn Randers-Pehrson */