[master] Imported from libpng-1.4.5beta03.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 4ac6145..bc99cf3 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.4.5beta03 - October 5, 2010
+Libpng 1.4.5beta03 - October 8, 2010
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.
@@ -32,11 +32,13 @@
version 1.4.5beta02 [October 5, 2010]
Reverted configure scripts to autoconf-2.65
- Fixed problem with symbols creation in Makefile.am which was assuming
- that CCP writes to standard output by default (Martin Banky).
+ Fixed problem with symbols creation in Makefile.am which was assuming that
+ all versions of cpp write to standard output by default (Martin Banky). The
+ bug was introduced in libpng-1.2.9beta5.
-version 1.4.5beta03 [October 5, 2010]
+version 1.4.5beta03 [October 8, 2010]
Wrapped long lines in CMakeLists.txt and introduced ${libpng_public_hdrs}
+ Undid Makefile revision of 1.4.5beta02.
Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit
diff --git a/CHANGES b/CHANGES
index cbb573e..46cbcec 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1479,7 +1479,7 @@
Removed trailing blanks from source files.
Put version and date of latest change in each source file, and changed
copyright year accordingly.
- More cleanup of configure.ac, Makefile.ac, and associated scripts.
+ More cleanup of configure.ac, Makefile.am, and associated scripts.
Restored scripts/makefile.elf which was inadvertently deleted.
version 1.2.9beta6 [March 6, 2006]
@@ -2686,11 +2686,13 @@
version 1.4.5beta02 [October 5, 2010]
Reverted configure scripts to autoconf-2.65
- Fixed problem with symbols creation in Makefile.am which was assuming
- that CCP writes to standard output by default (Martin Banky).
+ Fixed problem with symbols creation in Makefile.am which was assuming that
+ all versions of cpp write to standard output by default (Martin Banky). The
+ bug was introduced in libpng-1.2.9beta5.
-version 1.4.5beta03 [October 5, 2010]
+version 1.4.5beta03 [October 8, 2010]
Wrapped long lines in CMakeLists.txt and introduced ${libpng_public_hdrs}
+ Undid Makefile revision of 1.4.5beta02.
Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit
diff --git a/INSTALL b/INSTALL
index f57acc4..a8e6d70 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.4.5beta03 - October 5, 2010
+Installing libpng version 1.4.5beta03 - October 8, 2010
On Unix/Linux and similar systems, you can simply type
diff --git a/LICENSE b/LICENSE
index 813f7de..ba65e77 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.5beta03, October 5, 2010, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.5beta03, October 8, 2010, 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
-October 5, 2010
+October 8, 2010
diff --git a/Makefile.am b/Makefile.am
index e0fc8d3..620e2dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,8 +88,7 @@
libpng.sym: png.h pngconf.h
rm -f $@ $@.new
- $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h $(srcdir)/$@
- cat $(srcdir)/$@ | \
+ $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \
$(SED) -n -e \
's|^.*PNG_FUNCTION_EXPORT[ ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \
-e 's|^.*PNG_DATA_EXPORT[ ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \
diff --git a/Makefile.in b/Makefile.in
index ec2c1cc..b61fd7a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1213,8 +1213,7 @@
libpng.sym: png.h pngconf.h
rm -f $@ $@.new
- $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h $(srcdir)/$@
- cat $(srcdir)/$@ | \
+ $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \
$(SED) -n -e \
's|^.*PNG_FUNCTION_EXPORT[ ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \
-e 's|^.*PNG_DATA_EXPORT[ ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \
diff --git a/README b/README
index 8835ebf..6d6a14d 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.4.5beta03 - October 5, 2010 (shared library 14.0)
+README for libpng version 1.4.5beta03 - October 8, 2010 (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.5beta03.txt b/libpng-1.4.5beta03.txt
index 4a43d7e..2d17d28 100644
--- a/libpng-1.4.5beta03.txt
+++ b/libpng-1.4.5beta03.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.5beta03 - October 5, 2010
+ libpng version 1.4.5beta03 - October 8, 2010
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.5beta03 - October 5, 2010
+ libpng versions 0.97, January 1998, through 1.4.5beta03 - October 8, 2010
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -3297,7 +3297,7 @@
XIII. Y2K Compliance in libpng
-October 5, 2010
+October 8, 2010
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 60bdced..901e320 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "October 5, 2010"
+.TH LIBPNG 3 "October 8, 2010"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.5beta03
.SH SYNOPSIS
@@ -785,7 +785,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.5beta03 - October 5, 2010
+ libpng version 1.4.5beta03 - October 8, 2010
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.5beta03 - October 5, 2010
+ libpng versions 0.97, January 1998, through 1.4.5beta03 - October 8, 2010
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -4082,7 +4082,7 @@
.SH XIII. Y2K Compliance in libpng
-October 5, 2010
+October 8, 2010
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -4331,7 +4331,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.4.5beta03 - October 5, 2010:
+Libpng version 1.4.5beta03 - October 8, 2010:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -4354,7 +4354,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.4.5beta03, October 5, 2010, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.5beta03, October 8, 2010, 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
@@ -4453,7 +4453,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-October 5, 2010
+October 8, 2010
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index f8f3287..8de143c 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "October 5, 2010"
+.TH LIBPNGPF 3 "October 8, 2010"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.5beta03
(private functions)
diff --git a/png.5 b/png.5
index 065c9d5..0ea9799 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "October 5, 2010"
+.TH PNG 5 "October 8, 2010"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 49d4809..849914d 100644
--- a/png.c
+++ b/png.c
@@ -551,13 +551,13 @@
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
- "libpng version 1.4.5beta03 - October 5, 2010" PNG_STRING_NEWLINE \
+ "libpng version 1.4.5beta03 - October 8, 2010" 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.5beta03 - October 5, 2010\
+ return ((png_charp) "libpng version 1.4.5beta03 - October 8, 2010\
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 80196bf..7e2819e 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.4.5beta03 - October 5, 2010
+ * libpng version 1.4.5beta03 - October 8, 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.)
@@ -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.5beta03 - October 5, 2010: Glenn
+ * libpng versions 0.97, January 1998, through 1.4.5beta03 - October 8, 2010: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -180,7 +180,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.4.5beta03, October 5, 2010, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.5beta03, October 8, 2010, 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:
@@ -292,7 +292,7 @@
* Y2K compliance in libpng:
* =========================
*
- * October 5, 2010
+ * October 8, 2010
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -356,7 +356,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.4.5beta03"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.4.5beta03 - October 5, 2010\n"
+ " libpng version 1.4.5beta03 - October 8, 2010\n"
#define PNG_LIBPNG_VER_SONUM 14
#define PNG_LIBPNG_VER_DLLNUM 14
diff --git a/pngconf.h b/pngconf.h
index 162b33a..32cb0bd 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.4.5beta03 - October 5, 2010
+ * libpng version 1.4.5beta03 - October 8, 2010
* 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 cde123a..aedfa5d 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
- * libpng version 1.4.5beta03 - October 5, 2010
+ * libpng version 1.4.5beta03 - October 8, 2010
* 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/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index b0a8f94..233e255 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.4.5beta03 - October 5, 2010
+libpng version 1.4.5beta03 - October 8, 2010
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index d345e35..9d10e70 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.5beta03 - October 5, 2010
+ * libpng version 1.4.5beta03 - October 8, 2010
*
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index e881d13..7125cdc 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.4.5beta03 - October 5, 2010
+Makefiles for libpng version 1.4.5beta03 - October 8, 2010
makefile.linux => Linux/ELF makefile
(gcc, creates libpng14.so.14.1.4.5beta03)
