summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2006-12-04 20:04:02 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2009-04-06 16:12:08 -0500
commit948ee23a2a400672b1751cfc646a7467741e9b2e (patch)
tree6090fb0cf3256dfb4c134e8161c60c9877aa9ee6
parent271a2931b6f4acd581d7e63936c8aed93b96e4b3 (diff)
downloadlibpng-948ee23a2a400672b1751cfc646a7467741e9b2e.tar.gz
Imported from libpng-1.2.15beta3.tarv1.2.15beta3
-rw-r--r--ANNOUNCE29
-rw-r--r--CHANGES3
-rw-r--r--INSTALL16
-rw-r--r--KNOWNBUG2
-rw-r--r--LICENSE4
-rw-r--r--README14
-rw-r--r--Y2KINFO4
-rwxr-xr-xconfigure22
-rw-r--r--configure.ac4
-rw-r--r--libpng.318
-rw-r--r--libpng.txt6
-rw-r--r--libpngpf.34
-rw-r--r--png.52
-rw-r--r--png.c4
-rw-r--r--png.h20
-rw-r--r--pngconf.h2
-rw-r--r--pngtest.c2
-rw-r--r--pngwutil.c7
-rwxr-xr-xscripts/libpng-config-head.in2
-rw-r--r--scripts/libpng.pc-configure.in2
-rw-r--r--scripts/libpng.pc.in2
-rw-r--r--scripts/makefile.32sunu2
-rw-r--r--scripts/makefile.64sunu2
-rw-r--r--scripts/makefile.aix2
-rw-r--r--scripts/makefile.beos2
-rw-r--r--scripts/makefile.cygwin2
-rw-r--r--scripts/makefile.darwin2
-rw-r--r--scripts/makefile.dec2
-rw-r--r--scripts/makefile.elf2
-rw-r--r--scripts/makefile.gcmmx2
-rw-r--r--scripts/makefile.hp642
-rw-r--r--scripts/makefile.hpgcc2
-rw-r--r--scripts/makefile.hpux2
-rw-r--r--scripts/makefile.linux2
-rw-r--r--scripts/makefile.mingw2
-rw-r--r--scripts/makefile.ne12bsd2
-rw-r--r--scripts/makefile.netbsd2
-rw-r--r--scripts/makefile.openbsd2
-rw-r--r--scripts/makefile.sco2
-rw-r--r--scripts/makefile.sggcc2
-rw-r--r--scripts/makefile.sgi2
-rw-r--r--scripts/makefile.so92
-rw-r--r--scripts/makefile.solaris2
-rw-r--r--scripts/pngos2.def2
-rw-r--r--scripts/pngw32.def2
45 files changed, 113 insertions, 104 deletions
diff --git a/ANNOUNCE b/ANNOUNCE
index b59280882..20c9c9608 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.2.15beta2 - December 3, 2006
+Libpng 1.2.15beta3 - December 5, 2006
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.
@@ -9,32 +9,32 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- libpng-1.2.15beta2.tar.gz
- libpng-1.2.15beta2.tar.bz2
+ libpng-1.2.15beta3.tar.gz
+ libpng-1.2.15beta3.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- libpng-1.2.15beta2-no-config.tar.gz
- libpng-1.2.15beta2-no-config.tar.bz2
+ libpng-1.2.15beta3-no-config.tar.gz
+ libpng-1.2.15beta3-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp1215b02.zip
- lp1215b02.tar.bz2
+ lp1215b03.zip
+ lp1215b03.tar.bz2
Project files
- libpng-1.2.15beta2-project-netware.zip
- libpng-1.2.15beta2-project-wince.zip
+ libpng-1.2.15beta3-project-netware.zip
+ libpng-1.2.15beta3-project-wince.zip
Other information:
- libpng-1.2.15beta2-README.txt
- libpng-1.2.15beta2-KNOWNBUGS.txt
- libpng-1.2.15beta2-LICENSE.txt
- libpng-1.2.15beta2-Y2K-compliance.txt
+ libpng-1.2.15beta3-README.txt
+ libpng-1.2.15beta3-KNOWNBUGS.txt
+ libpng-1.2.15beta3-LICENSE.txt
+ libpng-1.2.15beta3-Y2K-compliance.txt
Changes since the last public release (1.2.14):
@@ -45,6 +45,9 @@ version 1.2.15beta1 [December 3, 2006]
version 1.2.15beta2 [December 3, 2006]
Always export MMX asm functions, just stubs if not building pnggccrd.c
+version 1.2.15beta3 [December 5, 2006]
+ Add "png_bytep" typecast to profile while calculating length in pngwutil.c
+
Send comments/corrections/commendations 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 e0f5fba3a..30b51cd44 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1647,6 +1647,9 @@ version 1.2.15beta1 [December 3, 2006]
version 1.2.15beta2 [December 3, 2006]
Always export MMX asm functions, just stubs if not building pnggccrd.c
+version 1.2.15beta3 [December 5, 2006]
+ Add "png_bytep" typecast to profile while calculating length in pngwutil.c
+
Send comments/corrections/commendations 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 dc3dbe370..b40b5b6f3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.2.15beta2 - December 3, 2006
+Installing libpng version 1.2.15beta3 - December 5, 2006
On Unix/Linux and similar systems, you can simply type
@@ -37,7 +37,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.2.15beta2" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.2.15beta3" or "lpng109" and "zlib-1.2.1"
or "zlib121") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this:
@@ -93,11 +93,11 @@ include
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng12.so.0.1.2.15beta2)
+ gcc, creates libpng12.so.0.1.2.15beta3)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.15beta2)
+ (gcc, creates libpng12.so.0.1.2.15beta3)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.15beta2,
+ (gcc, creates libpng12.so.0.1.2.15beta3,
uses assembler code tuned for Intel MMX platform)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
@@ -120,12 +120,12 @@ include
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.sggcc => Silicon Graphics (gcc,
- creates libpng12.so.0.1.2.15beta2)
+ creates libpng12.so.0.1.2.15beta3)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng12.so.0.1.2.15beta2)
+ creates libpng12.so.0.1.2.15beta3)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng12.so.0.1.2.15beta2)
+ creates libpng12.so.0.1.2.15beta3)
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/KNOWNBUG b/KNOWNBUG
index cf6ae4cdd..3a16b23b0 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.2.15beta2
+Known bugs in libpng version 1.2.15beta3
1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when
reading interlaced PNG files, when assembler code is enabled but running
diff --git a/LICENSE b/LICENSE
index faeb6e496..557637200 100644
--- a/LICENSE
+++ b/LICENSE
@@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.2.6, August 15, 2004, through 1.2.15beta2, December 3, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.15beta3, December 5, 2006, are
Copyright (c) 2004, 2006 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
@@ -106,4 +106,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-December 3, 2006
+December 5, 2006
diff --git a/README b/README
index a88f399f7..6b01a33d4 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.2.15beta2 - December 3, 2006 (shared library 12.0)
+README for libpng version 1.2.15beta3 - December 5, 2006 (shared library 12.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@@ -190,11 +190,11 @@ Files in this distribution:
descrip.mms => VMS makefile for MMS or MMK
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng12.so.0.1.2.15beta2)
+ gcc, creates libpng12.so.0.1.2.15beta3)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.15beta2)
+ (gcc, creates libpng12.so.0.1.2.15beta3)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.15beta2,
+ (gcc, creates libpng12.so.0.1.2.15beta3,
uses assembler code tuned for Intel MMX platform)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
@@ -216,12 +216,12 @@ Files in this distribution:
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
- (gcc, creates libpng12.so.0.1.2.15beta2)
+ (gcc, creates libpng12.so.0.1.2.15beta3)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng12.so.0.1.2.15beta2)
+ (gcc, creates libpng12.so.0.1.2.15beta3)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng12.so.0.1.2.15beta2)
+ (gcc, creates libpng12.so.0.1.2.15beta3)
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/Y2KINFO b/Y2KINFO
index 4593b3773..d6d708702 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- December 3, 2006
+ December 5, 2006
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.2.15beta2 are Y2K compliant. It is my belief that earlier
+ upward through 1.2.15beta3 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
diff --git a/configure b/configure
index b60c4d027..75b5e8323 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.61 for libpng 1.2.15beta2.
+# Generated by GNU Autoconf 2.61 for libpng 1.2.15beta3.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.2.15beta2'
-PACKAGE_STRING='libpng 1.2.15beta2'
+PACKAGE_VERSION='1.2.15beta3'
+PACKAGE_STRING='libpng 1.2.15beta3'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
@@ -1404,7 +1404,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.2.15beta2 to adapt to many kinds of systems.
+\`configure' configures libpng 1.2.15beta3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1474,7 +1474,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng 1.2.15beta2:";;
+ short | recursive ) echo "Configuration of libpng 1.2.15beta3:";;
esac
cat <<\_ACEOF
@@ -1584,7 +1584,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.2.15beta2
+libpng configure 1.2.15beta3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1598,7 +1598,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.2.15beta2, which was
+It was created by libpng $as_me 1.2.15beta3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2268,7 +2268,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.2.15beta2'
+ VERSION='1.2.15beta3'
cat >>confdefs.h <<_ACEOF
@@ -2439,7 +2439,7 @@ fi
-PNGLIB_VERSION=1.2.15beta2
+PNGLIB_VERSION=1.2.15beta3
PNGLIB_MAJOR=12
PNGLIB_MINOR=15
@@ -21116,7 +21116,7 @@ exec 6>&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.2.15beta2, which was
+This file was extended by libpng $as_me 1.2.15beta3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21169,7 +21169,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libpng config.status 1.2.15beta2
+libpng config.status 1.2.15beta3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 0c5f092f5..ea3a42b71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@ AC_PREREQ(2.59)
dnl Version number stuff here:
-AC_INIT([libpng], [1.2.15beta2], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.2.15beta3], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.2.15beta2
+PNGLIB_VERSION=1.2.15beta3
PNGLIB_MAJOR=12
PNGLIB_MINOR=15
diff --git a/libpng.3 b/libpng.3
index 99a75cff4..f4810b011 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "December 3, 2006"
+.TH LIBPNG 3 "December 5, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.15beta2
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.15beta3
.SH SYNOPSIS
\fB
#include <png.h>\fP
@@ -410,7 +410,7 @@ Following is a copy of the libpng.txt file that accompanies libpng.
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.15beta2 - December 3, 2006
+ libpng version 1.2.15beta3 - December 5, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -3327,13 +3327,13 @@ application:
.SH IX. Y2K Compliance in libpng
-December 3, 2006
+December 5, 2006
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.2.15beta2 are Y2K compliant. It is my belief that earlier
+upward through 1.2.15beta3 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
@@ -3506,7 +3506,7 @@ the first widely used release:
1.2.14beta1-2 13 10214 12.so.0.14[.0]
1.0.22rc1 10 10022 10.so.0.22[.0]
1.2.14rc1 13 10214 12.so.0.14[.0]
- 1.2.15beta1-2 13 10215 12.so.0.15[.0]
+ 1.2.15beta1-3 13 10215 12.so.0.15[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3562,7 +3562,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.15beta2 - December 3, 2006:
+Libpng version 1.2.15beta3 - December 5, 2006:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -3583,7 +3583,7 @@ included in the libpng distribution, the latter shall prevail.)
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.2.6, August 15, 2004, through 1.2.15beta2, December 3, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.15beta3, December 5, 2006, are
Copyright (c) 2004-2006 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
@@ -3682,7 +3682,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-December 3, 2006
+December 5, 2006
.\" end of man page
diff --git a/libpng.txt b/libpng.txt
index ef52c08c9..bfe54f6aa 100644
--- a/libpng.txt
+++ b/libpng.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.15beta2 - December 3, 2006
+ libpng version 1.2.15beta3 - December 5, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -2917,13 +2917,13 @@ application:
IX. Y2K Compliance in libpng
-December 3, 2006
+December 5, 2006
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.2.15beta2 are Y2K compliant. It is my belief that earlier
+upward through 1.2.15beta3 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/libpngpf.3 b/libpngpf.3
index c0b6cb329..d67e4f1a3 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "December 3, 2006"
+.TH LIBPNGPF 3 "December 5, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.15beta2
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.15beta3
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index acc53ff95..285634084 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "December 3, 2006"
+.TH PNG 5 "December 5, 2006"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 9d58a6f8c..8b7189e08 100644
--- a/png.c
+++ b/png.c
@@ -13,7 +13,7 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_15beta2 Your_png_h_is_not_version_1_2_15beta2;
+typedef version_1_2_15beta3 Your_png_h_is_not_version_1_2_15beta3;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@@ -701,7 +701,7 @@ png_charp PNGAPI
png_get_copyright(png_structp png_ptr)
{
if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */
- return ((png_charp) "\n libpng version 1.2.15beta2 - December 3, 2006\n\
+ return ((png_charp) "\n libpng version 1.2.15beta3 - December 5, 2006\n\
Copyright (c) 1998-2006 Glenn Randers-Pehrson\n\
Copyright (c) 1996-1997 Andreas Dilger\n\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
diff --git a/png.h b/png.h
index 7c3f8d7a2..f54ac79f4 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.15beta2 - December 3, 2006
+ * libpng version 1.2.15beta3 - December 5, 2006
* Copyright (c) 1998-2006 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.)
@@ -9,7 +9,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.2.15beta2 - December 3, 2006: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.15beta3 - December 5, 2006: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -134,7 +134,7 @@
* 1.2.14rc1 13 10214 12.so.0.14[.0]
* 1.0.22 10 10022 10.so.0.22[.0]
* 1.2.14 13 10214 12.so.0.14[.0]
- * 1.2.15beta1-2 13 10215 12.so.0.15[.0]
+ * 1.2.15beta1-3 13 10215 12.so.0.15[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -164,7 +164,7 @@
* If you modify libpng you may insert additional notices immediately following
* this sentence.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.2.15beta2, December 3, 2006, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.15beta3, December 5, 2006, are
* Copyright (c) 2004, 2006 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:
@@ -276,13 +276,13 @@
* Y2K compliance in libpng:
* =========================
*
- * December 3, 2006
+ * December 5, 2006
*
* 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.2.15beta2 are Y2K compliant. It is my belief that earlier
+ * upward through 1.2.15beta3 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
@@ -338,9 +338,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.15beta2"
+#define PNG_LIBPNG_VER_STRING "1.2.15beta3"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.15beta2 - December 3, 2006 (header)\n"
+ " libpng version 1.2.15beta3 - December 5, 2006 (header)\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@@ -352,7 +352,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 2
+#define PNG_LIBPNG_VER_BUILD 3
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -1382,7 +1382,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_2_15beta2;
+typedef png_structp version_1_2_15beta3;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index e8626b6d6..a6d409568 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.2.15beta2 - December 3, 2006
+ * libpng version 1.2.15beta3 - December 5, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2005 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngtest.c b/pngtest.c
index cda324837..53bf7c831 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1549,4 +1549,4 @@ main(int argc, char *argv[])
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_15beta2 your_png_h_is_not_version_1_2_15beta2;
+typedef version_1_2_15beta3 your_png_h_is_not_version_1_2_15beta3;
diff --git a/pngwutil.c b/pngwutil.c
index f7e72e36f..7c365ce31 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -757,8 +757,11 @@ png_write_iCCP(png_structp png_ptr, png_charp name, int compression_type,
profile_len = 0;
if (profile_len > 3)
- embedded_profile_len = ((*(profile ))<<24) | ((*(profile+1))<<16) |
- ((*(profile+2))<< 8) | ((*(profile+3)) );
+ embedded_profile_len =
+ ((*( (png_bytep)profile ))<<24) |
+ ((*( (png_bytep)profile+1))<<16) |
+ ((*( (png_bytep)profile+2))<< 8) |
+ ((*( (png_bytep)profile+3)) );
if (profile_len < embedded_profile_len)
{
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index 82998cdb5..9a7e360e3 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
-version=1.2.15beta2
+version=1.2.15beta3
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in
index 5d507a631..599c5ae72 100644
--- a/scripts/libpng.pc-configure.in
+++ b/scripts/libpng.pc-configure.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng12
Name: libpng
Description: Loads and saves PNG files
-Version: 1.2.15beta2
+Version: 1.2.15beta3
Libs: -L${libdir} -lpng12
Cflags: -I${includedir} @LIBPNG_NO_ASSEMBLER@
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index f80c98c04..ac9022972 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng12
Name: libpng
Description: Loads and saves PNG files
-Version: 1.2.15beta2
+Version: 1.2.15beta3
Libs: -L${libdir} -lpng12
Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index f64fe08e5..fae54d2af 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 2f4369a7b..48d0b3a5f 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 32722b9b0..a0101b427 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@ LN_SF = ln -f -s
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 3b168490a..3dd0bfd17 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index e6ea9d500..c9e511593 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -80,7 +80,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 963861453..86c61d9f1 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@ ZLIBINC=../zlib
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index fee433900..728bd9297 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index 9ddf5b704..86a90be9b 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index 335704db7..cd701b65d 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index d1b20b066..8ee2abc83 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index 1b27011cc..04f755603 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 458115638..6f254aa4f 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 71cd60c30..0c87bdeb5 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index ef9c7e853..80bed2f67 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -76,7 +76,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
MINGDLL = 12
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index d7ab05e29..62429bf00 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.15beta2
+SHLIB_MINOR= 1.2.15beta3
SRCS= pnggccrd.c 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 cd43bf586..5f1d2a1ee 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.2.15beta2
+SHLIB_MINOR= 1.2.15beta3
SRCS= pnggccrd.c 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 3c1d1b51e..2769b3e03 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -7,7 +7,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.15beta2
+SHLIB_MINOR= 1.2.15beta3
LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 59125b6ef..ce9d1d3b2 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index b42c64abc..be803aeb3 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index c8859787d..999a11bd8 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index e626fa131..381512293 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index f521b146c..68f22101d 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta2
+PNGMIN = 1.2.15beta3
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 37416c26f..6a013ca77 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.2.15beta2
+; Version 1.2.15beta3
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index 87426f5e5..c436b56f7 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.2.15beta2
+;Version 1.2.15beta3
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3