diff options
49 files changed, 217 insertions, 148 deletions
@@ -1,5 +1,5 @@ -Libpng 1.0.9beta9 - January 15, 2001 +Libpng 1.0.9rc2 - January 22, 2001 This is a public release of libpng, intended for use in production codes. @@ -50,6 +50,8 @@ Changes since the last public release (1.0.8): 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 + Do not typedef png_FILE_io in pngconf.h when PNG_NO_STDIO is defined. + Updated makefile.sgi to make shared library. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -856,11 +856,12 @@ version 1.0.9beta4 [December 1, 2000] Change png_chunk_warning to png_warning in png_check_keyword(). Increased the first part of msg buffer from 16 to 18 in png_chunk_error(). version 1.0.9beta5 [December 15, 2000] - Added support for filter method 64 (for PNG datastreams embedded in MNG) + Added support for filter method 64 (for PNG datastreams embedded in MNG). version 1.0.9beta6 [December 18, 2000] Revised png_set_filter() to accept filter method 64 when appropriate. Added new PNG_HAVE_PNG_SIGNATURE bit to png_ptr->mode and use it to help prevent applications from using MNG features in PNG datastreams. + Added png_permit_mng_features() function. Revised libpng.3/libpng.txt. Changed "filter type" to "filter method". version 1.0.9rc1 [December 23, 2000] Revised test for PNG_HAVE_PNG_SIGNATURE in pngrutil.c @@ -879,6 +880,14 @@ version 1.0.9beta9 [January 15, 2001] wince and msvc project module definition files. Minor revision of makefile.cygwin. Fixed bug with progressive reading of narrow interlaced images in pngpread.c +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] + 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. 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.9beta9 - January 15, 2001 +Installing libpng version 1.0.9rc2 - January 22, 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.9beta9" or "lpng109" and "zlib-1.1.3" +might be called "libpng-1.0.9rc2" 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.9beta9) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.9beta9, + 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, 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.9beta9) + makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.9rc2) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.9beta9) + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.9rc2) makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.mips => MIPS makefile makefile.acorn => Acorn makefile @@ -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.9beta9, January 15, 2001, are +libpng versions 1.0.7, July 1, 2000, through 1.0.9rc2, January 22, 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 15, 2001 +January 22, 2001 @@ -1,4 +1,4 @@ -README for libpng 1.0.9beta9 - January 15, 2001 (shared library 2.1) +README for libpng 1.0.9rc2 - January 22, 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.9beta9) + (gcc, creates libpng.so.2.1.0.9rc2) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng.so.2.1.0.9beta9, uses assembler code + libpng.so.2.1.0.9rc2, 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.9beta9) + makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.0.9rc2) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng.so.2.1.0.9beta9) + (gcc, creates libpng.so.2.1.0.9rc2) 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 15, 2001 + January 22, 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.9beta9 are Y2K compliant. It is my belief that earlier + upward through 1.0.9rc2 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.9beta9. Instead, please + There is no \"configure\" script for Libpng-1.0.9rc2. Instead, please copy the appropriate makefile for your system from the \"scripts\" directory. Read the INSTALL file for more details. " @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "January 15, 2001" +.TH LIBPNG 3 "January 22, 2001" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.9beta9 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.9rc2 .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.9beta9 - January 15, 2001 + libpng version 1.0.9rc2 - January 22, 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 15, 2001 +January 22, 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.9beta9 are Y2K compliant. It is my belief that earlier +upward through 1.0.9rc2 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.9beta9 - January 15, 2001: +Libpng version 1.0.9rc2 - January 22, 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.9beta9, January 15, 2001, are +libpng versions 1.0.7, July 1, 2000, through 1.0.9rc2, January 22, 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 15, 2001 +January 22, 2001 .\" end of man page diff --git a/libpng.txt b/libpng.txt index 735421a47..0e512d874 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.9beta9 - January 15, 2001 + libpng version 1.0.9rc2 - January 22, 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 15, 2001 +January 22, 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.9beta9 are Y2K compliant. It is my belief that earlier +upward through 1.0.9rc2 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 2451df04b..aae2d7988 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "January 15, 2001" +.TH LIBPNGPF 3 "January 22, 2001" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.9beta9 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.9rc2 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "January 15, 2001" +.TH PNG 5 "January 22, 2001" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -1,8 +1,8 @@ /* png.c - location for general purpose libpng functions * - * libpng version 1.0.9beta9 - January 15, 2001 - * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson + * libpng version 1.0.9rc2 - January 22, 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_9beta9 Your_png_h_is_not_version_1_0_9beta9; +typedef version_1_0_9rc2 Your_png_h_is_not_version_1_0_9rc2; /* 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.9beta9"; +const char png_libpng_ver[18] = "1.0.9rc2"; /* 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.9beta9 - January 15, 2001\n\ + return ((png_charp) "\n libpng version 1.0.9rc2 - January 22, 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.9beta9"); - return((png_charp) "1.0.9beta9"); + return((png_charp) "1.0.9rc2"); + return((png_charp) "1.0.9rc2"); } png_charp PNGAPI @@ -699,6 +699,7 @@ png_access_version_number(void) } +#if 0 /* delay this until version 1.2.0 */ /* this function was added to libpng 1.0.9 (porting aid to libpng-1.2.0) */ #ifndef PNG_ASSEMBLER_CODE_SUPPORTED int PNGAPI @@ -707,3 +708,4 @@ png_mmx_support(void) return -1; } #endif +#endif /* 0 */ @@ -1,15 +1,15 @@ /* png.h - header file for PNG reference library * - * libpng version 1.0.9beta9 - January 15, 2001 - * Copyright (c) 1998, 1999, 2000, 2001 Glenn Randers-Pehrson + * libpng version 1.0.9rc2 - January 22, 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.) * * 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.9beta9 - January 15, 2001: Glenn + * libpng versions 0.97, January 1998, through 1.0.9rc2 - January 22, 2001: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -52,20 +52,22 @@ * 1.0.6h 10007 10.6h (testing xy.z so-numbering) * 1.0.6i 10007 10.6i * 1.0.6j 10007 2.1.0.6j (incompatible with 1.0.0) - * 1.0.7beta11-18 10007 2.1.0.7beta11-18 (binary compatible) - * 1.0.7rc1-2 10007 2.1.0.7rc1-2 (binary compatible) - * 1.0.7 10007 (still compatible) - * 1.0.8beta1-4 10008 2.1.0.8beta1-4 - * 1.0.8rc1 10008 2.1.0.8rc1 - * 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-9 10009 2.1.0.9beta7-9 + * 1.0.7beta11-14 DLLNUM 10007 2.1.0.7beta11-14 (binary compatible) + * 1.0.7beta15-18 1 10007 2.1.0.7beta15-18 (binary compatible) + * 1.0.7rc1-2 1 10007 2.1.0.7rc1-2 (binary compatible) + * 1.0.7 1 10007 (still compatible) + * 1.0.8beta1-4 1 10008 2.1.0.8beta1-4 + * 1.0.8rc1 1 10008 2.1.0.8rc1 + * 1.0.8 1 10008 2.1.0.8 + * 1.0.9beta1-6 1 10009 2.1.0.9beta1-6 + * 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 * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be * used for changes in backward compatibility, as it is intended. The - * PNG_PNGLIB_VER macro, which is not used within libpng but is available + * PNG_LIBPNG_VER macro, which is not used within libpng but is available * for applications, is an unsigned integer of the form xyyzz corresponding * to the source version x.y.z (leading zeros in y and z). Beta versions * were given the previous public release number plus a letter, until @@ -76,6 +78,9 @@ * to the info_ptr or png_ptr members through png.h, and the compiled * application is loaded with a different version of the library. * + * DLLNUM will change each time there are forward or backward changes + * in binary compatibility (e.g., when a new feature is added). + * * See libpng.txt or libpng.3 for more information. The PNG specification * is available as RFC 2083 <ftp://ftp.uu.net/graphics/png/documents/> * and as a W3C Recommendation <http://www.w3.org/TR/REC.png.html> @@ -87,7 +92,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.9beta9, January 15, 2001, are + * libpng versions 1.0.7, July 1, 2000, through 1.0.9rc2, January 22, 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 +197,13 @@ * Y2K compliance in libpng: * ========================= * - * January 15, 2001 + * January 22, 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.9beta9 are Y2K compliant. It is my belief that earlier + * upward through 1.0.9rc2 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,9 +259,10 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.0.9beta9" +#define PNG_LIBPNG_VER_STRING "1.0.9rc2" #define PNG_LIBPNG_VER_SONUM 2 +#define PNG_LIBPNG_VER_DLLNUM %DLLNUM% /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 @@ -265,7 +271,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 9 +#define PNG_LIBPNG_VER_BUILD 2 #define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_BETA 2 @@ -273,7 +279,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 2 +#define PNG_LIBPNG_BUILD_TYPE 3 /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -1172,9 +1178,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.9beta9 +and png.h are both at * version 1.0.9rc2 */ -typedef png_structp version_1_0_9beta9; +typedef png_structp version_1_0_9rc2; typedef png_struct FAR * FAR * png_structpp; @@ -2214,13 +2220,15 @@ extern PNG_EXPORT(png_uint_32,png_permit_mng_features) PNGARG((png_structp png_ptr, png_uint_32 mng_features_permitted)); #endif +#if 0 /* delay these until version 1.2.0 */ /* png.c, pnggccrd.c, or pngvcrd.c */ extern PNG_EXPORT(int,png_mmx_support) PNGARG((void)); +#endif /* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */ #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.0.9beta9 - January 15, 2001 (header)\n" + " libpng version 1.0.9rc2 - January 22, 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 fa9be9808..030e71d9a 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.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 2001 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 2001 Glenn Randers-Pehrson * @@ -1,8 +1,8 @@ /* pngconf.h - machine configurable file for libpng * - * libpng 1.0.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-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.) */ @@ -493,11 +493,13 @@ # endif #endif -/* Disable if you don't need to support PNGs that are embedded in MNG +/* Enable if you need to support PNGs that are embedded in MNG datastreams */ +/* #ifndef PNG_NO_MNG_FEATURES # define PNG_MNG_FEATURES_SUPPORTED #endif +*/ /* Deprecated, will be removed from version 2.0.0 */ #ifndef PNG_NO_READ_EMPTY_PLTE @@ -984,11 +986,15 @@ typedef png_int_16 FAR * png_int_16p; typedef PNG_CONST char FAR * png_const_charp; typedef char FAR * png_charp; typedef png_fixed_point FAR * png_fixed_point_p; + +#ifndef PNG_NO_STDIO #if defined(_WIN32_WCE) typedef HANDLE png_FILE_p; #else typedef FILE * png_FILE_p; #endif +#endif + #ifdef PNG_FLOATING_POINT_SUPPORTED typedef double FAR * png_doublep; #endif diff --git a/pngerror.c b/pngerror.c index 03a0f8318..a097fb633 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,9 +1,9 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.0.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-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.) * diff --git a/pnggccrd.c b/pnggccrd.c index 9dcf836e7..296b576f3 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -6,9 +6,9 @@ * 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.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-2001 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation * * Based on MSVC code contributed by Nirav Chhatrapati, Intel Corp., 1998. @@ -4965,9 +4965,6 @@ 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,9 +1,9 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.0.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-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.) */ @@ -1,9 +1,9 @@ /* pngmem.c - stub functions for memory allocation * - * libpng 1.0.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-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.) * diff --git a/pngpread.c b/pngpread.c index d1e8b7566..69b115f19 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,9 +1,9 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.0.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-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.) */ @@ -786,9 +786,9 @@ png_push_process_row(png_structp png_ptr) for (i = 0; i < 8 && png_ptr->pass == 0; i++) { png_push_have_row(png_ptr, png_ptr->row_buf + 1); - png_read_push_finish_row(png_ptr); + png_read_push_finish_row(png_ptr); /* updates png_ptr->pass */ } - if (png_ptr->pass == 2) + if (png_ptr->pass == 2) /* pass 1 might be empty */ { for (i = 0; i < 4 && png_ptr->pass == 2; i++) { @@ -806,7 +806,7 @@ 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) + if (png_ptr->pass == 2) /* skip top 4 generated rows */ { for (i = 0; i < 4 && png_ptr->pass == 2; i++) { @@ -829,7 +829,7 @@ 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) + if (png_ptr->pass == 4) /* pass 3 might be empty */ { for (i = 0; i < 2 && png_ptr->pass == 4; i++) { @@ -847,7 +847,7 @@ 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 == 4) + if (png_ptr->pass == 4) /* skip top two generated rows */ { for (i = 0; i < 2 && png_ptr->pass == 4; i++) { @@ -870,7 +870,7 @@ 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) + if (png_ptr->pass == 6) /* pass 5 might be empty */ { png_push_have_row(png_ptr, NULL); png_read_push_finish_row(png_ptr); @@ -885,7 +885,7 @@ 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 == 6) + if (png_ptr->pass == 6) /* skip top generated row */ { png_push_have_row(png_ptr, NULL); png_read_push_finish_row(png_ptr); @@ -1,9 +1,9 @@ /* pngread.c - read a PNG file * - * libpng 1.0.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-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.) * @@ -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.9beta9 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.9rc2 */ 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.9beta9 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.9rc2 */ void PNGAPI png_read_image(png_structp png_ptr, png_bytepp image) @@ -1,9 +1,9 @@ /* pngrio.c - functions for data input * - * libpng 1.0.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-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.) * diff --git a/pngrtran.c b/pngrtran.c index 6c56c1d12..8e5bb142e 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,9 +1,9 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * libpng 1.0.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-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.) * diff --git a/pngrutil.c b/pngrutil.c index 7d8adeee1..fba1237cc 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,9 +1,9 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.0.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-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.) * @@ -1,9 +1,9 @@ /* pngset.c - storage of image information into info struct * - * libpng 1.0.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-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.) * @@ -1,9 +1,9 @@ /* pngtest.c - a simple test program to test libpng * - * libpng 1.0.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-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.) * @@ -50,6 +50,14 @@ # define FCLOSE(file) fclose(file) #endif +#if defined(PNG_NO_STDIO) +#if defined(_WIN32_WCE) +typedef HANDLE png_FILE_p; +#else +typedef FILE * png_FILE_p; +#endif +#endif + /* Makes pngtest verbose so we can find problems (needs to be before png.h) */ #ifndef PNG_DEBUG #define PNG_DEBUG 0 @@ -257,6 +265,7 @@ static int wrote_question = 0; not reading from a standard C stream, you should create a replacement read_data function and use it at run time with png_set_read_fn(), rather than changing the library. */ + #ifndef USE_FAR_KEYWORD static void pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length) @@ -1449,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_9beta9 your_png_h_is_not_version_1_0_9beta9; +typedef version_1_0_9rc2 your_png_h_is_not_version_1_0_9rc2; diff --git a/pngtrans.c b/pngtrans.c index 405e1312c..92e5e2e1d 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,9 +1,9 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * libpng 1.0.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-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.) */ @@ -2,9 +2,9 @@ * * For Intel x86 CPU and Microsoft Visual C++ compiler * - * libpng 1.0.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-2001 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation * * Contributed by Nirav Chhatrapati, Intel Corporation, 1998 @@ -1,9 +1,9 @@ /* pngwio.c - functions for data output * - * libpng 1.0.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-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.) * diff --git a/pngwrite.c b/pngwrite.c index b5d457f84..723fd0728 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,9 +1,9 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.0.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-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.) */ diff --git a/pngwtran.c b/pngwtran.c index f3ad634b9..8f7667c2c 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,9 +1,9 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * libpng 1.0.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-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.) */ diff --git a/pngwutil.c b/pngwutil.c index 80af56e67..80c35ee7c 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,9 +1,9 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.0.9beta9 - January 15, 2001 + * libpng 1.0.9rc2 - January 22, 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-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.) */ diff --git a/projects/msvc/README.txt b/projects/msvc/README.txt index 93094b3fc..013b24221 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.9beta9 (January 15, 2001) and zlib +libpng 1.0.9rc2 (January 22, 2001) and zlib Copyright (C) 2000 Simon-Pierre Cadieux For conditions of distribution and use, see copyright notice in png.h @@ -25,9 +25,9 @@ This project will build the PNG Development Group's "official" versions of libpng and zlib libraries: libpng1.dll (default version, currently C code only) - libpng1a.dll (C + Assembler version) - libpng1b.dll (C + Assembler debug version) - libpng1d.dll (C code debug version) + libpng1.dll (C + Assembler version) + libpng1.dll (C + Assembler debug version) + libpng1.dll (C code debug version) libpng1[c,e-m].dll (reserved for official versions) libpng1[n-z].dll (available for private versions) zlib.dll (default version, currently C code only) diff --git a/projects/msvc/png32ms.def b/projects/msvc/png32ms.def index 8e51b265d..638561b18 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.9beta9 +;Version 1.0.9rc2 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 @@ -176,8 +176,11 @@ EXPORTS png_write_init_2 @167 png_access_version_number @168 ; png_sig_bytes @169 - png_libpng_ver @170 +; png_libpng_ver @170 png_init_io @171 png_convert_to_rfc1123 @172 png_set_invalid @173 - png_mmx_supported @174 +;To be added at version 1.2.0 +; png_permit_mng_features @174 +;To be added at version 1.2.0 +; png_mmx_support @175 diff --git a/projects/wince/READMEE.WCE b/projects/wince/READMEE.WCE index b6f49221d..b21d71fb6 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.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. +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. 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.9beta9, for conditions +See README and LICENSE, documents of original libpng 1.0.9rc2, for conditions of use and distribution. Files diff --git a/projects/wince/READMEJ.WCE b/projects/wince/READMEJ.WCE index a25c7aed0..a4e129d84 100644 --- a/projects/wince/READMEJ.WCE +++ b/projects/wince/READMEJ.WCE @@ -24,7 +24,7 @@ libpngでは、データ圧縮ライブラリとして zlibを使用しています。libpngを になったいかなる被害についても、作者、配布者、その他利用者以外の人物、 団体に責任をとる義務はないものとします。 -その他、このソフトウェアの利用条件については、原版である libpng 1.0.9beta9に +その他、このソフトウェアの利用条件については、原版である libpng 1.0.9rc2に 準拠するものとします。詳しくは、付属の README,LICENSE をお読みください。 収録内容 diff --git a/projects/wince/png32ce.def b/projects/wince/png32ce.def index 04dd26487..73a54607a 100644 --- a/projects/wince/png32ce.def +++ b/projects/wince/png32ce.def @@ -5,7 +5,7 @@ LIBRARY lpngce EXPORTS -;Version 1.0.9beta9 +;Version 1.0.9rc2 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 @@ -179,4 +179,7 @@ EXPORTS png_init_io @171 png_convert_to_rfc1123 @172 png_set_invalid @173 - png_mmx_supported @174 +;To be added at version 1.2.0 +; png_permit_mng_features @174 +;To be added at version 1.2.0 +; png_mmx_support @175 diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 4e92c27fe..8458cf76f 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.9beta9 +PNGMIN = 1.0.9rc2 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 710fab385..ae36efd43 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -10,6 +10,12 @@ CC=gcc ZLIBLIB=/usr/local/lib 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 +PNGVER = $(PNGMAJ).$(PNGMIN) + ALIGN= # For i386: # ALIGN=-malign-loops=2 -malign-functions=2 @@ -28,12 +34,6 @@ LDFLAGS=-L. -Wl,-soname=libpng.so.$(PNGMAJ) -L$(ZLIBLIB) -lz -lm RANLIB=ranlib #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.9beta9 -PNGVER = $(PNGMAJ).$(PNGMIN) - # where make install puts libpng.a, libpng.so*, and png.h prefix=/usr/local INCPATH=$(prefix)/include diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 914407a8b..476835f72 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -38,11 +38,13 @@ 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.9beta9 +#PNGDLL = $DLLNUM% # msvc +PNGDLL = 2 # cygwin 1.0.9rc2 +PNGMIN = 1.0.9rc2 PNGMIN_BASE = 1.0.9 PNGVER = $(PNGMAJ).$(PNGMIN) -SHAREDLIB=cygpng$(PNGMAJ).dll +SHAREDLIB=cygpng$(PNGDLL).dll STATLIB=libpng.a IMPLIB=libpng.dll.a SHAREDDEF=libpng.def diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 37f61c92c..e70b7a28c 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.9beta9 +PNGMIN = 1.0.9rc2 PNGVER = $(PNGMAJ).$(PNGMIN) CC=cc diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 973902e77..bb161bab4 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.9beta9 +PNGMIN = 1.0.9rc2 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 4c7d00cf3..dfc3c85ff 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.9beta9 +PNGMIN = 1.0.9rc2 PNGVER = $(PNGMAJ).$(PNGMIN) # where make install puts libpng.a and png.h diff --git a/scripts/makefile.linux b/scripts/makefile.linux index d36788cdb..34e7b4e9a 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.9beta9 +PNGMIN = 1.0.9rc2 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 9ac49aff9..8ce011573 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.9beta9 +PNGMIN = 1.0.9rc2 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 9f0346939..1021b6cf1 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.9beta9 -LIBS=libpng.so.1.0.9beta9 +VER=1.0.9rc2 +LIBS=libpng.so.1.0.9rc2 SHAREDLIB=libpng.so libdir=$(prefix)/lib32 diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 010f5f7c3..4583a60d0 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -1,4 +1,5 @@ -# makefile for libpng +# makefile for libpng (.a and .so), SGI IRIX with 'cc' +# Copyright (C) 2001 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # For conditions of distribution and use, see copyright notice in png.h @@ -6,6 +7,9 @@ prefix=/usr/local # Where the zlib library and include files are located +# You can add the -n32 option; then zlib must also be compiled with -n32 +#ZLIBLIB=/usr/local/lib32 +#ZLIBINC=/usr/local/include #ZLIBLIB=/usr/local/lib #ZLIBINC=/usr/local/include ZLIBLIB=../zlib @@ -15,8 +19,16 @@ CC=cc WARNMORE=-fullwarn # You can add the -n32 option; then zlib must also be compiled with -n32 -CFLAGS=-I$(ZLIBINC) -O $(WARNMORE) # -g -DPNG_DEBUG=5 +# Note: -KPIC is the default anyhow +CFLAGS=-I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm +LDSHARED=cc -shared + +VER=1.0.9rc2 +SONUM=2 +SHAREDLIB=libpng.so +libdir=$(prefix) +#libdir=$(prefix)/lib32 RANLIB=echo #RANLIB=ranlib @@ -25,12 +37,20 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngwtran.o pngmem.o pngerror.o pngpread.o -all: libpng.a pngtest +all: libpng.a pngtest shared + +shared: $(SHAREDLIB).$(SONUM).$(VER) libpng.a: $(OBJS) ar rc $@ $(OBJS) $(RANLIB) $@ +$(SHAREDLIB).$(SONUM).$(VER): $(OBJS) + $(LDSHARED) -o $@ $(OBJS) + rm -f $(SHAREDLIB) $(SHAREDLIB).? + ln -s $@ $(SHAREDLIB) + ln -s $@ $(SHAREDLIB).$(SONUM) + pngtest: pngtest.o libpng.a $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) @@ -47,8 +67,16 @@ install: libpng.a cp libpng.a $(prefix)/lib chmod 644 $(prefix)/lib/libpng.a +install-shared: $(SHAREDLIB).$(SONUM).$(VER) + cp $(SHAREDLIB).$(SONUM).$(VER) $(libdir); + chmod 755 $(SHAREDLIB).$(SONUM).$(VER) + cd $(libdir); + rm -f $(SHAREDLIB) $(SHAREDLIB).$(SONUM); + ln -s $(SHAREDLIB).$(SONUM).$(VER) $(SHAREDLIB).$(SONUM); + ln -s $(SHAREDLIB).$(SONUM) $(SHAREDLIB); + clean: - rm -f *.o libpng.a pngtest pngout.png + rm -f *.o libpng.a pngtest pngout.png $(SHAREDLIB).* DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 2839ef883..fcf8149eb 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.9beta9 +PNGMIN = 1.0.9rc2 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index fc56e29cd..84b0c4d86 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -5,7 +5,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.0.9beta9'; + PNG_LIBPNG_VER_STRING = '1.0.9rc2'; PNG_LIBPNG_VER = 10009; type |