diff options
51 files changed, 253 insertions, 101 deletions
@@ -1,5 +1,5 @@ -Libpng 1.0.9beta8 - January 12, 2001 +Libpng 1.0.9beta9 - January 15, 2001 This is a public release of libpng, intended for use in production codes. @@ -47,6 +47,9 @@ Changes since the last public release (1.0.8): Revised the iCCP chunk reader to ignore trailing garbage. Moved pngasmrd.h into pngconf.h. Improved handling of out-of-spec garbage iCCP chunks generated by PhotoShop. + Added png_set_invalid, png_permit_mng_features, and png_mmx_supported to + wince and msvc project module definition files. + Fixed bug with progressive reading of narrow interlaced images in pngpread.c Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -874,6 +874,11 @@ version 1.0.9beta7 [December 28, 2000] version 1.0.9beta8 [January 12, 2001] Moved pngasmrd.h into pngconf.h. Improved handling of out-of-spec garbage iCCP chunks generated by PhotoShop. +version 1.0.9beta9 [January 15, 2001] + Added png_set_invalid, png_permit_mng_features, and png_mmx_supported to + wince and msvc project module definition files. + Minor revision of makefile.cygwin. + Fixed bug with progressive reading of narrow interlaced images in pngpread.c Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -1,5 +1,5 @@ -Installing libpng version 1.0.9beta8 - January 12, 2001 +Installing libpng version 1.0.9beta9 - January 15, 2001 Before installing libpng, you must first install zlib. zlib can usually be found wherever you got libpng. zlib can be @@ -10,7 +10,7 @@ zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.0.9beta8" or "lpng109" and "zlib-1.1.3" +might be called "libpng-1.0.9beta9" or "lpng109" and "zlib-1.1.3" or "zlib113") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -59,8 +59,8 @@ The files that are presently available in the scripts directory include makefile.std => Generic UNIX makefile (cc, creates static libpng.a) - makefile.linux => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.9beta8) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.9beta8, + makefile.linux => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.9beta9) + makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.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 @@ -75,9 +75,9 @@ include libpng.icc => Project file for IBM VisualAge/C++ version 4.0 or later makefile.macosx => MACOS X Makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) - makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.9beta8) + makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.9beta9) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.9beta8) + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.9beta9) makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.mips => MIPS makefile makefile.acorn => Acorn makefile @@ -1,4 +1,9 @@ Known bugs in libpng-1.0.9 -None as of January 12, 2001. +1: January 16, 2001 -- BUG -- progressive reading narrow interlaced PNGs + + A crash occurs in Mozilla when reading a 2x533 interlaced RGB image. + + Status: Under investigation. It appears that pngpread.c is not + taking care to skip empty passes. @@ -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.0.7, July 1, 2000, through 1.0.9beta8, January 12, 2001, are +libpng versions 1.0.7, July 1, 2000, through 1.0.9beta9, January 15, 2001, are Copyright (c) 2000 Glenn Randers-Pehrson and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors @@ -99,4 +99,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -January 12, 2001 +January 15, 2001 @@ -1,4 +1,4 @@ -README for libpng 1.0.9beta8 - January 12, 2001 (shared library 2.1) +README for libpng 1.0.9beta9 - January 15, 2001 (shared library 2.1) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -182,9 +182,9 @@ Files in this distribution: descrip.mms => VMS makefile for MMS or MMK makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.linux => Linux/ELF makefile - (gcc, creates libpng.so.2.1.0.9beta8) + (gcc, creates libpng.so.2.1.0.9beta9) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng.so.2.1.0.9beta8, uses assembler code + libpng.so.2.1.0.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 @@ -199,10 +199,10 @@ Files in this distribution: libpng.icc => Project file, IBM VisualAge/C++ 4.0 or later makefile.macosx => MACOS X Makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) - makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.9beta8) + makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.9beta9) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng.so.2.1.0.9beta8) + (gcc, creates libpng.so.2.1.0.9beta9) makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.mips => MIPS makefile makefile.acorn => Acorn makefile @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - January 12, 2001 + January 15, 2001 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and - upward through 1.0.9beta8 are Y2K compliant. It is my belief that earlier + upward through 1.0.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,5 +1,5 @@ echo " - There is no \"configure\" script for Libpng-1.0.9beta8. Instead, please + There is no \"configure\" script for Libpng-1.0.9beta9. Instead, please copy the appropriate makefile for your system from the \"scripts\" directory. Read the INSTALL file for more details. " diff --git a/contrib/gregbook/Makefile.sgi b/contrib/gregbook/Makefile.sgi new file mode 100644 index 000000000..bba61fbf8 --- /dev/null +++ b/contrib/gregbook/Makefile.sgi @@ -0,0 +1,102 @@ +# Sample makefile for rpng-x / rpng2-x / wpng for SGI using cc and make. +# Greg Roelofs +# Last modified: 16 January 1000 +# +# The programs built by this makefile are described in the book, +# "PNG: The Definitive Guide," by Greg Roelofs (O'Reilly and +# Associates, 1999). Go buy a copy, eh? Buy some for friends +# and family, too. (Not that this is a blatant plug or anything.) +# +# Invoke this makefile from a shell prompt in the usual way; for example: +# +# make -f Makefile.sgi +# +# This makefile assumes libpng and zlib have already been built or downloaded +# and are both installed in /usr/local/{include,lib} (as indicated by the +# PNG* and Z* macros below). Edit as appropriate--choose only ONE each of +# the PNGINC, PNGLIB, ZINC and ZLIB lines. +# +# This makefile builds dynamically linked executables (against libpng and zlib, +# that is), but that can be changed by uncommenting the appropriate PNGLIB and +# ZLIB lines. + + +# macros -------------------------------------------------------------------- + +PNGINC = -I/usr/local/include +PNGLIB = -L/usr/local/lib -lpng # dynamically linked against libpng +#PNGLIB = /usr/local/lib/libpng.a # statically linked against libpng +# or: +#PNGINC = -I../.. +#PNGLIB = -L../.. -lpng +#PNGLIB = ../../libpng.a + +ZINC = -I/usr/local/include +ZLIB = -L/usr/local/lib -lz # dynamically linked against zlib +#ZLIB = /usr/local/lib/libz.a # statically linked against zlib +#ZINC = -I../zlib +#ZLIB = -L../zlib -lz +#ZLIB = ../../../zlib/libz.a + +XINC = -I/usr/include/X11 # old-style, stock X distributions +XLIB = -L/usr/lib/X11 -lX11 +#XINC = -I/usr/openwin/include # Sun workstations (OpenWindows) +#XLIB = -L/usr/openwin/lib -lX11 +#XINC = -I/usr/X11R6/include # new X distributions (XFree86, etc.) +#XLIB = -L/usr/X11R6/lib -lX11 + +INCS = $(PNGINC) $(ZINC) $(XINC) +RLIBS = $(PNGLIB) $(ZLIB) $(XLIB) -lm +WLIBS = $(PNGLIB) $(ZLIB) + +CC = cc +LD = cc +RM = rm -f +CFLAGS = -O -fullwarn $(INCS) +LDFLAGS = +O = .o +E = + +RPNG = rpng-x +RPNG2 = rpng2-x +WPNG = wpng + +ROBJS = $(RPNG)$(O) readpng$(O) +ROBJS2 = $(RPNG2)$(O) readpng2$(O) +WOBJS = $(WPNG)$(O) writepng$(O) + +EXES = $(RPNG)$(E) $(RPNG2)$(E) $(WPNG)$(E) + + +# implicit make rules ------------------------------------------------------- + +.c$(O): + $(CC) -c $(CFLAGS) $< + + +# dependencies -------------------------------------------------------------- + +all: $(EXES) + +$(RPNG)$(E): $(ROBJS) + $(LD) $(LDFLAGS) -o $@ $(ROBJS) $(RLIBS) + +$(RPNG2)$(E): $(ROBJS2) + $(LD) $(LDFLAGS) -o $@ $(ROBJS2) $(RLIBS) + +$(WPNG)$(E): $(WOBJS) + $(LD) $(LDFLAGS) -o $@ $(WOBJS) $(WLIBS) + +$(RPNG)$(O): $(RPNG).c readpng.h +$(RPNG2)$(O): $(RPNG2).c readpng2.h +$(WPNG)$(O): $(WPNG).c writepng.h + +readpng$(O): readpng.c readpng.h +readpng2$(O): readpng2.c readpng2.h +writepng$(O): writepng.c writepng.h + + +# maintenance --------------------------------------------------------------- + +clean: + $(RM) $(EXES) $(ROBJS) $(ROBJS2) $(WOBJS) @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "January 12, 2001" +.TH LIBPNG 3 "January 15, 2001" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.9beta8 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.9beta9 .SH SYNOPSIS \fI\fB @@ -759,7 +759,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.0.9beta8 - January 12, 2001 + libpng version 1.0.9beta9 - January 15, 2001 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson @@ -3441,13 +3441,13 @@ application: .SH VIII. Y2K Compliance in libpng -January 12, 2001 +January 15, 2001 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.0.9beta8 are Y2K compliant. It is my belief that earlier +upward through 1.0.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 @@ -3588,7 +3588,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.9beta8 - January 12, 2001: +Libpng version 1.0.9beta9 - January 15, 2001: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu). @@ -3605,7 +3605,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.0.7, July 1, 2000, through 1.0.9beta8, January 12, 2001, are +libpng versions 1.0.7, July 1, 2000, through 1.0.9beta9, January 15, 2001, are Copyright (c) 2000 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors @@ -3696,7 +3696,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -January 12, 2001 +January 15, 2001 .\" end of man page diff --git a/libpng.txt b/libpng.txt index 9d550b10e..735421a47 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.0.9beta8 - January 12, 2001 + libpng version 1.0.9beta9 - January 15, 2001 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson @@ -2682,13 +2682,13 @@ application: VIII. Y2K Compliance in libpng -January 12, 2001 +January 15, 2001 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.0.9beta8 are Y2K compliant. It is my belief that earlier +upward through 1.0.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 cb0cf375c..2451df04b 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "January 12, 2001" +.TH LIBPNGPF 3 "January 15, 2001" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.9beta8 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.9beta9 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "January 12, 2001" +.TH PNG 5 "January 15, 2001" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * libpng version 1.0.9beta8 - January 12, 2001 + * libpng version 1.0.9beta9 - January 15, 2001 * Copyright (c) 1998, 1999, 2000, 2001 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.) @@ -13,14 +13,14 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_0_9beta8 Your_png_h_is_not_version_1_0_9beta8; +typedef version_1_0_9beta9 Your_png_h_is_not_version_1_0_9beta9; /* Version information for C files. This had better match the version * string defined in png.h. */ #ifdef PNG_USE_GLOBAL_ARRAYS /* png_libpng_ver was changed to a function in version 1.0.5c */ -const char png_libpng_ver[18] = "1.0.9beta8"; +const char png_libpng_ver[18] = "1.0.9beta9"; /* png_sig was changed to a function in version 1.0.5c */ /* Place to hold the signature string for a PNG file. */ @@ -626,7 +626,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { if (png_ptr != NULL || png_ptr == NULL) /* silence compiler warning */ - return ((png_charp) "\n libpng version 1.0.9beta8 - January 12, 2001\n\ + return ((png_charp) "\n libpng version 1.0.9beta9 - January 15, 2001\n\ Copyright (c) 1998-2001 Glenn Randers-Pehrson\n\ Copyright (c) 1996, 1997 Andreas Dilger\n\ Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.\n"); @@ -644,8 +644,8 @@ png_get_libpng_ver(png_structp png_ptr) { /* Version of *.c files used when building libpng */ if(png_ptr != NULL) /* silence compiler warning about unused png_ptr */ - return((png_charp) "1.0.9beta8"); - return((png_charp) "1.0.9beta8"); + return((png_charp) "1.0.9beta9"); + return((png_charp) "1.0.9beta9"); } png_charp PNGAPI @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.0.9beta8 - January 12, 2001 + * libpng version 1.0.9beta9 - January 15, 2001 * Copyright (c) 1998, 1999, 2000, 2001 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.0.9beta8 - January 12, 2001: Glenn + * libpng versions 0.97, January 1998, through 1.0.9beta9 - January 15, 2001: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -60,7 +60,7 @@ * 1.0.8 10008 2.1.0.8 * 1.0.9beta1-6 10009 2.1.0.9beta1-6 * 1.0.9rc1 10009 2.1.0.9rc1 - * 1.0.9beta7-8 10009 2.1.0.9beta7-8 + * 1.0.9beta7-9 10009 2.1.0.9beta7-9 * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -87,7 +87,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.0.7, July 1, 2000, through 1.0.9beta8, January 12, 2001, are + * libpng versions 1.0.7, July 1, 2000, through 1.0.9beta9, January 15, 2001, are * Copyright (c) 2000, 2001 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.0.6 * with the following individuals added to the list of Contributing Authors @@ -192,13 +192,13 @@ * Y2K compliance in libpng: * ========================= * - * January 12, 2001 + * January 15, 2001 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.0.9beta8 are Y2K compliant. It is my belief that earlier + * upward through 1.0.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 @@ -254,7 +254,7 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.0.9beta8" +#define PNG_LIBPNG_VER_STRING "1.0.9beta9" #define PNG_LIBPNG_VER_SONUM 2 @@ -265,7 +265,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 #define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_BETA 2 @@ -1172,9 +1172,9 @@ struct png_struct_def /* This prevents a compiler error in png_get_copyright() in png.c if png.c -and png.h are both at * version 1.0.9beta8 +and png.h are both at * version 1.0.9beta9 */ -typedef png_structp version_1_0_9beta8; +typedef png_structp version_1_0_9beta9; typedef png_struct FAR * FAR * png_structpp; @@ -2217,10 +2217,10 @@ extern PNG_EXPORT(png_uint_32,png_permit_mng_features) PNGARG((png_structp /* png.c, pnggccrd.c, or pngvcrd.c */ extern PNG_EXPORT(int,png_mmx_support) PNGARG((void)); -/* Maintainer: Put new public prototypes here ^ and in libpng.3 */ +/* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */ #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.0.9beta8 - January 12, 2001 (header)\n" + " libpng version 1.0.9beta9 - January 15, 2001 (header)\n" #ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED /* With these routines we avoid an integer divide, which will be slower on diff --git a/pngasmrd.h b/pngasmrd.h index 0ee0e8543..fa9be9808 100644 --- a/pngasmrd.h +++ b/pngasmrd.h @@ -1,6 +1,6 @@ /* pngasmrd.h - assembler version of utilities to read a PNG file * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 2001 Glenn Randers-Pehrson * @@ -1,6 +1,6 @@ /* pngconf.h - machine configurable file for libpng * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -499,7 +499,7 @@ # define PNG_MNG_FEATURES_SUPPORTED #endif -/* Deprecated, will be removed */ +/* Deprecated, will be removed from version 2.0.0 */ #ifndef PNG_NO_READ_EMPTY_PLTE # define PNG_READ_EMPTY_PLTE_SUPPORTED #endif @@ -586,9 +586,11 @@ # define PNG_EASY_ACCESS_SUPPORTED #endif +/* PNG_ASSEMBLER_CODE will be enabled by default in version 1.2.0 + even when PNG_USE_PNGVCRD or PNG_USE_PNGGCCRD is not defined */ #ifndef PNG_NO_ASSEMBLER_CODE -# define PNG_ASSEMBLER_CODE_SUPPORTED # if defined(PNG_USE_PNGVCRD) || defined(PNG_USE_PNGGCCRD) +# define PNG_ASSEMBLER_CODE_SUPPORTED # define PNG_MMX_CODE_SUPPORTED # endif #endif @@ -1214,7 +1216,7 @@ typedef z_stream FAR * png_zstreamp; /* These are the default thresholds before the MMX code kicks in; if either * rowbytes or bitdepth is below the threshold, plain C code is used. These * can be overridden at runtime via the png_set_mmx_thresholds() call in - * libpng 1.0.9 and later. The values below were chosen by Intel. + * libpng 1.2.0 and later. The values below were chosen by Intel. */ #ifndef PNG_MMX_ROWBYTES_THRESHOLD_DEFAULT diff --git a/pngerror.c b/pngerror.c index aa0860be2..03a0f8318 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pnggccrd.c b/pnggccrd.c index 446614797..9dcf836e7 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -6,7 +6,7 @@ * and http://www.intel.com/drg/pentiumII/appnotes/923/923.htm * for Intel's performance analysis of the MMX vs. non-MMX code. * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation @@ -223,7 +223,7 @@ * x pick one version of mmxsupport() and get rid of the other * - add error messages to any remaining bogus default cases * - enable pixel_depth == 8 cases in png_read_filter_row()? (test speed) - * x add support for runtime enable/disable/query of various MMX routines + * - add support for runtime enable/disable/query of various MMX routines */ //#define PNG_DEBUG 2 // GRR @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpread.c b/pngpread.c index 336c3f753..d1e8b7566 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -778,8 +778,8 @@ png_push_process_row(png_structp png_ptr) */ png_do_read_interlace(png_ptr); - switch (png_ptr->pass) - { + switch (png_ptr->pass) + { case 0: { int i; @@ -788,6 +788,14 @@ png_push_process_row(png_structp png_ptr) png_push_have_row(png_ptr, png_ptr->row_buf + 1); png_read_push_finish_row(png_ptr); } + if (png_ptr->pass == 2) + { + for (i = 0; i < 4 && png_ptr->pass == 2; i++) + { + png_push_have_row(png_ptr, NULL); + png_read_push_finish_row(png_ptr); + } + } break; } case 1: @@ -821,6 +829,14 @@ png_push_process_row(png_structp png_ptr) png_push_have_row(png_ptr, NULL); png_read_push_finish_row(png_ptr); } + if (png_ptr->pass == 4) + { + for (i = 0; i < 2 && png_ptr->pass == 4; i++) + { + png_push_have_row(png_ptr, NULL); + png_read_push_finish_row(png_ptr); + } + } break; } case 3: @@ -854,6 +870,11 @@ png_push_process_row(png_structp png_ptr) png_push_have_row(png_ptr, NULL); png_read_push_finish_row(png_ptr); } + if (png_ptr->pass == 6) + { + png_push_have_row(png_ptr, NULL); + png_read_push_finish_row(png_ptr); + } break; } case 5: @@ -931,6 +952,11 @@ png_read_push_finish_row(png_structp png_ptr) do { png_ptr->pass++; + if ((png_ptr->pass == 1 && png_ptr->width < 5) || + (png_ptr->pass == 3 && png_ptr->width < 3) || + (png_ptr->pass == 5 && png_ptr->width < 2)) + png_ptr->pass++; + if (png_ptr->pass >= 7) break; @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -715,7 +715,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row) * not called png_set_interlace_handling(), the display_row buffer will * be ignored, so pass NULL to it. * - * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.9beta8 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.9beta9 */ void PNGAPI @@ -764,7 +764,7 @@ png_read_rows(png_structp png_ptr, png_bytepp row, * only call this function once. If you desire to have an image for * each pass of a interlaced image, use png_read_rows() instead. * - * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.9beta8 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.9beta9 */ void PNGAPI png_read_image(png_structp png_ptr, png_bytepp image) @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index bd858c0b6..6c56c1d12 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index 832cd3aeb..7d8adeee1 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1449,4 +1449,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_0_9beta8 your_png_h_is_not_version_1_0_9beta8; +typedef version_1_0_9beta9 your_png_h_is_not_version_1_0_9beta9; diff --git a/pngtrans.c b/pngtrans.c index af7983df6..405e1312c 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) * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -2,7 +2,7 @@ * * For Intel x86 CPU and Microsoft Visual C++ compiler * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation @@ -19,8 +19,6 @@ * * [png_read_filter_row_mmx_avg() bpp == 2 bugfix, GRR 20000916] * - * [runtime MMX configuration, GRR 20010102] - * */ #define PNG_INTERNAL @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwrite.c b/pngwrite.c index 88e19ff9b..b5d457f84 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwtran.c b/pngwtran.c index 4096c284e..f3ad634b9 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwutil.c b/pngwutil.c index 531479de8..80af56e67 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.0.9beta8 - January 12, 2001 + * libpng 1.0.9beta9 - January 15, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/projects/msvc/README.txt b/projects/msvc/README.txt index cfff6ff1e..93094b3fc 100644 --- a/projects/msvc/README.txt +++ b/projects/msvc/README.txt @@ -1,5 +1,5 @@ Microsoft Developer Studio Build File, Format Version 6.00 for -libpng 1.0.9beta8 (January 12, 2001) and zlib +libpng 1.0.9beta9 (January 15, 2001) and zlib Copyright (C) 2000 Simon-Pierre Cadieux For conditions of distribution and use, see copyright notice in png.h diff --git a/projects/msvc/png32ms.def b/projects/msvc/png32ms.def index 51dd2e2ed..8e51b265d 100644 --- a/projects/msvc/png32ms.def +++ b/projects/msvc/png32ms.def @@ -6,7 +6,7 @@ LIBRARY DESCRIPTION "PNG image compression library for Windows" EXPORTS -;Version 1.0.9beta8 +;Version 1.0.9beta9 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 @@ -176,3 +176,8 @@ EXPORTS png_write_init_2 @167 png_access_version_number @168 ; png_sig_bytes @169 + png_libpng_ver @170 + png_init_io @171 + png_convert_to_rfc1123 @172 + png_set_invalid @173 + png_mmx_supported @174 diff --git a/projects/wince/READMEE.WCE b/projects/wince/READMEE.WCE index 088598121..b6f49221d 100644 --- a/projects/wince/READMEE.WCE +++ b/projects/wince/READMEE.WCE @@ -8,9 +8,9 @@ libpng for WindowsCE Rel.1.0 Introduction ============ -This is libpng 1.0.9beta8 ported to WindowsCE 2.0 and 2.11. -libpng 1.0.9beta8 is a PNG reference library. -See README, a document of original libpng 1.0.9beta8. +This is libpng 1.0.9beta9 ported to WindowsCE 2.0 and 2.11. +libpng 1.0.9beta9 is a PNG reference library. +See README, a document of original libpng 1.0.9beta9. zlib for WindowsCE ================== @@ -23,7 +23,7 @@ This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -See README and LICENSE, documents of original libpng 1.0.9beta8, for conditions +See README and LICENSE, documents of original libpng 1.0.9beta9, for conditions of use and distribution. Files diff --git a/projects/wince/READMEJ.WCE b/projects/wince/READMEJ.WCE index 8b0e3196f..a25c7aed0 100644 --- a/projects/wince/READMEJ.WCE +++ b/projects/wince/READMEJ.WCE @@ -24,7 +24,7 @@ libpngでは、データ圧縮ライブラリとして zlibを使用しています。libpngを になったいかなる被害についても、作者、配布者、その他利用者以外の人物、 団体に責任をとる義務はないものとします。 -その他、このソフトウェアの利用条件については、原版である libpng 1.0.9beta8に +その他、このソフトウェアの利用条件については、原版である libpng 1.0.9beta9に 準拠するものとします。詳しくは、付属の README,LICENSE をお読みください。 収録内容 diff --git a/projects/wince/png32ce.def b/projects/wince/png32ce.def index e9bea72a2..04dd26487 100644 --- a/projects/wince/png32ce.def +++ b/projects/wince/png32ce.def @@ -5,7 +5,7 @@ LIBRARY lpngce EXPORTS -;Version 1.0.9beta8 +;Version 1.0.9beta9 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 @@ -178,3 +178,5 @@ EXPORTS png_libpng_ver @170 png_init_io @171 png_convert_to_rfc1123 @172 + png_set_invalid @173 + png_mmx_supported @174 diff --git a/scripts/makefile.aix b/scripts/makefile.aix index fc82e8653..4e92c27fe 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -18,7 +18,7 @@ RM = rm -f # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.9beta8 +PNGMIN = 1.0.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index e9f4b62e3..710fab385 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -31,7 +31,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.9beta8 +PNGMIN = 1.0.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) # where make install puts libpng.a, libpng.so*, and png.h diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 92bed57ce..914407a8b 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -38,7 +38,8 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \ # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.9beta8 +PNGMIN = 1.0.9beta9 +PNGMIN_BASE = 1.0.9 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(PNGMAJ).dll @@ -60,7 +61,7 @@ LIBPATH=$(prefix)/lib BINPATH=$(prefix)/bin MANPATH=$(prefix)/man MAN3PATH=$(MANPATH)/man3 -DOCPATH=$(prefix)/doc/libpng-$(PNGMIN) +DOCPATH=$(prefix)/doc/libpng-$(PNGMIN_BASE) OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 34bc279cb..37f61c92c 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -17,7 +17,7 @@ ZLIBINC=../zlib # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.9beta8 +PNGMIN = 1.0.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) CC=cc diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 60e696a59..973902e77 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -51,7 +51,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.9beta8 +PNGMIN = 1.0.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index dd29546dc..4c7d00cf3 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -18,7 +18,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.9beta8 +PNGMIN = 1.0.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) # where make install puts libpng.a and png.h diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 335921b29..d36788cdb 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -34,7 +34,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.9beta8 +PNGMIN = 1.0.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.sco b/scripts/makefile.sco index ac0c833c6..9ac49aff9 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -25,7 +25,7 @@ RANLIB=echo # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.9beta8 +PNGMIN = 1.0.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 12e80bd20..9f0346939 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -19,8 +19,8 @@ CFLAGS=-I$(ZLIBINC) -O2 $(WARNMORE) -fPIC -mabi=n32 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm LDSHARED=gcc -shared -VER=1.0.9beta8 -LIBS=libpng.so.1.0.9beta8 +VER=1.0.9beta9 +LIBS=libpng.so.1.0.9beta9 SHAREDLIB=libpng.so libdir=$(prefix)/lib32 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 64bf97aa3..2839ef883 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -31,7 +31,7 @@ RANLIB=echo # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.9beta8 +PNGMIN = 1.0.9beta9 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index 6deee81e6..fc56e29cd 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -5,7 +5,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.0.9beta8'; + PNG_LIBPNG_VER_STRING = '1.0.9beta9'; PNG_LIBPNG_VER = 10009; type diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 333f056f5..7d8841e1b 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -325,3 +325,6 @@ EXPORTS png_tIME png_tRNS png_zTXt + + png_mmx_supported + png_permit_empty_plte |