[legacy] Imported from libpng-1.2.46rc01.tar

This commit is contained in:
Glenn Randers-Pehrson 2011-07-08 06:49:31 -05:00
parent 3341f519f4
commit b973ab0914
53 changed files with 209 additions and 134 deletions

114
ANNOUNCE
View File

@ -1,48 +1,109 @@
Libpng 1.2.45 - July 7, 2011
Libpng 1.2.46rc01 - July 8, 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.2.45.tar.xz (LZMA-compressed, recommended)
libpng-1.2.45.tar.gz
libpng-1.2.45.tar.bz2
libpng-1.2.46rc01.tar.xz (LZMA-compressed, recommended)
libpng-1.2.46rc01.tar.gz
libpng-1.2.46rc01.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
libpng-1.2.45-no-config.tar.xz (LZMA-compressed, recommended)
libpng-1.2.45-no-config.tar.gz
libpng-1.2.45-no-config.tar.bz2
libpng-1.2.46rc01-no-config.tar.xz (LZMA-compressed, recommended)
libpng-1.2.46rc01-no-config.tar.gz
libpng-1.2.46rc01-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lpng1245.zip
lpng1245.7z
lpng1245.tar.bz2
lp1246r01.zip
lp1246r01.7z
lp1246r01.tar.bz2
Project files
libpng-1.2.45-project-netware.zip
libpng-1.2.45-project-wince.zip
libpng-1.2.46rc01-project-netware.zip
libpng-1.2.46rc01-project-wince.zip
Other information:
libpng-1.2.45-README.txt
libpng-1.2.45-KNOWNBUGS.txt
libpng-1.2.45-LICENSE.txt
libpng-1.2.45-Y2K-compliance.txt
libpng-1.2.45-[previous version]-diff.txt
libpng-1.2.46rc01-README.txt
libpng-1.2.46rc01-KNOWNBUGS.txt
libpng-1.2.46rc01-LICENSE.txt
libpng-1.2.46rc01-Y2K-compliance.txt
libpng-1.2.46rc01-[previous version]-diff.txt
Changes since the last public release (1.2.43):
Changes since the last public release (1.2.42):
version 1.2.45 [July 7, 2011]
version 1.2.43beta01 [January 27, 2010]
Updated CMakeLists.txt for consistent indentation and to avoid an
unclosed if-statement warning (Philip Lowman).
Removed "#ifdef PNG_1_0_X / #endif" surrounding
PNG_READ_16_TO_8_SUPPORTED and PNG_READ_GRAY_TO_RGB_SUPPORTED
in pngconf.h. These were added in libpng-1.2.41beta08 and libpng-1.0.51,
which introduced a binary incompatibility with libpng-1.0.50.
Backported new png_decompress_chunk() algorithm from libpng-1.4.1
version 1.2.43beta02 [February 1, 2010]
Backported two-pass png_decompress_chunk() algorithm from libpng-1.4.1
version 1.2.43beta03 [February 6, 2010]
Backported fast png_push_save_buffer() algorithm from libpng-1.4.1
version 1.2.43beta04 [February 8, 2010]
Reverted recent changes to png_push_save-buffer().
Removed PNGAPI declaration of png_calloc() and png_write_sig() in
1ibpng-1.2.X, introduced by mistake in libpng-1.2.41.
Return allocated "old_buffer" in png_push_save_buffer() before png_error(),
to avoid a potential memory leak.
version 1.2.43beta05 [February 8, 2010]
Ported rewritten png_decompress_chunk() by John Bowler from libpng-1.4.1.
version 1.0.53rc01 and 1.2.43rc01 [February 18, 2010]
No changes.
version 1.0.53rc02 and 1.2.43rc02 [February 19, 2010]
Define _ALL_SOURCE in configure.ac, makefile.aix, and CMakeLists.txt
when using AIX compiler.
version 1.0.53 and 1.2.43 [February 25, 2010]
Removed unused gzio.c from contrib/pngminim gather and makefile scripts
version 1.2.44beta01 [June 18, 2010]
In pngpread.c: png_push_have_row() add check for new_row > height
Removed the now-redundant check for out-of-bounds new_row from example.c
version 1.2.44beta02 [June 19, 2010]
In pngpread.c: png_push_process_row() add check for too many rows.
Removed the now-redundant check for new_row > height in png_push_have_row().
version 1.2.44beta03 [June 20, 2010]
Rewrote png_process_IDAT_data to consistently treat extra data as warnings
and handle end conditions more cleanly.
Removed the new (beta02) check in png_push_process_row().
version 1.2.44rc01 [June 21, 2010]
Revised some comments in png_process_IDAT_data().
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
version 1.2.44rc02 [June 22, 2010]
Stop memory leak when reading a malformed sCAL chunk.
version 1.2.44rc03 [June 23, 2010]
Revised pngpread.c patch of beta05 to avoid an endless loop.
version 1.2.44 [June 26, 2010]
Updated some of the "last changed" dates.
version 1.2.45beta01 [June 7, 2011]
Fixed uninitialized memory read in png_format_buffer() (Bug
report by Frank Busse, related to CVE-2004-0421).
Pass "" instead of '\0' to png_default_error() in png_err(). This mistake
@ -51,10 +112,21 @@ version 1.2.45 [July 7, 2011]
before IDAT.
Ported bugfix in pngrtran.c from 1.5.3: when expanding a paletted image,
always expand to RGBA if transparency is present.
version 1.2.45beta02 [June 8, 2011]
Check for integer overflow in png_set_rgb_to_gray().
version 1.2.45beta03 [June 19, 2011]
Check for sCAL chunk too short.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
version 1.2.45rc01 and 1.0.55rc01 [June 30, 2011]
Updated "last changed" dates and copyright year.
version 1.2.45 and 1.0.55 [July 7, 2011]
No changes.
version 1.2.46rc01 and 1.0.56rc01 [July 8, 2011]
Reverted changes to Makefile.am and Makefile.in to libpng-1.2.44 versions.
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement

