diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2006-03-10 10:19:04 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:08:42 -0500 |
| commit | 170b70ce30593998d179a53c35e981a7bccd02c6 (patch) | |
| tree | 917d68e7b67c1ac3d0ba099e59ed1ba607eac3dc | |
| parent | 1ce0836b4a9c1fe453a93d323ca0b806564d559e (diff) | |
| download | libpng-1.2.9beta9.tar.gz | |
Imported from libpng-1.2.9beta9.tarv1.2.9beta9
55 files changed, 251 insertions, 160 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.9beta8 - March 9, 2006 +Libpng 1.2.9beta9 - March 10, 2006 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,26 +9,26 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.2.9beta8.tar.gz - 1.2.9beta8.tar.bz2 + 1.2.9beta9.tar.gz + 1.2.9beta9.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp129b08.zip - lp129b08.tar.bz2 + lp129b09.zip + lp129b09.tar.bz2 Project files - 1.2.9beta8-project-netware.zip - 1.2.9beta8-project-wince.zip + 1.2.9beta9-project-netware.zip + 1.2.9beta9-project-wince.zip Other information: - 1.2.9beta8-README.txt - 1.2.9beta8-KNOWNBUGS.txt - 1.2.9beta8-LICENSE.txt - 1.2.9beta8-Y2K-compliance.txt + 1.2.9beta9-README.txt + 1.2.9beta9-KNOWNBUGS.txt + 1.2.9beta9-LICENSE.txt + 1.2.9beta9-Y2K-compliance.txt Changes since the last public release (1.2.8): @@ -122,6 +122,14 @@ version 1.2.9beta8 [March 9, 2006] Added png_set_expand_gray_1_2_4_to_8() and deprecated png_set_gray_1_2_4_to_8() which also expands tRNS to alpha. +version 1.2.9beta9 [March 10, 2006] + Include "config.h" in pngconf.h when available. + Enabled MMX when appropriate in "configure". + Made pnggccrd.c PIC-compliant. + Added some checks for NULL png_ptr or NULL info_ptr (Coverity) + +version 1.2.9beta10 [March 10, 2006] + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement @@ -1501,11 +1501,15 @@ version 1.2.9beta8 [March 9, 2006] Added png_set_expand_gray_1_2_4_to_8() and deprecated png_set_gray_1_2_4_to_8() which also expands tRNS to alpha. +version 1.2.9beta9 [March 10, 2006] + Include "config.h" in pngconf.h when available. + Added some checks for NULL png_ptr or NULL info_ptr (Coverity) + version 1.4.0beta1 [future] Enabled iTXt support (changes png_struct, thus requires so-number change). Removed deprecated functions png_read_init, png_write_init, png_info_init, - png_permit_empty_plte, png_set_gray_1_2_4_to_8, and deprecated macro - PNG_MAX_UINT. + png_permit_empty_plte, png_set_gray_1_2_4_to_8, and removed the + deprecated macro PNG_MAX_UINT. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -1,5 +1,5 @@ -Installing libpng version 1.2.9beta8 - March 9, 2006 +Installing libpng version 1.2.9beta9 - March 10, 2006 On Unix/Linux and similar systems, you can simply type @@ -29,7 +29,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.9beta8" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.9beta9" 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: @@ -85,11 +85,11 @@ include makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.9beta8) + gcc, creates libpng12.so.0.1.2.9beta9) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.9beta8) + (gcc, creates libpng12.so.0.1.2.9beta9) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.9beta8, + (gcc, creates libpng12.so.0.1.2.9beta9, 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 @@ -112,12 +112,12 @@ 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.9beta8) + creates libpng12.so.0.1.2.9beta9) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.9beta8) + creates libpng12.so.0.1.2.9beta9) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.9beta8) + creates libpng12.so.0.1.2.9beta9) 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,5 +1,5 @@ -Known bugs in libpng version 1.2.9beta8 +Known bugs in libpng version 1.2.9beta9 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 @@ -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.9beta8, March 9, 2006, are +libpng versions 1.2.6, August 15, 2004, through 1.2.9beta9, March 10, 2006, are Copyright (c) 2004, 2006 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 -March 9, 2006 +March 10, 2006 @@ -1,4 +1,4 @@ -README for libpng version 1.2.9beta8 - March 9, 2006 (shared library 12.0) +README for libpng version 1.2.9beta9 - March 10, 2006 (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. @@ -190,11 +190,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.9beta8) + gcc, creates libpng12.so.0.1.2.9beta9) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.9beta8) + (gcc, creates libpng12.so.0.1.2.9beta9) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.9beta8, + (gcc, creates libpng12.so.0.1.2.9beta9, 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 @@ -216,12 +216,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.9beta8) + (gcc, creates libpng12.so.0.1.2.9beta9) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.9beta8) + (gcc, creates libpng12.so.0.1.2.9beta9) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.9beta8) + (gcc, creates libpng12.so.0.1.2.9beta9) 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: ========================= - March 9, 2006 + March 10, 2006 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.9beta8 are Y2K compliant. It is my belief that earlier + upward through 1.2.9beta9 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.59 for libpng 1.2.9beta8. +# Generated by GNU Autoconf 2.59 for libpng 1.2.9beta7. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.9beta8' -PACKAGE_STRING='libpng 1.2.9beta8' +PACKAGE_VERSION='1.2.9beta7' +PACKAGE_STRING='libpng 1.2.9beta7' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' ac_unique_file="pngget.c" @@ -954,7 +954,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.9beta8 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.9beta7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1020,7 +1020,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.2.9beta8:";; + short | recursive ) echo "Configuration of libpng 1.2.9beta7:";; esac cat <<\_ACEOF @@ -1167,7 +1167,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.2.9beta8 +libpng configure 1.2.9beta7 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1181,7 +1181,7 @@ cat >&5 <<_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.9beta8, which was +It was created by libpng $as_me 1.2.9beta7, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1824,7 +1824,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.2.9beta8' + VERSION='1.2.9beta7' cat >>confdefs.h <<_ACEOF @@ -1979,7 +1979,7 @@ fi -PNGLIB_VERSION=1.2.9beta8 +PNGLIB_VERSION=1.2.9beta7 PNGLIB_MAJOR=12 PNGLIB_MINOR=9 @@ -20833,7 +20833,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by libpng $as_me 1.2.9beta8, which was +This file was extended by libpng $as_me 1.2.9beta7, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20896,7 +20896,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpng config.status 1.2.9beta8 +libpng config.status 1.2.9beta7 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 83580899b..1d78d57a3 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.9beta8], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.9beta7], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.9beta8 +PNGLIB_VERSION=1.2.9beta7 PNGLIB_MAJOR=12 PNGLIB_MINOR=9 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "March 9, 2006" +.TH LIBPNG 3 "March 10, 2006" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.9beta8 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.9beta9 .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.9beta8 - March 9, 2006 + libpng version 1.2.9beta9 - March 10, 2006 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -3730,13 +3730,13 @@ application: .SH IX. Y2K Compliance in libpng -March 9, 2006 +March 10, 2006 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.9beta8 are Y2K compliant. It is my belief that earlier +upward through 1.2.9beta9 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 @@ -3890,7 +3890,7 @@ the first widely used release: 1.0.18 10 10018 12.so.0.1.0.18 1.2.8 13 10208 12.so.0.1.2.8 1.2.9beta1-3 13 10209 12.so.0.1.2.9beta1-3 - 1.2.9beta4-8 13 10209 12.so.0.9[.0] + 1.2.9beta4-10 13 10209 12.so.0.9[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3946,7 +3946,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.9beta8 - March 9, 2006: +Libpng version 1.2.9beta9 - March 10, 2006: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -3967,7 +3967,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.9beta8, March 9, 2006, are +libpng versions 1.2.6, August 15, 2004, through 1.2.9beta9, March 10, 2006, are Copyright (c) 2004-2006 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 @@ -4066,7 +4066,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 9, 2006 +March 10, 2006 .\" end of man page diff --git a/libpng.txt b/libpng.txt index 1c6b84756..d4d6b6ee3 100644 --- a/libpng.txt +++ b/libpng.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.9beta8 - March 9, 2006 + libpng version 1.2.9beta9 - March 10, 2006 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -2909,13 +2909,13 @@ application: IX. Y2K Compliance in libpng -March 9, 2006 +March 10, 2006 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.9beta8 are Y2K compliant. It is my belief that earlier +upward through 1.2.9beta9 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/libpngpf.3 b/libpngpf.3 index 3c4794426..ddbc18c43 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 9, 2006" +.TH LIBPNGPF 3 "March 10, 2006" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.9beta8 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.9beta9 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "March 9, 2006" +.TH PNG 5 "March 10, 2006" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.2.9 March 9, 2006 + * Last changed in libpng 1.2.9 March 10, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 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_9beta8 Your_png_h_is_not_version_1_2_9beta8; +typedef version_1_2_9beta9 Your_png_h_is_not_version_1_2_9beta9; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -693,7 +693,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */ - return ((png_charp) "\n libpng version 1.2.9beta8 - March 9, 2006\n\ + return ((png_charp) "\n libpng version 1.2.9beta9 - March 10, 2006\n\ Copyright (c) 1998-2006 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.9beta8 - March 9, 2006 + * libpng version 1.2.9beta9 - March 10, 2006 * Copyright (c) 1998-2006 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.2.9beta8 - March 9, 2006: Glenn + * libpng versions 0.97, January 1998, through 1.2.9beta9 - March 10, 2006: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -113,7 +113,7 @@ * 1.0.18 10 10018 12.so.0.1.0.18 * 1.2.8 13 10208 12.so.0.1.2.8 * 1.2.9beta1-3 13 10209 12.so.0.1.2.9beta1-3 - * 1.2.9beta4-8 13 10209 12.so.0.9[.0] + * 1.2.9beta4-10 13 10209 12.so.0.9[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -143,7 +143,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.9beta8, March 9, 2006, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.9beta9, March 10, 2006, are * Copyright (c) 2004, 2006 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: @@ -255,13 +255,13 @@ * Y2K compliance in libpng: * ========================= * - * March 9, 2006 + * March 10, 2006 * * 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.9beta8 are Y2K compliant. It is my belief that earlier + * upward through 1.2.9beta9 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 @@ -317,9 +317,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.9beta8" +#define PNG_LIBPNG_VER_STRING "1.2.9beta9" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.9beta8 - March 9, 2006 (header)\n" + " libpng version 1.2.9beta9 - March 10, 2006 (header)\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -331,7 +331,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 8 +#define PNG_LIBPNG_VER_BUILD 9 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1361,7 +1361,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_9beta8; +typedef png_structp version_1_2_9beta9; typedef png_struct FAR * FAR * png_structpp; @@ -1,10 +1,7 @@ /* pngconf.h - machine configurable file for libpng * -#if defined(PNG_1_0_X) -#endif -#if defined (PNG_1_2_X) - * libpng version 1.2.9beta8 - March 9, 2006 + * libpng version 1.2.9beta9 - March 10, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2005 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -30,6 +27,10 @@ #include "pngusr.h" #endif +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* * Added at libpng-1.2.8 * diff --git a/pngerror.c b/pngerror.c index 650e8ed80..ad99788bd 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.9 March 9, 2006 + * Last changed in libpng 1.2.9 March 10, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -34,33 +34,37 @@ png_error(png_structp png_ptr, png_const_charp error_message) { #ifdef PNG_ERROR_NUMBERS_SUPPORTED char msg[16]; - if (png_ptr->flags&(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) + if (png_ptr != NULL) { - if (*error_message == '#') + if (png_ptr->flags& + (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) { - int offset; - for (offset=1; offset<15; offset++) - if (*(error_message+offset) == ' ') - break; - if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT) - { - int i; - for (i=0; i<offset-1; i++) - msg[i]=error_message[i+1]; - msg[i]='\0'; - error_message=msg; - } - else - error_message+=offset; - } - else - { - if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT) - { - msg[0]='0'; - msg[1]='\0'; - error_message=msg; - } + if (*error_message == '#') + { + int offset; + for (offset=1; offset<15; offset++) + if (*(error_message+offset) == ' ') + break; + if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT) + { + int i; + for (i=0; i<offset-1; i++) + msg[i]=error_message[i+1]; + msg[i]='\0'; + error_message=msg; + } + else + error_message+=offset; + } + else + { + if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT) + { + msg[0]='0'; + msg[1]='\0'; + error_message=msg; + } + } } } #endif @@ -81,19 +85,23 @@ void PNGAPI png_warning(png_structp png_ptr, png_const_charp warning_message) { int offset = 0; + if (png_ptr != NULL) + { #ifdef PNG_ERROR_NUMBERS_SUPPORTED - if (png_ptr->flags&(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) + if (png_ptr->flags& + (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) #endif - { - if (*warning_message == '#') { - for (offset=1; offset<15; offset++) - if (*(warning_message+offset) == ' ') - break; + if (*warning_message == '#') + { + for (offset=1; offset<15; offset++) + if (*(warning_message+offset) == ' ') + break; + } } + if (png_ptr != NULL && png_ptr->warning_fn != NULL) + (*(png_ptr->warning_fn))(png_ptr, warning_message+offset); } - if (png_ptr != NULL && png_ptr->warning_fn != NULL) - (*(png_ptr->warning_fn))(png_ptr, warning_message+offset); else png_default_warning(png_ptr, warning_message+offset); } @@ -147,6 +155,8 @@ void PNGAPI png_chunk_error(png_structp png_ptr, png_const_charp error_message) { char msg[18+64]; + if (png_ptr == NULL) + png_error(png_ptr, error_message); png_format_buffer(png_ptr, msg, error_message); png_error(png_ptr, msg); } @@ -155,6 +165,8 @@ void PNGAPI png_chunk_warning(png_structp png_ptr, png_const_charp warning_message) { char msg[18+64]; + if (png_ptr == NULL) + png_warning(png_ptr, warning_message); png_format_buffer(png_ptr, msg, warning_message); png_warning(png_ptr, msg); } @@ -266,6 +278,8 @@ void PNGAPI png_set_error_fn(png_structp png_ptr, png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn) { + if (png_ptr == NULL) + return; png_ptr->error_ptr = error_ptr; png_ptr->error_fn = error_fn; png_ptr->warning_fn = warning_fn; @@ -279,6 +293,8 @@ png_set_error_fn(png_structp png_ptr, png_voidp error_ptr, png_voidp PNGAPI png_get_error_ptr(png_structp png_ptr) { + if (png_ptr == NULL) + return NULL; return ((png_voidp)png_ptr->error_ptr); } diff --git a/pnggccrd.c b/pnggccrd.c index 8e97449db..012f68a75 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -7,7 +7,7 @@ * and http://www.intel.com/drg/pentiumII/appnotes/923/923.htm * for Intel's performance analysis of the MMX vs. non-MMX code. * - * Last changed in libpng 1.2.9 March 9, 2006 + * Last changed in libpng 1.2.9 March 10, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.2.9 March 9, 2006 + * Last changed in libpng 1.2.9 March 10, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.2.9 March 9, 2006 + * Last changed in libpng 1.2.9 March 10, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.2.9 March 9, 2006 + * Last changed in libpng 1.2.9 March 10, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.2.9 March 9, 2006 + * Last changed in libpng 1.2.9 March 10, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index 2a03d6ef1..19db0953c 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.9 March 9, 2006 + * Last changed in libpng 1.2.9 March 10, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index c8b5b8834..647a12c31 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.9 March 9, 2006 + * Last changed in libpng 1.2.9 March 10, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -620,7 +620,7 @@ png_handle_gAMA(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) } #if defined(PNG_READ_sRGB_SUPPORTED) - if (info_ptr->valid & PNG_INFO_sRGB) + if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB)) if (PNG_OUT_OF_RANGE(igamma, 45500L, 500)) { png_warning(png_ptr, @@ -829,7 +829,7 @@ png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) #endif #if defined(PNG_READ_sRGB_SUPPORTED) - if (info_ptr->valid & PNG_INFO_sRGB) + if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB)) { if (PNG_OUT_OF_RANGE(int_x_white, 31270, 1000) || PNG_OUT_OF_RANGE(int_y_white, 32900, 1000) || @@ -924,7 +924,7 @@ png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) } #if defined(PNG_READ_gAMA_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED) - if ((info_ptr->valid & PNG_INFO_gAMA)) + if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)) { png_fixed_point igamma; #ifdef PNG_FIXED_POINT_SUPPORTED @@ -953,7 +953,7 @@ png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) #ifdef PNG_READ_cHRM_SUPPORTED #ifdef PNG_FIXED_POINT_SUPPORTED - if (info_ptr->valid & PNG_INFO_cHRM) + if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM)) if (PNG_OUT_OF_RANGE(info_ptr->int_x_white, 31270, 1000) || PNG_OUT_OF_RANGE(info_ptr->int_y_white, 32900, 1000) || PNG_OUT_OF_RANGE(info_ptr->int_x_red, 64000L, 1000) || @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.2.9 March 9, 2006 + * Last changed in libpng 1.2.9 March 10, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -950,6 +950,9 @@ png_set_sPLT(png_structp png_ptr, png_sPLT_tp np; int i; + if (png_ptr == NULL || info_ptr == NULL) + return; + np = (png_sPLT_tp)png_malloc_warn(png_ptr, (info_ptr->splt_palettes_num + nentries) * png_sizeof(png_sPLT_t)); if (np == NULL) @@ -1090,6 +1093,8 @@ png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_bytep { png_bytep new_list, p; int i, old_num_chunks; + if (png_ptr == NULL) + return; if (num_chunks == 0) { if(keep == PNG_HANDLE_CHUNK_ALWAYS || keep == PNG_HANDLE_CHUNK_IF_SAFE) @@ -1133,6 +1138,8 @@ png_set_read_user_chunk_fn(png_structp png_ptr, png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn) { png_debug(1, "in png_set_read_user_chunk_fn\n"); + if (png_ptr == NULL) + return; png_ptr->read_user_chunk_fn = read_user_chunk_fn; png_ptr->user_chunk_ptr = user_chunk_ptr; } @@ -1159,6 +1166,8 @@ png_set_rows(png_structp png_ptr, png_infop info_ptr, png_bytepp row_pointers) void PNGAPI png_set_compression_buffer_size(png_structp png_ptr, png_uint_32 size) { + if (png_ptr == NULL) + return; if(png_ptr->zbuf) png_free(png_ptr, png_ptr->zbuf); png_ptr->zbuf_size = (png_size_t)size; @@ -1185,6 +1194,9 @@ png_set_asm_flags (png_structp png_ptr, png_uint_32 asm_flags) png_uint_32 settable_asm_flags; png_uint_32 settable_mmx_flags; + if (png_ptr == NULL) + return; + settable_mmx_flags = #ifdef PNG_HAVE_ASSEMBLER_COMBINE_ROW PNG_ASM_FLAG_MMX_READ_COMBINE_ROW | @@ -1227,6 +1239,8 @@ png_set_mmx_thresholds (png_structp png_ptr, png_byte mmx_bitdepth_threshold, png_uint_32 mmx_rowbytes_threshold) { + if (png_ptr == NULL) + return; png_ptr->mmx_bitdepth_threshold = mmx_bitdepth_threshold; png_ptr->mmx_rowbytes_threshold = mmx_rowbytes_threshold; } diff --git a/pngsyms.c b/pngsyms.c new file mode 100644 index 000000000..8f0b08a0e --- /dev/null +++ b/pngsyms.c @@ -0,0 +1,3 @@ +#define PNG_BUILDSYMS +#include "config.h" +#include "png.h" @@ -1551,4 +1551,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_9beta8 your_png_h_is_not_version_1_2_9beta8; +typedef version_1_2_9beta9 your_png_h_is_not_version_1_2_9beta9; diff --git a/pngtrans.c b/pngtrans.c index 9e6ef8ae9..d64b47c7c 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.9 March 9, 2006 + * Last changed in libpng 1.2.9 March 10, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwrite.c b/pngwrite.c index e7817f28a..17d285b15 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.9 March 9, 2006 + * Last changed in libpng 1.2.9 March 10, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -26,6 +26,8 @@ void PNGAPI png_write_info_before_PLTE(png_structp png_ptr, png_infop info_ptr) { png_debug(1, "in png_write_info_before_PLTE\n"); + if (png_ptr == NULL || info_ptr == NULL) + return; if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE)) { png_write_sig(png_ptr); /* write PNG signature */ @@ -128,6 +130,9 @@ png_write_info(png_structp png_ptr, png_infop info_ptr) png_debug(1, "in png_write_info\n"); + if (png_ptr == NULL || info_ptr == NULL) + return; + png_write_info_before_PLTE(png_ptr, info_ptr); if (info_ptr->valid & PNG_INFO_PLTE) @@ -290,6 +295,8 @@ void PNGAPI png_write_end(png_structp png_ptr, png_infop info_ptr) { png_debug(1, "in png_write_end\n"); + if (png_ptr == NULL) + return; if (!(png_ptr->mode & PNG_HAVE_IDAT)) png_error(png_ptr, "No IDATs written into file"); @@ -617,6 +624,10 @@ png_write_init_3(png_structpp ptr_ptr, png_const_charp user_png_ver, #ifdef PNG_SETJMP_SUPPORTED jmp_buf tmp_jmp; /* to save current jump buffer */ #endif + + if (png_ptr == NULL) + return; + int i = 0; do { @@ -694,6 +705,10 @@ png_write_rows(png_structp png_ptr, png_bytepp row, png_bytepp rp; /* row pointer */ png_debug(1, "in png_write_rows\n"); + + if (png_ptr == NULL) + return; + /* loop through the rows */ for (i = 0, rp = row; i < num_rows; i++, rp++) { @@ -711,6 +726,9 @@ png_write_image(png_structp png_ptr, png_bytepp image) int pass, num_pass; /* pass variables */ png_bytepp rp; /* points to current row */ + if (png_ptr == NULL) + return; + png_debug(1, "in png_write_image\n"); #if defined(PNG_WRITE_INTERLACING_SUPPORTED) /* intialize interlace handling. If image is not interlaced, @@ -734,8 +752,11 @@ png_write_image(png_structp png_ptr, png_bytepp image) void PNGAPI png_write_row(png_structp png_ptr, png_bytep row) { + if (png_ptr == NULL) + return; png_debug2(1, "in png_write_row (row %ld, pass %d)\n", png_ptr->row_number, png_ptr->pass); + /* initialize transformations and other stuff if first time */ if (png_ptr->row_number == 0 && png_ptr->pass == 0) { @@ -909,6 +930,8 @@ void PNGAPI png_set_flush(png_structp png_ptr, int nrows) { png_debug(1, "in png_set_flush\n"); + if (png_ptr == NULL) + return; png_ptr->flush_dist = (nrows < 0 ? 0 : nrows); } @@ -919,6 +942,8 @@ png_write_flush(png_structp png_ptr) int wrote_IDAT; png_debug(1, "in png_write_flush\n"); + if (png_ptr == NULL) + return; /* We have already written out all of the data */ if (png_ptr->row_number >= png_ptr->num_rows) return; @@ -1095,6 +1120,8 @@ void PNGAPI png_set_filter(png_structp png_ptr, int method, int filters) { png_debug(1, "in png_set_filter\n"); + if (png_ptr == NULL) + return; #if defined(PNG_MNG_FEATURES_SUPPORTED) if((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) && (method == PNG_INTRAPIXEL_DIFFERENCING)) @@ -1203,6 +1230,8 @@ png_set_filter_heuristics(png_structp png_ptr, int heuristic_method, int i; png_debug(1, "in png_set_filter_heuristics\n"); + if (png_ptr == NULL) + return; if (heuristic_method >= PNG_FILTER_HEURISTIC_LAST) { png_warning(png_ptr, "Unknown filter heuristic method"); @@ -1315,6 +1344,8 @@ void PNGAPI png_set_compression_level(png_structp png_ptr, int level) { png_debug(1, "in png_set_compression_level\n"); + if (png_ptr == NULL) + return; png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_LEVEL; png_ptr->zlib_level = level; } @@ -1323,6 +1354,8 @@ void PNGAPI png_set_compression_mem_level(png_structp png_ptr, int mem_level) { png_debug(1, "in png_set_compression_mem_level\n"); + if (png_ptr == NULL) + return; png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL; png_ptr->zlib_mem_level = mem_level; } @@ -1331,6 +1364,8 @@ void PNGAPI png_set_compression_strategy(png_structp png_ptr, int strategy) { png_debug(1, "in png_set_compression_strategy\n"); + if (png_ptr == NULL) + return; png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_STRATEGY; png_ptr->zlib_strategy = strategy; } @@ -1338,6 +1373,8 @@ png_set_compression_strategy(png_structp png_ptr, int strategy) void PNGAPI png_set_compression_window_bits(png_structp png_ptr, int window_bits) { + if (png_ptr == NULL) + return; if (window_bits > 15) png_warning(png_ptr, "Only compression windows <= 32k supported by PNG"); else if (window_bits < 8) @@ -1358,6 +1395,8 @@ void PNGAPI png_set_compression_method(png_structp png_ptr, int method) { png_debug(1, "in png_set_compression_method\n"); + if (png_ptr == NULL) + return; if (method != 8) png_warning(png_ptr, "Only compression method 8 is supported by PNG"); png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_METHOD; @@ -1367,6 +1406,8 @@ png_set_compression_method(png_structp png_ptr, int method) void PNGAPI png_set_write_status_fn(png_structp png_ptr, png_write_status_ptr write_row_fn) { + if (png_ptr == NULL) + return; png_ptr->write_row_fn = write_row_fn; } @@ -1376,6 +1417,8 @@ png_set_write_user_transform_fn(png_structp png_ptr, png_user_transform_ptr write_user_transform_fn) { png_debug(1, "in png_set_write_user_transform_fn\n"); + if (png_ptr == NULL) + return; png_ptr->transformations |= PNG_USER_TRANSFORM; png_ptr->write_user_transform_fn = write_user_transform_fn; } @@ -1387,6 +1430,8 @@ void PNGAPI png_write_png(png_structp png_ptr, png_infop info_ptr, int transforms, voidp params) { + if (png_ptr == NULL || info_ptr == NULL) + return; #if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED) /* invert the alpha channel from opacity to transparency */ if (transforms & PNG_TRANSFORM_INVERT_ALPHA) diff --git a/pngwtran.c b/pngwtran.c index 316510962..dca30f0a5 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.2.9 March 9, 2006 + * Last changed in libpng 1.2.9 March 10, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwutil.c b/pngwutil.c index d97ff6377..db98c028e 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.9 March 9, 2006 + * Last changed in libpng 1.2.9 March 10, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 221d3da9e..d3b9b5395 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.9beta8 +version=1.2.9beta9 prefix="" libdir="" libs="" diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 90daa53ce..d1d2cf2e4 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -7,7 +7,7 @@ LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) CC=cc diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 577bc5e03..b4de36573 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -7,7 +7,7 @@ LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) CC=cc diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 08d883a8c..2d97bae22 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -13,14 +13,14 @@ ZLIBLIB = ../zlib CC = gcc LD = $(CC) AR_RC = ar rcs -MKDIR_P = mkdir +MKDIR_P = mkdir -p RANLIB = ranlib RM_F = rm -f LN_SF = ln -f -s LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 7b27f850b..a77364f87 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -7,7 +7,7 @@ CC=gcc AR_RC=ar rc -MKDIR_P=mkdir +MKDIR_P=mkdir -p LN_SF=ln -sf RANLIB=ranlib RM_F=/bin/rm -f @@ -17,7 +17,7 @@ ZLIBLIB=/usr/local/lib ZLIBINC=/usr/local/include PNGMAJ = 0 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 8c2714f74..582448db0 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -80,7 +80,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 5e3ecf87b..1b2d15944 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -18,7 +18,7 @@ ZLIBINC=../zlib CC=cc AR_RC=ar rc -MKDIR_P=mkdir +MKDIR_P=mkdir -p LN_SF=ln -sf RANLIB=ranlib RM_F=/bin/rm -f @@ -27,7 +27,7 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz PNGMAJ = 0 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.dec b/scripts/makefile.dec index a7e4744dc..b8c1fbd24 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -33,7 +33,7 @@ ZLIBLIB=../zlib ZLIBINC=../zlib PNGMAJ = 0 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 20dd781a1..cca9f39e9 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -11,7 +11,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) AR_RC=ar rc diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 63577e7e5..38b588de6 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -15,7 +15,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) # Compiler, linker, lib and other tools @@ -23,7 +23,7 @@ CC = gcc LD = $(CC) AR_RC = ar rc LN_SF = ln -sf -MKDIR_P = mkdir +MKDIR_P = mkdir -p RANLIB = ranlib RM_F = /bin/rm -f diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index f5f2d4c64..ed76d95be 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -17,7 +17,7 @@ ZLIBINC=/opt/zlib/include AR_RC=ar rc CC=cc -MKDIR_P=mkdir +MKDIR_P=mkdir -p LN_SF=ln -sf RANLIB=ranlib RM_F=/bin/rm -f @@ -32,7 +32,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm PNGMAJ = 0 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 8194ef491..04c54d7ed 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ CC=gcc LD=ld AR_RC=ar rc -MKDIR_P=mkdir +MKDIR_P=mkdir -p LN_SF=ln -sf RANLIB=ranlib RM_F=/bin/rm -f @@ -44,7 +44,7 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm PNGMAJ = 0 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index b2ed0f106..0b1fc3262 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -17,7 +17,7 @@ ZLIBINC=/opt/zlib/include AR_RC=ar rc CC=cc -MKDIR_P=mkdir +MKDIR_P=mkdir -p LN_SF=ln -sf RANLIB=ranlib RM_F=/bin/rm -f @@ -28,7 +28,7 @@ CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm PNGMAJ = 0 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 9e0082805..61eead8b1 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -5,7 +5,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) AR_RC=ar rc diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 0b6fe5075..c3550d6ec 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.9beta8 +SHLIB_MINOR= 1.2.9beta9 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 e67cdf9e3..49c0dd6d2 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.2.9beta8 +SHLIB_MINOR= 1.2.9beta9 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.openbsd b/scripts/makefile.openbsd index 963fabfc4..eb13226ff 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -7,7 +7,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.9beta8 +SHLIB_MINOR= 1.2.9beta9 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 43fb560ab..30c8307c3 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -27,7 +27,7 @@ CFLAGS= -dy -belf -I$(ZLIBINC) -O3 LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm PNGMAJ = 0 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 63f2af25f..1fa1fd74a 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -19,7 +19,7 @@ ZLIBINC=../zlib LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) AR_RC=ar rc diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index c0eafda03..6832665de 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -5,7 +5,7 @@ LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) # Where make install puts libpng.a, libpng12.so, and libpng12/png.h diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 70fe48f8c..5cb5dc75b 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -37,7 +37,7 @@ CFLAGS=-I$(ZLIBINC) -O3 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm PNGMAJ = 0 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index f2b4c2c52..6bbf086f4 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -33,7 +33,7 @@ CFLAGS=-I$(ZLIBINC) -Wall -O \ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm PNGMAJ = 0 -PNGMIN = 1.2.9beta8 +PNGMIN = 1.2.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index f26f242bc..f05538602 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.9beta8 +; Version 1.2.9beta9 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index fca2e1fac..0ace6474e 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.9beta8 +;Version 1.2.9beta9 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |