[master] Imported from libpng-1.4.7rc01.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index b5f7d20..f20edb4 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,58 +1,33 @@
-Libpng 1.4.6 - April 8, 2011
+Libpng 1.4.7rc01 - April 9, 2011
-This is a public release of libpng, intended for use in production codes.
+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.
Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- libpng-1.4.6.tar.xz (LZMA-compressed, recommended)
- libpng-1.4.6.tar.gz
- libpng-1.4.6.tar.bz2
+ 1.4.7rc01.tar.xz (LZMA-compressed, recommended)
+ 1.4.7rc01.tar.gz
+ 1.4.7rc01.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lpng146.7z (LZMA-compressed, recommended)
- lpng146.zip
+ lp147r01.7z (LZMA-compressed, recommended)
+ lp147r01.zip
Other information:
- libpng-1.4.6-README.txt
- libpng-1.4.6-LICENSE.txt
+ 1.4.7rc01-README.txt
+ 1.4.7rc01-LICENSE.txt
-Changes since the last public release (1.4.5):
+Changes since the last public release (1.4.6):
- Fixed bug in background transformation handling in pngrtran.c (it was
- looking for the flag in png_ptr->transformations instead of in
- png_ptr->flags) (David Raymond).
- Fixed misspelled macros in contrib/pngminim (Cosmin)
- Updated CMakeLists.txt (Clifford Yapp)
- Fixed some typecasts in png_debug statements (Cosmin).
- Updated documentation of png_set|get_tRNS() (Thomas Klausner).
- Added png_const_structp and png_const_infop types, and used them in
- prototypes for most png_get_*() functions.
- In the manual, describe the png_get_IHDR() arguments in the correct order.
- Updated the synopses in the manual to reflect recent changes.
- Fixed a typo in the *.def files and deleted entries that are now
- declared in pngpriv.h
- Updated contrib/pngsuite/README to add the word "modify".
- Added the private PNG_UNUSED() macro definition in pngconf.h.
- ifdef out mask arrays in pngread.c when interlacing is not supported.
- Added attribute definition (warnings) for MSC_VER >= 1300 in pngconf.h
- Added -D_CRT_SECURE_NO_DEPRECATE to CFLAGS in makefile.vcwin32
- Fixed mistake in the descriptions of user read_transform and write_transform
- function prototypes in the manual. The row_info struct is png_row_infop.
- Added a request in the manual that applications do not use "png_" or
- "PNG_" to begin any of their own symbols.
- Fixed incorrect examples of callback prototypes in the manual, that were
- introduced in libpng-1.0.0.
- Removed "strip" from contrib/pngminim/*/makefile.
- Fixed a bug (present since libpng-1.0.7) that makes png_handle_sPLT() fail
- to compile when PNG_NO_POINTER_INDEXING is defined (Chubanov Kirill)
- Improved the optimization of the zlib CMF byte (see libpng-1.2.6beta03).
+version 1.4.7rc01 [April 9, 2011]
+ Relocated misplaced new declarations in pngwutil.c.
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 d77826a..8056137 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2788,6 +2788,9 @@
version 1.4.6 [April 8, 2011]
No changes.
+version 1.4.7rc01 [April 9, 2011]
+ Relocated misplaced new declarations in pngwutil.c.
+
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/CMakeLists.txt b/CMakeLists.txt
index d14cdf8..f3a2681 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@
set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 4)
-set(PNGLIB_RELEASE 6)
+set(PNGLIB_RELEASE 7)
set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
@@ -255,7 +255,7 @@
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 14.${PNGLIB_RELEASE}.1.4.6
+# VERSION 14.${PNGLIB_RELEASE}.1.4.7rc01
VERSION 14.${PNGLIB_RELEASE}.0
SOVERSION 14
CLEAN_DIRECT_OUTPUT 1)
diff --git a/INSTALL b/INSTALL
index d95fddb..1513ad4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.4.6 - April 8, 2011
+Installing libpng version 1.4.7rc01 - April 9, 2011
On Unix/Linux and similar systems, you can simply type
@@ -46,7 +46,7 @@
correspond to the version of zlib that's installed.
You can rename the directories that you downloaded (they
-might be called "libpng-1.4.6" or "libpng14" and "zlib-1.2.3"
+might be called "libpng-1.4.7rc01" or "libpng14" and "zlib-1.2.3"
or "zlib123") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this:
diff --git a/LICENSE b/LICENSE
index e5ea844..fa729f6 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.6, April 8, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.7rc01, April 9, 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
-April 8, 2011
+April 9, 2011
diff --git a/README b/README
index 96715a5..f95784c 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.4.6 - April 8, 2011 (shared library 14.0)
+README for libpng version 1.4.7rc01 - April 9, 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.
@@ -185,9 +185,9 @@
makefile.std => Generic UNIX makefile (cc, creates static
libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- (gcc, creates libpng14.so.14.1.4.6)
+ (gcc, creates libpng14.so.14.1.4.7rc01)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.14.1.4.6)
+ (gcc, creates libpng14.so.14.1.4.7rc01)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
@@ -209,12 +209,12 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
- (gcc, creates libpng14.so.14.1.4.6)
+ (gcc, creates libpng14.so.14.1.4.7rc01)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng14.so.14.1.4.6)
+ (gcc, creates libpng14.so.14.1.4.7rc01)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng14.so.14.1.4.6)
+ (gcc, creates libpng14.so.14.1.4.7rc01)
makefile.32sunu => Sun Ultra 32-bit makefile
makefile.64sunu => Sun Ultra 64-bit makefile
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
diff --git a/configure b/configure
index 5f87de2..8984a63 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for libpng 1.4.6.
+# Generated by GNU Autoconf 2.65 for libpng 1.4.7rc01.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@@ -562,8 +562,8 @@
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.4.6'
-PACKAGE_STRING='libpng 1.4.6'
+PACKAGE_VERSION='1.4.7rc01'
+PACKAGE_STRING='libpng 1.4.7rc01'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL=''
@@ -1292,7 +1292,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libpng 1.4.6 to adapt to many kinds of systems.
+\`configure' configures libpng 1.4.7rc01 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1362,7 +1362,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng 1.4.6:";;
+ short | recursive ) echo "Configuration of libpng 1.4.7rc01:";;
esac
cat <<\_ACEOF
@@ -1467,7 +1467,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.4.6
+libpng configure 1.4.7rc01
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1892,7 +1892,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libpng $as_me 1.4.6, which was
+It was created by libpng $as_me 1.4.7rc01, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2700,7 +2700,7 @@
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.4.6'
+ VERSION='1.4.7rc01'
cat >>confdefs.h <<_ACEOF
@@ -2764,10 +2764,10 @@
-PNGLIB_VERSION=1.4.6
+PNGLIB_VERSION=1.4.7rc01
PNGLIB_MAJOR=1
PNGLIB_MINOR=4
-PNGLIB_RELEASE=6
+PNGLIB_RELEASE=7
@@ -12175,7 +12175,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libpng $as_me 1.4.6, which was
+This file was extended by libpng $as_me 1.4.7rc01, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12241,7 +12241,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libpng config.status 1.4.6
+libpng config.status 1.4.7rc01
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 0f20a8e..69cca04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,17 +16,17 @@
dnl stamps are correct
AC_PREREQ(2.59)
-AC_INIT([libpng], [1.4.6], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.4.7rc01], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
dnl Version number stuff here:
-PNGLIB_VERSION=1.4.6
+PNGLIB_VERSION=1.4.7rc01
PNGLIB_MAJOR=1
PNGLIB_MINOR=4
-PNGLIB_RELEASE=6
+PNGLIB_RELEASE=7
dnl End of version number stuff
diff --git a/libpng-1.4.6.txt b/libpng-1.4.7rc01.txt
similarity index 99%
rename from libpng-1.4.6.txt
rename to libpng-1.4.7rc01.txt
index 4a4891a..88bbb36 100644
--- a/libpng-1.4.6.txt
+++ b/libpng-1.4.7rc01.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.6 - April 8, 2011
+ libpng version 1.4.7rc01 - April 9, 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.6 - April 8, 2011
+ libpng versions 0.97, January 1998, through 1.4.7rc01 - April 9, 2011
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -905,7 +905,7 @@
As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was
added. It expands the sample depth without changing tRNS to alpha.
-As of libpng version 1.4.6, not all possible expansions are supported.
+As of libpng version 1.4.7rc01, not all possible expansions are supported.
In the following table, the 01 means grayscale with depth<8, 31 means
indexed with depth<8, other numerals represent the color type, "T" means
@@ -3307,13 +3307,13 @@
XIII. Y2K Compliance in libpng
-April 8, 2011
+April 9, 2011
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.4.6 are Y2K compliant. It is my belief that earlier
+upward through 1.4.7rc01 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.
Libpng only has three year fields. One is a 2-byte unsigned integer that
diff --git a/libpng.3 b/libpng.3
index 1fe3461..cc418a6 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "April 8, 2011"
+.TH LIBPNG 3 "April 9, 2011"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.7rc01
.SH SYNOPSIS
\fI\fB
@@ -895,7 +895,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.6 - April 8, 2011
+ libpng version 1.4.7rc01 - April 9, 2011
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -906,7 +906,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.4.6 - April 8, 2011
+ libpng versions 0.97, January 1998, through 1.4.7rc01 - April 9, 2011
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -1800,7 +1800,7 @@
As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was
added. It expands the sample depth without changing tRNS to alpha.
-As of libpng version 1.4.6, not all possible expansions are supported.
+As of libpng version 1.4.7rc01, not all possible expansions are supported.
In the following table, the 01 means grayscale with depth<8, 31 means
indexed with depth<8, other numerals represent the color type, "T" means
@@ -4202,13 +4202,13 @@
.SH XIII. Y2K Compliance in libpng
-April 8, 2011
+April 9, 2011
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.4.6 are Y2K compliant. It is my belief that earlier
+upward through 1.4.7rc01 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.
Libpng only has three year fields. One is a 2-byte unsigned integer that
@@ -4403,6 +4403,7 @@
1.4.6beta01-07 14 10406 14.so.14.6[.0]
1.4.6rc01 14 10406 14.so.14.6[.0]
1.4.6 14 10406 14.so.14.6[.0]
+ 1.4.7rc01 14 10407 14.so.14.7[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -4458,7 +4459,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.4.6 - April 8, 2011:
+Libpng version 1.4.7rc01 - April 9, 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).
@@ -4481,7 +4482,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.4.6, April 8, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.7rc01, April 9, 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
@@ -4580,7 +4581,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-April 8, 2011
+April 9, 2011
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 29ec5f9..d40ebc8 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "April 8, 2011"
+.TH LIBPNGPF 3 "April 9, 2011"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.7rc01
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index b1382cd..229352b 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "April 8, 2011"
+.TH PNG 5 "April 9, 2011"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index c833e03..aae4d4b 100644
--- a/png.c
+++ b/png.c
@@ -17,7 +17,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_6 Your_png_h_is_not_version_1_4_6;
+typedef version_1_4_7rc01 Your_png_h_is_not_version_1_4_7rc01;
/* Tells libpng that we have already handled the first "num_bytes" bytes
* of the PNG file signature. If the PNG data is embedded into another
@@ -547,13 +547,13 @@
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
- "libpng version 1.4.6 - April 8, 2011" PNG_STRING_NEWLINE \
+ "libpng version 1.4.7rc01 - April 9, 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.6 - April 8, 2011\
+ return ((png_charp) "libpng version 1.4.7rc01 - April 9, 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 b8d6bc5..d2bb821 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.4.6 - April 8, 2011
+ * libpng version 1.4.7rc01 - April 9, 2011
* 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.)
@@ -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.6 - April 8, 2011: Glenn
+ * libpng versions 0.97, January 1998, through 1.4.7rc01 - April 9, 2011: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -156,6 +156,7 @@
* 1.4.6beta01-07 14 10406 14.so.14.6[.0]
* 1.4.6rc01 14 10406 14.so.14.6[.0]
* 1.4.6 14 10406 14.so.14.6[.0]
+ * 1.4.7rc01 14 10407 14.so.14.7[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -187,7 +188,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.4.6, April 8, 2011, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.7rc01, April 9, 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:
@@ -299,13 +300,13 @@
* Y2K compliance in libpng:
* =========================
*
- * April 8, 2011
+ * April 9, 2011
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
- * upward through 1.4.6 are Y2K compliant. It is my belief that earlier
+ * upward through 1.4.7rc01 are Y2K compliant. It is my belief that earlier
* versions were also Y2K compliant.
*
* Libpng only has three year fields. One is a 2-byte unsigned integer
@@ -361,9 +362,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.4.6"
+#define PNG_LIBPNG_VER_STRING "1.4.7rc01"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.4.6 - April 8, 2011\n"
+ " libpng version 1.4.7rc01 - April 9, 2011\n"
#define PNG_LIBPNG_VER_SONUM 14
#define PNG_LIBPNG_VER_DLLNUM 14
@@ -371,12 +372,12 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 4
-#define PNG_LIBPNG_VER_RELEASE 6
+#define PNG_LIBPNG_VER_RELEASE 7
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
-#define PNG_LIBPNG_VER_BUILD 0
+#define PNG_LIBPNG_VER_BUILD 01
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -401,7 +402,7 @@
* version 1.0.0 was mis-numbered 100 instead of 10000). From
* version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release
*/
-#define PNG_LIBPNG_VER 10406 /* 1.4.6 */
+#define PNG_LIBPNG_VER 10407 /* 1.4.7 */
#ifndef PNG_VERSION_INFO_ONLY
/* Include the compression library's header */
@@ -1487,7 +1488,7 @@
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
-typedef png_structp version_1_4_6;
+typedef png_structp version_1_4_7rc01;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index 9682ca7..e061e23 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.4.6 - April 8, 2011
+ * libpng version 1.4.7rc01 - April 9, 2011
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngget.c b/pngget.c
index ac5e27c..286b439 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@
/* pngget.c - retrieval of values from info struct
*
- * Last changed in libpng 1.4.6 [April 8, 2011]
+ * Last changed in libpng 1.4.6 [April 9, 2011]
* 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/pngmem.c b/pngmem.c
index 4f00cff..317b1ac 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,7 +1,7 @@
/* pngmem.c - stub functions for memory allocation
*
- * Last changed in libpng 1.4.6 [April 8, 2011]
+ * Last changed in libpng 1.4.6 [April 9, 2011]
* 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/pngpriv.h b/pngpriv.h
index aa134b5..fcaabdd 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
- * libpng version 1.4.6 - April 8, 2011
+ * libpng version 1.4.7rc01 - April 9, 2011
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngtest.c b/pngtest.c
index 0c822ac..8e23534 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1687,4 +1687,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_6 your_png_h_is_not_version_1_4_6;
+typedef version_1_4_7rc01 your_png_h_is_not_version_1_4_7rc01;
diff --git a/pngtrans.c b/pngtrans.c
index 8068e90..55b90f5 100644
--- a/pngtrans.c
+++ b/pngtrans.c
@@ -1,7 +1,7 @@
/* pngtrans.c - transforms the data in a row (used by both readers and writers)
*
- * Last changed in libpng 1.4.6 [April 8, 2011]
+ * Last changed in libpng 1.4.6 [April 9, 2011]
* 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/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index 9089f24..438bdcb 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.4.6 - April 8, 2011
+libpng version 1.4.7rc01 - April 9, 2011
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 673bd55..a471523 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.6 - April 8, 2011
+ * libpng version 1.4.7rc01 - April 9, 2011
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index d5b005c..9b08294 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,8 +1,8 @@
-Makefiles for libpng version 1.4.6 - April 8, 2011
+Makefiles for libpng version 1.4.7rc01 - April 9, 2011
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.14.1.4.6)
+ (gcc, creates libpng14.so.14.1.4.7rc01)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
@@ -20,7 +20,7 @@
makefile.dec => DEC Alpha UNIX makefile
makefile.dj2 => DJGPP 2 makefile
makefile.elf => Linux/ELF makefile symbol versioning,
- (gcc, creates libpng14.so.14.1.4.6)
+ (gcc, creates libpng14.so.14.1.4.7rc01)
makefile.freebsd => FreeBSD makefile
makefile.gcc => Generic gcc makefile
makefile.hpgcc => HPUX makefile using gcc
@@ -36,12 +36,12 @@
makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def)
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
makefile.sggcc => Silicon Graphics (gcc,
- creates libpng14.so.14.1.4.6)
+ creates libpng14.so.14.1.4.7rc01)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng14.so.14.1.4.6)
+ creates libpng14.so.14.1.4.7rc01)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng14.so.14.1.4.6)
+ creates libpng14.so.14.1.4.7rc01)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index 5e011a6..60475b3 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
-version=1.4.6
+version=1.4.7rc01
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 4c11fda..8778e2b 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@
Name: libpng
Description: Loads and saves PNG files
-Version: 1.4.6
+Version: 1.4.7rc01
Libs: -L${libdir} -lpng14
Cflags: -I${includedir}
diff --git a/scripts/makefile.cegcc b/scripts/makefile.cegcc
index c56b4b4..94127db 100644
--- a/scripts/makefile.cegcc
+++ b/scripts/makefile.cegcc
@@ -23,7 +23,7 @@
VERMAJ = 1
VERMIN = 4
-VERMIC = 6
+VERMIC = 7
VER = $(VERMAJ).$(VERMIN).$(VERMIC)
NAME = libpng
PACKAGE = $(NAME)-$(VER)
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 1dfddf2..9ca4037 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng14
PNGMAJ = 14
-RELEASE = 6
+RELEASE = 7
# Shared library names:
LIBSO=$(LIBNAME).so
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 105b07f..0fc49b4 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@
LIB= png14
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.6
+SHLIB_MINOR= 1.4.7rc01
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index 5201867..bffc3ea 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -17,7 +17,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.4.6
+SHLIB_MINOR= 1.4.7rc01
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index 1f046a3..d10509d 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -11,7 +11,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.6
+SHLIB_MINOR= 1.4.7rc01
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/png32ce.def b/scripts/png32ce.def
index e837ea1..aafbbfc 100644
--- a/scripts/png32ce.def
+++ b/scripts/png32ce.def
@@ -15,7 +15,7 @@
png_get_int_32
EXPORTS
-;Version 1.4.6
+;Version 1.4.7rc01
png_build_grayscale_palette @1
; png_check_sig @2
png_chunk_error @3
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 4472dc6..ffd02cb 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.4.6
+; Version 1.4.7rc01
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngwin.def b/scripts/pngwin.def
index 522b750..5d5971f 100644
--- a/scripts/pngwin.def
+++ b/scripts/pngwin.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.4.6
+;Version 1.4.7rc01
png_build_grayscale_palette
png_chunk_error
png_chunk_warning
