summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2011-04-08 11:58:34 -0500
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2011-04-08 12:03:08 -0500
commit8a35e25852e666f0d962808412a353af96a65a68 (patch)
treedf25f603e1c81580b94c9f413157992296cdfec4
parent97eb073189239749c93f3b7ff3bf5b6531c9c366 (diff)
downloadlibpng-8a35e25852e666f0d962808412a353af96a65a68.tar.gz
[master] Imported from libpng-1.4.6.tarv1.4.6
Diffstat
-rw-r--r--ANNOUNCE37
-rw-r--r--CHANGES3
-rw-r--r--CMakeLists.txt2
-rw-r--r--INSTALL4
-rw-r--r--LICENSE4
-rw-r--r--README12
-rwxr-xr-xconfigure22
-rw-r--r--configure.ac4
-rw-r--r--libpng-1.4.6.txt (renamed from libpng-1.4.6rc02.txt)10
-rw-r--r--libpng.321
-rw-r--r--libpngpf.34
-rw-r--r--png.52
-rw-r--r--png.c6
-rw-r--r--png.h19
-rw-r--r--pngconf.h2
-rw-r--r--pngget.c2
-rw-r--r--pngmem.c2
-rw-r--r--pngpriv.h2
-rw-r--r--pngtest.c2
-rw-r--r--pngtrans.c2
-rw-r--r--projects/vstudio/readme.txt2
-rw-r--r--projects/vstudio/zlib.props2
-rw-r--r--scripts/README.txt12
-rwxr-xr-xscripts/libpng-config-head.in2
-rw-r--r--scripts/libpng.pc.in2
-rw-r--r--scripts/makefile.ne12bsd2
-rw-r--r--scripts/makefile.netbsd2
-rw-r--r--scripts/makefile.openbsd2
-rw-r--r--scripts/png32ce.def2
-rw-r--r--scripts/pngos2.def2
-rw-r--r--scripts/pngwin.def2
31 files changed, 90 insertions, 104 deletions
diff --git a/ANNOUNCE b/ANNOUNCE
index 86406edbd..b5f7d200d 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,59 +1,45 @@
-Libpng 1.4.6rc02 - April 6, 2011
+Libpng 1.4.6 - April 8, 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.
+This is a public release of libpng, intended for use in production codes.
Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- 1.4.6rc02.tar.xz (LZMA-compressed, recommended)
- 1.4.6rc02.tar.gz
- 1.4.6rc02.tar.bz2
+ libpng-1.4.6.tar.xz (LZMA-compressed, recommended)
+ libpng-1.4.6.tar.gz
+ libpng-1.4.6.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp146r02.7z (LZMA-compressed, recommended)
- lp146r02.zip
+ lpng146.7z (LZMA-compressed, recommended)
+ lpng146.zip
Other information:
- 1.4.6rc02-README.txt
- 1.4.6rc02-LICENSE.txt
+ libpng-1.4.6-README.txt
+ libpng-1.4.6-LICENSE.txt
Changes since the last public release (1.4.5):
-version 1.4.6beta01 [December 29, 2010]
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).
-
-version 1.4.6beta02 [January 14, 2011]
Fixed misspelled macros in contrib/pngminim (Cosmin)
Updated CMakeLists.txt (Clifford Yapp)
-
-version 1.4.6beta03 [January 14, 2011]
Fixed some typecasts in png_debug statements (Cosmin).
-
-version 1.4.6beta04 [January 22, 2011]
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.
-
-version 1.4.6beta05 [January 23, 2011]
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
-
-version 1.4.6beta06 [March 19, 2011]
Updated contrib/pngsuite/README to add the word "modify".
Added the private PNG_UNUSED() macro definition in pngconf.h.
-
-version 1.4.6beta07 [March 22, 2011]
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
@@ -66,11 +52,6 @@ version 1.4.6beta07 [March 22, 2011]
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)
-
-version 1.4.6rc01 [March 31, 2011]
- No changes.
-
-version 1.4.6rc02 [April 6, 2011]
Improved the optimization of the zlib CMF byte (see libpng-1.2.6beta03).
Send comments/corrections/commendations to glennrp at users.sourceforge.net
diff --git a/CHANGES b/CHANGES
index 12f6bccac..d77826a8d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2785,6 +2785,9 @@ version 1.4.6rc01 [March 31, 2011]
version 1.4.6rc02 [April 6, 2011]
Improved the optimization of the zlib CMF byte (see libpng-1.2.6beta03).
+version 1.4.6 [April 8, 2011]
+ No changes.
+
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 b70899af7..d14cdf85e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -255,7 +255,7 @@ install(CODE ${PNG_CONFIG_INSTALL_CODE})
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 14.${PNGLIB_RELEASE}.1.4.6rc02
+# VERSION 14.${PNGLIB_RELEASE}.1.4.6
VERSION 14.${PNGLIB_RELEASE}.0
SOVERSION 14
CLEAN_DIRECT_OUTPUT 1)
diff --git a/INSTALL b/INSTALL
index 15169fbb5..d95fddbfd 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.4.6rc02 - April 6, 2011
+Installing libpng version 1.4.6 - April 8, 2011
On Unix/Linux and similar systems, you can simply type
@@ -46,7 +46,7 @@ to have access to the zlib.h and zconf.h include files that
correspond to the version of zlib that's installed.
You can rename the directories that you downloaded (they
-might be called "libpng-1.4.6rc02" or "libpng14" and "zlib-1.2.3"
+might be called "libpng-1.4.6" 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 43632cd84..e5ea84420 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.4.6rc02, April 6, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.6, April 8, 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 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-April 6, 2011
+April 8, 2011
diff --git a/README b/README
index 187eb7ef6..96715a575 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.4.6rc02 - April 6, 2011 (shared library 14.0)
+README for libpng version 1.4.6 - April 8, 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 @@ Files in this distribution:
makefile.std => Generic UNIX makefile (cc, creates static
libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- (gcc, creates libpng14.so.14.1.4.6rc02)
+ (gcc, creates libpng14.so.14.1.4.6)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.14.1.4.6rc02)
+ (gcc, creates libpng14.so.14.1.4.6)
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 @@ Files in this distribution:
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
- (gcc, creates libpng14.so.14.1.4.6rc02)
+ (gcc, creates libpng14.so.14.1.4.6)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng14.so.14.1.4.6rc02)
+ (gcc, creates libpng14.so.14.1.4.6)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng14.so.14.1.4.6rc02)
+ (gcc, creates libpng14.so.14.1.4.6)
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 43f3f18d3..5f87de25b 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.6rc02.
+# Generated by GNU Autoconf 2.65 for libpng 1.4.6.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@@ -562,8 +562,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.4.6rc02'
-PACKAGE_STRING='libpng 1.4.6rc02'
+PACKAGE_VERSION='1.4.6'
+PACKAGE_STRING='libpng 1.4.6'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL=''
@@ -1292,7 +1292,7 @@ if test "$ac_init_help" = "long"; then
# 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.6rc02 to adapt to many kinds of systems.
+\`configure' configures libpng 1.4.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1362,7 +1362,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng 1.4.6rc02:";;
+ short | recursive ) echo "Configuration of libpng 1.4.6:";;
esac
cat <<\_ACEOF
@@ -1467,7 +1467,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.4.6rc02
+libpng configure 1.4.6
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1892,7 +1892,7 @@ cat >config.log <<_ACEOF
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.6rc02, which was
+It was created by libpng $as_me 1.4.6, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2700,7 +2700,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.4.6rc02'
+ VERSION='1.4.6'
cat >>confdefs.h <<_ACEOF
@@ -2764,7 +2764,7 @@ fi
-PNGLIB_VERSION=1.4.6rc02
+PNGLIB_VERSION=1.4.6
PNGLIB_MAJOR=1
PNGLIB_MINOR=4
PNGLIB_RELEASE=6
@@ -12175,7 +12175,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# 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.6rc02, which was
+This file was extended by libpng $as_me 1.4.6, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12241,7 +12241,7 @@ _ACEOF
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.6rc02
+libpng config.status 1.4.6
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index f173326fa..0f20a8ec0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,14 +16,14 @@ dnl should not be necessary to regenerate configure if the time
dnl stamps are correct
AC_PREREQ(2.59)
-AC_INIT([libpng], [1.4.6rc02], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.4.6], [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.6rc02
+PNGLIB_VERSION=1.4.6
PNGLIB_MAJOR=1
PNGLIB_MINOR=4
PNGLIB_RELEASE=6
diff --git a/libpng-1.4.6rc02.txt b/libpng-1.4.6.txt
index 61a9a83a2..4a4891aa4 100644
--- a/libpng-1.4.6rc02.txt
+++ b/libpng-1.4.6.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.6rc02 - April 6, 2011
+ libpng version 1.4.6 - April 8, 2011
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng
Based on:
- libpng versions 0.97, January 1998, through 1.4.6rc02 - April 6, 2011
+ libpng versions 0.97, January 1998, through 1.4.6 - April 8, 2011
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -905,7 +905,7 @@ things.
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.6rc02, not all possible expansions are supported.
+As of libpng version 1.4.6, 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 @@ Other rules can be inferred by inspecting the libpng source.
XIII. Y2K Compliance in libpng
-April 6, 2011
+April 8, 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.6rc02 are Y2K compliant. It is my belief that earlier
+upward through 1.4.6 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 9908c37e1..1fe3461c7 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "April 6, 2011"
+.TH LIBPNG 3 "April 8, 2011"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6rc02
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6
.SH SYNOPSIS
\fI\fB
@@ -895,7 +895,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.6rc02 - April 6, 2011
+ libpng version 1.4.6 - April 8, 2011
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -906,7 +906,7 @@ libpng.txt - A description on how to use and modify libpng
Based on:
- libpng versions 0.97, January 1998, through 1.4.6rc02 - April 6, 2011
+ libpng versions 0.97, January 1998, through 1.4.6 - April 8, 2011
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -1800,7 +1800,7 @@ things.
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.6rc02, not all possible expansions are supported.
+As of libpng version 1.4.6, 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 @@ Other rules can be inferred by inspecting the libpng source.
.SH XIII. Y2K Compliance in libpng
-April 6, 2011
+April 8, 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.6rc02 are Y2K compliant. It is my belief that earlier
+upward through 1.4.6 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
@@ -4402,6 +4402,7 @@ the first widely used release:
1.4.5 14 10405 14.so.14.5[.0]
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]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -4457,7 +4458,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.4.6rc02 - April 6, 2011:
+Libpng version 1.4.6 - April 8, 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).
@@ -4480,7 +4481,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.4.6rc02, April 6, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.6, April 8, 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
@@ -4579,7 +4580,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-April 6, 2011
+April 8, 2011
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 3be37be23..29ec5f959 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "April 6, 2011"
+.TH LIBPNGPF 3 "April 8, 2011"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6rc02
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index 519aceaad..b1382cd02 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "April 6, 2011"
+.TH PNG 5 "April 8, 2011"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 4b263f950..c833e03f8 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_6rc02 Your_png_h_is_not_version_1_4_6rc02;
+typedef version_1_4_6 Your_png_h_is_not_version_1_4_6;
/* 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 @@ png_get_copyright(png_const_structp png_ptr)
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
- "libpng version 1.4.6rc02 - April 6, 2011" PNG_STRING_NEWLINE \
+ "libpng version 1.4.6 - April 8, 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.6rc02 - April 6, 2011\
+ return ((png_charp) "libpng version 1.4.6 - April 8, 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 9f5be1a29..b8d6bc55e 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.4.6rc02 - April 6, 2011
+ * libpng version 1.4.6 - April 8, 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.6rc02 - April 6, 2011: Glenn
+ * libpng versions 0.97, January 1998, through 1.4.6 - April 8, 2011: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -155,6 +155,7 @@
* 1.4.5 14 10405 14.so.14.5[.0]
* 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]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -186,7 +187,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.4.6rc02, April 6, 2011, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.6, April 8, 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:
@@ -298,13 +299,13 @@
* Y2K compliance in libpng:
* =========================
*
- * April 6, 2011
+ * April 8, 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.6rc02 are Y2K compliant. It is my belief that earlier
+ * upward through 1.4.6 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
@@ -360,9 +361,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.4.6rc02"
+#define PNG_LIBPNG_VER_STRING "1.4.6"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.4.6rc02 - April 6, 2011\n"
+ " libpng version 1.4.6 - April 8, 2011\n"
#define PNG_LIBPNG_VER_SONUM 14
#define PNG_LIBPNG_VER_DLLNUM 14
@@ -375,7 +376,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
-#define PNG_LIBPNG_VER_BUILD 02
+#define PNG_LIBPNG_VER_BUILD 0
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -1486,7 +1487,7 @@ struct png_struct_def
/* 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_6rc02;
+typedef png_structp version_1_4_6;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index 71752ba51..9682ca7c3 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.4.6rc02 - April 6, 2011
+ * libpng version 1.4.6 - April 8, 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 d4d95841f..ac5e27c33 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 6, 2011]
+ * Last changed in libpng 1.4.6 [April 8, 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 c5cda4df6..4f00cffad 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 6, 2011]
+ * Last changed in libpng 1.4.6 [April 8, 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 ac34b7b57..aa134b55c 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
- * libpng version 1.4.6rc02 - April 6, 2011
+ * libpng version 1.4.6 - April 8, 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 5bf816905..0c822acdb 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1687,4 +1687,4 @@ main(int argc, char *argv[])
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_6rc02 your_png_h_is_not_version_1_4_6rc02;
+typedef version_1_4_6 your_png_h_is_not_version_1_4_6;
diff --git a/pngtrans.c b/pngtrans.c
index 02506e948..8068e902e 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 6, 2011]
+ * Last changed in libpng 1.4.6 [April 8, 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 42f7bee0f..9089f24e1 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.4.6rc02 - April 6, 2011
+libpng version 1.4.6 - April 8, 2011
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 5d6788f7a..673bd55fe 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.6rc02 - April 6, 2011
+ * libpng version 1.4.6 - April 8, 2011
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index 3ff6857fe..d5b005c0f 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,8 +1,8 @@
-Makefiles for libpng version 1.4.6rc02 - April 6, 2011
+Makefiles for libpng version 1.4.6 - April 8, 2011
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.14.1.4.6rc02)
+ (gcc, creates libpng14.so.14.1.4.6)
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 @@ Makefiles for libpng version 1.4.6rc02 - April 6, 2011
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.6rc02)
+ (gcc, creates libpng14.so.14.1.4.6)
makefile.freebsd => FreeBSD makefile
makefile.gcc => Generic gcc makefile
makefile.hpgcc => HPUX makefile using gcc
@@ -36,12 +36,12 @@ Makefiles for libpng version 1.4.6rc02 - April 6, 2011
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.6rc02)
+ creates libpng14.so.14.1.4.6)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng14.so.14.1.4.6rc02)
+ creates libpng14.so.14.1.4.6)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng14.so.14.1.4.6rc02)
+ creates libpng14.so.14.1.4.6)
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 821e1a7fe..5e011a6bd 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
-version=1.4.6rc02
+version=1.4.6
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index ec64acd04..4c11fda00 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng14
Name: libpng
Description: Loads and saves PNG files
-Version: 1.4.6rc02
+Version: 1.4.6
Libs: -L${libdir} -lpng14
Cflags: -I${includedir}
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 3c21c3cdf..105b07f96 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng14
LIB= png14
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.6rc02
+SHLIB_MINOR= 1.4.6
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 1988e9049..520186703 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.4.6rc02
+SHLIB_MINOR= 1.4.6
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 3fe0e4b12..1f046a3dd 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.6rc02
+SHLIB_MINOR= 1.4.6
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/png32ce.def b/scripts/png32ce.def
index 625c736b0..e837ea1fc 100644
--- a/scripts/png32ce.def
+++ b/scripts/png32ce.def
@@ -15,7 +15,7 @@ LIBRARY lpngce
png_get_int_32
EXPORTS
-;Version 1.4.6rc02
+;Version 1.4.6
png_build_grayscale_palette @1
; png_check_sig @2
png_chunk_error @3
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 5026d2f07..4472dc64f 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.4.6rc02
+; Version 1.4.6
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngwin.def b/scripts/pngwin.def
index 537b84ee4..522b7505c 100644
--- a/scripts/pngwin.def
+++ b/scripts/pngwin.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.4.6rc02
+;Version 1.4.6
png_build_grayscale_palette
png_chunk_error
png_chunk_warning
View Lorry Controller Status