[master] Bump to version 1.4.6beta02
diff --git a/ANNOUNCE b/ANNOUNCE
index dcb2c80..8472233 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.4.6beta02 - January 14, 2011
+Libpng 1.4.6beta02 - January 15, 2011
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.
@@ -35,6 +35,8 @@
Fixed misspelled macros in contrib/pngminim (Cosmin)
Updated CMakeLists.txt (Clifford Yapp)
+version 1.4.6rc01 [January 15, 2011]
+
Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement).
diff --git a/CHANGES b/CHANGES
index 2a25a33..2c17dec 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2744,6 +2744,8 @@
Fixed misspelled macros in contrib/pngminim (Cosmin)
Updated CMakeLists.txt (Clifford Yapp)
+version 1.4.6rc01 [January 15, 2011]
+
Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement).
diff --git a/INSTALL b/INSTALL
index 9cc872d..5de9df7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.4.6beta02 - January 14, 2011
+Installing libpng version 1.4.6beta02 - January 15, 2011
On Unix/Linux and similar systems, you can simply type
diff --git a/LICENSE b/LICENSE
index 1497b9a..63a58a1 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.4.6beta02, January 14, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.6beta02, January 15, 2011, are
Copyright (c) 2004, 2006-2010 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
-January 14, 2011
+January 15, 2011
diff --git a/README b/README
index dca82cd..ab8f4d5 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.4.6beta02 - January 14, 2011 (shared library 14.0)
+README for libpng version 1.4.6beta02 - January 15, 2011 (shared library 14.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-1.4.6beta02.txt b/libpng-1.4.6beta02.txt
index 5f0c43c..a4d961c 100644
--- a/libpng-1.4.6beta02.txt
+++ b/libpng-1.4.6beta02.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.6beta02 - January 14, 2011
+ libpng version 1.4.6beta02 - January 15, 2011
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.4.6beta02 - January 14, 2011
+ libpng versions 0.97, January 1998, through 1.4.6beta02 - January 15, 2011
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -3303,7 +3303,7 @@
XIII. Y2K Compliance in libpng
-January 14, 2011
+January 15, 2011
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 6f46ce5..2a440fb 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "January 14, 2011"
+.TH LIBPNG 3 "January 15, 2011"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta02
.SH SYNOPSIS
@@ -785,7 +785,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.6beta02 - January 14, 2011
+ libpng version 1.4.6beta02 - January 15, 2011
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -796,7 +796,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.4.6beta02 - January 14, 2011
+ libpng versions 0.97, January 1998, through 1.4.6beta02 - January 15, 2011
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -4088,7 +4088,7 @@
.SH XIII. Y2K Compliance in libpng
-January 14, 2011
+January 15, 2011
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -4286,7 +4286,8 @@
1.4.5beta05-07 14 10405 14.so.14.5[.0]
1.4.5rc02-03 14 10405 14.so.14.5[.0]
1.4.5 14 10405 14.so.14.5[.0]
- 1.4.6beta01 14 10406 14.so.14.6[.0]
+ 1.4.6beta01-02 14 10406 14.so.14.6[.0]
+ 1.4.6rc01 14 10406 14.so.14.6[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -4342,7 +4343,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.4.6beta02 - January 14, 2011:
+Libpng version 1.4.6beta02 - January 15, 2011:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -4365,7 +4366,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.4.6beta02, January 14, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.6beta02, January 15, 2011, 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
@@ -4464,7 +4465,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-January 14, 2011
+January 15, 2011
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 5e447e1..4efc7b9 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "January 14, 2011"
+.TH LIBPNGPF 3 "January 15, 2011"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta02
(private functions)
diff --git a/png.5 b/png.5
index f15ffe9..2596761 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "January 14, 2011"
+.TH PNG 5 "January 15, 2011"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 58c82be..400cd68 100644
--- a/png.c
+++ b/png.c
@@ -547,13 +547,13 @@
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
- "libpng version 1.4.6beta02 - January 14, 2011" PNG_STRING_NEWLINE \
+ "libpng version 1.4.6beta02 - January 15, 2011" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2010 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 ((png_charp) "libpng version 1.4.6beta02 - January 14, 2011\
+ return ((png_charp) "libpng version 1.4.6beta02 - January 15, 2011\
Copyright (c) 1998-2010 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 71dfeeb..ea79360 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.4.6beta02 - January 14, 2011
+ * libpng version 1.4.6beta02 - January 15, 2011
* Copyright (c) 1998-2010 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.4.6beta02 - January 14, 2011: Glenn
+ * libpng versions 0.97, January 1998, through 1.4.6beta02 - January 15, 2011: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -153,7 +153,8 @@
* 1.4.5beta05-07 14 10405 14.so.14.5[.0]
* 1.4.5rc02-03 14 10405 14.so.14.5[.0]
* 1.4.5 14 10405 14.so.14.5[.0]
- * 1.4.6beta01 14 10406 14.so.14.6[.0]
+ * 1.4.6beta01-02 14 10406 14.so.14.6[.0]
+ * 1.4.6rc01 14 10406 14.so.14.6[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -185,7 +186,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.4.6beta02, January 14, 2011, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.6beta02, January 15, 2011, are
* Copyright (c) 2004, 2006-2010 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:
@@ -297,7 +298,7 @@
* Y2K compliance in libpng:
* =========================
*
- * January 14, 2011
+ * January 15, 2011
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -361,7 +362,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.4.6beta02"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.4.6beta02 - January 14, 2011\n"
+ " libpng version 1.4.6beta02 - January 15, 2011\n"
#define PNG_LIBPNG_VER_SONUM 14
#define PNG_LIBPNG_VER_DLLNUM 14
diff --git a/pngconf.h b/pngconf.h
index bae615a..1081470 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.4.6beta02 - January 14, 2011
+ * libpng version 1.4.6beta02 - January 15, 2011
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngpriv.h b/pngpriv.h
index 666c82d..5c94e68 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
- * libpng version 1.4.6beta02 - January 14, 2011
+ * libpng version 1.4.6beta02 - January 15, 2011
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngread.c b/pngread.c
index 633cac0..4806448 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
- * Last changed in libpng 1.4.5 [January 14, 2011]
+ * Last changed in libpng 1.4.5 [December 9, 2010]
* Copyright (c) 1998-2010 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.)
diff --git a/pngrio.c b/pngrio.c
index bf85439..cab7114 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,7 +1,7 @@
/* pngrio.c - functions for data input
*
- * Last changed in libpng 1.4.5 [January 14, 2011]
+ * Last changed in libpng 1.4.5 [December 9, 2010]
* Copyright (c) 1998-2010 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.)
diff --git a/pngrtran.c b/pngrtran.c
index 58c5c0a..36c3348 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1,8 +1,8 @@
/* pngrtran.c - transforms the data in a row for PNG readers
*
- * Last changed in libpng 1.4.5 [January 14, 2011]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [%RDATE%]
+ * Copyright (c) 1998-2011 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.)
*
diff --git a/pngrutil.c b/pngrutil.c
index 8af8b39..5429887 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
- * Last changed in libpng 1.4.5 [January 14, 2011]
+ * Last changed in libpng 1.4.5 [December 9, 2010]
* Copyright (c) 1998-2010 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.)
diff --git a/pngset.c b/pngset.c
index e264fea..76f173e 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct
*
- * Last changed in libpng 1.4.5 [January 14, 2011]
+ * Last changed in libpng 1.4.5 [December 9, 2010]
* Copyright (c) 1998-2010 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.)
diff --git a/pngtest.c b/pngtest.c
index ab30eaf..bcf9c3a 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1,7 +1,7 @@
/* pngtest.c - a simple test program to test libpng
*
- * Last changed in libpng 1.4.5 [January 14, 2011]
+ * Last changed in libpng 1.4.5 [December 9, 2010]
* Copyright (c) 1998-2010 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.)
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index af097ac..8f155f9 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.4.6beta02 - January 14, 2011
+libpng version 1.4.6beta02 - January 15, 2011
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 1db4fc2..aec3929 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source and build
*
- * libpng version 1.4.6beta02 - January 14, 2011
+ * libpng version 1.4.6beta02 - January 15, 2011
*
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index d99496e..8de340b 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.4.6beta02 - January 14, 2011
+Makefiles for libpng version 1.4.6beta02 - January 15, 2011
makefile.linux => Linux/ELF makefile
(gcc, creates libpng14.so.14.1.4.6beta02)