From d9b4c01719e820b353cb91014f73ea3cf04ca574 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 29 Jul 2008 19:08:32 -0500 Subject: [PATCH] Imported from libpng-1.2.30rc06.tar --- ANNOUNCE | 40 ++++++++++--------- CHANGES | 10 +++-- INSTALL | 16 ++++---- KNOWNBUG | 2 +- LICENSE | 4 +- Makefile.am | 2 +- Makefile.in | 2 +- README | 14 +++---- Y2KINFO | 4 +- configure | 22 +++++----- configure.ac | 4 +- example.c | 2 +- ...ng-1.2.30rc05.txt => libpng-1.2.30rc06.txt | 8 ++-- libpng.3 | 22 +++++----- libpngpf.3 | 4 +- png.5 | 2 +- png.c | 6 +-- png.h | 22 +++++----- pngconf.h | 2 +- pngerror.c | 26 +++--------- pngget.c | 2 +- pngmem.c | 2 +- pngpread.c | 12 +++--- pngread.c | 2 +- pngrio.c | 2 +- pngrtran.c | 2 +- pngrutil.c | 10 +---- pngset.c | 2 +- pngtest.c | 4 +- pngtrans.c | 2 +- pngwio.c | 2 +- pngwrite.c | 2 +- pngwutil.c | 2 +- scripts/CMakeLists.txt | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.32sunu | 2 +- scripts/makefile.64sunu | 2 +- scripts/makefile.aix | 2 +- scripts/makefile.beos | 2 +- scripts/makefile.cygwin | 2 +- scripts/makefile.darwin | 2 +- scripts/makefile.dec | 2 +- scripts/makefile.elf | 2 +- scripts/makefile.gcmmx | 2 +- scripts/makefile.hp64 | 2 +- scripts/makefile.hpgcc | 2 +- scripts/makefile.hpux | 2 +- scripts/makefile.linux | 2 +- scripts/makefile.mingw | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.nommx | 2 +- scripts/makefile.openbsd | 2 +- scripts/makefile.sco | 2 +- scripts/makefile.sggcc | 2 +- scripts/makefile.sgi | 2 +- scripts/makefile.so9 | 2 +- scripts/makefile.solaris | 2 +- scripts/makefile.solaris-x86 | 2 +- scripts/pngos2.def | 2 +- scripts/pngw32.def | 2 +- 62 files changed, 152 insertions(+), 166 deletions(-) rename libpng-1.2.30rc05.txt => libpng-1.2.30rc06.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index 3313b34f..e1cd436c 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.30rc05 - July 25, 2008 +Libpng 1.2.30rc06 - July 30, 2008 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,37 +9,37 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.30rc05.tar.gz - libpng-1.2.30rc05.tar.lzma + libpng-1.2.30rc06.tar.gz + libpng-1.2.30rc06.tar.lzma (Get the lzma codec from ). - libpng-1.2.30rc05.tar.bz2 + libpng-1.2.30rc06.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.30rc05-no-config.tar.gz - libpng-1.2.30rc05-no-config.tar.lzma - libpng-1.2.30rc05-no-config.tar.bz2 + libpng-1.2.30rc06-no-config.tar.gz + libpng-1.2.30rc06-no-config.tar.lzma + libpng-1.2.30rc06-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1230r05.zip - lp1230r05.7z - lp1230r05.tar.bz2 + lp1230r06.zip + lp1230r06.7z + lp1230r06.tar.bz2 Project files - libpng-1.2.30rc05-project-netware.zip - libpng-1.2.30rc05-project-wince.zip + libpng-1.2.30rc06-project-netware.zip + libpng-1.2.30rc06-project-wince.zip Other information: - libpng-1.2.30rc05-README.txt - libpng-1.2.30rc05-KNOWNBUGS.txt - libpng-1.2.30rc05-LICENSE.txt - libpng-1.2.30rc05-Y2K-compliance.txt - libpng-1.2.30rc05-[previous version]-diff.txt + libpng-1.2.30rc06-README.txt + libpng-1.2.30rc06-KNOWNBUGS.txt + libpng-1.2.30rc06-LICENSE.txt + libpng-1.2.30rc06-Y2K-compliance.txt + libpng-1.2.30rc06-[previous version]-diff.txt Changes since the last public release (1.2.29): @@ -85,7 +85,7 @@ version 1.2.30beta03 [July 6, 2008] version 1.2.30beta04 [July 10, 2008] Merged more cosmetic whitespace changes from libpng-1.4.0beta19. -version 1.0.38rc01, 1.2.30rc01 [July 25, 2008] +version 1.0.38rc01, 1.2.30rc01 [July 30, 2008] No changes. version 1.0.38rc02, 1.2.30rc02 [July 21, 2008] @@ -107,6 +107,10 @@ version 1.0.38rc05, 1.2.30rc05 [July 25, 2008] Revised png_check_chunk_name() to reject a name with a lowercase 3rd byte. Removed two calls to png_check_chunk_name() occuring later in the process. +version 1.0.38rc06, 1.2.30rc06 [July 30, 2008] + Added a call to png_check_chunk_name() in pngpread.c + Reverted png_check_chunk_name() to accept a name with a lowercase 3rd byte. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 202a5a4f..837a9f4a 100644 --- a/CHANGES +++ b/CHANGES @@ -2107,7 +2107,7 @@ version 1.2.27beta01 [April 12, 2008] Fixed bug (introduced in libpng-1.0.5h) with handling zero-length unknown chunks. Added more information about png_set_keep_unknown_chunks() to the - documetation. + documentation. Reject tRNS chunk with out-of-range samples instead of masking off the invalid high bits as done in since libpng-1.2.19beta5. @@ -2127,7 +2127,7 @@ version 1.2.27beta04 [April 18, 2008] Rebuilt Makefile.in, aclocal.m4, and configure with autoconf-2.62 version 1.2.27beta05 [April 19, 2008] - Added MAINTEINERCLEANFILES variable to Makefile.am + Added MAINTAINERCLEANFILES variable to Makefile.am version 1.2.27beta06 [April 21, 2008] Avoid changing color_type from GRAY to RGB by @@ -2186,7 +2186,7 @@ version 1.2.30beta03 [July 6, 2008] version 1.2.30beta04 [July 10, 2008] Merged more cosmetic whitespace changes from libpng-1.4.0beta19. -version 1.0.38rc01, 1.2.30rc01 [July 25, 2008] +version 1.0.38rc01, 1.2.30rc01 [July 30, 2008] No changes. version 1.0.38rc02, 1.2.30rc02 [July 21, 2008] @@ -2208,6 +2208,10 @@ version 1.0.38rc05, 1.2.30rc05 [July 25, 2008] Revised png_check_chunk_name() to reject a name with a lowercase 3rd byte. Removed two calls to png_check_chunk_name() occuring later in the process. +version 1.0.38rc06, 1.2.30rc06 [July 30, 2008] + Added a call to png_check_chunk_name() in pngpread.c + Reverted png_check_chunk_name() to accept a name with a lowercase 3rd byte. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/INSTALL b/INSTALL index 384d3240..02e2be2d 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.30rc05 - July 25, 2008 +Installing libpng version 1.2.30rc06 - July 30, 2008 On Unix/Linux and similar systems, you can simply type @@ -44,7 +44,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.30rc05" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.30rc06" or "lpng109" and "zlib-1.2.1" or "zlib121") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -101,9 +101,9 @@ include CMakeLists.txt => "cmake" script makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.30rc05) + gcc, creates libpng12.so.0.1.2.30rc06) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.30rc05) + (gcc, creates libpng12.so.0.1.2.30rc06) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -125,14 +125,14 @@ include makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sggcc => Silicon Graphics (gcc, - creates libpng12.so.0.1.2.30rc05) + creates libpng12.so.0.1.2.30rc06) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.30rc05) + creates libpng12.so.0.1.2.30rc06) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.30rc05) + creates libpng12.so.0.1.2.30rc06) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.30rc05) + creates libpng12.so.0.1.2.30rc06) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc diff --git a/KNOWNBUG b/KNOWNBUG index 7bc2736b..339dbb4f 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.30rc05 +Known bugs in libpng version 1.2.30rc06 1. February 23, 2006: The custom makefiles don't build libpng with -lz. diff --git a/LICENSE b/LICENSE index a4a43b52..a3251dae 100644 --- a/LICENSE +++ b/LICENSE @@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.30rc05, July 25, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.30rc06, July 30, 2008, 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 @@ -106,4 +106,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 25, 2008 +July 30, 2008 diff --git a/Makefile.am b/Makefile.am index 38e935ef..b59c35fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,7 +86,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.2.30rc05.txt pngvcrd.c + example.c libpng-1.2.30rc06.txt pngvcrd.c CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index 1b2ab46d..d2666e68 100644 --- a/Makefile.in +++ b/Makefile.in @@ -331,7 +331,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.2.30rc05.txt pngvcrd.c + example.c libpng-1.2.30rc06.txt pngvcrd.c CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym diff --git a/README b/README index 188aeadb..83812ffc 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.30rc05 - July 25, 2008 (shared library 12.0) +README for libpng version 1.2.30rc06 - July 30, 2008 (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. @@ -194,11 +194,11 @@ Files in this distribution: descrip.mms => VMS makefile for MMS or MMK makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.30rc05) + gcc, creates libpng12.so.0.1.2.30rc06) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.30rc05) + (gcc, creates libpng12.so.0.1.2.30rc06) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.30rc05, + (gcc, creates libpng12.so.0.1.2.30rc06, uses assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -220,12 +220,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.30rc05) + (gcc, creates libpng12.so.0.1.2.30rc06) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.30rc05) + (gcc, creates libpng12.so.0.1.2.30rc06) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.30rc05) + (gcc, creates libpng12.so.0.1.2.30rc06) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc diff --git a/Y2KINFO b/Y2KINFO index ae2517cf..4c35d86a 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - July 25, 2008 + July 30, 2008 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.30rc05 are Y2K compliant. It is my belief that earlier + upward through 1.2.30rc06 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer diff --git a/configure b/configure index 10255348..61e73f6d 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.62 for libpng 1.2.30rc05. +# Generated by GNU Autoconf 2.62 for libpng 1.2.30rc06. # # Report bugs to . # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.30rc05' -PACKAGE_STRING='libpng 1.2.30rc05' +PACKAGE_VERSION='1.2.30rc06' +PACKAGE_STRING='libpng 1.2.30rc06' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' ac_unique_file="pngget.c" @@ -1484,7 +1484,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.30rc05 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.30rc06 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1554,7 +1554,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.2.30rc05:";; + short | recursive ) echo "Configuration of libpng 1.2.30rc06:";; esac cat <<\_ACEOF @@ -1661,7 +1661,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.2.30rc05 +libpng configure 1.2.30rc06 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1675,7 +1675,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.30rc05, which was +It was created by libpng $as_me 1.2.30rc06, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -2389,7 +2389,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.2.30rc05' + VERSION='1.2.30rc06' cat >>confdefs.h <<_ACEOF @@ -2558,7 +2558,7 @@ fi -PNGLIB_VERSION=1.2.30rc05 +PNGLIB_VERSION=1.2.30rc06 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=30 @@ -13125,7 +13125,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpng $as_me 1.2.30rc05, which was +This file was extended by libpng $as_me 1.2.30rc06, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13178,7 +13178,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libpng config.status 1.2.30rc05 +libpng config.status 1.2.30rc06 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 1ad49155..740319ba 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.2.30rc05], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.30rc06], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.30rc05 +PNGLIB_VERSION=1.2.30rc06 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=30 diff --git a/example.c b/example.c index 2fb9e56c..0896c52f 100644 --- a/example.c +++ b/example.c @@ -2,7 +2,7 @@ #if 0 /* in case someone actually tries to compile this */ /* example.c - an example of using libpng - * Last changed in libpng 1.2.30 [July 25, 2008] + * Last changed in libpng 1.2.30 [July 30, 2008] * This file has been placed in the public domain by the authors. * Maintained 1998-2008 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) diff --git a/libpng-1.2.30rc05.txt b/libpng-1.2.30rc06.txt similarity index 99% rename from libpng-1.2.30rc05.txt rename to libpng-1.2.30rc06.txt index d6a57afe..db546a3b 100644 --- a/libpng-1.2.30rc05.txt +++ b/libpng-1.2.30rc06.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.30rc05 - July 25, 2008 + libpng version 1.2.30rc06 - July 30, 2008 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -9,7 +9,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.30rc05 - July 25, 2008 + libpng versions 0.97, January 1998, through 1.2.30rc06 - July 30, 2008 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -2851,13 +2851,13 @@ application: IX. Y2K Compliance in libpng -July 25, 2008 +July 30, 2008 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.30rc05 are Y2K compliant. It is my belief that earlier +upward through 1.2.30rc06 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 0ccd16c3..881d976f 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "July 25, 2008" +.TH LIBPNG 3 "July 30, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.30rc05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.30rc06 .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.30rc05 - July 25, 2008 + libpng version 1.2.30rc06 - July 30, 2008 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -830,7 +830,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.30rc05 - July 25, 2008 + libpng versions 0.97, January 1998, through 1.2.30rc06 - July 30, 2008 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -3672,13 +3672,13 @@ application: .SH IX. Y2K Compliance in libpng -July 25, 2008 +July 30, 2008 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.30rc05 are Y2K compliant. It is my belief that earlier +upward through 1.2.30rc06 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 @@ -3912,8 +3912,8 @@ the first widely used release: 1.2.29 13 10229 12.so.0.29[.0] 1.0.37 10 10037 10.so.0.37[.0] 1.2.30beta01-04 13 10230 12.so.0.30[.0] - 1.0.38rc01-05 10 10038 10.so.0.38[.0] - 1.2.30rc01-05 13 10230 12.so.0.30[.0] + 1.0.38rc01-06 10 10038 10.so.0.38[.0] + 1.2.30rc01-06 13 10230 12.so.0.30[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3969,7 +3969,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.30rc05 - July 25, 2008: +Libpng version 1.2.30rc06 - July 30, 2008: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -3990,7 +3990,7 @@ included in the libpng distribution, the latter shall prevail.) If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.30rc05, July 25, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.30rc06, July 30, 2008, 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 @@ -4089,7 +4089,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 25, 2008 +July 30, 2008 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 106bc656..07d40094 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "July 25, 2008" +.TH LIBPNGPF 3 "July 30, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.30rc05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.30rc06 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index fc9b384c..619e8d03 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "July 25, 2008" +.TH PNG 5 "July 30, 2008" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 29a80e69..ffca94c6 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.2.30 [July 25, 2008] + * Last changed in libpng 1.2.30 [July 30, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -13,7 +13,7 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_30rc05 Your_png_h_is_not_version_1_2_30rc05; +typedef version_1_2_30rc06 Your_png_h_is_not_version_1_2_30rc06; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -694,7 +694,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { png_ptr = png_ptr; /* silence compiler warning about unused png_ptr */ - return ((png_charp) "\n libpng version 1.2.30rc05 - July 25, 2008\n\ + return ((png_charp) "\n libpng version 1.2.30rc06 - July 30, 2008\n\ Copyright (c) 1998-2008 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); diff --git a/png.h b/png.h index 12980d73..53959356 100644 --- a/png.h +++ b/png.h @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.30rc05 - July 25, 2008 + * libpng version 1.2.30rc06 - July 30, 2008 * Copyright (c) 1998-2008 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.) @@ -8,7 +8,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.30rc05 - July 25, 2008: Glenn + * libpng versions 0.97, January 1998, through 1.2.30rc06 - July 30, 2008: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -194,8 +194,8 @@ * 1.2.29 13 10229 12.so.0.29[.0] * 1.0.37 10 10037 10.so.0.37[.0] * 1.2.30beta01-04 13 10230 12.so.0.30[.0] - * 1.0.38rc01-05 10 10038 10.so.0.38[.0] - * 1.2.30rc01-05 13 10230 12.so.0.30[.0] + * 1.0.38rc01-06 10 10038 10.so.0.38[.0] + * 1.2.30rc01-06 13 10230 12.so.0.30[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -225,7 +225,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.30rc05, July 25, 2008, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.30rc06, July 30, 2008, 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: @@ -337,13 +337,13 @@ * Y2K compliance in libpng: * ========================= * - * July 25, 2008 + * July 30, 2008 * * 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.30rc05 are Y2K compliant. It is my belief that earlier + * upward through 1.2.30rc06 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 @@ -399,9 +399,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.30rc05" +#define PNG_LIBPNG_VER_STRING "1.2.30rc06" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.30rc05 - July 25, 2008\n" + " libpng version 1.2.30rc06 - July 30, 2008\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -413,7 +413,7 @@ /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 05 +#define PNG_LIBPNG_VER_BUILD 06 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1458,7 +1458,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_30rc05; +typedef png_structp version_1_2_30rc06; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index ba82efd6..b6707337 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.30rc05 - July 25, 2008 + * libpng version 1.2.30rc06 - July 30, 2008 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index 9a5466a8..3338fa3c 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.2.30 [July 25, 2008] + * Last changed in libpng 1.2.30 [July 30, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -44,13 +44,7 @@ png_error(png_structp png_ptr, png_const_charp error_message) { if (*error_message == '#') { - /* - * 012345678901234567890 - * error_message: #nnnn text\0 - * error_number: nnnn\0 - * offset points to the first blank after nnnn - * In this example, offset is 5. - */ + /* Strip "#nnnn " from beginning of error message. */ int offset; for (offset = 1; offset<15; offset++) if (error_message[offset] == ' ') @@ -60,7 +54,7 @@ png_error(png_structp png_ptr, png_const_charp error_message) int i; for (i = 0; i < offset - 1; i++) msg[i] = error_message[i + 1]; - msg[i] = '\0'; + msg[i - 1] = '\0'; error_message = msg; } else @@ -223,14 +217,7 @@ png_default_error(png_structp png_ptr, png_const_charp error_message) #ifdef PNG_ERROR_NUMBERS_SUPPORTED if (*error_message == '#') { - /* - * 012345678901234567890 - * error_message: #nnnn text\0 - * error_number: nnnn\0 - * offset points to the first blank after nnnn - * In this example, offset is 5, and we want to - * insert a terminating NULL at error_number[4]. - */ + /* Strip "#nnnn " from beginning of warning message. */ int offset; char error_number[16]; for (offset = 0; offset<15; offset++) @@ -241,10 +228,9 @@ png_default_error(png_structp png_ptr, png_const_charp error_message) } if ((offset > 1) && (offset < 15)) { - error_number[offset - 1] = '\0'; /* should this be [offset + 1]? */ - /* should we update "offset" to point to the beginning of the text? */ + error_number[offset - 1] = '\0'; fprintf(stderr, "libpng error no. %s: %s\n", error_number, - error_message + offset); + error_message + offset + 1); } else fprintf(stderr, "libpng error: %s, offset=%d\n", error_message, offset); diff --git a/pngget.c b/pngget.c index d365eb9f..41ddf292 100644 --- a/pngget.c +++ b/pngget.c @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.2.30 [July 25, 2008] + * Last changed in libpng 1.2.30 [July 30, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngmem.c b/pngmem.c index a2652b5b..588e9c0e 100644 --- a/pngmem.c +++ b/pngmem.c @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.2.30 [July 25, 2008] + * Last changed in libpng 1.2.30 [July 30, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpread.c b/pngpread.c index f219b7bc..56e73334 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.2.30 [July 25, 2008] + * Last changed in libpng 1.2.30 [July 30, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -212,6 +212,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr) png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length); png_reset_crc(png_ptr); png_crc_read(png_ptr, png_ptr->chunk_name, 4); + png_check_chunk_name(png_ptr, png_ptr->chunk_name); png_ptr->mode |= PNG_HAVE_CHUNK_HEADER; } @@ -221,10 +222,10 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr) if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4)) { + if (png_ptr->push_length != 13) + png_error(png_ptr, "Invalid IHDR length"); if (png_ptr->push_length + 4 > png_ptr->buffer_size) { - if (png_ptr->push_length != 13) - png_error(png_ptr, "Invalid IHDR length"); png_push_save_buffer(png_ptr); return; } @@ -598,6 +599,7 @@ png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length) } } + void /* PRIVATE */ png_push_save_buffer(png_structp png_ptr) { @@ -1463,10 +1465,6 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) { png_uint_32 skip = 0; -#if 0 - /* Redundant? */ - png_check_chunk_name(png_ptr, png_ptr->chunk_name); -#endif if (!(png_ptr->chunk_name[0] & 0x20)) { diff --git a/pngread.c b/pngread.c index 99391fa8..6e9d57bf 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.2.30 [July 25, 2008] + * Last changed in libpng 1.2.30 [July 30, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrio.c b/pngrio.c index f8ded82d..6d15707b 100644 --- a/pngrio.c +++ b/pngrio.c @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.2.30 [July 25, 2008] + * Last changed in libpng 1.2.30 [July 30, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index 3b4df99a..f0bfe1ba 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.2.30 [July 25, 2008] + * Last changed in libpng 1.2.30 [July 30, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index 985b6e4c..074630f1 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.30 [July 25, 2008] + * Last changed in libpng 1.2.30 [July 30, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -2243,11 +2243,6 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) png_ptr->mode |= PNG_AFTER_IDAT; } -#if 0 - /* Redundant? */ - png_check_chunk_name(png_ptr, png_ptr->chunk_name); -#endif - if (!(png_ptr->chunk_name[0] & 0x20)) { #if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) @@ -2328,14 +2323,13 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) the chunk name itself is valid. */ #define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97)) -#define isnonupper(c) ((c) < 65 || (c) > 90) void /* PRIVATE */ png_check_chunk_name(png_structp png_ptr, png_bytep chunk_name) { png_debug(1, "in png_check_chunk_name\n"); if (isnonalpha(chunk_name[0]) || isnonalpha(chunk_name[1]) || - isnonupper(chunk_name[2]) || isnonalpha(chunk_name[3])) + isnonalpha(chunk_name[2]) || isnonalpha(chunk_name[3])) { png_chunk_error(png_ptr, "invalid chunk type"); } diff --git a/pngset.c b/pngset.c index ef61e390..6a9b3f2d 100644 --- a/pngset.c +++ b/pngset.c @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.2.30 [July 25, 2008] + * Last changed in libpng 1.2.30 [July 30, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 5e0ff145..8faba25d 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.2.30 [July 25, 2008] + * Last changed in libpng 1.2.30 [July 30, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1685,4 +1685,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_30rc05 your_png_h_is_not_version_1_2_30rc05; +typedef version_1_2_30rc06 your_png_h_is_not_version_1_2_30rc06; diff --git a/pngtrans.c b/pngtrans.c index 972bb2c0..c73b360d 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.2.30 [July 25, 2008] + * Last changed in libpng 1.2.30 [July 30, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwio.c b/pngwio.c index 07317188..58176f7a 100644 --- a/pngwio.c +++ b/pngwio.c @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.2.30 [July 25, 2008] + * Last changed in libpng 1.2.30 [July 30, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwrite.c b/pngwrite.c index e69706d9..647c1082 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.2.30 [July 25, 2008] + * Last changed in libpng 1.2.30 [July 30, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwutil.c b/pngwutil.c index 6c43b0ff..0dfa0c97 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.2.30 [July 25, 2008] + * Last changed in libpng 1.2.30 [July 30, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index d7d2758e..bbca3339 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -169,7 +169,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in # SET UP LINKS set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 0.${PNGLIB_RELEASE}.1.2.30rc05 +# VERSION 0.${PNGLIB_RELEASE}.1.2.30rc06 VERSION 0.${PNGLIB_RELEASE}.0 SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 15a0eea7..7419079d 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.30rc05 +version=1.2.30rc06 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index fbac27d8..302983b7 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng12 Name: libpng Description: Loads and saves PNG files -Version: 1.2.30rc05 +Version: 1.2.30rc06 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index b76dc666..023a7a25 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 7afc21f8..31fce032 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index e09ea371..d6f5a65b 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -20,7 +20,7 @@ LN_SF = ln -f -s LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index da6db5d5..c43166fe 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 79434695..52399dac 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 4257e315..afb30541 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 12 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 94866af1..d5719b3e 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 476fbe3b..dfd33bb1 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 3c993a35..74c18957 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -14,7 +14,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 52f2c51f..79abee54 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 0f2c238d..5f055f45 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 67b6a77a..67a621f5 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 557474c4..4cd28b3b 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 7515934a..5bef8296 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index feba8ec5..56601fef 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.30rc05 +SHLIB_MINOR= 1.2.30rc06 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 f5c69ec5..6a10014e 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.30rc05 +SHLIB_MINOR= 1.2.30rc06 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 eb358a99..2834f626 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 28260b23..4df1561b 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -8,7 +8,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.30rc05 +SHLIB_MINOR= 1.2.30rc06 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index ac8de538..9867b478 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 8d07caf6..2bdf9867 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 2d949180..50a74632 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 4f42e3d9..fe1ba027 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 21db19eb..aba4edd4 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 38fd2a71..88e0e538 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.30rc05 +PNGMIN = 1.2.30rc06 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 07adec52..03a7e259 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.30rc05 +; Version 1.2.30rc06 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 64ff2a5d..caf4b7c2 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.30rc05 +;Version 1.2.30rc06 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3