View File

@ -2726,6 +2726,9 @@ version 1.2.45rc01 and 1.0.55rc01 [June 30, 2011]
version 1.2.45 and 1.0.55 [July 7, 2011]
No changes.
version 1.2.46rc01 and 1.0.56rc01 [July 8, 2011]
Reverted changes to Makefile.am and Makefile.in to libpng-1.2.44 versions.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement

View File

@ -22,7 +22,7 @@ enable_testing()
set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 2)
set(PNGLIB_RELEASE 45)
set(PNGLIB_RELEASE 46)
set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
@ -215,7 +215,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/libpng-config.in
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
# VERSION 0.${PNGLIB_RELEASE}.1.2.45
# VERSION 0.${PNGLIB_RELEASE}.1.2.46rc01
VERSION 0.${PNGLIB_RELEASE}.0
SOVERSION 0
CLEAN_DIRECT_OUTPUT 1)

View File

@ -1,5 +1,5 @@
Installing libpng version 1.2.45 - July 7, 2011
Installing libpng version 1.2.46rc01 - July 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.2.45" or "libpng12" and "zlib-1.2.3"
might be called "libpng-1.2.46rc01" or "libpng12" and "zlib-1.2.3"
or "zlib123") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this:

View File

@ -1,5 +1,5 @@
Known bugs in libpng version 1.2.45
Known bugs in libpng version 1.2.46rc01
1. February 23, 2006: The custom makefiles don't build libpng with -lz.

View File

@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.2.45, July 7, 2011, are
libpng versions 1.2.6, August 15, 2004, through 1.2.46rc01, July 8, 2011, are
Copyright (c) 2004, 2006-2009 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
July 7, 2011
July 8, 2011

View File

