[libpng16] Imported from libpng-1.6.0beta22.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index dda8517..cb43832 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.6.0beta22 - April 30, 2012
+Libpng 1.6.0beta22 - May 23, 2012
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.
@@ -360,13 +360,14 @@
Added -lssp_nonshared in a comment in scripts/makefile.freebsd
and changed deprecated NOOBJ and NOPROFILE to NO_OBJ and NO_PROFILE.
-Version 1.6.0beta22 [April 30, 2012]
+Version 1.6.0beta22 [May 23, 2012]
Removed need for -Wno-cast-align with clang. clang correctly warns on
alignment increasing pointer casts when -Wcast-align is passed. This
- fixes the cases clang warns about either (pngread.c) by eliminating the
- casts from png_bytep to png_uint_16p or, for pngrutil.c where the cast
- is previously verified or pngstest.c where it is OK by introducing new
- png_aligncast macros to do the cast in a way that clang accepts.
+ fixes the cases that clang warns about either by eliminating the
+ casts from png_bytep to png_uint_16p (pngread.c), or, for pngrutil.c
+ where the cast is previously verified or pngstest.c where it is OK, by
+ introducing new png_aligncast macros to do the cast in a way that clang
+ accepts.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 771c53e..367b57f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4111,13 +4111,14 @@
Added -lssp_nonshared in a comment in scripts/makefile.freebsd
and changed deprecated NOOBJ and NOPROFILE to NO_OBJ and NO_PROFILE.
-Version 1.6.0beta22 [April 30, 2012]
+Version 1.6.0beta22 [May 23, 2012]
Removed need for -Wno-cast-align with clang. clang correctly warns on
alignment increasing pointer casts when -Wcast-align is passed. This
- fixes the cases clang warns about either (pngread.c) by eliminating the
- casts from png_bytep to png_uint_16p or, for pngrutil.c where the cast
- is previously verified or pngstest.c where it is OK by introducing new
- png_aligncast macros to do the cast in a way that clang accepts.
+ fixes the cases that clang warns about either by eliminating the
+ casts from png_bytep to png_uint_16p (pngread.c), or, for pngrutil.c
+ where the cast is previously verified or pngstest.c where it is OK, by
+ introducing new png_aligncast macros to do the cast in a way that clang
+ accepts.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/LICENSE b/LICENSE
index d4dd000..e9f9c1e 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.6.0beta22, April 28, 2012, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.0beta22, May 23, 2012, are
Copyright (c) 2004, 2006-2011 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
-April 28, 2012
+May 23, 2012
diff --git a/README b/README
index dc88cda..a2f5a7e 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.0beta22 - April 28, 2012 (shared library 16.0)
+README for libpng version 1.6.0beta22 - May 23, 2012 (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 57ae319..f5fd787 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.0beta22 - April 28, 2012
+ libpng version 1.6.0beta22 - May 23, 2012
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.6.0beta22 - April 28, 2012
+ libpng versions 0.97, January 1998, through 1.6.0beta22 - May 23, 2012
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -5012,7 +5012,7 @@
XVI. Y2K Compliance in libpng
-April 28, 2012
+May 23, 2012
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 0156819..473a3ef 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "April 28, 2012"
+.TH LIBPNG 3 "May 23, 2012"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta22
.SH SYNOPSIS
@@ -1007,7 +1007,7 @@
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.6.0beta22 - April 28, 2012
+ libpng version 1.6.0beta22 - May 23, 2012
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -1018,7 +1018,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.6.0beta22 - April 28, 2012
+ libpng versions 0.97, January 1998, through 1.6.0beta22 - May 23, 2012
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -6020,7 +6020,7 @@
.SH XVI. Y2K Compliance in libpng
-April 28, 2012
+May 23, 2012
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -6288,7 +6288,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.6.0beta22 - April 28, 2012:
+Libpng version 1.6.0beta22 - May 23, 2012:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -6311,7 +6311,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.6.0beta22, April 28, 2012, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.0beta22, May 23, 2012, 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
@@ -6410,7 +6410,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-April 28, 2012
+May 23, 2012
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 106d338..a59dd6d 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "April 28, 2012"
+.TH LIBPNGPF 3 "May 23, 2012"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta22
(private functions)
diff --git a/png.5 b/png.5
index 9e22ab6..d233fa6 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "April 28, 2012"
+.TH PNG 5 "May 23, 2012"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 95cbbb5..b63a059 100644
--- a/png.c
+++ b/png.c
@@ -747,13 +747,13 @@
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.6.0beta22 - April 30, 2012" PNG_STRING_NEWLINE \
+ "libpng version 1.6.0beta22 - May 23, 2012" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2012 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.0beta22 - April 30, 2012\
+ return "libpng version 1.6.0beta22 - May 23, 2012\
Copyright (c) 1998-2012 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@@ -3128,7 +3128,7 @@
}
#endif
-#ifdef PNG_READ_GAMMA_SUPPORTED /* more fixed point functions for gammma */
+#ifdef PNG_READ_GAMMA_SUPPORTED /* more fixed point functions for gamma */
/* Calculate a reciprocal, return 0 on div-by-zero or overflow. */
png_fixed_point
png_reciprocal(png_fixed_point a)
diff --git a/png.h b/png.h
index 7ae10eb..49705f6 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.6.0beta22 - April 30, 2012
+ * libpng version 1.6.0beta22 - May 23, 2012
* Copyright (c) 1998-2012 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.0beta22 - April 30, 2012: Glenn
+ * libpng versions 0.97, January 1998, through 1.6.0beta22 - May 23, 2012: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -198,7 +198,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta22, April 30, 2012, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta22, May 23, 2012, 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:
@@ -310,7 +310,7 @@
* Y2K compliance in libpng:
* =========================
*
- * April 30, 2012
+ * May 23, 2012
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -376,7 +376,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.0beta22"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.6.0beta22 - April 30, 2012\n"
+ " libpng version 1.6.0beta22 - May 23, 2012\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
diff --git a/pngconf.h b/pngconf.h
index 1b69728..e81e4bf 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.6.0beta22 - April 30, 2012
+ * libpng version 1.6.0beta22 - May 23, 2012
*
* Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngset.c b/pngset.c
index 7f159a0..f197c84 100644
--- a/pngset.c
+++ b/pngset.c
@@ -148,7 +148,7 @@
* possible for 1/gamma to overflow the limit of 21474 and this means the
* gamma value must be at least 5/100000 and hence at most 20000.0. For
* safety the limits here are a little narrower. The values are 0.00016 to
- * 6250.0, which are truly ridiculous gammma values (and will produce
+ * 6250.0, which are truly ridiculous gamma values (and will produce
* displays that are all black or all white.)
*/
if (file_gamma < 16 || file_gamma > 625000000)
diff --git a/pngwutil.c b/pngwutil.c
index ca745f7..3fb10dd 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -722,7 +722,7 @@
*/
*new_key++ = 32, ++key_len, space = 1;
- /* If the character was not a space then it is inalid. */
+ /* If the character was not a space then it is invalid. */
if (ch != 32)
bad_character = ch;
}
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index c754ae6..96dcf9c 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.6.0beta22 - April 28, 2012
+libpng version 1.6.0beta22 - May 23, 2012
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index e2957a9..f228253 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.0beta22 - April 28, 2012
+ * libpng version 1.6.0beta22 - May 23, 2012
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index 41d05ba..5268186 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.6.0beta22 - April 28, 2012
+Makefiles for libpng version 1.6.0beta22 - May 23, 2012
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa
index 7b1cc23..083ec20 100644
--- a/scripts/pnglibconf.dfa
+++ b/scripts/pnglibconf.dfa
@@ -21,10 +21,10 @@
# C compiler to generate 'pnglibconf.h' - a list of all the
# configuration options. The file lists the various options
# that can *only* be specified during the libpng build;
-# pnglibconf.h freezes the definitons selected for the specific
+# pnglibconf.h freezes the definitions selected for the specific
# build.
#
-# The syntax is detailed in scripts/options.awk, this is a summary
+# The syntax is detailed in scripts/options.awk; this is a summary
# only:
#
# setting <name> [default]
@@ -48,7 +48,7 @@
# The following setting, option and chunk values can all be changed
# while building libpng:
#
-# setting: change 'setting' lines to fine tune library performance,
+# setting: change 'setting' lines to fine tune library performance;
# changes to the settings don't affect the libpng API functionally
#
# option: change 'option' lines to remove or add capabilities from
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 6b81e0c..d166e6e 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -3,7 +3,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng 1.6.0beta22 - April 28, 2012 */
+/* Libpng 1.6.0beta22 - May 23, 2012 */
/* Copyright (c) 1998-2012 Glenn Randers-Pehrson */
