diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-06-30 20:04:31 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-09-03 12:27:16 -0500 |
commit | 8b1b797f877e50051e62d87c56d32579b075f57d (patch) | |
tree | ca07ffd932b2431bbdf529a648614b220bc53103 | |
parent | b7f5fe143044fbfb22125b00ce16c2bd9323971e (diff) | |
download | libpng-8b1b797f877e50051e62d87c56d32579b075f57d.tar.gz |
[libpng10] Imported from libpng-1.0.55rc01.tarv1.0.55rc01
55 files changed, 278 insertions, 149 deletions
@@ -1,54 +1,127 @@ -Libpng 1.0.54 - July 2, 2010 +Libpng 1.0.55rc01 - June 30, 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.0.54.tar.xz (LZMA-compressed, recommended) - libpng-1.0.54.tar.gz - libpng-1.0.54.tar.bz2 + libpng-1.0.55rc01.tar.xz (LZMA-compressed, recommended) + libpng-1.0.55rc01.tar.gz + libpng-1.0.55rc01.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.0.54-no-config.tar.xz (LZMA-compressed, recommended) - libpng-1.0.54-no-config.tar.gz - libpng-1.0.54-no-config.tar.bz2 + libpng-1.0.55rc01-no-config.tar.xz (LZMA-compressed, recommended) + libpng-1.0.55rc01-no-config.tar.gz + libpng-1.0.55rc01-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng1054.zip - lpng1054.7z - lpng1054.tar.bz2 + lp1055r01.zip + lp1055r01.7z + lp1055r01.tar.bz2 Project files - libpng-1.0.54-project-netware.zip - libpng-1.0.54-project-wince.zip + libpng-1.0.55rc01-project-netware.zip + libpng-1.0.55rc01-project-wince.zip Other information: - libpng-1.0.54-README.txt - libpng-1.0.54-KNOWNBUGS.txt - libpng-1.0.54-LICENSE.txt - libpng-1.0.54-Y2K-compliance.txt + libpng-1.0.55rc01-README.txt + libpng-1.0.55rc01-KNOWNBUGS.txt + libpng-1.0.55rc01-LICENSE.txt + libpng-1.0.55rc01-Y2K-compliance.txt + libpng-1.0.55rc01-[previous version]-diff.txt -Changes since the last public release (1.0.53): +Changes since the last public release (1.0.52): -version 1.0.54 [July 2, 2010] +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 - Rewrote png_process_IDAT_data to consistently treat extra data as warnings - and handle end conditions more cleanly. +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 + was introduced in libpng-1.2.20beta01. + Check for up->location !PNG_AFTER_IDAT when writing unknown chunks + 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. + +Version 1.2.45rc01 and 1.0.55rc01 [June 30, 2011] + Updated "last changed" dates and copyright year. + (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement to subscribe) or to glennrp at users.sourceforge.net @@ -1467,7 +1467,7 @@ version 1.2.9beta5 [March 4, 2006] Removed trailing blanks from source files. Put version and date of latest change in each source file, and changed copyright year accordingly. - More cleanup of configure.ac, Makefile.ac, and associated scripts. + More cleanup of configure.ac, Makefile.am, and associated scripts. Restored scripts/makefile.elf which was inadvertently deleted. version 1.2.9beta6 [March 6, 2006] @@ -2693,6 +2693,25 @@ version 1.2.44rc03 [June 23, 2010] 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 + was introduced in libpng-1.2.20beta01. + Check for up->location !PNG_AFTER_IDAT when writing unknown chunks + 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. + +version 1.2.45rc01 and 1.0.55rc01 [June 30, 2011] + Updated "last changed" dates and copyright year. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement @@ -1,5 +1,5 @@ -Installing libpng version 1.0.54 - July 2, 2010 +Installing libpng version 1.0.55rc01 - June 30, 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.0.54" or "libpng10" and "zlib-1.2.3" +might be called "libpng-1.0.55rc01" or "libpng10" and "zlib-1.2.3" or "zlib123") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.0.54 +Known bugs in libpng version 1.0.55rc01 1. December 4, 2009: The PNG_NO_ERROR_NUMBERS macro was inadvertently defined in libpng-1.2.41/pngconf.h, which may cause a problem with @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.0.54, July 2, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.0.55rc01, June 30, 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 2, 2010 +June 30, 2011 diff --git a/Makefile.am b/Makefile.am index e135d46d4..cee166a50 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,7 +86,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.0.54.txt pngvcrd.c + example.c libpng-1.0.55rc01.txt pngvcrd.c CLEANFILES= pngout.png libpng10.pc libpng10-config libpng.vers \ libpng.sym @@ -102,7 +102,8 @@ $(PNGLIB_BASENAME)-config: libpng-config libpng.sym: png.h pngconf.h rm -f $@ $@.new - $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \ + $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h $(srcdir)/$@ + cat $(srcdir)/$@ | \ $(SED) -n -e \ 's|^.*PNG_FUNCTION_EXPORT[ ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \ -e 's|^.*PNG_DATA_EXPORT[ ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \ diff --git a/Makefile.in b/Makefile.in index df3421fd7..e7af35670 100644 --- a/Makefile.in +++ b/Makefile.in @@ -351,7 +351,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.0.54.txt pngvcrd.c + example.c libpng-1.0.55rc01.txt pngvcrd.c CLEANFILES = pngout.png libpng10.pc libpng10-config libpng.vers \ libpng.sym @@ -1354,7 +1354,8 @@ $(PNGLIB_BASENAME)-config: libpng-config libpng.sym: png.h pngconf.h rm -f $@ $@.new - $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \ + $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h $(srcdir)/$@ + cat $(srcdir)/$@ | \ $(SED) -n -e \ 's|^.*PNG_FUNCTION_EXPORT[ ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \ -e 's|^.*PNG_DATA_EXPORT[ ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \ @@ -1,4 +1,4 @@ -README for libpng version 1.0.54 - July 2, 2010 (shared library 10.0) +README for libpng version 1.0.55rc01 - June 30, 2011 (shared library 10.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 libpng10.so.0.1.0.54) + creates libpng10.so.0.1.0.55rc01) makefile.linux => Linux/ELF makefile (gcc, creates - libpng10.so.0.1.0.54) + libpng10.so.0.1.0.55rc01) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng10.so.0.1.0.54, previously + libpng10.so.0.1.0.55rc01, 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 libpng10.so.0.1.0.54) + (gcc, creates libpng10.so.0.1.0.55rc01) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng10.so.0.1.0.54) + (gcc, creates libpng10.so.0.1.0.55rc01) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng10.so.0.1.0.54) + (gcc, creates libpng10.so.0.1.0.55rc01) 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 @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - July 2, 2010 + June 30, 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.0.54 are Y2K compliant. It is my belief that earlier + upward through 1.0.55rc01 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 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for libpng 1.0.54. +# Generated by GNU Autoconf 2.65 for libpng 1.0.55rc01. # # 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.0.54' -PACKAGE_STRING='libpng 1.0.54' +PACKAGE_VERSION='1.0.55rc01' +PACKAGE_STRING='libpng 1.0.55rc01' 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.0.54 to adapt to many kinds of systems. +\`configure' configures libpng 1.0.55rc01 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.0.54:";; + short | recursive ) echo "Configuration of libpng 1.0.55rc01:";; 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.0.54 +libpng configure 1.0.55rc01 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.0.54, which was +It was created by libpng $as_me 1.0.55rc01, 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.0.54' + VERSION='1.0.55rc01' cat >>confdefs.h <<_ACEOF @@ -2909,10 +2909,10 @@ fi -PNGLIB_VERSION=1.0.54 +PNGLIB_VERSION=1.0.55rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 -PNGLIB_RELEASE=54 +PNGLIB_RELEASE=55 @@ -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.0.54, which was +This file was extended by libpng $as_me 1.0.55rc01, 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.0.54 +libpng config.status 1.0.55rc01 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 8d6b865ef..50107a1aa 100644 --- a/configure.ac +++ b/configure.ac @@ -18,15 +18,15 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.0.54], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.0.55rc01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.0.54 +PNGLIB_VERSION=1.0.55rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 -PNGLIB_RELEASE=54 +PNGLIB_RELEASE=55 dnl End of version number stuff diff --git a/libpng-1.0.54.txt b/libpng-1.0.55rc01.txt index ab1a8343a..0fbc28b99 100644 --- a/libpng-1.0.54.txt +++ b/libpng-1.0.55rc01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.0.54 - July 2, 2010 + libpng version 1.0.55rc01 - June 30, 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.0.54 - July 2, 2010 + libpng versions 0.97, January 1998, through 1.0.55rc01 - June 30, 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.0.54, not all possible expansions are supported. +As of libpng version 1.0.55rc01, 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 @@ -3076,13 +3076,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -July 2, 2010 +June 30, 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.0.54 are Y2K compliant. It is my belief that earlier +upward through 1.0.55rc01 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 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "July 2, 2010" +.TH LIBPNG 3 "June 30, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.54 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.55rc01 .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.0.54 - July 2, 2010 + libpng version 1.0.55rc01 - June 30, 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.0.54 - July 2, 2010 + libpng versions 0.97, January 1998, through 1.0.55rc01 - June 30, 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.0.54, not all possible expansions are supported. +As of libpng version 1.0.55rc01, 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 @@ -3897,13 +3897,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -July 2, 2010 +June 30, 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.0.54 are Y2K compliant. It is my belief that earlier +upward through 1.0.55rc01 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 @@ -4172,7 +4172,7 @@ the first widely used release: 1.2.37beta01-03 13 10237 12.so.0.37[.0] 1.2.37rc01 13 10237 12.so.0.37[.0] 1.2.37 13 10237 12.so.0.37[.0] - 1.2.45 10 10045 12.so.0.45[.0] + 1.0.45 10 10045 12.so.0.45[.0] 1.0.46 10 10046 10.so.0.46[.0] 1.2.38beta01 13 10238 12.so.0.38[.0] 1.2.38rc01-03 13 10238 12.so.0.38[.0] @@ -4204,6 +4204,9 @@ the first widely used release: 1.2.44beta01-03 13 10244 12.so.0.44[.0] 1.2.44rc01-03 13 10244 12.so.0.44[.0] 1.2.44 13 10244 12.so.0.44[.0] + 1.2.45beta01-03 13 10245 12.so.0.45[.0] + 1.0.55rc01 10 10055 10.so.0.55[.0] + 1.2.45rc01 13 10245 12.so.0.45[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4259,7 +4262,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.54 - July 2, 2010: +Libpng version 1.0.55rc01 - June 30, 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). @@ -4282,7 +4285,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.0.54, July 2, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.0.55rc01, June 30, 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 @@ -4381,7 +4384,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 2, 2010 +June 30, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index c2eb9649e..d0e6cdbb7 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "July 2, 2010" +.TH LIBPNGPF 3 "June 30, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.54 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.55rc01 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "July 2, 2010" +.TH PNG 5 "June 30, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -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_0_54 Your_png_h_is_not_version_1_0_54; +typedef version_1_0_55rc01 Your_png_h_is_not_version_1_0_55rc01; /* 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.0.54 - July 2, 2010" PNG_STRING_NEWLINE \ + "libpng version 1.0.55rc01 - June 30, 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.0.54 - July 2, 2010\ + return ((png_charp) "libpng version 1.0.55rc01 - June 30, 2011\ Copyright (c) 1998-2010 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.0.54 - July 2, 2010 - * Copyright (c) 1998-2010 Glenn Randers-Pehrson + * libpng version 1.0.55rc01 - June 30, 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.0.54 - July 2, 2010: Glenn + * libpng versions 0.97, January 1998, through 1.0.55rc01 - June 30, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -231,7 +231,7 @@ * 1.2.37beta01-03 13 10237 12.so.0.37[.0] * 1.2.37rc01 13 10237 12.so.0.37[.0] * 1.2.37 13 10237 12.so.0.37[.0] - * 1.2.45 10 10045 12.so.0.45[.0] + * 1.0.45 10 10045 12.so.0.45[.0] * 1.0.46 10 10046 10.so.0.46[.0] * 1.2.38beta01 13 10238 12.so.0.38[.0] * 1.2.38rc01-03 13 10238 12.so.0.38[.0] @@ -262,6 +262,9 @@ * 1.2.44beta01-03 13 10244 12.so.0.44[.0] * 1.2.44rc01-03 13 10244 12.so.0.44[.0] * 1.2.44 13 10244 12.so.0.44[.0] + * 1.2.45beta01-03 13 10245 12.so.0.45[.0] + * 1.0.55rc01 13 10055 10.so.0.55[.0] + * 1.2.45rc01 13 10245 12.so.0.45[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -293,7 +296,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.0.54, July 2, 2010, are + * libpng versions 1.2.6, August 15, 2004, through 1.0.55rc01, June 30, 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: @@ -405,13 +408,13 @@ * Y2K compliance in libpng: * ========================= * - * July 2, 2010 + * June 30, 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.0.54 are Y2K compliant. It is my belief that earlier + * upward through 1.0.55rc01 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 @@ -467,9 +470,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.0.54" +#define PNG_LIBPNG_VER_STRING "1.0.55rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.0.54 - July 2, 2010\n" + " libpng version 1.0.55rc01 - June 30, 2011\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 10 @@ -477,12 +480,12 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 0 -#define PNG_LIBPNG_VER_RELEASE 54 +#define PNG_LIBPNG_VER_RELEASE 55 /* 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 @@ -499,7 +502,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. @@ -507,7 +510,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 10054 /* 1.0.54 */ +#define PNG_LIBPNG_VER 10055 /* 1.0.55 */ #ifndef PNG_VERSION_INFO_ONLY /* Include the compression library's header */ @@ -1547,7 +1550,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_0_54; +typedef png_structp version_1_0_55rc01; typedef png_struct FAR * FAR * png_structpp; @@ -1,8 +1,8 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.0.54 - July 2, 2010 - * Copyright (c) 1998-2010 Glenn Randers-Pehrson + * libpng version 1.0.55rc01 - June 30, 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/pngerror.c b/pngerror.c index 2bec64e83..428696104 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,8 +1,8 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.2.41 [December 3, 2009] - * Copyright (c) 1998-2009 Glenn Randers-Pehrson + * Last changed in libpng 1.2.45 [June 30, 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.) * @@ -87,12 +87,17 @@ png_error(png_structp png_ptr, png_const_charp error_message) void PNGAPI png_err(png_structp png_ptr) { + /* Prior to 1.2.45 the error_fn received a NULL pointer, expressed + * erroneously as '\0', instead of the empty string "". This was + * apparently an error, introduced in libpng-1.2.20, and png_default_error + * will crash in this case. + */ if (png_ptr != NULL && png_ptr->error_fn != NULL) - (*(png_ptr->error_fn))(png_ptr, '\0'); + (*(png_ptr->error_fn))(png_ptr, ""); /* If the custom handler doesn't exist, or if it returns, use the default handler, which will not return. */ - png_default_error(png_ptr, '\0'); + png_default_error(png_ptr, ""); } #endif /* PNG_ERROR_TEXT_SUPPORTED */ @@ -181,8 +186,13 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp { buffer[iout++] = ':'; buffer[iout++] = ' '; - png_memcpy(buffer + iout, error_message, PNG_MAX_ERROR_TEXT); - buffer[iout + PNG_MAX_ERROR_TEXT - 1] = '\0'; + + iin = 0; + while (iin < PNG_MAX_ERROR_TEXT-1 && error_message[iin] != '\0') + buffer[iout++] = error_message[iin++]; + + /* iin < PNG_MAX_ERROR_TEXT, so the following is safe: */ + buffer[iout] = '\0'; } } diff --git a/pngrtran.c b/pngrtran.c index af1aa8e4a..6f06d6f66 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,8 +1,8 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.2.43 [February 25, 2010] - * Copyright (c) 1998-2010 Glenn Randers-Pehrson + * Last changed in libpng 1.2.45 [June 30, 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.) * @@ -676,10 +676,21 @@ void PNGAPI png_set_rgb_to_gray(png_structp png_ptr, int error_action, double red, double green) { - int red_fixed = (int)((float)red*100000.0 + 0.5); - int green_fixed = (int)((float)green*100000.0 + 0.5); + int red_fixed, green_fixed; if (png_ptr == NULL) return; + if (red > 21474.83647 || red < -21474.83648 || + green > 21474.83647 || green < -21474.83648) + { + png_warning(png_ptr, "ignoring out of range rgb_to_gray coefficients"); + red_fixed = -1; + green_fixed = -1; + } + else + { + red_fixed = (int)((float)red*100000.0 + 0.5); + green_fixed = (int)((float)green*100000.0 + 0.5); + } png_set_rgb_to_gray_fixed(png_ptr, error_action, red_fixed, green_fixed); } #endif @@ -1196,8 +1207,7 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr) { if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) { - if (png_ptr->num_trans && - (png_ptr->transformations & PNG_EXPAND_tRNS)) + if (png_ptr->num_trans) info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA; else info_ptr->color_type = PNG_COLOR_TYPE_RGB; diff --git a/pngrutil.c b/pngrutil.c index 1e2db31b2..a60a2a291 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,8 +1,8 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.44 [June 26, 2010] - * Copyright (c) 1998-2010 Glenn Randers-Pehrson + * Last changed in libpng 1.2.45 [June 30, 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.) * @@ -1812,6 +1812,14 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) return; } + /* Need unit type, width, \0, height: minimum 4 bytes */ + else if (length < 4) + { + png_warning(png_ptr, "sCAL chunk too short"); + png_crc_finish(png_ptr, length); + return; + } + png_debug1(2, "Allocating and reading sCAL chunk data (%lu bytes)", length + 1); png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1); @@ -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_0_54 your_png_h_is_not_version_1_0_54; +typedef version_1_0_55rc01 your_png_h_is_not_version_1_0_55rc01; diff --git a/pngwrite.c b/pngwrite.c index e411e8165..786bf4bea 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.2.42 [January 3, 2010] - * Copyright (c) 1998-2010 Glenn Randers-Pehrson + * Last changed in libpng 1.2.45 [June 30, 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.) * @@ -295,6 +295,7 @@ png_write_info(png_structp png_ptr, png_infop info_ptr) if (keep != PNG_HANDLE_CHUNK_NEVER && up->location && (up->location & PNG_HAVE_PLTE) && !(up->location & PNG_HAVE_IDAT) && + !(up->location & PNG_AFTER_IDAT) && ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS || (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS))) { diff --git a/projects/wince.txt b/projects/wince.txt index 692709639..b9caf306c 100644 --- a/projects/wince.txt +++ b/projects/wince.txt @@ -1,6 +1,6 @@ A set of project files is available for WinCE. Get -libpng-1.0.54-project-wince.zip from a libpng distribution +libpng-1.0.55rc01-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.0.54-project-wince.zip" +"unzip -a libpng-1.0.55rc01-project-wince.zip" diff --git a/scripts/README.txt b/scripts/README.txt index 354025216..e0892cc02 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.0.54 - July 2, 2010 +Makefiles for libpng version 1.0.55rc01 - June 30, 2011 makefile.linux => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.54) + (gcc, creates libpng10.so.0.1.0.55rc01) 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.0.54 - July 2, 2010 makefile.dec => DEC Alpha UNIX makefile makefile.dj2 => DJGPP 2 makefile makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng10.so.0.1.0.54) + gcc, creates libpng10.so.0.1.0.55rc01) 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.0.54 - July 2, 2010 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 libpng10.so.0.1.0.54) + creates libpng10.so.0.1.0.55rc01) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng10.so.0.1.0.54) + creates libpng10.so.0.1.0.55rc01) makefile.solaris-x86 => Solaris 2.X makefile (gcc, no MMX code, - creates libpng10.so.0.1.0.54) + creates libpng10.so.0.1.0.55rc01) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng10.so.0.1.0.54) + creates libpng10.so.0.1.0.55rc01) 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 27d9aea53..6be94d411 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.0.54 +version=1.0.55rc01 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 5245b8db1..d98b47cb5 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng10 Name: libpng Description: Loads and saves PNG files -Version: 1.0.54 +Version: 1.0.55rc01 Libs: -L${libdir} -lpng10 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 38cc18f68..f7ac99e2a 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 45b1a9507..79335427c 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 6aaccfdf3..46030f3b2 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -23,7 +23,7 @@ LN_SF = ln -f -s LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index f926051c3..e9b5f7cd6 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cegcc b/scripts/makefile.cegcc index f7819e061..b1e6e95e7 100644 --- a/scripts/makefile.cegcc +++ b/scripts/makefile.cegcc @@ -23,7 +23,7 @@ VERMAJ = 1 VERMIN = 0 -VERMIC = 54 +VERMIC = 55 VER = $(VERMAJ).$(VERMIN).$(VERMIC) NAME = libpng PACKAGE = $(NAME)-$(VER) diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 294b71037..802a01fe8 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng10 PNGMAJ = 0 CYGDLL = 10 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index c2b0cca9a..b51f87b5d 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -22,7 +22,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng10 PNGMAJ = 10 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index e30794a0b..1557ca102 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index d66182365..9f0bc773e 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 2578d33ee..9561a5fc9 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -17,7 +17,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 6f557d53e..c73f2afc8 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 94da81122..872131bf2 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 0b77871e0..39ac03b4c 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index e379f5c47..cb535f049 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index be756347b..cca4218ec 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -81,7 +81,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng10 PNGMAJ = 0 MINGDLL = 10 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 482990016..0bb1117c5 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng10 LIB= png10 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.0.54 +SHLIB_MINOR= 1.0.55rc01 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 d093172f6..b1796a47e 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.0.54 +SHLIB_MINOR= 1.0.55rc01 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.nommx b/scripts/makefile.nommx index d2a7f17af..ce97c9cab 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 0d15063e9..49801255b 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.0.54 +SHLIB_MINOR= 1.0.55rc01 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index aa2811884..c873828cf 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 413f5c728..d7c0e2c23 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 70371d498..1068cf738 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 5ecbfffe8..a1eed681a 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -11,7 +11,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 97e22c2ab..e98c2a4fc 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 7b5cb4541..538f1a3ae 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.54 +PNGMIN = 1.0.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/png32ce.def b/scripts/png32ce.def index 6ac972b69..0bfe4faf7 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -5,7 +5,7 @@ LIBRARY lpngce EXPORTS -;Version 1.0.54 +;Version 1.0.55rc01 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 96510981c..3e091c0b3 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.0.54 +; Version 1.0.55rc01 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index dbe2469a3..ad67a1086 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.0.54 +;Version 1.0.55rc01 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |