[master] Imported from libpng-1.4.6beta03.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 8472233..8339278 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.4.6beta02 - January 15, 2011
+Libpng 1.4.6beta03 - January 15, 2011
This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version.
@@ -9,24 +9,24 @@
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- 1.4.6beta02.tar.xz (LZMA-compressed, recommended)
- 1.4.6beta02.tar.gz
- 1.4.6beta02.tar.bz2
+ 1.4.6beta03.tar.xz (LZMA-compressed, recommended)
+ 1.4.6beta03.tar.gz
+ 1.4.6beta03.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp146b02.7z (LZMA-compressed, recommended)
- lp146b02.zip
+ lp146b03.7z (LZMA-compressed, recommended)
+ lp146b03.zip
Other information:
- 1.4.6beta02-README.txt
- 1.4.6beta02-LICENSE.txt
+ 1.4.6beta03-README.txt
+ 1.4.6beta03-LICENSE.txt
Changes since the last public release (1.4.5):
-Version 1.4.6beta01 [December 29, 2010]
+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).
@@ -35,7 +35,8 @@
Fixed misspelled macros in contrib/pngminim (Cosmin)
Updated CMakeLists.txt (Clifford Yapp)
-version 1.4.6rc01 [January 15, 2011]
+version 1.4.6beta03 [January 15, 2011]
+ Fixed some typecasts in png_debug statements (Cosmin).
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 2c17dec..94d9527 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2741,10 +2741,11 @@
png_ptr->flags) (David Raymond).
version 1.4.6beta02 [January 14, 2011]
- Fixed misspelled macros in contrib/pngminim (Cosmin)
- Updated CMakeLists.txt (Clifford Yapp)
+ Fixed misspelled macros in contrib/pngminim (Cosmin).
+ Updated CMakeLists.txt (Clifford Yapp).
-version 1.4.6rc01 [January 15, 2011]
+version 1.4.6beta03 [January 15, 2011]
+ Fixed some typecasts in png_debug statements (Cosmin).
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/CMakeLists.txt b/CMakeLists.txt
index c3a4840..a476966 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -255,7 +255,7 @@
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 14.${PNGLIB_RELEASE}.1.4.6beta02
+# VERSION 14.${PNGLIB_RELEASE}.1.4.6beta03
VERSION 14.${PNGLIB_RELEASE}.0
SOVERSION 14
CLEAN_DIRECT_OUTPUT 1)
diff --git a/INSTALL b/INSTALL
index 5de9df7..242f06a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.4.6beta02 - January 15, 2011
+Installing libpng version 1.4.6beta03 - January 15, 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.6beta02" or "libpng14" and "zlib-1.2.3"
+might be called "libpng-1.4.6beta03" 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 63a58a1..c755501 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.4.6beta02, January 15, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.6beta03, January 15, 2011, are
Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
diff --git a/README b/README
index ab8f4d5..a72c5dd 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.4.6beta02 - January 15, 2011 (shared library 14.0)
+README for libpng version 1.4.6beta03 - January 15, 2011 (shared library 14.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@@ -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.6beta02)
+ (gcc, creates libpng14.so.14.1.4.6beta03)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.14.1.4.6beta02)
+ (gcc, creates libpng14.so.14.1.4.6beta03)
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.6beta02)
+ (gcc, creates libpng14.so.14.1.4.6beta03)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng14.so.14.1.4.6beta02)
+ (gcc, creates libpng14.so.14.1.4.6beta03)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng14.so.14.1.4.6beta02)
+ (gcc, creates libpng14.so.14.1.4.6beta03)
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 cb7a1a5..d398ca4 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.6beta02.
+# Generated by GNU Autoconf 2.65 for libpng 1.4.6beta03.
#
# 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.6beta02'
-PACKAGE_STRING='libpng 1.4.6beta02'
+PACKAGE_VERSION='1.4.6beta03'
+PACKAGE_STRING='libpng 1.4.6beta03'
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.6beta02 to adapt to many kinds of systems.
+\`configure' configures libpng 1.4.6beta03 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.6beta02:";;
+ short | recursive ) echo "Configuration of libpng 1.4.6beta03:";;
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.6beta02
+libpng configure 1.4.6beta03
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.6beta02, which was
+It was created by libpng $as_me 1.4.6beta03, 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.6beta02'
+ VERSION='1.4.6beta03'
cat >>confdefs.h <<_ACEOF
@@ -2764,7 +2764,7 @@
-PNGLIB_VERSION=1.4.6beta02
+PNGLIB_VERSION=1.4.6beta03
PNGLIB_MAJOR=1
PNGLIB_MINOR=4
PNGLIB_RELEASE=6
@@ -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.6beta02, which was
+This file was extended by libpng $as_me 1.4.6beta03, 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.6beta02
+libpng config.status 1.4.6beta03
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 9dbebd7..987c3b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,14 +16,14 @@
dnl stamps are correct
AC_PREREQ(2.59)
-AC_INIT([libpng], [1.4.6beta02], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.4.6beta03], [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.6beta02
+PNGLIB_VERSION=1.4.6beta03
PNGLIB_MAJOR=1
PNGLIB_MINOR=4
PNGLIB_RELEASE=6
diff --git a/libpng-1.4.6beta02.txt b/libpng-1.4.6beta03.txt
similarity index 99%
rename from libpng-1.4.6beta02.txt
rename to libpng-1.4.6beta03.txt
index a4d961c..1475644 100644
--- a/libpng-1.4.6beta02.txt
+++ b/libpng-1.4.6beta03.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.6beta02 - January 15, 2011
+ libpng version 1.4.6beta03 - January 15, 2011
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.4.6beta02 - January 15, 2011
+ libpng versions 0.97, January 1998, through 1.4.6beta03 - January 15, 2011
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -903,7 +903,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.6beta02, not all possible expansions are supported.
+As of libpng version 1.4.6beta03, 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
@@ -3309,7 +3309,7 @@
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.4.6beta02 are Y2K compliant. It is my belief that earlier
+upward through 1.4.6beta03 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 2a440fb..f0c86f8 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
.TH LIBPNG 3 "January 15, 2011"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta02
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta03
.SH SYNOPSIS
\fI\fB
@@ -785,7 +785,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.6beta02 - January 15, 2011
+ libpng version 1.4.6beta03 - January 15, 2011
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -796,7 +796,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.4.6beta02 - January 15, 2011
+ libpng versions 0.97, January 1998, through 1.4.6beta03 - January 15, 2011
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -1688,7 +1688,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.6beta02, not all possible expansions are supported.
+As of libpng version 1.4.6beta03, 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
@@ -4094,7 +4094,7 @@
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.4.6beta02 are Y2K compliant. It is my belief that earlier
+upward through 1.4.6beta03 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
@@ -4286,7 +4286,7 @@
1.4.5beta05-07 14 10405 14.so.14.5[.0]
1.4.5rc02-03 14 10405 14.so.14.5[.0]
1.4.5 14 10405 14.so.14.5[.0]
- 1.4.6beta01-02 14 10406 14.so.14.6[.0]
+ 1.4.6beta01-03 14 10406 14.so.14.6[.0]
1.4.6rc01 14 10406 14.so.14.6[.0]
Henceforth the source version will match the shared-library minor
@@ -4343,7 +4343,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.4.6beta02 - January 15, 2011:
+Libpng version 1.4.6beta03 - January 15, 2011:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -4366,7 +4366,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.4.6beta02, January 15, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.6beta03, January 15, 2011, are
Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
diff --git a/libpngpf.3 b/libpngpf.3
index 4efc7b9..529038a 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "January 15, 2011"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta02
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta03
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.c b/png.c
index 400cd68..2977283 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_6beta02 Your_png_h_is_not_version_1_4_6beta02;
+typedef version_1_4_6beta03 Your_png_h_is_not_version_1_4_6beta03;
/* 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.6beta02 - January 15, 2011" PNG_STRING_NEWLINE \
+ "libpng version 1.4.6beta03 - January 15, 2011" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE);
#else
- return ((png_charp) "libpng version 1.4.6beta02 - January 15, 2011\
+ return ((png_charp) "libpng version 1.4.6beta03 - January 15, 2011\
Copyright (c) 1998-2010 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");
diff --git a/png.h b/png.h
index ea79360..820d30d 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.4.6beta02 - January 15, 2011
+ * libpng version 1.4.6beta03 - January 15, 2011
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -11,7 +11,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- * libpng versions 0.97, January 1998, through 1.4.6beta02 - January 15, 2011: Glenn
+ * libpng versions 0.97, January 1998, through 1.4.6beta03 - January 15, 2011: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -153,7 +153,7 @@
* 1.4.5beta05-07 14 10405 14.so.14.5[.0]
* 1.4.5rc02-03 14 10405 14.so.14.5[.0]
* 1.4.5 14 10405 14.so.14.5[.0]
- * 1.4.6beta01-02 14 10406 14.so.14.6[.0]
+ * 1.4.6beta01-03 14 10406 14.so.14.6[.0]
* 1.4.6rc01 14 10406 14.so.14.6[.0]
*
* Henceforth the source version will match the shared-library major
@@ -186,7 +186,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.4.6beta02, January 15, 2011, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.6beta03, January 15, 2011, are
* Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.2.5
* with the following individual added to the list of Contributing Authors:
@@ -304,7 +304,7 @@
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
- * upward through 1.4.6beta02 are Y2K compliant. It is my belief that earlier
+ * upward through 1.4.6beta03 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 +360,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.4.6beta02"
+#define PNG_LIBPNG_VER_STRING "1.4.6beta03"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.4.6beta02 - January 15, 2011\n"
+ " libpng version 1.4.6beta03 - January 15, 2011\n"
#define PNG_LIBPNG_VER_SONUM 14
#define PNG_LIBPNG_VER_DLLNUM 14
@@ -375,7 +375,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
-#define PNG_LIBPNG_VER_BUILD 02
+#define PNG_LIBPNG_VER_BUILD 03
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -1484,7 +1484,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_6beta02;
+typedef png_structp version_1_4_6beta03;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index 1081470..24a2d50 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.4.6beta02 - January 15, 2011
+ * libpng version 1.4.6beta03 - January 15, 2011
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngpriv.h b/pngpriv.h
index 5c94e68..8d572a6 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
- * libpng version 1.4.6beta02 - January 15, 2011
+ * libpng version 1.4.6beta03 - January 15, 2011
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngread.c b/pngread.c
index 4806448..b2c7391 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,8 +1,8 @@
/* pngread.c - read a PNG file
*
- * Last changed in libpng 1.4.5 [December 9, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [January 14, 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/pngrio.c b/pngrio.c
index cab7114..710f4f0 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,8 +1,8 @@
/* pngrio.c - functions for data input
*
- * Last changed in libpng 1.4.5 [December 9, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [January 14, 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/pngrutil.c b/pngrutil.c
index 5429887..cf04d0b 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,8 +1,8 @@
/* pngrutil.c - utilities to read a PNG file
*
- * Last changed in libpng 1.4.5 [December 9, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [January 14, 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.)
*
@@ -138,7 +138,7 @@
png_memcpy(png_ptr->chunk_name, buf + 4, 4);
png_debug2(0, "Reading %s chunk, length = %lu",
- png_ptr->chunk_name, length);
+ png_ptr->chunk_name, (unsigned long)length);
/* Reset the crc and run it over the chunk name. */
png_reset_crc(png_ptr);
@@ -1726,7 +1726,7 @@
}
png_debug1(2, "Allocating and reading pCAL chunk data (%lu bytes)",
- length + 1);
+ (unsigned long)(length + 1));
png_free(png_ptr, png_ptr->chunkdata);
png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
if (png_ptr->chunkdata == NULL)
@@ -1864,7 +1864,7 @@
}
png_debug1(2, "Allocating and reading sCAL chunk data (%lu bytes)",
- length + 1);
+ (unsigned long)(length + 1));
png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
if (png_ptr->chunkdata == NULL)
{
@@ -2971,7 +2971,8 @@
png_bytep prev_row, int filter)
{
png_debug(1, "in png_read_filter_row");
- png_debug2(2, "row = %lu, filter = %d", png_ptr->row_number, filter);
+ png_debug2(2, "row = %lu, filter = %d",
+ (unsigned long)png_ptr->row_number, filter);
switch (filter)
{
case PNG_FILTER_VALUE_NONE:
@@ -3412,13 +3413,13 @@
png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
- png_debug1(3, "width = %lu,", png_ptr->width);
- png_debug1(3, "height = %lu,", png_ptr->height);
- png_debug1(3, "iwidth = %lu,", png_ptr->iwidth);
- png_debug1(3, "num_rows = %lu,", png_ptr->num_rows);
- png_debug1(3, "rowbytes = %lu,", png_ptr->rowbytes);
+ png_debug1(3, "width = %lu,", (unsigned long)png_ptr->width);
+ png_debug1(3, "height = %lu,", (unsigned long)png_ptr->height);
+ png_debug1(3, "iwidth = %lu,", (unsigned long)png_ptr->iwidth);
+ png_debug1(3, "num_rows = %lu,", (unsigned long)png_ptr->num_rows);
+ png_debug1(3, "rowbytes = %lu,", (unsigned long)png_ptr->rowbytes);
png_debug1(3, "irowbytes = %lu",
- PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1);
+ (unsigned long)PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1);
png_ptr->flags |= PNG_FLAG_ROW_INIT;
}
diff --git a/pngset.c b/pngset.c
index 76f173e..d568c53 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,8 +1,8 @@
/* pngset.c - storage of image information into info struct
*
- * Last changed in libpng 1.4.5 [December 9, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [January 14, 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/pngtest.c b/pngtest.c
index bcf9c3a..6844ae1 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1,8 +1,8 @@
/* pngtest.c - a simple test program to test libpng
*
- * Last changed in libpng 1.4.5 [December 9, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [January 14, 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.)
*
@@ -1687,4 +1687,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_6beta02 your_png_h_is_not_version_1_4_6beta02;
+typedef version_1_4_6beta03 your_png_h_is_not_version_1_4_6beta03;
diff --git a/pngwrite.c b/pngwrite.c
index 0252051..62d1166 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,8 +1,8 @@
/* pngwrite.c - general routines to write a PNG file
*
- * Last changed in libpng 1.4.0 [January 3, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [January 14, 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.)
*
@@ -661,8 +661,8 @@
if (png_ptr == NULL)
return;
- png_debug2(1, "in png_write_row (row %ld, pass %d)",
- png_ptr->row_number, png_ptr->pass);
+ png_debug2(1, "in png_write_row (row %lu, pass %d)",
+ (unsigned long)png_ptr->row_number, png_ptr->pass);
/* Initialize transformations and other stuff if first time */
if (png_ptr->row_number == 0 && png_ptr->pass == 0)
@@ -778,7 +778,8 @@
png_ptr->row_info.width);
png_debug1(3, "row_info->color_type = %d", png_ptr->row_info.color_type);
- png_debug1(3, "row_info->width = %lu", png_ptr->row_info.width);
+ png_debug1(3, "row_info->width = %lu",
+ (unsigned long)png_ptr->row_info.width);
png_debug1(3, "row_info->channels = %d", png_ptr->row_info.channels);
png_debug1(3, "row_info->bit_depth = %d", png_ptr->row_info.bit_depth);
png_debug1(3, "row_info->pixel_depth = %d", png_ptr->row_info.pixel_depth);
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index 8f155f9..55fc0e6 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.4.6beta02 - January 15, 2011
+libpng version 1.4.6beta03 - January 15, 2011
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index aec3929..85394c5 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source and build
*
- * libpng version 1.4.6beta02 - January 15, 2011
+ * libpng version 1.4.6beta03 - January 15, 2011
*
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index 8de340b..464c204 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,8 +1,8 @@
-Makefiles for libpng version 1.4.6beta02 - January 15, 2011
+Makefiles for libpng version 1.4.6beta03 - January 15, 2011
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.14.1.4.6beta02)
+ (gcc, creates libpng14.so.14.1.4.6beta03)
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.6beta02)
+ (gcc, creates libpng14.so.14.1.4.6beta03)
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.6beta02)
+ creates libpng14.so.14.1.4.6beta03)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng14.so.14.1.4.6beta02)
+ creates libpng14.so.14.1.4.6beta03)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng14.so.14.1.4.6beta02)
+ creates libpng14.so.14.1.4.6beta03)
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 736255d..9c4e9b2 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
-version=1.4.6beta02
+version=1.4.6beta03
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 6a64363..562c787 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.6beta02
+Version: 1.4.6beta03
Libs: -L${libdir} -lpng14
Cflags: -I${includedir}
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 1b85662..b2d63ed 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@
LIB= png14
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.6beta02
+SHLIB_MINOR= 1.4.6beta03
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 28f937d..8c3d686 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -17,7 +17,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.4.6beta02
+SHLIB_MINOR= 1.4.6beta03
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 b7d3d07..5dc09a3 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -11,7 +11,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.6beta02
+SHLIB_MINOR= 1.4.6beta03
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/png32ce.def b/scripts/png32ce.def
index 62c8c8a..a25d338 100644
--- a/scripts/png32ce.def
+++ b/scripts/png32ce.def
@@ -15,7 +15,7 @@
png_get_int_32
EXPORTS
-;Version 1.4.6beta02
+;Version 1.4.6beta03
png_build_grayscale_palette @1
; png_check_sig @2
png_chunk_error @3
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 5975870..a280082 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.4.6beta02
+; Version 1.4.6beta03
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngwin.def b/scripts/pngwin.def
index a6a3409..b85b46d 100644
--- a/scripts/pngwin.def
+++ b/scripts/pngwin.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.4.6beta02
+;Version 1.4.6beta03
png_build_grayscale_palette
png_chunk_error
png_chunk_warning