@ -86,7 +86,7 @@ EXTRA_DIST= \
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
example.c libpng-1.2.45.txt pngvcrd.c
example.c libpng-1.2.46rc01.txt pngvcrd.c
CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \
libpng.sym
@ -102,8 +102,7 @@ $(PNGLIB_BASENAME)-config: libpng-config
libpng.sym: png.h pngconf.h
rm -f $@ $@.new
$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h $(srcdir)/$@
cat $(srcdir)/$@ | \
$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \
$(SED) -n -e \
's|^.*PNG_FUNCTION_EXPORT[ ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \
-e 's|^.*PNG_DATA_EXPORT[ ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \

View File

@ -351,7 +351,7 @@ EXTRA_DIST = \
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
example.c libpng-1.2.45.txt pngvcrd.c
example.c libpng-1.2.46rc01.txt pngvcrd.c
CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers \
libpng.sym
@ -1354,8 +1354,7 @@ $(PNGLIB_BASENAME)-config: libpng-config
libpng.sym: png.h pngconf.h
rm -f $@ $@.new
$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h $(srcdir)/$@
cat $(srcdir)/$@ | \
$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \
$(SED) -n -e \
's|^.*PNG_FUNCTION_EXPORT[ ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \
-e 's|^.*PNG_DATA_EXPORT[ ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \

14
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.2.45 - July 7, 2011 (shared library 12.0)
README for libpng version 1.2.46rc01 - July 8, 2011 (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.
@ -199,11 +199,11 @@ Files in this distribution:
makefile.std => Generic UNIX makefile (cc, creates static
libpng.a)
makefile.elf => Linux/ELF gcc makefile symbol versioning,
creates libpng12.so.0.1.2.45)
creates libpng12.so.0.1.2.46rc01)
makefile.linux => Linux/ELF makefile (gcc, creates
libpng12.so.0.1.2.45)
libpng12.so.0.1.2.46rc01)
makefile.gcmmx => Linux/ELF makefile (gcc, creates
libpng12.so.0.1.2.45, previously
libpng12.so.0.1.2.46rc01, previously
used assembler code tuned for Intel MMX
platform)
makefile.gcc => Generic makefile (gcc, creates static
@ -228,12 +228,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.45)
(gcc, creates libpng12.so.0.1.2.46rc01)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng12.so.0.1.2.45)
(gcc, creates libpng12.so.0.1.2.46rc01)
makefile.so9 => Solaris 9 makefile
(gcc, creates libpng12.so.0.1.2.45)
(gcc, creates libpng12.so.0.1.2.46rc01)
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

View File

@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
July 7, 2011
July 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.2.45 are Y2K compliant. It is my belief that earlier
upward through 1.2.46rc01 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

