diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2001-11-24 14:53:31 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:06:37 -0500 |
| commit | ae498dcff322a562d140935cfa80ff7de095b9b8 (patch) | |
| tree | 72c4d4ce3a311f550e82798cef5cccb37753c7b7 | |
| parent | 5cded0b4b5eeca9ad91782563cad9c3f4a86e8ce (diff) | |
| download | libpng-1.2.1rc1.tar.gz | |
Imported from libpng-1.2.1rc1.tarv1.2.1rc1
55 files changed, 151 insertions, 127 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.1beta4 - November 7, 2001 +Libpng 1.2.1rc1 - November 24, 2001 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -23,6 +23,14 @@ version 1.2.1beta4 [November 7, 2001] Added error message if png_write_info() was omitted. Type cast NULLs appearing in function calls when _NO_PROTO or PNG_TYPECAST_NULL is defined. +version 1.2.1rc1 [November 24, 2001] + Type cast NULLs appearing in function calls except when PNG_NO_TYPECAST_NULL + Changed typecast of "size" argument to png_size_t in pngmem.c calls to + the user malloc_fn, to agree with the prototype in png.h + Added a pop/push operation to pnggccrd.c, to preserve Eflag (Maxim Sobolev) + Updated makefile.sgi to recognize LIBPATH and INCPATH. + Updated various makefiles so "make clean" does not remove previous major + version of the shared library. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -998,6 +998,15 @@ version 1.2.1beta4 [November 7, 2001] Added error message if png_write_info() was omitted. Type cast NULLs appearing in function calls when _NO_PROTO or PNG_TYPECAST_NULL is defined. +version 1.2.1rc1 [November 24, 2001] + Type cast NULLs appearing in function calls except when PNG_NO_TYPECAST_NULL + is defined. + Changed typecast of "size" argument to png_size_t in pngmem.c calls to + the user malloc_fn, to agree with the prototype in png.h + Added a pop/push operation to pnggccrd.c, to preserve Eflag (Maxim Sobolev) + Updated makefile.sgi to recognize LIBPATH and INCPATH. + Updated various makefiles so "make clean" does not remove previous major + version of the shared library. 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.1beta4 - November 7, 2001 +Installing libpng version 1.2.1rc1 - November 24, 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.1beta4" or "lpng109" and "zlib-1.1.3" +might be called "libpng-1.2.1rc1" 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.3.1.2.1beta4) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng.so.3.1.2.1beta4, + makefile.linux => Linux/ELF makefile (gcc, creates libpng.so.3.1.2.1rc1) + makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng.so.3.1.2.1rc1, 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 @@ -83,10 +83,10 @@ 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.3.1.2.1beta4) + makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.3.1.2.1rc1) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.3.1.2.1beta4) - makefile.so9 => Solaris 9 makefile (gcc, creates libpng.so.3.1.2.1beta4) + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.3.1.2.1rc1) + makefile.so9 => Solaris 9 makefile (gcc, creates libpng.so.3.1.2.1rc1) makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.mips => MIPS makefile makefile.acorn => Acorn makefile @@ -1,8 +1,9 @@ -Known bugs in libpng-1.2.0 +Known bugs in libpng version 1.2.1rc1 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when reading interlaced PNG files, when assembler code is enabled. - STATUS: Under investigation. + STATUS: Under investigation. The change to pnggccrd.c in libpng-1.2.1 + fixed a problem under FreeBSD but not the problem with NetBSD. @@ -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.1beta4, November 7, 2001, are +libpng versions 1.0.7, July 1, 2000, through 1.2.1rc1, November 24, 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 -November 7, 2001 +November 24, 2001 @@ -1,4 +1,4 @@ -README for libpng 1.2.1beta4 - November 7, 2001 (shared library 2.1) +README for libpng 1.2.1rc1 - November 24, 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.3.1.2.1beta4) + (gcc, creates libpng.so.3.1.2.1rc1) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng.so.3.1.2.1beta4, uses assembler code + libpng.so.3.1.2.1rc1, 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 @@ -207,12 +207,12 @@ 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.3.1.2.1beta4) + makefile.sggcc => Silicon Graphics (gcc, creates libpng.so.3.1.2.1rc1) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng.so.3.1.2.1beta4) + (gcc, creates libpng.so.3.1.2.1rc1) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng.so.3.1.2.1beta4) + (gcc, creates libpng.so.3.1.2.1rc1) 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: ========================= - November 7, 2001 + November 24, 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.1beta4 are Y2K compliant. It is my belief that earlier + upward through 1.2.1rc1 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.1beta4. Instead, please + There is no \"configure\" script for Libpng-1.2.1rc1. 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 "November 7, 2001" +.TH LIBPNG 3 "November 24, 2001" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.1beta4 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.1rc1 .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.1beta4 - November 7, 2001 + libpng version 1.2.1rc1 - November 24, 2001 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998-2001 Glenn Randers-Pehrson @@ -3106,7 +3106,7 @@ This function also provides a void pointer that can be retrieved via Your replacement memory functions must have prototypes as follows: png_voidp malloc_fn(png_structp png_ptr, - png_uint_32 size); + png_size_t size); void free_fn(png_structp png_ptr, png_voidp ptr); Your malloc_fn() can return NULL in case of failure. The png_malloc() @@ -3635,13 +3635,13 @@ application: .SH IX. Y2K Compliance in libpng -November 7, 2001 +November 24, 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.1beta4 are Y2K compliant. It is my belief that earlier +upward through 1.2.1rc1 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 @@ -3762,6 +3762,7 @@ the first widely used release: 1.2.0rc1 3 10200 3.1.2.0rc1 1.2.0 3 10200 3.1.2.0 1.2.1beta-4 3 10201 3.1.2.1beta1-4 + 1.2.1rc1 3 10201 3.1.2.1rc1 Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3819,7 +3820,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.1beta4 - November 7, 2001: +Libpng version 1.2.1rc1 - November 24, 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 +3837,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.1beta4, November 7, 2001, are +libpng versions 1.0.7, July 1, 2000, through 1.2.1rc1, November 24, 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 +3929,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -November 7, 2001 +November 24, 2001 .\" end of man page diff --git a/libpng.txt b/libpng.txt index 6e2934f1d..b9e57e7c3 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.1beta4 - November 7, 2001 + libpng version 1.2.1rc1 - November 24, 2001 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998-2001 Glenn Randers-Pehrson @@ -2319,7 +2319,7 @@ This function also provides a void pointer that can be retrieved via Your replacement memory functions must have prototypes as follows: png_voidp malloc_fn(png_structp png_ptr, - png_uint_32 size); + png_size_t size); void free_fn(png_structp png_ptr, png_voidp ptr); Your malloc_fn() can return NULL in case of failure. The png_malloc() @@ -2848,13 +2848,13 @@ application: IX. Y2K Compliance in libpng -November 7, 2001 +November 24, 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.1beta4 are Y2K compliant. It is my belief that earlier +upward through 1.2.1rc1 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 34f66002c..8340d030f 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "November 7, 2001" +.TH LIBPNGPF 3 "November 24, 2001" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.1beta4 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.1rc1 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "November 7, 2001" +.TH PNG 5 "November 24, 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.1beta4 - November 7, 2001 + * libpng version 1.2.1rc1 - November 24, 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_1beta4 Your_png_h_is_not_version_1_2_1beta4; +typedef version_1_2_1rc1 Your_png_h_is_not_version_1_2_1rc1; /* 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.1beta4"; +const char png_libpng_ver[18] = "1.2.1rc1"; /* png_sig was changed to a function in version 1.0.5c */ /* Place to hold the signature string for a PNG file. */ @@ -645,7 +645,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.1beta4 - November 7, 2001\n\ + return ((png_charp) "\n libpng version 1.2.1rc1 - November 24, 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"); @@ -663,8 +663,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.1beta4"); - return((png_charp) "1.2.1beta4"); + return((png_charp) "1.2.1rc1"); + return((png_charp) "1.2.1rc1"); } png_charp PNGAPI @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.1beta4 - November 7, 2001 + * libpng version 1.2.1rc1 - November 24, 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.1beta4 - November 7, 2001: Glenn + * libpng versions 0.97, January 1998, through 1.2.1rc1 - November 24, 2001: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -79,6 +79,7 @@ * 1.2.0rc1 3 10200 3.1.2.0rc1 * 1.2.0 3 10200 3.1.2.0 * 1.2.1beta1-4 3 10201 3.1.2.1beta1-4 + * 1.2.1rc1 3 10201 3.1.2.1rc1 * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -108,7 +109,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.1beta4, November 7, 2001, are + * libpng versions 1.0.7, July 1, 2000, through 1.2.1rc1, November 24, 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 +214,13 @@ * Y2K compliance in libpng: * ========================= * - * November 7, 2001 + * November 24, 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.1beta4 are Y2K compliant. It is my belief that earlier + * upward through 1.2.1rc1 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 +276,7 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.1beta4" +#define PNG_LIBPNG_VER_STRING "1.2.1rc1" #define PNG_LIBPNG_VER_SONUM 3 #define PNG_LIBPNG_VER_DLLNUM %DLLNUM% @@ -287,7 +288,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 4 +#define PNG_LIBPNG_VER_BUILD 1 #define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_BETA 2 @@ -295,7 +296,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. @@ -323,7 +324,7 @@ extern "C" { * which applications aren't expected to use directly. */ -#ifdef PNG_TYPECAST_NULL +#ifndef PNG_NO_TYPECAST_NULL #define int_p_NULL (int *)NULL #define png_bytep_NULL (png_bytep)NULL #define png_bytepp_NULL (png_bytepp)NULL @@ -1251,9 +1252,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.1beta4 + and png.h are both at version 1.2.1rc1 */ -typedef png_structp version_1_2_1beta4; +typedef png_structp version_1_2_1rc1; typedef png_struct FAR * FAR * png_structpp; @@ -2370,7 +2371,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.1beta4 - November 7, 2001 (header)\n" + " libpng version 1.2.1rc1 - November 24, 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 366ba34d6..829c3250a 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.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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 952f1b8d0..3a13117d0 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.2.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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 7aed706f3..5c4e31714 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.1beta4 - November 7, 2001 + * libpng version 1.2.1rc1 - November 24, 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 @@ -5287,6 +5287,8 @@ png_mmx_support(void) "popfl \n\t" // restore modified value to Eflag reg "pushfl \n\t" // save Eflag to stack "popl %%eax \n\t" // get Eflag from stack + "pushl %%ecx \n\t" // save original Eflag to stack + "popfl \n\t" // restore original Eflag "xorl %%ecx, %%eax \n\t" // compare new Eflag with original Eflag "jz .NOT_SUPPORTED \n\t" // if same, CPUID instr. is not supported @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.2.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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) @@ -122,7 +122,7 @@ png_malloc(png_structp png_ptr, png_uint_32 size) #ifdef PNG_USER_MEM_SUPPORTED if(png_ptr->malloc_fn != NULL) { - ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, size)); + ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size)); if (ret == NULL) png_error(png_ptr, "Out of memory!"); return (ret); @@ -314,7 +314,7 @@ png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr) png_struct dummy_struct; png_structp png_ptr = &dummy_struct; png_ptr->mem_ptr=mem_ptr; - struct_ptr = (*(malloc_fn))(png_ptr, (png_uint_32)size); + struct_ptr = (*(malloc_fn))(png_ptr, size); if (struct_ptr != NULL) png_memset(struct_ptr, 0, size); return (struct_ptr); diff --git a/pngpread.c b/pngpread.c index b1a1d93d5..88483bac1 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.2.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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.2.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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) @@ -767,7 +767,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.1beta4 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.1rc1 */ void PNGAPI @@ -816,7 +816,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.1beta4 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.1rc1 */ void PNGAPI png_read_image(png_structp png_ptr, png_bytepp image) @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * libpng 1.2.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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 402223881..b9b6bdb1b 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.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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 634ac835d..b795dc4e2 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.2.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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) @@ -1512,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_1beta4 your_png_h_is_not_version_1_2_1beta4; +typedef version_1_2_1rc1 your_png_h_is_not_version_1_2_1rc1; diff --git a/pngtrans.c b/pngtrans.c index cc7bf1913..f1ccd66b0 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.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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 d0331e379..3d4cfccab 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.2.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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 7791709ed..52ae4a8e1 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.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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 a0cd1554a..f971303c7 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.2.1beta4 - November 7, 2001 + * libpng 1.2.1rc1 - November 24, 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 2ade89a83..d8ab6b26b 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.1beta4 (November 7, 2001) and zlib +libpng 1.2.1rc1 (November 24, 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 0d3075c56..4f57e8286 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.1beta4 +;Version 1.2.1rc1 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/projects/netware.txt b/projects/netware.txt index f2fcddb7c..16a6b1aac 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.1beta4-project-netware.zip from a libpng distribution +libpng-1.2.1rc1-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.1beta4-project-netware.zip" +"unzip -a libpng-1.2.1rc1-project-netware.zip" diff --git a/projects/wince.txt b/projects/wince.txt index 5b05ac2b8..c93547ea1 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.1beta4-project-wince.zip from a libpng distribution +libpng-1.2.1rc1-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.1beta4-project-wince.zip" +"unzip -a libpng-1.2.1rc1-project-wince.zip" diff --git a/scripts/makefile.aix b/scripts/makefile.aix index b54885661..4afecd5da 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.1beta4 +PNGMIN = 1.2.1rc1 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local @@ -63,7 +63,7 @@ install: libpng.a cp libpng.a $(LIBPATH) clean: - /bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png + /bin/rm -f *.o libpng.a pngtest pngout.png png$(O): png.h pngconf.h pngerror$(O): png.h pngconf.h diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 07f07db48..d19419892 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.1beta4 +PNGMIN = 1.2.1rc1 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= @@ -82,7 +82,7 @@ install: libpng.a libpng.so.$(PNGVER) ln -sf libpng.so.$(PNGMAJ) libpng.so) clean: - /bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png + /bin/rm -f *.o libpng.a libpng.so libpng.so.$(PNGMAJ)* pngtest pngout.png # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 63284032a..e739fdd0e 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.1beta4 +PNGMIN = 1.2.1rc1 PNGMIN_BASE = 1.2.1 PNGVER = $(PNGMAJ).$(PNGMIN) diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index e5a3ccf41..2d08ab9f3 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.1beta4 +PNGMIN = 1.2.1rc1 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 9f027e47d..b53bd983b 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.1beta4 +PNGMIN = 1.2.1rc1 PNGVER = $(PNGMAJ).$(PNGMIN) CC=cc @@ -68,7 +68,7 @@ install: libpng.a libpng.so.$(PNGVER) ln -f -s libpng.so.$(PNGMAJ) libpng.so) clean: - rm -f *.o libpng.a pngtest pngout.png libpng.so* + /bin/rm -f *.o libpng.a libpng.so libpng.so.$(PNGMAJ)* pngtest pngout.png # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index dc8b3a548..289f1c3cb 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.1beta4 +PNGMIN = 1.2.1rc1 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -122,7 +122,7 @@ install: libpng.a libpng.so.$(PNGVER) ln -sf libpng.so.$(PNGMAJ) libpng.so) clean: - /bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png + /bin/rm -f *.o libpng.a libpng.so libpng.so.$(PNGMAJ)* pngtest pngout.png DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 722b4e509..0dfd53ac4 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.1beta4 +PNGMIN = 1.2.1rc1 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -85,7 +85,7 @@ install: libpng.a libpng.sl.$(PNGVER) ln -sf libpng.sl.$(PNGMAJ) libpng.sl) clean: - /bin/rm -f *.o libpng.a libpng.sl* pngtest pngout.png + /bin/rm -f *.o libpng.a libpng.sl libpng.sl.$(PNGMAJ)* pngtest pngout.png DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 2bb5bfa19..fd122f3dd 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.1beta4 +PNGMIN = 1.2.1rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # where make install puts libpng.a and png.h @@ -72,7 +72,7 @@ install: libpng.a ln -f -s libpng.sl.$(PNGMAJ) libpng.sl) clean: - rm -f *.o libpng.a libpng.sl* pngtest pngout.png + /bin/rm -f *.o libpng.a libpng.sl libpng.sl.$(PNGMAJ)* pngtest pngout.png DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index f907f5de8..a4966d7ea 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.1beta4 +PNGMIN = 1.2.1rc1 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -85,7 +85,7 @@ install: libpng.a libpng.so.$(PNGVER) ln -sf libpng.so.$(PNGMAJ) libpng.so) clean: - /bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png + /bin/rm -f *.o libpng.a libpng.so libpng.so.$(PNGMAJ)* pngtest pngout.png DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx index 81b4c2619..b694d04a8 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.1beta4 +PNGMIN = 1.2.1rc1 VER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng SHAREDLIB_POSTFIX=dylib diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index 1b5fc7a20..f7da259cc 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.1beta4 +SHLIB_MINOR= 1.2.1rc1 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 81f64e1c2..92245eb19 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.1beta4 +PNGMIN = 1.2.1rc1 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -75,7 +75,7 @@ install: libpng.a libpng.so.$(PNGVER) ln -f -s libpng.so.$(PNGMAJ) libpng.so) clean: - /bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png + /bin/rm -f *.o libpng.a libpng.so libpng.so.$(PNGMAJ)* pngtest pngout.png DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index d5d4f1f09..2b9193b2f 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.1beta4 +VER=1.2.1rc1 # 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 565bbf45d..7d7aa3fbe 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -27,16 +27,18 @@ 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.1beta4 +VER=1.2.1rc1 # See "man dso" for info about shared objects SONUM=3 SHAREDLIB=libpng.so -libdir=$(prefix) -#libdir=$(prefix)/lib32 RANLIB=echo #RANLIB=ranlib +INCPATH=$(prefix)/include +LIBPATH=$(prefix)/lib +#LIBPATH=$(prefix)/lib32 + OBJS = pnggccrd.o 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 @@ -51,7 +53,7 @@ libpng.a: $(OBJS) $(SHAREDLIB).$(SONUM).$(VER): $(OBJS) $(LDSHARED) -o $@ $(OBJS) - rm -f $(SHAREDLIB) $(SHAREDLIB).? + rm -f $(SHAREDLIB) $(SHAREDLIB).$(SONUM) ln -s $@ $(SHAREDLIB) ln -s $@ $(SHAREDLIB).$(SONUM) @@ -62,25 +64,25 @@ test: pngtest ./pngtest install: libpng.a - -@mkdir $(prefix)/include - -@mkdir $(prefix)/lib - cp png.h $(prefix)/include - cp pngconf.h $(prefix)/include - chmod 644 $(prefix)/include/png.h - chmod 644 $(prefix)/include/pngconf.h - cp libpng.a $(prefix)/lib - chmod 644 $(prefix)/lib/libpng.a + -@mkdir $(INCPATH) + -@mkdir $(LIBPATH) + cp png.h $(INCPATH) + cp pngconf.h $(INCPATH) + chmod 644 $(INCPATH)/png.h + chmod 644 $(INCPATH)/pngconf.h + cp libpng.a $(LIBPATH) + chmod 644 $(LIBPATH)/libpng.a install-shared: $(SHAREDLIB).$(SONUM).$(VER) - cp $(SHAREDLIB).$(SONUM).$(VER) $(libdir) + cp $(SHAREDLIB).$(SONUM).$(VER) $(LIBPATH) chmod 755 $(SHAREDLIB).$(SONUM).$(VER) - (cd $(libdir); if test -f $(SHAREDLIB).$(SONUM).$(VER); then \ + (cd $(LIBPATH); if test -f $(SHAREDLIB).$(SONUM).$(VER); then \ 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 $(SHAREDLIB).* + rm -f *.o libpng.a pngtest pngout.png $(SHAREDLIB) $(SHAREDLIB).$(SONUM)* DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 9a635ff5c..3b51fd93b 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -35,7 +35,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.1beta4 +PNGMIN = 1.2.1rc1 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -97,7 +97,7 @@ install: libpng.a libpng.so.$(PNGVER) ln -f -s libpng.so.$(PNGMAJ) libpng.so) clean: - /bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png + /bin/rm -f *.o libpng.a libpng.so libpng.so.$(PNGMAJ)* pngtest pngout.png DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 6a0da5198..1ba8245ed 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.1beta4 +PNGMIN = 1.2.1rc1 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -93,7 +93,7 @@ install: libpng.a libpng.so.$(PNGVER) ln -f -s libpng.so.$(PNGMAJ) libpng.so) clean: - /bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png + /bin/rm -f *.o libpng.a libpng.so libpng.so.$(PNGMAJ)* pngtest pngout.png DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index d0ce78f12..0cc41a501 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -7,7 +7,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.2.1beta4'; + PNG_LIBPNG_VER_STRING = '1.2.1rc1'; PNG_LIBPNG_VER = 10201; type diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 166d06c26..349d83f7e 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.1beta4 +; Version 1.2.1rc1 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" |