From 43aaf6eb378ba3adfdb4a582f44002943303dd24 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 5 Aug 2008 22:17:03 -0500 Subject: [PATCH] Imported from libpng-1.4.0beta28.tar --- ANNOUNCE | 26 +++++++++------- CHANGES | 4 +++ INSTALL | 18 +++++------ KNOWNBUG | 2 +- LICENSE | 4 +-- Makefile.am | 2 +- Makefile.in | 2 +- README | 14 ++++----- configure | 22 +++++++------- configure.ac | 4 +-- example.c | 2 +- ...-1.4.0beta27.txt => libpng-1.4.0beta28.txt | 6 ++-- libpng.3 | 18 +++++------ libpngpf.3 | 4 +-- png.5 | 2 +- png.c | 16 +++++----- png.h | 30 +++++++++---------- pngconf.h | 8 ++++- pngerror.c | 28 +++++++++-------- pngget.c | 2 +- pngmem.c | 2 +- pngpread.c | 2 +- pngpriv.h | 2 +- pngread.c | 2 +- pngrio.c | 2 +- pngrtran.c | 2 +- pngrutil.c | 2 +- pngset.c | 2 +- pngtest.c | 4 +-- pngtrans.c | 2 +- pngwio.c | 2 +- pngwrite.c | 2 +- pngwtran.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/pngos2.def | 2 +- scripts/pngwin.def | 2 +- 62 files changed, 159 insertions(+), 141 deletions(-) rename libpng-1.4.0beta27.txt => libpng-1.4.0beta28.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index e1354b576..8a5e5c5fb 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.0beta27 - August 5, 2008 +Libpng 1.4.0beta28 - August 6, 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,27 +9,27 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.4.0beta27.tar.gz - 1.4.0beta27.tar.bz2 + 1.4.0beta28.tar.gz + 1.4.0beta28.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - 1.4.0beta27-no-config.tar.gz - 1.4.0beta27-no-config.tar.bz2 + 1.4.0beta28-no-config.tar.gz + 1.4.0beta28-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp140b27.zip - lp140b27.tar.bz2 + lp140b28.zip + lp140b28.tar.bz2 Other information: - 1.4.0beta27-README.txt - 1.4.0beta27-KNOWNBUGS.txt - 1.4.0beta27-LICENSE.txt - 1.4.0beta27-Y2K-compliance.txt + 1.4.0beta28-README.txt + 1.4.0beta28-KNOWNBUGS.txt + 1.4.0beta28-LICENSE.txt + 1.4.0beta28-Y2K-compliance.txt Changes since the last public release (1.2.10): @@ -297,6 +297,10 @@ version 1.4.0beta27 [August 5, 2008] png_debug macros. Allow user to #define their own png_debug, png_debug1, and png_debug2. +version 1.4.0beta28 [August 6, 2008] + Revised usage of PNG_LITERAL_SHARP in pngerror.c. + Added PNG_STRING_NEWLINE macro + version 1.4.0betaN [future] Build shared libraries with -lz and sometimes -lm. diff --git a/CHANGES b/CHANGES index e724cc400..625cd1e24 100644 --- a/CHANGES +++ b/CHANGES @@ -1970,6 +1970,10 @@ version 1.4.0beta27 [August 5, 2008] png_debug macros. Allow user to #define their own png_debug, png_debug1, and png_debug2. +version 1.4.0beta28 [August 6, 2008] + Revised usage of PNG_LITERAL_SHARP in pngerror.c. + Added PNG_STRING_NEWLINE macro + version 1.4.0betaN [future] Build shared libraries with -lz and sometimes -lm. diff --git a/INSTALL b/INSTALL index 118197b57..549623e86 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.0beta27 - August 5, 2008 +Installing libpng version 1.4.0beta28 - August 6, 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.4.0beta27" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.4.0beta28" 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: @@ -95,14 +95,14 @@ include CMakeLists.txt => "cmake" script makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng14.so.0.1.4.0beta27) + gcc, creates libpng14.so.0.1.4.0beta28) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.0.1.4.0beta27) + (gcc, creates libpng14.so.0.1.4.0beta28) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng14.so.0.1.4.0beta27, + (gcc, creates libpng14.so.0.1.4.0beta28, uses assembler code tuned for Intel MMX platform) makefile.nommx => Linux/ELF makefile - (gcc, creates libpng14.so.0.1.4.0beta27 + (gcc, creates libpng14.so.0.1.4.0beta28 does not use Intel MMX assembler code) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -125,12 +125,12 @@ include makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sggcc => Silicon Graphics (gcc, - creates libpng14.so.0.1.4.0beta27) + creates libpng14.so.0.1.4.0beta28) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng14.so.0.1.4.0beta27) + creates libpng14.so.0.1.4.0beta28) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng14.so.0.1.4.0beta27) + creates libpng14.so.0.1.4.0beta28) 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 b0a7ce246..6b927aa5a 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.4.0beta27 +Known bugs in libpng version 1.4.0beta28 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when reading interlaced PNG files, when assembler code is enabled but running diff --git a/LICENSE b/LICENSE index 152fd9242..0398a84fc 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.4.0beta27, August 5, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta28, August 6, 2008, are Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -106,4 +106,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 5, 2008 +August 6, 2008 diff --git a/Makefile.am b/Makefile.am index d5e39b866..b04bd0654 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,7 +86,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.0beta27.txt pngvcrd.c + example.c libpng-1.4.0beta28.txt pngvcrd.c CLEANFILES= pngout.png libpng14.pc libpng14-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index 36ab7759c..40ea12122 100644 --- a/Makefile.in +++ b/Makefile.in @@ -331,7 +331,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.0beta27.txt pngvcrd.c + example.c libpng-1.4.0beta28.txt pngvcrd.c CLEANFILES = pngout.png libpng14.pc libpng14-config libpng.vers \ libpng.sym diff --git a/README b/README index 12537a30b..a86bac813 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.0beta27 - August 5, 2008 (shared library 14.0) +README for libpng version 1.4.0beta28 - August 6, 2008 (shared library 14.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -184,11 +184,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 libpng14.so.0.1.4.0beta27) + gcc, creates libpng14.so.0.1.4.0beta28) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.0.1.4.0beta27) + (gcc, creates libpng14.so.0.1.4.0beta28) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng14.so.0.1.4.0beta27, + (gcc, creates libpng14.so.0.1.4.0beta28, 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 @@ -210,12 +210,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng14.so.0.1.4.0beta27) + (gcc, creates libpng14.so.0.1.4.0beta28) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.0.1.4.0beta27) + (gcc, creates libpng14.so.0.1.4.0beta28) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.0.1.4.0beta27) + (gcc, creates libpng14.so.0.1.4.0beta28) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc diff --git a/configure b/configure index 368c78003..357ae1b69 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.4.0beta27. +# Generated by GNU Autoconf 2.62 for libpng 1.4.0beta28. # # 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.4.0beta27' -PACKAGE_STRING='libpng 1.4.0beta27' +PACKAGE_VERSION='1.4.0beta28' +PACKAGE_STRING='libpng 1.4.0beta28' 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.4.0beta27 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.0beta28 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.4.0beta27:";; + short | recursive ) echo "Configuration of libpng 1.4.0beta28:";; 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.4.0beta27 +libpng configure 1.4.0beta28 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.4.0beta27, which was +It was created by libpng $as_me 1.4.0beta28, 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.4.0beta27' + VERSION='1.4.0beta28' cat >>confdefs.h <<_ACEOF @@ -2558,7 +2558,7 @@ fi -PNGLIB_VERSION=1.4.0beta27 +PNGLIB_VERSION=1.4.0beta28 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=0 @@ -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.4.0beta27, which was +This file was extended by libpng $as_me 1.4.0beta28, 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.4.0beta27 +libpng config.status 1.4.0beta28 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 3ccd0c822..37bd3a2ff 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.4.0beta27], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.0beta28], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.4.0beta27 +PNGLIB_VERSION=1.4.0beta28 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=0 diff --git a/example.c b/example.c index 2e7b3d2f5..9e27f54d2 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.4.0 [August 5, 2008] + * Last changed in libpng 1.4.0 [August 6, 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.4.0beta27.txt b/libpng-1.4.0beta28.txt similarity index 99% rename from libpng-1.4.0beta27.txt rename to libpng-1.4.0beta28.txt index 05d67797d..562b413f4 100644 --- a/libpng-1.4.0beta27.txt +++ b/libpng-1.4.0beta28.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.0beta27 - August 5, 2008 + libpng version 1.4.0beta28 - August 6, 2008 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -2919,13 +2919,13 @@ application: IX. Y2K Compliance in libpng -August 5, 2008 +August 6, 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.4.0beta27 are Y2K compliant. It is my belief that earlier +upward through 1.4.0beta28 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 ee676c427..043711ea3 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "August 5, 2008" +.TH LIBPNG 3 "August 6, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta27 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta28 .SH SYNOPSIS \fI\fB @@ -797,7 +797,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.4.0beta27 - August 5, 2008 + libpng version 1.4.0beta28 - August 6, 2008 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -3716,13 +3716,13 @@ application: .SH IX. Y2K Compliance in libpng -August 5, 2008 +August 6, 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.4.0beta27 are Y2K compliant. It is my belief that earlier +upward through 1.4.0beta28 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 @@ -3889,7 +3889,7 @@ the first widely used release: 1.2.12 13 10212 12.so.0.12[.0] 1.4.0beta9-14 14 10400 14.so.0.0[.0] 1.2.13 13 10213 12.so.0.13[.0] - 1.4.0beta15-27 14 10400 14.so.0.0[.0] + 1.4.0beta15-28 14 10400 14.so.0.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3945,7 +3945,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.0beta27 - August 5, 2008: +Libpng version 1.4.0beta28 - August 6, 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). @@ -3966,7 +3966,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.4.0beta27, August 5, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta28, August 6, 2008, are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -4065,7 +4065,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 5, 2008 +August 6, 2008 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index c798b7633..564d117db 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "August 5, 2008" +.TH LIBPNGPF 3 "August 6, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta27 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta28 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index 5e2eab71e..339eaa209 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "August 5, 2008" +.TH PNG 5 "August 6, 2008" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index ddc98e698..837da9584 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 [August 5, 2008] + * Last changed in libpng 1.2.30 [August 6, 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 "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_0beta27 Your_png_h_is_not_version_1_4_0beta27; +typedef version_1_4_0beta28 Your_png_h_is_not_version_1_4_0beta28; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -636,10 +636,12 @@ 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.4.0beta27 - August 5, 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"); + return ((png_charp) PNG_STRING_NEWLINE \ + "libpng version x 1.4.0beta28 - August 6, 2008" PNG_STRING_NEWLINE \ + "Copyright (c) 1998-2008 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); } /* The following return the library version as a short string in the @@ -675,7 +677,7 @@ png_get_header_version(png_structp png_ptr) #ifndef PNG_READ_SUPPORTED " (NO READ SUPPORT)" #endif - "\n"); + PNG_STRING_NEWLINE); } #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) diff --git a/png.h b/png.h index 5096aaf15..1d4abd131 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.0beta27 - August 5, 2008 + * libpng version 1.4.0beta28 - August 6, 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.) @@ -9,7 +9,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.4.0beta27 - August 5, 2008: Glenn + * libpng versions 0.97, January 1998, through 1.4.0beta28 - August 6, 2008: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -126,7 +126,7 @@ * 1.2.12 13 10212 12.so.0.10[.0] * 1.4.0beta9-14 14 10400 14.so.0.0[.0] * 1.2.13 13 10213 12.so.0.10[.0] - * 1.4.0beta15-27 14 10400 14.so.0.0[.0] + * 1.4.0beta15-28 14 10400 14.so.0.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -156,7 +156,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta27, August 5, 2008, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta28, August 6, 2008, are * Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -274,7 +274,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.4.0beta27 are Y2K compliant. It is my belief that earlier + * upward through 1.4.0beta28 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 @@ -330,9 +330,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.0beta27" +#define PNG_LIBPNG_VER_STRING "1.4.0beta28" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.0beta27 - August 5, 2008\n" + " libpng version 1.4.0beta28 - August 6, 2008\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -344,7 +344,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 27 +#define PNG_LIBPNG_VER_BUILD 28 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1347,7 +1347,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_4_0beta27; +typedef png_structp version_1_4_0beta28; typedef png_struct FAR * FAR * png_structpp; @@ -2363,13 +2363,13 @@ extern PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr, #include #if (PNG_DEBUG > 1) #ifndef png_debug -#define png_debug(l,m) _RPT0(_CRT_WARN,m"\n") +#define png_debug(l,m) _RPT0(_CRT_WARN,m PNG_STRING_NEWLINE) #endif #ifndef png_debug1 -#define png_debug1(l,m,p1) _RPT1(_CRT_WARN,m"\n",p1) +#define png_debug1(l,m,p1) _RPT1(_CRT_WARN,m PNG_STRING_NEWLINE,p1) #endif #ifndef png_debug2 -#define png_debug2(l,m,p1,p2) _RPT2(_CRT_WARN,m"\n",p1,p2) +#define png_debug2(l,m,p1,p2) _RPT2(_CRT_WARN,m PNG_STRING_NEWLINE,p1,p2) #endif #endif #else /* PNG_DEBUG_FILE || !_MSC_VER */ @@ -2381,7 +2381,7 @@ extern PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr, #define png_debug(l,m) \ { \ int num_tabs=l; \ - fprintf(PNG_DEBUG_FILE,"%s"m"\n",(num_tabs==1 ? "\t" : \ + fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \ (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":"")))); \ } #endif @@ -2389,7 +2389,7 @@ extern PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr, #define png_debug1(l,m,p1) \ { \ int num_tabs=l; \ - fprintf(PNG_DEBUG_FILE,"%s"m"\n",(num_tabs==1 ? "\t" : \ + fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \ (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1); \ } #endif @@ -2397,7 +2397,7 @@ extern PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr, #define png_debug2(l,m,p1,p2) \ { \ int num_tabs=l; \ - fprintf(PNG_DEBUG_FILE,"%s"m"\n",(num_tabs==1 ? "\t" : \ + fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \ (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1,p2); \ } #endif diff --git a/pngconf.h b/pngconf.h index 8b1eaa25f..d0ebb89cd 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.0beta27 - August 5, 2008 + * libpng version 1.4.0beta28 - August 6, 2008 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -683,12 +683,18 @@ # define PNG_IO_STATE_SUPPORTED #endif +#ifndef PNG_LITERAL_SHARP +# define PNG_LITERAL_SHARP 0x23 +#endif #ifndef PNG_LITERAL_LEFT_SQUARE_BRACKET # define PNG_LITERAL_LEFT_SQUARE_BRACKET 0x5b #endif #ifndef PNG_LITERAL_RIGHT_SQUARE_BRACKET # define PNG_LITERAL_RIGHT_SQUARE_BRACKET 0x5d #endif +#ifndef PNG_STRING_NEWLINE +# define PNG_STRING_NEWLINE "\n" +#endif /* These are currently experimental features, define them if you want */ diff --git a/pngerror.c b/pngerror.c index c99592382..317e754d4 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.4.0 [August 5, 2008] + * Last changed in libpng 1.4.0 [August 6, 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) @@ -42,7 +42,7 @@ png_error(png_structp png_ptr, png_const_charp error_message) if (png_ptr->flags& (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) { - if (*error_message == 0x23) /* '#' */ + if (*error_message == PNG_LITERAL_SHARP) { /* Strip "#nnnn " from beginning of error message. */ /* @@ -130,7 +130,7 @@ png_warning(png_structp png_ptr, png_const_charp warning_message) (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) #endif { - if (*warning_message == 0x23) /* '#' */ + if (*warning_message == PNG_LITERAL_SHARP) { for (offset = 1; offset < 15; offset++) if (warning_message[offset] == ' ') @@ -258,7 +258,7 @@ png_default_error(png_structp png_ptr, png_const_charp error_message) { #ifndef PNG_NO_CONSOLE_IO #ifdef PNG_ERROR_NUMBERS_SUPPORTED - if (*error_message == 0x23) /* '#' */ + if (*error_message == PNG_LITERAL_SHARP) { /* Strip "#nnnn " from beginning of error message. */ /* @@ -292,15 +292,16 @@ png_default_error(png_structp png_ptr, png_const_charp error_message) error_number[offset - 1] = '\0'; /* GRR: this should be [offset + 1] */ /* should we update "offset" to point to the beginning of the text? */ - fprintf(stderr, "libpng error no. %s: %s\n", error_number, - error_message + offset + 1); + fprintf(stderr, "libpng error no. %s: %s" PNG_STRING_NEWLINE, + error_number, error_message + offset + 1); } else - fprintf(stderr, "libpng error: %s, offset=%d\n", error_message, offset); + fprintf(stderr, "libpng error: %s, offset=%d" PNG_STRING_NEWLINE, + error_message, offset); } else #endif - fprintf(stderr, "libpng error: %s\n", error_message); + fprintf(stderr, "libpng error: %s" PNG_STRING_NEWLINE, error_message); #endif #ifdef PNG_SETJMP_SUPPORTED @@ -335,7 +336,7 @@ png_default_warning(png_structp png_ptr, png_const_charp warning_message) { #ifndef PNG_NO_CONSOLE_IO # ifdef PNG_ERROR_NUMBERS_SUPPORTED - if (*warning_message == 0x23) /* '#' */ + if (*warning_message == PNG_LITERAL_SHARP) { int offset; char warning_number[16]; @@ -348,15 +349,16 @@ png_default_warning(png_structp png_ptr, png_const_charp warning_message) if ((offset > 1) && (offset < 15)) { warning_number[offset + 1] = '\0'; - fprintf(stderr, "libpng warning no. %s: %s\n", warning_number, - warning_message + offset); + fprintf(stderr, "libpng warning no. %s: %s" PNG_STRING_NEWLINE, + warning_number, warning_message + offset); } else - fprintf(stderr, "libpng warning: %s\n", warning_message); + fprintf(stderr, "libpng warning: %s" PNG_STRING_NEWLINE, + warning_message); } else # endif - fprintf(stderr, "libpng warning: %s\n", warning_message); + fprintf(stderr, "libpng warning: %s" PNG_STRING_NEWLINE, warning_message); #else warning_message = warning_message; /* make compiler happy */ #endif diff --git a/pngget.c b/pngget.c index 9020859ef..674674e61 100644 --- a/pngget.c +++ b/pngget.c @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.40. [August 5, 2008] + * Last changed in libpng 1.40. [August 6, 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 a5e260a2d..8b4fc94cb 100644 --- a/pngmem.c +++ b/pngmem.c @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.4.0 [August 5, 2008] + * Last changed in libpng 1.4.0 [August 6, 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 37c60d5d3..e4acee804 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.4.0 [August 5, 2008] + * Last changed in libpng 1.4.0 [August 6, 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/pngpriv.h b/pngpriv.h index d038dd04d..37437170c 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.0beta27 - August 5, 2008 + * libpng version 1.4.0beta28 - August 6, 2008 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngread.c b/pngread.c index d56ed4890..b50648012 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.4.0 [August 5, 2008] + * Last changed in libpng 1.4.0 [August 6, 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 3df86da65..e3df09c1b 100644 --- a/pngrio.c +++ b/pngrio.c @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.4.0 [August 5, 2008] + * Last changed in libpng 1.4.0 [August 6, 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 5b4c337a7..34e1987df 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.4.0 [August 5, 2008] + * Last changed in libpng 1.4.0 [August 6, 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 11c9a6f8c..5e4e14d03 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.4.0 [August 5, 2008] + * Last changed in libpng 1.4.0 [August 6, 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/pngset.c b/pngset.c index 82a9b7aec..8a0d67674 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.4.0 [August 5, 2008] + * Last changed in libpng 1.4.0 [August 6, 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 f3084e58a..0a746165d 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.4.0 [August 5, 2008] + * Last changed in libpng 1.4.0 [August 6, 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) @@ -1613,4 +1613,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_0beta27 your_png_h_is_not_version_1_4_0beta27; +typedef version_1_4_0beta28 your_png_h_is_not_version_1_4_0beta28; diff --git a/pngtrans.c b/pngtrans.c index 981b9b4bf..c86123780 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.4.0 [August 5, 2008] + * Last changed in libpng 1.4.0 [August 6, 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 8fd5c0c57..d4f24d193 100644 --- a/pngwio.c +++ b/pngwio.c @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.4.0 [August 5, 2008] + * Last changed in libpng 1.4.0 [August 6, 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 df9209369..3684b0d5c 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.4.0 [August 5, 2008] + * Last changed in libpng 1.4.0 [August 6, 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/pngwtran.c b/pngwtran.c index 16bef1723..cadc30961 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * Last changed in libpng 1.4.0 [August 5, 2008] + * Last changed in libpng 1.4.0 [August 6, 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 8dff3df22..8168a2957 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.4.0 [August 5, 2008] + * Last changed in libpng 1.4.0 [August 6, 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 408eef800..a8c718c82 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -178,7 +178,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.4.0beta27 +# VERSION 0.${PNGLIB_RELEASE}.1.4.0beta28 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 6fa7e58d3..59e284a4b 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.4.0beta27 +version=1.4.0beta28 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 9d068f981..fe5fd5d6e 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng14 Name: libpng Description: Loads and saves PNG files -Version: 1.4.0beta27 +Version: 1.4.0beta28 Libs: -L${libdir} -lpng14 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 5c08df70e..de6e21b29 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index a96183a06..6d431bb72 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index b3cbe62b9..11fce5c0a 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -20,7 +20,7 @@ LN_SF = ln -f -s LIBNAME=libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index ff2ec21f9..0f8f2312a 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index c3cfe13c0..4533c1ecf 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -65,7 +65,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng14 PNGMAJ = 0 CYGDLL = 14 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 01f30fc58..60efa5b76 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng14 PNGMAJ = 12 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index d69854a62..8b3636ba6 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng14 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index feae817d0..3d7344efc 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index a166e1282..0d8a6e353 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 724485db7..ef4b1752b 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index cb04a1801..9089792a6 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 2a91bd5c6..d9094cfdd 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 83fd2976a..7096aa4b8 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index f2ef8cf6a..7376c90ba 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -81,7 +81,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng14 PNGMAJ = 0 MINGDLL = 14 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 807046883..826246ca9 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng14 LIB= png14 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.4.0beta27 +SHLIB_MINOR= 1.4.0beta28 SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index 33471467b..4f1d568e6 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.4.0beta27 +SHLIB_MINOR= 1.4.0beta28 SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx index 13dc98486..51faf0eef 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 081261106..37995147b 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.4.0beta27 +SHLIB_MINOR= 1.4.0beta28 LIB= png SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 95a74b6fa..67f53a2df 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 53cb9ad84..7c4d5307b 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 9f5cc5906..cfca3065f 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index bf116cf6a..202bcbb3e 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng14 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index c89fa02fa..0ea01e3cf 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta27 +PNGMIN = 1.4.0beta28 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index f7f3d2ee8..38fdeb405 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.4.0beta27 +; Version 1.4.0beta28 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngwin.def b/scripts/pngwin.def index 434958e22..0d887abda 100644 --- a/scripts/pngwin.def +++ b/scripts/pngwin.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.4.0beta27 +;Version 1.4.0beta28 png_build_grayscale_palette png_chunk_error png_chunk_warning