diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2001-01-31 05:56:52 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:05:56 -0500 |
| commit | d4e8109a481c9acaa84bc6db4db711a42256b6c9 (patch) | |
| tree | 4341f347b24a809cc08ad6953d7ff40c7cba6193 | |
| parent | be9de0f428597268130f8f675b25db7920be3f1f (diff) | |
| download | libpng-d4e8109a481c9acaa84bc6db4db711a42256b6c9.tar.gz | |
Imported from libpng-1.0.9.tarv1.0.9
53 files changed, 128 insertions, 122 deletions
@@ -1,5 +1,5 @@ -Libpng 1.0.9rc2 - January 22, 2001 +Libpng 1.0.9 - January 31, 2001 This is a public release of libpng, intended for use in production codes. @@ -47,11 +47,12 @@ 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. + Added png_set_invalid to wince and msvc project module definition files. Fixed bug with progressive reading of narrow interlaced images in pngpread.c Do not typedef png_FILE_io in pngconf.h when PNG_NO_STDIO is defined. Updated makefile.sgi to make shared library. + Added check of cygwin's ALL_STATIC in pngconf.h + Added "-nommx" parameter to contrib/gregbook/rpng2-win and rpng2-x demos. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -883,11 +883,16 @@ version 1.0.9beta9 [January 15, 2001] version 1.0.9beta10 [January 16, 2001] Do not typedef png_FILE_p in pngconf.h when PNG_NO_STDIO is defined. Fixed "png_mmx_supported" typo in project definition files. -version 1.0.9rc2 [January 22, 2001] +version 1.0.9beta11 [January 19, 2001] Updated makefile.sgi to make shared library. Removed png_mmx_support() function and disabled PNG_MNG_FEATURES_SUPPORTED by default, for the benefit of DLL forward compatibility. These will be re-enabled in version 1.2.0. +version 1.0.9rc2 [January 22, 2001] + Revised cygwin support. +version 1.0.9 [January 31, 2001] + Added check of cygwin's ALL_STATIC in pngconf.h + Added "-nommx" parameter to contrib/gregbook/rpng2-win and rpng2-x demos. 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.9rc2 - January 22, 2001 +Installing libpng version 1.0.9 - January 31, 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.9rc2" or "lpng109" and "zlib-1.1.3" +might be called "libpng-1.0.9" 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.9rc2) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.9rc2, + makefile.linux => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.9) + makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.9, 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.9rc2) + makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.9) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.9rc2) + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.9) makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.mips => MIPS makefile makefile.acorn => Acorn makefile @@ -1,9 +1,4 @@ Known bugs in libpng-1.0.9 -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. +None. @@ -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.9rc2, January 22, 2001, are +libpng versions 1.0.7, July 1, 2000, through 1.0.9, January 31, 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 22, 2001 +January 31, 2001 @@ -1,4 +1,4 @@ -README for libpng 1.0.9rc2 - January 22, 2001 (shared library 2.1) +README for libpng 1.0.9 - January 31, 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.9rc2) + (gcc, creates libpng.so.2.1.0.9) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng.so.2.1.0.9rc2, uses assembler code + libpng.so.2.1.0.9, 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.9rc2) + makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.9) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng.so.2.1.0.9rc2) + (gcc, creates libpng.so.2.1.0.9) 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 22, 2001 + January 31, 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.9rc2 are Y2K compliant. It is my belief that earlier + upward through 1.0.9 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.9rc2. Instead, please + There is no \"configure\" script for Libpng-1.0.9. 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/rpng2-win.c b/contrib/gregbook/rpng2-win.c index 8a8d3e7e1..d6073ff33 100644 --- a/contrib/gregbook/rpng2-win.c +++ b/contrib/gregbook/rpng2-win.c @@ -56,7 +56,7 @@ #define PROGNAME "rpng2-win" #define LONGNAME "Progressive PNG Viewer for Windows" -#define VERSION "1.20 of 4 January 2001" +#define VERSION "1.20 of 29 January 2001" #include <stdio.h> #include <stdlib.h> @@ -373,6 +373,10 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode) rpng2_info.nommxcombine = TRUE; } else if (!strncmp(*argv, "-nommxinterlace", 7)) { rpng2_info.nommxinterlace = TRUE; + } else if (!strcmp(*argv, "-nommx")) { + rpng2_info.nommxfilters = TRUE; + rpng2_info.nommxcombine = TRUE; + rpng2_info.nommxinterlace = TRUE; #endif } else { if (**argv != '-') { @@ -428,7 +432,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode) fprintf(stderr, "\n" "Usage: %s [-gamma exp] [-bgcolor bg | -bgpat pat] [-timing]\n" #if (defined(__i386__) || defined(_M_IX86)) - " %*s [-nommxfilters] [-nommxcombine] [-nommxinterlace]\n" + " %*s [[-nommxfilters] [-nommxcombine] [-nommxinterlace] | -nommx]\n" #endif " %*s file.png\n\n" " exp \ttransfer-function exponent (``gamma'') of the display\n" diff --git a/contrib/gregbook/rpng2-x.c b/contrib/gregbook/rpng2-x.c index dd26fec6b..4f90ef09a 100644 --- a/contrib/gregbook/rpng2-x.c +++ b/contrib/gregbook/rpng2-x.c @@ -56,7 +56,7 @@ #define PROGNAME "rpng2-x" #define LONGNAME "Progressive PNG Viewer for X" -#define VERSION "1.20 of 4 January 2001" +#define VERSION "1.20 of 29 January 2001" #include <stdio.h> #include <stdlib.h> @@ -367,6 +367,10 @@ int main(int argc, char **argv) rpng2_info.nommxcombine = TRUE; } else if (!strncmp(*argv, "-nommxinterlace", 7)) { rpng2_info.nommxinterlace = TRUE; + } else if (!strcmp(*argv, "-nommx")) { + rpng2_info.nommxfilters = TRUE; + rpng2_info.nommxcombine = TRUE; + rpng2_info.nommxinterlace = TRUE; #endif } else { if (**argv != '-') { @@ -428,7 +432,7 @@ int main(int argc, char **argv) fprintf(stderr, "\n" "Usage: %s [-display xdpy] [-gamma exp] [-bgcolor bg | -bgpat pat]\n" #if (defined(__i386__) || defined(_M_IX86)) - " %*s [-nommxfilters] [-nommxcombine] [-nommxinterlace]\n" + " %*s [[-nommxfilters] [-nommxcombine] [-nommxinterlace] | -nommx]\n" #endif " %*s [-usleep dur | -timing] [-pause] file.png\n\n" " xdpy\tname of the target X display (e.g., ``hostname:0'')\n" @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "January 22, 2001" +.TH LIBPNG 3 "January 31, 2001" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.9rc2 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.9 .SH SYNOPSIS \fI\fB @@ -100,10 +100,6 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.0.9rc2 \fI\fB -\fBpng_uint_32 png_get_asm_flags (png_structp \fIpng_ptr\fP\fB);\fP - -\fI\fB - \fBpng_byte png_get_bit_depth (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP \fI\fB @@ -338,10 +334,6 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.0.9rc2 \fI\fB -\fBint png_mmx_support \fI(void\fP\fB);\fP - -\fI\fB - \fBvoid png_permit_empty_plte (png_structp \fP\fIpng_ptr\fP\fB, int \fIempty_plte_permitted\fP\fB);\fP \fI\fB @@ -392,10 +384,6 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.0.9rc2 \fI\fB -\fBpng_set_asm_flags (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIasm_flags\fP\fB);\fP - -\fI\fB - \fBvoid png_set_background (png_structp \fP\fIpng_ptr\fP\fB, png_color_16p \fP\fIbackground_color\fP\fB, int \fP\fIbackground_gamma_code\fP\fB, int \fP\fIneed_expand\fP\fB, double \fIbackground_gamma\fP\fB);\fP \fI\fB @@ -759,7 +747,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.9rc2 - January 22, 2001 + libpng version 1.0.9 - January 31, 2001 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson @@ -3441,13 +3429,13 @@ application: .SH VIII. Y2K Compliance in libpng -January 22, 2001 +January 31, 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.9rc2 are Y2K compliant. It is my belief that earlier +upward through 1.0.9 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 +3576,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.9rc2 - January 22, 2001: +Libpng version 1.0.9 - January 31, 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 +3593,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.9rc2, January 22, 2001, are +libpng versions 1.0.7, July 1, 2000, through 1.0.9, January 31, 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 +3684,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -January 22, 2001 +January 31, 2001 .\" end of man page diff --git a/libpng.txt b/libpng.txt index 0e512d874..f070320ef 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.9rc2 - January 22, 2001 + libpng version 1.0.9 - January 31, 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 22, 2001 +January 31, 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.9rc2 are Y2K compliant. It is my belief that earlier +upward through 1.0.9 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 aae2d7988..61e8d51cb 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "January 22, 2001" +.TH LIBPNGPF 3 "January 31, 2001" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.9rc2 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.9 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "January 22, 2001" +.TH PNG 5 "January 31, 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.9rc2 - January 22, 2001 + * libpng version 1.0.9 - January 31, 2001 * Copyright (c) 1998-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_9rc2 Your_png_h_is_not_version_1_0_9rc2; +typedef version_1_0_9 Your_png_h_is_not_version_1_0_9; /* 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.9rc2"; +const char png_libpng_ver[18] = "1.0.9"; /* 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.9rc2 - January 22, 2001\n\ + return ((png_charp) "\n libpng version 1.0.9 - January 31, 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.9rc2"); - return((png_charp) "1.0.9rc2"); + return((png_charp) "1.0.9"); + return((png_charp) "1.0.9"); } png_charp PNGAPI @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.0.9rc2 - January 22, 2001 + * libpng version 1.0.9 - January 31, 2001 * Copyright (c) 1998-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.9rc2 - January 22, 2001: Glenn + * libpng versions 0.97, January 1998, through 1.0.9 - January 31, 2001: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -63,6 +63,7 @@ * 1.0.9rc1 1 10009 2.1.0.9rc1 * 1.0.9beta7-10 1 10009 2.1.0.9beta7-10 * 1.0.9rc2 1 10009 2.1.0.9rc2 + * 1.0.9 1 10009 2.1.0.9 * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -92,7 +93,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.9rc2, January 22, 2001, are + * libpng versions 1.0.7, July 1, 2000, through 1.0.9, January 31, 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 @@ -197,13 +198,13 @@ * Y2K compliance in libpng: * ========================= * - * January 22, 2001 + * January 31, 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.9rc2 are Y2K compliant. It is my belief that earlier + * upward through 1.0.9 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 @@ -259,7 +260,7 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.0.9rc2" +#define PNG_LIBPNG_VER_STRING "1.0.9" #define PNG_LIBPNG_VER_SONUM 2 #define PNG_LIBPNG_VER_DLLNUM %DLLNUM% @@ -271,7 +272,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 2 +#define PNG_LIBPNG_VER_BUILD 0 #define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_BETA 2 @@ -279,7 +280,7 @@ #define PNG_LIBPNG_BUILD_STABLE 4 #define PNG_LIBPNG_BUILD_TYPEMASK 7 #define PNG_LIBPNG_BUILD_PATCH 8 /* Can be OR'ed with STABLE only */ -#define PNG_LIBPNG_BUILD_TYPE 3 +#define PNG_LIBPNG_BUILD_TYPE 4 /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -1178,9 +1179,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.9rc2 +and png.h are both at * version 1.0.9 */ -typedef png_structp version_1_0_9rc2; +typedef png_structp version_1_0_9; typedef png_struct FAR * FAR * png_structpp; @@ -2228,7 +2229,7 @@ extern PNG_EXPORT(int,png_mmx_support) PNGARG((void)); /* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */ #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.0.9rc2 - January 22, 2001 (header)\n" + " libpng version 1.0.9 - January 31, 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 030e71d9a..caefcc857 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.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 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.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -59,7 +59,9 @@ * PNG_BUILD_DLL -- building the dll * (no define) -- building an application, linking to the dll * PNG_STATIC -- building the static lib, or building an application - * which links to the static lib. + * that links to the static lib. + * ALL_STATIC -- building various static libs, or building an application + * that links to the static libs. * Thus, * a cygwin user should define either PNG_BUILD_DLL or PNG_STATIC, and * this bit of #ifdefs will define the 'correct' config variables based on @@ -78,6 +80,9 @@ # undef PNG_STATIC # endif # else +# if defined(ALL_STATIC) +# define PNG_STATIC +# endif # if defined(PNG_STATIC) # if defined(PNG_USE_DLL) # undef PNG_USE_DLL @@ -1028,7 +1033,7 @@ typedef z_stream FAR * png_zstreamp; * LIBPNG DLL. * * Define PNG_USE_DLL if you want to *link* to the Windows LIBPNG DLL. - * It is equivalent to Microsoft predefined macro _DLL which is + * It is equivalent to Microsoft predefined macro _DLL that is * automatically defined when you compile using the share * version of the CRT (C Run-Time library) * diff --git a/pngerror.c b/pngerror.c index a097fb633..ffaac6471 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.0.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pnggccrd.c b/pnggccrd.c index 296b576f3..fb34abc01 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.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2001 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation @@ -4951,7 +4951,7 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep //===========================================================================// // // -// M M X S U P P O R T // +// P N G _ M M X _ S U P P O R T // // // //===========================================================================// @@ -4965,6 +4965,9 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep // each inlined instance, e.g., by appending _1, _2, etc.? // maybe if don't use leading "." in label name? (nope...sigh)] +// GRR TO DO: make sure PNGAPI doesn't do/require anything screwy here +// [looks OK for everybody except possibly Cygwin (__cdecl)] + int PNGAPI png_mmx_support(void) { @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.0.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-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.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpread.c b/pngpread.c index 69b115f19..9088b53d1 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.0.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * libpng 1.0.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-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.9rc2 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.9 */ 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.9rc2 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.9 */ 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.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index 8e5bb142e..8cc28df4d 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.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index fba1237cc..c2f556b2c 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.0.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-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.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-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.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1458,4 +1458,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_9rc2 your_png_h_is_not_version_1_0_9rc2; +typedef version_1_0_9 your_png_h_is_not_version_1_0_9; diff --git a/pngtrans.c b/pngtrans.c index 92e5e2e1d..001a3eec7 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.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-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.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2001 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * libpng 1.0.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwrite.c b/pngwrite.c index 723fd0728..8d5a796f0 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.0.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwtran.c b/pngwtran.c index 8f7667c2c..660729868 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.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2001 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwutil.c b/pngwutil.c index 80c35ee7c..f87c86bd8 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.0.9rc2 - January 22, 2001 + * libpng 1.0.9 - January 31, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-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 013b24221..b4cd06759 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.9rc2 (January 22, 2001) and zlib +libpng 1.0.9 (January 31, 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 638561b18..661be0caf 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.9rc2 +;Version 1.0.9 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/projects/wince/READMEE.WCE b/projects/wince/READMEE.WCE index b21d71fb6..74162bc2a 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.9rc2 ported to WindowsCE 2.0 and 2.11. -libpng 1.0.9rc2 is a PNG reference library. -See README, a document of original libpng 1.0.9rc2. +This is libpng 1.0.9 ported to WindowsCE 2.0 and 2.11. +libpng 1.0.9 is a PNG reference library. +See README, a document of original libpng 1.0.9. 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.9rc2, for conditions +See README and LICENSE, documents of original libpng 1.0.9, for conditions of use and distribution. Files diff --git a/projects/wince/READMEJ.WCE b/projects/wince/READMEJ.WCE index a4e129d84..398634dce 100644 --- a/projects/wince/READMEJ.WCE +++ b/projects/wince/READMEJ.WCE @@ -24,7 +24,7 @@ libpngでは、データ圧縮ライブラリとして zlibを使用しています。libpngを になったいかなる被害についても、作者、配布者、その他利用者以外の人物、 団体に責任をとる義務はないものとします。 -その他、このソフトウェアの利用条件については、原版である libpng 1.0.9rc2に +その他、このソフトウェアの利用条件については、原版である libpng 1.0.9に 準拠するものとします。詳しくは、付属の README,LICENSE をお読みください。 収録内容 diff --git a/projects/wince/grep b/projects/wince/grep deleted file mode 100644 index e69de29bb..000000000 --- a/projects/wince/grep +++ /dev/null diff --git a/projects/wince/png32ce.def b/projects/wince/png32ce.def index 73a54607a..02de8477f 100644 --- a/projects/wince/png32ce.def +++ b/projects/wince/png32ce.def @@ -5,7 +5,7 @@ LIBRARY lpngce EXPORTS -;Version 1.0.9rc2 +;Version 1.0.9 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 8458cf76f..ba7ab48f9 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.9rc2 +PNGMIN = 1.0.9 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index ae36efd43..2c8b49f69 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -13,7 +13,7 @@ ZLIBINC=/usr/local/include # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.9rc2 +PNGMIN = 1.0.9 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 476835f72..90c7bae1f 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -38,9 +38,9 @@ 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 -#PNGDLL = $DLLNUM% # msvc -PNGDLL = 2 # cygwin 1.0.9rc2 -PNGMIN = 1.0.9rc2 +#PNGDLL = $%DLLNUM% # msvc +PNGDLL = 2 # cygwin 1.0.9 +PNGMIN = 1.0.9 PNGMIN_BASE = 1.0.9 PNGVER = $(PNGMAJ).$(PNGMIN) @@ -107,7 +107,7 @@ $(STATLIB): $(OBJS) ar rc $@ $(OBJS) $(RANLIB) $@ -$(SHAREDDEF): msvc/png32ms.def +$(SHAREDDEF): projects/msvc/png32ms.def cat $< | sed -e '1{G;s/^\(.*\)\(\n\)/EXPORTS/;};2,/^EXPORTS/d' > $@ $(SHAREDLIB): $(OBJSDLL) $(SHAREDDEF) diff --git a/scripts/makefile.dec b/scripts/makefile.dec index e70b7a28c..6e5e6194a 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.9rc2 +PNGMIN = 1.0.9 PNGVER = $(PNGMAJ).$(PNGMIN) CC=cc diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index bb161bab4..3f8ee2a31 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.9rc2 +PNGMIN = 1.0.9 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index dfc3c85ff..87f7f7248 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.9rc2 +PNGMIN = 1.0.9 PNGVER = $(PNGMAJ).$(PNGMIN) # where make install puts libpng.a and png.h diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 34e7b4e9a..81b378f42 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.9rc2 +PNGMIN = 1.0.9 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 8ce011573..8c4030a34 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.9rc2 +PNGMIN = 1.0.9 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 1021b6cf1..b885b62b6 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.9rc2 -LIBS=libpng.so.1.0.9rc2 +VER=1.0.9 +LIBS=libpng.so.1.0.9 SHAREDLIB=libpng.so libdir=$(prefix)/lib32 diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 4583a60d0..9cb9169e8 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -24,7 +24,7 @@ CFLAGS=-I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm LDSHARED=cc -shared -VER=1.0.9rc2 +VER=1.0.9 SONUM=2 SHAREDLIB=libpng.so libdir=$(prefix) diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index fcf8149eb..5ae0c232e 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.9rc2 +PNGMIN = 1.0.9 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index 84b0c4d86..f15553d98 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -5,7 +5,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.0.9rc2'; + PNG_LIBPNG_VER_STRING = '1.0.9'; PNG_LIBPNG_VER = 10009; type |