diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2001-10-24 22:01:19 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:06:32 -0500 |
| commit | 6c97ddbffc6796e32809da678a29522a221ddf3e (patch) | |
| tree | 99f01478a072187fd4416502e3907ef892675421 | |
| parent | 5a0be341baa9726ca0afdd70abbdfba8b35fe7ff (diff) | |
| download | libpng-6c97ddbffc6796e32809da678a29522a221ddf3e.tar.gz | |
Imported from libpng-1.2.1beta2.tarv1.2.1beta2
55 files changed, 267 insertions, 131 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.1beta1 - October 19, 2001 +Libpng 1.2.1beta2 - October 25, 2001 This is a public release of libpng, intended for use in production codes. @@ -9,6 +9,8 @@ Changes since the last public release (1.2.0): Include background_1 in png_struct regardless of gamma support. Revised makefile.netbsd and makefile.macosx, added makefile.darwin. Revised example.c to provide more details about using row_callback(). + Added type cast to each NULL appearing in a function call, except for + WINCE functions. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -986,6 +986,9 @@ version 1.2.1beta1 [October 19, 2001] Include background_1 in png_struct regardless of gamma support. Revised makefile.netbsd and makefile.macosx, added makefile.darwin. Revised example.c to provide more details about using row_callback(). +version 1.2.1beta2 [October 25, 2001] + Added type cast to each NULL appearing in a function call, except for + WINCE functions. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -1,5 +1,5 @@ -Installing libpng version 1.2.1beta1 - October 19, 2001 +Installing libpng version 1.2.1beta2 - October 25, 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.2.1beta1" or "lpng109" and "zlib-1.1.3" +might be called "libpng-1.2.1beta2" 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: @@ -64,8 +64,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.2.1beta1) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng.so.2.1.2.1beta1, + makefile.linux => Linux/ELF makefile (gcc, creates libpng.so.2.1.2.1beta2) + makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng.so.2.1.2.1beta2, 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 @@ -82,9 +82,9 @@ include makefile.macosx => MACOS X Makefile makefile.netbsd => NetBSD/cc makefile, uses PNGGCCRD makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) - makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.2.1beta1) + makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.2.1beta2) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.2.1.2.1beta1) + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.2.1.2.1beta2) 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.2.1beta1, October 19, 2001, are +libpng versions 1.0.7, July 1, 2000, through 1.2.1beta2, October 25, 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 -October 19, 2001 +October 25, 2001 @@ -1,4 +1,4 @@ -README for libpng 1.2.1beta1 - October 19, 2001 (shared library 2.1) +README for libpng 1.2.1beta2 - October 25, 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. @@ -187,9 +187,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.2.1beta1) + (gcc, creates libpng.so.2.1.2.1beta2) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng.so.2.1.2.1beta1, uses assembler code + libpng.so.2.1.2.1beta2, 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 @@ -206,10 +206,10 @@ Files in this distribution: makefile.macosx => MACOS X Makefile makefile.netbsd => NetBSD/cc makefile, uses PNGGCCRD makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) - makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.2.1beta1) + makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.2.1.2.1beta2) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng.so.2.1.2.1beta1) + (gcc, creates libpng.so.2.1.2.1beta2) 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: ========================= - October 19, 2001 + October 25, 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.2.1beta1 are Y2K compliant. It is my belief that earlier + upward through 1.2.1beta2 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.2.1beta1. Instead, please + There is no \"configure\" script for Libpng-1.2.1beta2. Instead, please copy the appropriate makefile for your system from the \"scripts\" directory. Read the INSTALL file for more details. " @@ -157,7 +157,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */ * adjustment), then you can read the entire image (including * pixels) into the info structure with this call: */ - png_read_png(png_ptr, info_ptr, png_transforms, NULL); + png_read_png(png_ptr, info_ptr, png_transforms, (png_voidp)NULL); #else /* OK, you're doing it the hard way, with the lower-level functions */ @@ -167,7 +167,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */ png_read_info(png_ptr, info_ptr); png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, - &interlace_type, NULL, NULL); + &interlace_type, (int *)NULL, (int *)NULL); /**** Set up the data transformations you want. Note that these are all **** optional. Only call them if you want/need them. Many of the @@ -277,7 +277,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */ png_color std_color_cube[MAX_SCREEN_COLORS]; png_set_dither(png_ptr, std_color_cube, MAX_SCREEN_COLORS, - MAX_SCREEN_COLORS, NULL, 0); + MAX_SCREEN_COLORS, (png_uint_16p)NULL, 0); } /* This reduces the image to the palette supplied in the file */ else if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) @@ -354,16 +354,18 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */ #ifdef single /* Read the image a single row at a time */ for (y = 0; y < height; y++) { - png_read_rows(png_ptr, &row_pointers[y], NULL, 1); + png_read_rows(png_ptr, &row_pointers[y], (png_bytepp)NULL, 1); } #else no_single /* Read the image several rows at a time */ for (y = 0; y < height; y += number_of_rows) { #ifdef sparkle /* Read the image using the "sparkle" effect. */ - png_read_rows(png_ptr, &row_pointers[y], NULL, number_of_rows); + png_read_rows(png_ptr, &row_pointers[y], (png_bytepp)NULL, + number_of_rows); #else no_sparkle /* Read the image using the "rectangle" effect */ - png_read_rows(png_ptr, NULL, &row_pointers[y], number_of_rows); + png_read_rows(png_ptr, (png_bytepp)NULL, &row_pointers[y], + number_of_rows); #endif no_sparkle /* use only one of these two methods */ } @@ -612,7 +614,7 @@ void write_png(char *file_name /* , ... other image information ... */) * image info living info in the structure. You could "|" many * PNG_TRANSFORM flags into the png_transforms integer here. */ - png_write_png(png_ptr, info_ptr, png_transforms, NULL); + png_write_png(png_ptr, info_ptr, png_transforms, (png_voidp)NULL); #else /* This is the hard way */ @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "October 19, 2001" +.TH LIBPNG 3 "October 25, 2001" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.1beta1 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.1beta2 .SH SYNOPSIS \fI\fB @@ -787,7 +787,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.2.1beta1 - October 19, 2001 + libpng version 1.2.1beta2 - October 25, 2001 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998-2001 Glenn Randers-Pehrson @@ -3635,13 +3635,13 @@ application: .SH IX. Y2K Compliance in libpng -October 19, 2001 +October 25, 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.2.1beta1 are Y2K compliant. It is my belief that earlier +upward through 1.2.1beta2 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 @@ -3819,7 +3819,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.1beta1 - October 19, 2001: +Libpng version 1.2.1beta2 - October 25, 2001: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu). @@ -3836,7 +3836,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.2.1beta1, October 19, 2001, are +libpng versions 1.0.7, July 1, 2000, through 1.2.1beta2, October 25, 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 @@ -3928,7 +3928,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -October 19, 2001 +October 25, 2001 .\" end of man page diff --git a/libpng.txt b/libpng.txt index 615c0e63a..d9963fe21 100644 --- a/libpng.txt +++ b/libpng.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.1beta1 - October 19, 2001 + libpng version 1.2.1beta2 - October 25, 2001 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998-2001 Glenn Randers-Pehrson @@ -2848,13 +2848,13 @@ application: IX. Y2K Compliance in libpng -October 19, 2001 +October 25, 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.2.1beta1 are Y2K compliant. It is my belief that earlier +upward through 1.2.1beta2 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 78a978f39..81aba255c 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "October 19, 2001" +.TH LIBPNGPF 3 "October 25, 2001" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.1beta1 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.1beta2 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "October 19, 2001" +.TH PNG 5 "October 25, 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.2.1beta1 - October 19, 2001 + * libpng version 1.2.1beta2 - October 25, 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_2_1beta1 Your_png_h_is_not_version_1_2_1beta1; +typedef version_1_2_1beta2 Your_png_h_is_not_version_1_2_1beta2; /* 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.2.1beta1"; +const char png_libpng_ver[18] = "1.2.1beta2"; /* png_sig was changed to a function in version 1.0.5c */ /* Place to hold the signature string for a PNG file. */ @@ -646,7 +646,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.2.1beta1 - October 19, 2001\n\ + return ((png_charp) "\n libpng version 1.2.1beta2 - October 25, 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"); @@ -664,8 +664,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.2.1beta1"); - return((png_charp) "1.2.1beta1"); + return((png_charp) "1.2.1beta2"); + return((png_charp) "1.2.1beta2"); } png_charp PNGAPI @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.1beta1 - October 19, 2001 + * libpng version 1.2.1beta2 - October 25, 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.2.1beta1 - October 19, 2001: Glenn + * libpng versions 0.97, January 1998, through 1.2.1beta2 - October 25, 2001: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -78,7 +78,7 @@ * 1.2.0beta3-5 3 10200 3.1.2.0beta3-5 * 1.2.0rc1 3 10200 3.1.2.0rc1 * 1.2.0 3 10200 3.1.2.0 - * 1.2.1beta1 3 10201 3.1.2.1beta1 + * 1.2.1beta1-2 3 10201 3.1.2.1beta1-2 * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -108,7 +108,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.0.7, July 1, 2000, through 1.2.1beta1, October 19, 2001, are + * libpng versions 1.0.7, July 1, 2000, through 1.2.1beta2, October 25, 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 @@ -213,13 +213,13 @@ * Y2K compliance in libpng: * ========================= * - * October 19, 2001 + * October 25, 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.2.1beta1 are Y2K compliant. It is my belief that earlier + * upward through 1.2.1beta2 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 @@ -275,7 +275,7 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.1beta1" +#define PNG_LIBPNG_VER_STRING "1.2.1beta2" #define PNG_LIBPNG_VER_SONUM 3 #define PNG_LIBPNG_VER_DLLNUM %DLLNUM% @@ -287,7 +287,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 1 +#define PNG_LIBPNG_VER_BUILD 2 #define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_BETA 2 @@ -1217,9 +1217,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.2.1beta1 + and png.h are both at version 1.2.1beta2 */ -typedef png_structp version_1_2_1beta1; +typedef png_structp version_1_2_1beta2; typedef png_struct FAR * FAR * png_structpp; @@ -2336,7 +2336,7 @@ extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp /* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */ #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.1beta1 - October 19, 2001 (header)\n" + " libpng version 1.2.1beta2 - October 25, 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 01ffc0b29..ee90d18bf 100644 --- a/pngasmrd.h +++ b/pngasmrd.h @@ -1,6 +1,6 @@ /* pngasmrd.h - assembler version of utilities to read a PNG file * - * libpng 1.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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/pngerror.c b/pngerror.c index 9139bb817..2b122195d 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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 d4f77bf95..b3cb65342 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 version 1.2.1beta1 - October 19, 2001 + * libpng version 1.2.1beta2 - October 25, 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 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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) @@ -27,7 +27,7 @@ png_voidp /* PRIVATE */ png_create_struct(int type) { #ifdef PNG_USER_MEM_SUPPORTED - return (png_create_struct_2(type, NULL, NULL)); + return (png_create_struct_2(type, (png_malloc_ptr)NULL, (png_voidp)NULL)); } /* Alternate version of png_create_struct, for use with user-defined malloc. */ @@ -56,7 +56,7 @@ png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr) struct_ptr = (*(malloc_fn))(png_ptr, size); } else - struct_ptr = (*(malloc_fn))(NULL, size); + struct_ptr = (*(malloc_fn))((png_structp)NULL, size); if (struct_ptr != NULL) png_memset(struct_ptr, 0, size); return (struct_ptr); @@ -297,7 +297,7 @@ png_voidp /* PRIVATE */ png_create_struct(int type) { #ifdef PNG_USER_MEM_SUPPORTED - return (png_create_struct_2(type, NULL, NULL)); + return (png_create_struct_2(type, (png_malloc_ptr)NULL, (png_voidp)NULL)); } /* Allocate memory for a png_struct or a png_info. The malloc and @@ -328,7 +328,7 @@ png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr) struct_ptr = (*(malloc_fn))(png_ptr, size); } else - struct_ptr = (*(malloc_fn))(NULL, size); + struct_ptr = (*(malloc_fn))((png_structp)NULL, size); if (struct_ptr != NULL) png_memset(struct_ptr, 0, size); return (struct_ptr); diff --git a/pngpread.c b/pngpread.c index 92965651b..c612e4633 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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) @@ -792,7 +792,7 @@ png_push_process_row(png_structp png_ptr) { for (i = 0; i < 4 && png_ptr->pass == 2; i++) { - png_push_have_row(png_ptr, NULL); + png_push_have_row(png_ptr, (png_bytep)NULL); png_read_push_finish_row(png_ptr); } } @@ -800,13 +800,13 @@ png_push_process_row(png_structp png_ptr) { for (i = 0; i < 2 && png_ptr->pass == 4; i++) { - png_push_have_row(png_ptr, NULL); + png_push_have_row(png_ptr, (png_bytep)NULL); png_read_push_finish_row(png_ptr); } } if (png_ptr->pass == 6 && png_ptr->height <= 4) { - png_push_have_row(png_ptr, NULL); + png_push_have_row(png_ptr, (png_bytep)NULL); png_read_push_finish_row(png_ptr); } break; @@ -823,7 +823,7 @@ png_push_process_row(png_structp png_ptr) { for (i = 0; i < 4 && png_ptr->pass == 2; i++) { - png_push_have_row(png_ptr, NULL); + png_push_have_row(png_ptr, (png_bytep)NULL); png_read_push_finish_row(png_ptr); } } @@ -839,14 +839,14 @@ png_push_process_row(png_structp png_ptr) } for (i = 0; i < 4 && png_ptr->pass == 2; i++) { - png_push_have_row(png_ptr, NULL); + png_push_have_row(png_ptr, (png_bytep)NULL); png_read_push_finish_row(png_ptr); } if (png_ptr->pass == 4) /* pass 3 might be empty */ { for (i = 0; i < 2 && png_ptr->pass == 4; i++) { - png_push_have_row(png_ptr, NULL); + png_push_have_row(png_ptr, (png_bytep)NULL); png_read_push_finish_row(png_ptr); } } @@ -864,7 +864,7 @@ png_push_process_row(png_structp png_ptr) { for (i = 0; i < 2 && png_ptr->pass == 4; i++) { - png_push_have_row(png_ptr, NULL); + png_push_have_row(png_ptr, (png_bytep)NULL); png_read_push_finish_row(png_ptr); } } @@ -880,12 +880,12 @@ png_push_process_row(png_structp png_ptr) } for (i = 0; i < 2 && png_ptr->pass == 4; i++) { - png_push_have_row(png_ptr, NULL); + png_push_have_row(png_ptr, (png_bytep)NULL); png_read_push_finish_row(png_ptr); } if (png_ptr->pass == 6) /* pass 5 might be empty */ { - png_push_have_row(png_ptr, NULL); + png_push_have_row(png_ptr, (png_bytep)NULL); png_read_push_finish_row(png_ptr); } break; @@ -900,7 +900,7 @@ png_push_process_row(png_structp png_ptr) } if (png_ptr->pass == 6) /* skip top generated row */ { - png_push_have_row(png_ptr, NULL); + png_push_have_row(png_ptr, (png_bytep)NULL); png_read_push_finish_row(png_ptr); } break; @@ -911,7 +911,7 @@ png_push_process_row(png_structp png_ptr) png_read_push_finish_row(png_ptr); if (png_ptr->pass != 6) break; - png_push_have_row(png_ptr, NULL); + png_push_have_row(png_ptr, (png_bytep)NULL); png_read_push_finish_row(png_ptr); } } @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * libpng 1.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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) @@ -22,7 +22,7 @@ png_create_read_struct(png_const_charp user_png_ver, png_voidp error_ptr, #ifdef PNG_USER_MEM_SUPPORTED return (png_create_read_struct_2(user_png_ver, error_ptr, error_fn, - warn_fn, NULL, NULL, NULL)); + warn_fn, (png_voidp)NULL, (png_malloc_ptr)NULL, (png_free_ptr)NULL)); } /* Alternate create PNG structure for reading, and allocate any memory needed. */ @@ -139,7 +139,7 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr, png_ptr->zstream.next_out = png_ptr->zbuf; png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size; - png_set_read_fn(png_ptr, NULL, NULL); + png_set_read_fn(png_ptr, (png_voidp)NULL, (png_rw_ptr)NULL); return (png_ptr); } @@ -267,7 +267,7 @@ png_read_init_3(png_structpp ptr_ptr, png_const_charp user_png_ver, png_ptr->zstream.next_out = png_ptr->zbuf; png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size; - png_set_read_fn(png_ptr, NULL, NULL); + png_set_read_fn(png_ptr, (png_voidp)NULL, (png_rw_ptr)NULL); } /* Read the information before the actual image data. This has been @@ -769,7 +769,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.2.1beta1 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.1beta2 */ void PNGAPI @@ -796,14 +796,14 @@ png_read_rows(png_structp png_ptr, png_bytepp row, for (i = 0; i < num_rows; i++) { png_bytep rptr = *rp; - png_read_row(png_ptr, rptr, NULL); + png_read_row(png_ptr, rptr, (png_bytep)NULL); rp++; } else if(dp != NULL) for (i = 0; i < num_rows; i++) { png_bytep dptr = *dp; - png_read_row(png_ptr, NULL, dptr); + png_read_row(png_ptr, (png_bytep)NULL, dptr); dp++; } } @@ -818,7 +818,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.2.1beta1 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.1beta2 */ void PNGAPI png_read_image(png_structp png_ptr, png_bytepp image) @@ -848,7 +848,7 @@ png_read_image(png_structp png_ptr, png_bytepp image) rp = image; for (i = 0; i < image_height; i++) { - png_read_row(png_ptr, *rp, NULL); + png_read_row(png_ptr, *rp, (png_bytep)NULL); rp++; } } @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * libpng 1.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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 7329ccf9d..9feefe6dc 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * libpng 1.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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 5086297de..436ab8eab 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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) @@ -727,9 +727,9 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) else { #ifdef PNG_WRITE_SUPPORTED - png_set_write_status_fn(write_ptr, NULL); + png_set_write_status_fn(write_ptr, (png_write_status_ptr)NULL); #endif - png_set_read_status_fn(read_ptr, NULL); + png_set_read_status_fn(read_ptr, (png_read_status_ptr)NULL); } #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) @@ -748,10 +748,12 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) #define HANDLE_CHUNK_IF_SAFE 2 #define HANDLE_CHUNK_ALWAYS 3 #if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) - png_set_keep_unknown_chunks(read_ptr, HANDLE_CHUNK_ALWAYS, NULL, 0); + png_set_keep_unknown_chunks(read_ptr, HANDLE_CHUNK_ALWAYS, + (png_bytep)NULL, 0); #endif #if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED) - png_set_keep_unknown_chunks(write_ptr, HANDLE_CHUNK_IF_SAFE, NULL, 0); + png_set_keep_unknown_chunks(write_ptr, HANDLE_CHUNK_IF_SAFE, + (png_bytep)NULL, 0); #endif png_debug(0, "Reading info struct\n"); @@ -1510,4 +1512,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_1beta1 your_png_h_is_not_version_1_2_1beta1; +typedef version_1_2_1beta2 your_png_h_is_not_version_1_2_1beta2; diff --git a/pngtrans.c b/pngtrans.c index e3b182fb2..617c3a8d9 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.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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 1a67b70da..1ca7a3743 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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) @@ -424,7 +424,7 @@ png_create_write_struct(png_const_charp user_png_ver, png_voidp error_ptr, { #ifdef PNG_USER_MEM_SUPPORTED return (png_create_write_struct_2(user_png_ver, error_ptr, error_fn, - warn_fn, NULL, NULL, NULL)); + warn_fn, (png_voidp)NULL, (png_malloc_ptr)NULL, (png_free_ptr)NULL)); } /* Alternate initialize png_ptr structure, and allocate any memory needed */ @@ -521,11 +521,12 @@ png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr, png_ptr->zbuf = (png_bytep)png_malloc(png_ptr, (png_uint_32)png_ptr->zbuf_size); - png_set_write_fn(png_ptr, NULL, NULL, NULL); + png_set_write_fn(png_ptr, (png_voidp)NULL, (png_rw_ptr)NULL, + (png_flush_ptr)NULL); #if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) png_set_filter_heuristics(png_ptr, PNG_FILTER_HEURISTIC_DEFAULT, - 1, NULL, NULL); + 1, (png_doublep)NULL, (png_doublep)NULL); #endif return ((png_structp)png_ptr); @@ -634,7 +635,8 @@ png_write_init_3(png_structpp ptr_ptr, png_const_charp user_png_ver, png_memcpy(png_ptr->jmpbuf, tmp_jmp, sizeof (jmp_buf)); #endif - png_set_write_fn(png_ptr, NULL, NULL, NULL); + png_set_write_fn(png_ptr, (png_voidp)NULL, (png_rw_ptr)NULL, + (png_flush_ptr)NULL); /* initialize zbuf - compression buffer */ png_ptr->zbuf_size = PNG_ZBUF_SIZE; @@ -643,7 +645,7 @@ png_write_init_3(png_structpp ptr_ptr, png_const_charp user_png_ver, #if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) png_set_filter_heuristics(png_ptr, PNG_FILTER_HEURISTIC_DEFAULT, - 1, NULL, NULL); + 1, (png_doublep)NULL, (png_doublep)NULL); #endif } diff --git a/pngwtran.c b/pngwtran.c index aa6b5f857..385895cc1 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * libpng 1.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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 8282da671..3e1b345fd 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.2.1beta1 - October 19, 2001 + * libpng 1.2.1beta2 - October 25, 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) @@ -608,7 +608,8 @@ png_write_IEND(png_structp png_ptr) PNG_IEND; #endif png_debug(1, "in png_write_IEND\n"); - png_write_chunk(png_ptr, (png_bytep)png_IEND, NULL, (png_size_t)0); + png_write_chunk(png_ptr, (png_bytep)png_IEND, (png_bytep)NULL, + (png_size_t)0); png_ptr->mode |= PNG_HAVE_IEND; } diff --git a/projects/msvc/README.txt b/projects/msvc/README.txt index 3185e56bd..c5314ae2d 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.2.1beta1 (October 19, 2001) and zlib +libpng 1.2.1beta2 (October 25, 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 e8bc6ea39..677ff292a 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.2.1beta1 +;Version 1.2.1beta2 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/projects/netware.txt b/projects/netware.txt index e03cb805e..7aa8a674f 100644 --- a/projects/netware.txt +++ b/projects/netware.txt @@ -1,6 +1,6 @@ A set of project files is available for Netware. Get -libpng-1.2.1beta1-project-netware.zip from a libpng distribution +libpng-1.2.1beta2-project-netware.zip from a libpng distribution site such as http://libpng.sourceforge.net Put the zip file in this directory (projects) and then run -"unzip -a libpng-1.2.1beta1-project-netware.zip" +"unzip -a libpng-1.2.1beta2-project-netware.zip" diff --git a/projects/wince.txt b/projects/wince.txt index 28fa6afaf..5d30c762f 100644 --- a/projects/wince.txt +++ b/projects/wince.txt @@ -1,6 +1,6 @@ A set of project files is available for WinCE. Get -libpng-1.2.1beta1-project-wince.zip from a libpng distribution +libpng-1.2.1beta2-project-wince.zip from a libpng distribution site such as http://libpng.sourceforge.net Put the zip file in this directory (projects) and then run -"unzip -a libpng-1.2.1beta1-project-wince.zip" +"unzip -a libpng-1.2.1beta2-project-wince.zip" diff --git a/scripts/makefile.aix b/scripts/makefile.aix index e6840348a..78eaaf965 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 3. You should not # have to change it. PNGMAJ = 3 -PNGMIN = 1.2.1beta1 +PNGMIN = 1.2.1beta2 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index b12351441..a3508f46a 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 3. You should not # have to change it. PNGMAJ = 3 -PNGMIN = 1.2.1beta1 +PNGMIN = 1.2.1beta2 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index b464e8126..9c42c6709 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -39,7 +39,7 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \ # have to change it. PNGMAJ = 3 #PNGDLL = $3 -PNGMIN = 1.2.1beta1 +PNGMIN = 1.2.1beta2 PNGMIN_BASE = 1.2.1 PNGVER = $(PNGMAJ).$(PNGMIN) diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index d2e3dfa87..d18ac2be5 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -24,7 +24,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 3. You should not # have to change it. PNGMAJ = 3 -PNGMIN = 1.2.1beta1 +PNGMIN = 1.2.1beta2 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.dec b/scripts/makefile.dec index a867c179f..3ab2cd8ec 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 3. You should not # have to change it. PNGMAJ = 3 -PNGMIN = 1.2.1beta1 +PNGMIN = 1.2.1beta2 PNGVER = $(PNGMAJ).$(PNGMIN) CC=cc diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 842e9262d..f112eb6ec 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -55,7 +55,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 3. You should not # have to change it. PNGMAJ = 3 -PNGMIN = 1.2.1beta1 +PNGMIN = 1.2.1beta2 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index cddbf6b61..ca0baba3a 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -34,7 +34,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 3. You should not # have to change it. PNGMAJ = 3 -PNGMIN = 1.2.1beta1 +PNGMIN = 1.2.1beta2 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 12f460575..51e90a9e0 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -19,7 +19,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 3. You should not # have to change it. PNGMAJ = 3 -PNGMIN = 1.2.1beta1 +PNGMIN = 1.2.1beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # where make install puts libpng.a and png.h diff --git a/scripts/makefile.linux b/scripts/makefile.linux index bca411d71..bcd995601 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 3. You should not # have to change it. PNGMAJ = 3 -PNGMIN = 1.2.1beta1 +PNGMIN = 1.2.1beta2 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx index 4ca44c458..0cbacfb11 100644 --- a/scripts/makefile.macosx +++ b/scripts/makefile.macosx @@ -19,7 +19,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz LDSHARED=cc -lz -dynamiclib -compatibility_version $(VER) -current_version $(VER) PNGMAJ = 3 -PNGMIN = 1.2.1beta1 +PNGMIN = 1.2.1beta2 VER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng SHAREDLIB_POSTFIX=dylib diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index a7526659e..17fa7ca17 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -11,7 +11,7 @@ INCSDIR=${LOCALBASE}/include LIB=png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.1beta1 +SHLIB_MINOR= 1.2.1beta2 SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.sco b/scripts/makefile.sco index b801021e2..79c1caa01 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 3. You should not # have to change it. PNGMAJ = 3 -PNGMIN = 1.2.1beta1 +PNGMIN = 1.2.1beta2 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 389fe5802..05abb2fb3 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -22,7 +22,7 @@ CFLAGS=$(ABI) -I$(ZLIBINC) -O2 $(WARNMORE) -fPIC -mabi=n32 LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm LDSHARED=CC $(ABI) -shared -VER=1.2.1beta1 +VER=1.2.1beta2 # See "man dso" for info about shared objects SONUM=3 LIBS=libpng.so.$(SONUM).$(VER) diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 556c34b0f..05888c76f 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -27,7 +27,7 @@ CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -DPNG_USE_PNGGCCRD -DPNG_NO_ASSEMBLER_ LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm LDSHARED=cc $(ABI) -shared -VER=1.2.1beta1 +VER=1.2.1beta2 # See "man dso" for info about shared objects SONUM=3 SHAREDLIB=libpng.so diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 new file mode 100644 index 000000000..701bc2cb8 --- /dev/null +++ b/scripts/makefile.so9 @@ -0,0 +1,124 @@ +# makefile for libpng on Solaris 9 (beta) with Forte cc +# Updated by Chad Schrock for Solaris 9 +# Contributed by William L. Sebok, based on makefile.linux +# Copyright (C) 1998-2001 Greg Roelofs +# Copyright (C) 1996-1997 Andreas Dilger +# For conditions of distribution and use, see copyright notice in png.h + +# gcc 2.95 doesn't work. +CC=cc + +# Where make install puts libpng.a, libpng.so*, and png.h +prefix=/usr/local + +# Where the zlib library and include files are located +# Changing these to ../zlib poses a security risk. If you want +# to have zlib in an adjacent directory, specify the full path instead of "..". +#ZLIBLIB=../zlib +#ZLIBINC=../zlib +#ZLIBLIB=/usr/local/lib +#ZLIBINC=/usr/local/include +#Use the preinstalled zlib that comes with Solaris 9: +ZLIBLIB=/usr/lib +ZLIBINC=/usr/include + +#WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ + -Wmissing-declarations -Wtraditional -Wcast-align \ + -Wstrict-prototypes -Wmissing-prototypes #-Wconversion +#CFLAGS=-I$(ZLIBINC) -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 +CFLAGS=-I$(ZLIBINC) -O3 +LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng -lz -lm + +#RANLIB=ranlib +RANLIB=echo + +# read libpng.txt or png.h to see why PNGMAJ is 3. You should not +# have to change it. +PNGMAJ = 3 +PNGMIN = 1.2.1beta2 +PNGVER = $(PNGMAJ).$(PNGMIN) + +INCPATH=$(prefix)/include +LIBPATH=$(prefix)/lib + +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 + +OBJSDLL = $(OBJS:.o=.pic.o) + +.SUFFIXES: .c .o .pic.o + +.c.pic.o: + $(CC) -c $(CFLAGS) -KPIC -o $@ $*.c + +all: libpng.a libpng.so pngtest + +libpng.a: $(OBJS) + ar rc $@ $(OBJS) + $(RANLIB) $@ + +libpng.so: libpng.so.$(PNGMAJ) + ln -f -s libpng.so.$(PNGMAJ) libpng.so + +libpng.so.$(PNGMAJ): libpng.so.$(PNGVER) + ln -f -s libpng.so.$(PNGVER) libpng.so.$(PNGMAJ) + +libpng.so.$(PNGVER): $(OBJSDLL) + @case "`type ld`" in *ucb*) \ + echo; \ + echo '## WARNING:'; \ + echo '## The commands "CC" and "LD" must NOT refer to /usr/ucb/cc'; \ + echo '## and /usr/ucb/ld. If they do, you need to adjust your PATH'; \ + echo '## environment variable to put /usr/ccs/bin ahead of /usr/ucb.'; \ + echo '## The environment variable LD_LIBRARY_PATH should not be set'; \ + echo '## at all. If it is, things are likely to break because of'; \ + echo '## the libucb dependency that is created.'; \ + echo; \ + ;; \ + esac + $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h libpng.so.$(PNGMAJ) \ + -o libpng.so.$(PNGVER) $(OBJSDLL) -lz + +pngtest: pngtest.o libpng.so + $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) + +test: pngtest + ./pngtest + +install: libpng.a libpng.so.$(PNGVER) + -@mkdir $(INCPATH) $(LIBPATH) + cp png.h pngconf.h $(INCPATH) + chmod 644 $(INCPATH)/png.h $(INCPATH)/pngconf.h + cp libpng.a libpng.so.$(PNGVER) $(LIBPATH) + chmod 755 $(LIBPATH)/libpng.so.$(PNGVER) + -@/bin/rm -f $(LIBPATH)/libpng.so.$(PNGMAJ) $(LIBPATH)/libpng.so + (cd $(LIBPATH); ln -f -s libpng.so.$(PNGVER) libpng.so.$(PNGMAJ); \ + ln -f -s libpng.so.$(PNGMAJ) libpng.so) + +clean: + /bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png + +DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO +writelock: + chmod a-w *.[ch35] $(DOCS) scripts/* + +# DO NOT DELETE THIS LINE -- make depend depends on it. + +png.o png.pic.o: png.h pngconf.h +pngerror.o pngerror.pic.o: png.h pngconf.h +pngrio.o pngrio.pic.o: png.h pngconf.h +pngwio.o pngwio.pic.o: png.h pngconf.h +pngmem.o pngmem.pic.o: png.h pngconf.h +pngset.o pngset.pic.o: png.h pngconf.h +pngget.o pngget.pic.o: png.h pngconf.h +pngread.o pngread.pic.o: png.h pngconf.h +pngrtran.o pngrtran.pic.o: png.h pngconf.h +pngrutil.o pngrutil.pic.o: png.h pngconf.h +pngtrans.o pngtrans.pic.o: png.h pngconf.h +pngwrite.o pngwrite.pic.o: png.h pngconf.h +pngwtran.o pngwtran.pic.o: png.h pngconf.h +pngwutil.o pngwutil.pic.o: png.h pngconf.h +pngpread.o pngpread.pic.o: png.h pngconf.h + +pngtest.o: png.h pngconf.h diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 2d6d17d73..1f075cdc5 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 3. You should not # have to change it. PNGMAJ = 3 -PNGMIN = 1.2.1beta1 +PNGMIN = 1.2.1beta2 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index b0edbf087..1c9771c27 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -7,7 +7,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.2.1beta1'; + PNG_LIBPNG_VER_STRING = '1.2.1beta2'; PNG_LIBPNG_VER = 10201; type diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 9ff0d3345..c521424fa 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.1beta1 +; Version 1.2.1beta2 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" |