24
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for libpng 1.2.45.
# Generated by GNU Autoconf 2.65 for libpng 1.2.46rc01.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@ -701,8 +701,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.2.45'
PACKAGE_STRING='libpng 1.2.45'
PACKAGE_VERSION='1.2.46rc01'
PACKAGE_STRING='libpng 1.2.46rc01'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL=''
@ -1435,7 +1435,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.45 to adapt to many kinds of systems.
\`configure' configures libpng 1.2.46rc01 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1505,7 +1505,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.2.45:";;
short | recursive ) echo "Configuration of libpng 1.2.46rc01:";;
esac
cat <<\_ACEOF
@ -1612,7 +1612,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.2.45
libpng configure 1.2.46rc01
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@ -2037,7 +2037,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.45, which was
It was created by libpng $as_me 1.2.46rc01, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@ -2845,7 +2845,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.2.45'
VERSION='1.2.46rc01'
cat >>confdefs.h <<_ACEOF
@ -2909,10 +2909,10 @@ fi
PNGLIB_VERSION=1.2.45
PNGLIB_VERSION=1.2.46rc01
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=45
PNGLIB_RELEASE=46
@ -12079,7 +12079,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.2.45, which was
This file was extended by libpng $as_me 1.2.46rc01, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -12145,7 +12145,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.2.45
libpng config.status 1.2.46rc01
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"

View File

@ -18,15 +18,15 @@ AC_PREREQ(2.59)
dnl Version number stuff here:
AC_INIT([libpng], [1.2.45], [png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng], [1.2.46rc01], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
PNGLIB_VERSION=1.2.45
PNGLIB_VERSION=1.2.46rc01
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=45
PNGLIB_RELEASE=46
dnl End of version number stuff

View File

@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
libpng version 1.2.45 - July 7, 2011
libpng version 1.2.46rc01 - July 8, 2011
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 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.2.45 - July 7, 2011
libpng versions 0.97, January 1998, through 1.2.46rc01 - July 8, 2011
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@ -878,7 +878,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.2.45, not all possible expansions are supported.
As of libpng version 1.2.46rc01, 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
@ -3179,13 +3179,13 @@ Other rules can be inferred by inspecting the libpng source.
XIII. Y2K Compliance in libpng
July 7, 2011
July 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.2.45 are Y2K compliant. It is my belief that earlier
upward through 1.2.46rc01 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

View File

@ -1,6 +1,6 @@
.TH LIBPNG 3 "July 7, 2011"
.TH LIBPNG 3 "July 8, 2011"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.45
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.46rc01
.SH SYNOPSIS
\fI\fB
@ -821,7 +821,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.45 - July 7, 2011
libpng version 1.2.46rc01 - July 8, 2011
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@ -832,7 +832,7 @@ libpng.txt - A description on how to use and modify libpng
Based on:
libpng versions 0.97, January 1998, through 1.2.45 - July 7, 2011
libpng versions 0.97, January 1998, through 1.2.46rc01 - July 8, 2011
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@ -1699,7 +1699,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.2.45, not all possible expansions are supported.
As of libpng version 1.2.46rc01, 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
@ -4000,13 +4000,13 @@ Other rules can be inferred by inspecting the libpng source.
.SH XIII. Y2K Compliance in libpng
July 7, 2011
July 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.2.45 are Y2K compliant. It is my belief that earlier
upward through 1.2.46rc01 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
@ -4312,6 +4312,7 @@ the first widely used release:
1.2.45rc01 13 10245 12.so.0.45[.0]
1.0.55 10 10055 10.so.0.55[.0]
1.2.45 13 10245 12.so.0.45[.0]
1.2.46rc01 13 10246 12.so.0.46[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@ -4367,7 +4368,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.2.45 - July 7, 2011:
Libpng version 1.2.46rc01 - July 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).
@ -4390,7 +4391,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.2.45, July 7, 2011, are
libpng versions 1.2.6, August 15, 2004, through 1.2.46rc01, July 8, 2011, are
Copyright (c) 2004,2006-2008 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
@ -4489,7 +4490,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
July 7, 2011
July 8, 2011
.\" end of man page

View File

@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "July 7, 2011"
.TH LIBPNGPF 3 "July 8, 2011"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.45
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.46rc01
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "July 7, 2011"
.TH PNG 5 "July 8, 2011"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION

6
png.c
View File

@ -17,7 +17,7 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_2_45 Your_png_h_is_not_version_1_2_45;
typedef version_1_2_46rc01 Your_png_h_is_not_version_1_2_46rc01;
/* Version information for C files. This had better match the version
* string defined in png.h.
@ -724,13 +724,13 @@ png_get_copyright(png_structp png_ptr)
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
"libpng version 1.2.45 - July 7, 2011" PNG_STRING_NEWLINE \
"libpng version 1.2.46rc01 - July 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.2.45 - July 7, 2011\
return ((png_charp) "libpng version 1.2.46rc01 - July 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.");

25
png.h
View File

@ -1,6 +1,6 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.2.45 - July 7, 2011
* libpng version 1.2.46rc01 - July 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.)
@ -10,7 +10,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.45 - July 7, 2011: Glenn
* libpng versions 0.97, January 1998, through 1.2.46rc01 - July 8, 2011: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -267,6 +267,7 @@
* 1.2.45rc01 13 10245 12.so.0.45[.0]
* 1.0.55 13 10055 10.so.0.55[.0]
* 1.2.45 13 10245 12.so.0.45[.0]
* 1.2.46rc01 13 10246 12.so.0.46[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@ -298,7 +299,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.2.45, July 7, 2011, are
* libpng versions 1.2.6, August 15, 2004, through 1.2.46rc01, July 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:
@ -410,13 +411,13 @@
* Y2K compliance in libpng:
* =========================
*
* July 7, 2011
* July 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.2.45 are Y2K compliant. It is my belief that earlier
* upward through 1.2.46rc01 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
@ -472,9 +473,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.45"
#define PNG_LIBPNG_VER_STRING "1.2.46rc01"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.2.45 - July 7, 2011\n"
" libpng version 1.2.46rc01 - July 8, 2011\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@ -482,12 +483,12 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 2
#define PNG_LIBPNG_VER_RELEASE 45
#define PNG_LIBPNG_VER_RELEASE 46
/* 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
@ -504,7 +505,7 @@
#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
PNG_LIBPNG_BUILD_PRIVATE */
#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC
/* Careful here. At one time, Guy wanted to use 082, but that would be octal.
* We must not include leading zeros.
@ -512,7 +513,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 10245 /* 1.2.45 */
#define PNG_LIBPNG_VER 10246 /* 1.2.46 */
#ifndef PNG_VERSION_INFO_ONLY
/* Include the compression library's header */
@ -1552,7 +1553,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_45;
typedef png_structp version_1_2_46rc01;
typedef png_struct FAR * FAR * png_structpp;

View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.2.45 - July 7, 2011
* libpng version 1.2.46rc01 - July 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.)

View File

@ -1702,4 +1702,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_45 your_png_h_is_not_version_1_2_45;
typedef version_1_2_46rc01 your_png_h_is_not_version_1_2_46rc01;

View File

@ -1,6 +1,6 @@
A set of project files is available for WinCE. Get
libpng-1.2.45-project-wince.zip from a libpng distribution
libpng-1.2.46rc01-project-wince.zip from a libpng distribution
site such as http://libpng.sourceforge.net/index.html
Put the zip file in this directory (projects) and then run
"unzip -a libpng-1.2.45-project-wince.zip"
"unzip -a libpng-1.2.46rc01-project-wince.zip"

View File

@ -222,7 +222,7 @@
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 3;
DYLIB_CURRENT_VERSION = 3;
FRAMEWORK_VERSION = 1.2.45;
FRAMEWORK_VERSION = 1.2.46rc01;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
INFOPLIST_FILE = Info.plist;
@ -240,7 +240,7 @@
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 3;
DYLIB_CURRENT_VERSION = 3;
FRAMEWORK_VERSION = 1.2.45;
FRAMEWORK_VERSION = 1.2.46rc01;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
INFOPLIST_FILE = Info.plist;

View File

@ -1,8 +1,8 @@
Makefiles for libpng version 1.2.45 - July 7, 2011
Makefiles for libpng version 1.2.46rc01 - July 8, 2011
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.45)
(gcc, creates libpng12.so.0.1.2.46rc01)
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.2.45 - July 7, 2011
makefile.dec => DEC Alpha UNIX makefile
makefile.dj2 => DJGPP 2 makefile
makefile.elf => Linux/ELF makefile symbol versioning,
gcc, creates libpng12.so.0.1.2.45)
gcc, creates libpng12.so.0.1.2.46rc01)
makefile.freebsd => FreeBSD makefile
makefile.gcc => Generic gcc makefile
makefile.gccmmx => Generic gcc makefile previously using MMX code
@ -38,14 +38,14 @@ Makefiles for libpng version 1.2.45 - July 7, 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 libpng12.so.0.1.2.45)
creates libpng12.so.0.1.2.46rc01)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng12.so.0.1.2.45)
creates libpng12.so.0.1.2.46rc01)
makefile.solaris-x86 => Solaris 2.X makefile (gcc, no MMX code,
creates libpng12.so.0.1.2.45)
creates libpng12.so.0.1.2.46rc01)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng12.so.0.1.2.45)
creates libpng12.so.0.1.2.46rc01)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile

View File

@ -11,7 +11,7 @@
# Modeled after libxml-config.
version=1.2.45
version=1.2.46rc01
prefix=""
libdir=""
libs=""

View File

@ -5,6 +5,6 @@ includedir=@includedir@/libpng12
Name: libpng
Description: Loads and saves PNG files
Version: 1.2.45
Version: 1.2.46rc01
Libs: -L${libdir} -lpng12
Cflags: -I${includedir}

View File

@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -23,7 +23,7 @@ LN_SF = ln -f -s
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local

View File

@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -23,7 +23,7 @@
VERMAJ = 1
VERMIN = 2
VERMIC = 45
VERMIC = 46
VER = $(VERMAJ).$(VERMIN).$(VERMIC)
NAME = libpng
PACKAGE = $(NAME)-$(VER)

View File

@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll

View File

@ -22,7 +22,7 @@ ZLIBINC=../zlib
# Library name:
LIBNAME = libpng12
PNGMAJ = 12
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12

View File

@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -17,7 +17,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -81,7 +81,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
MINGDLL = 12
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll

View File

@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
LIB= png12
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.45
SHLIB_MINOR= 1.2.46rc01
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

View File

@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB= png
SHLIB_MAJOR= 3
SHLIB_MINOR= 1.2.45
SHLIB_MINOR= 1.2.46rc01
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

View File

@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.45
SHLIB_MINOR= 1.2.46rc01
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \

View File

@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -9,7 +9,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -9,7 +9,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -11,7 +11,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12

View File

@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.45
PNGMIN = 1.2.46rc01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

View File

@ -5,7 +5,7 @@
LIBRARY lpngce
EXPORTS
;Version 1.2.45
;Version 1.2.46rc01
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3

View File

@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
; Version 1.2.45
; Version 1.2.46rc01
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"

View File

@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 1.2.45
;Version 1.2.46rc01
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3