diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2002-09-15 20:30:38 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:07:28 -0500 |
| commit | 865f4f073a692279c4aecbce7c9b9ed5a27372cf (patch) | |
| tree | 282c93bc5efeff3da080d1f167bdb61f9c36cf89 | |
| parent | 51d9250c88aa62f3aaf7c1f72209513035066074 (diff) | |
| download | libpng-865f4f073a692279c4aecbce7c9b9ed5a27372cf.tar.gz | |
Imported from libpng-1.2.5rc2.tarv1.2.5rc2
62 files changed, 157 insertions, 143 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.5rc1 - August 24, 2002 +Libpng 1.2.5rc2 - September 16, 2002 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. @@ -21,8 +21,13 @@ version 1.2.5beta2 [August 15, 2002] Only issue png_warning() about "Too much data" in pngpread.c when avail_in is nonzero. Updated makefiles to install a separate libpng.so.3 with its own rpath. -version 1.2.5rc1 [August 24, 2002] +version 1.2.5rc1 and 1.0.15rc1 [August 24, 2002] Revised makefiles to not remove previous minor versions of shared libraries. +version 1.2.5rc2 and 1.0.15rc2 [September 16, 2002] + Revised 13 makefiles to remove "-lz" and "-L$(ZLIBLIB)", etc., from shared + library loader directive. + Added missing "$OBJSDLL" line to makefile.gcmmx. + Added missing "; fi" to makefile.32sunu. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -1166,6 +1166,11 @@ version 1.2.5beta2 [August 15, 2002] Updated makefiles to install a separate libpng.so.3 with its own rpath. version 1.2.5rc1 and 1.0.15rc1 [August 24, 2002] Revised makefiles to not remove previous minor versions of shared libraries. +version 1.2.5rc2 and 1.0.15rc2 [September 16, 2002] + Revised 13 makefiles to remove "-lz" and "-L$(ZLIBLIB)", etc., from shared + library loader directive. + Added missing "$OBJSDLL" line to makefile.gcmmx. + Added missing "; fi" to makefile.32sunu. 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.5rc1 - August 24, 2002 +Installing libpng version 1.2.5rc2 - September 16, 2002 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.5rc1" or "lpng109" and "zlib-1.1.4" +might be called "libpng-1.2.5rc2" or "lpng109" and "zlib-1.1.4" or "zlib114") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -68,8 +68,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 libpng12.so.0.1.2.5rc1) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.5rc1, + makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.5rc2) + makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.5rc2, 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 @@ -90,10 +90,10 @@ include makefile.ne0bsd => NetBSD/cc makefile, uses PNGGCCRD, makes libpng0.so makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) - makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.5rc1) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.5rc2) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.5rc1) - makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.5rc1) + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.5rc2) + makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.5rc2) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc @@ -158,9 +158,9 @@ in the scripts directory when you run "make", "make install", or mangle.in => Function-decoration macros added to png.h by the makefiles. makefile.linux => Linux/ELF makefile - (gcc, creates libpng12m.so.0.1.2.5rc1) + (gcc, creates libpng12m.so.0.1.2.5rc2) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0m.1.2.5rc1, uses assembler code + libpng12.so.0m.1.2.5rc2, uses assembler code tuned for Intel MMX platform) makefile.sgi => Silicon Graphics (cc, creates libpng12m.so) makefile.sggcc => Silicon Graphics (gcc, creates libpng12m.so) @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.5rc1 +Known bugs in libpng version 1.2.5rc2 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when reading interlaced PNG files, when assembler code is enabled but running @@ -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.5rc1, August 24, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.5rc2, September 16, 2002, are Copyright (c) 2000-2002 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 -August 24, 2002 +September 16, 2002 @@ -1,4 +1,4 @@ -README for libpng 1.2.5rc1 - August 24, 2002 (shared library 12.0) +README for libpng 1.2.5rc2 - September 16, 2002 (shared library 12.0) 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 libpng12.so.0.1.2.5rc1) + (gcc, creates libpng12.so.0.1.2.5rc2) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.5rc1, uses assembler code + libpng12.so.0.1.2.5rc2, 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 @@ -210,12 +210,12 @@ Files in this distribution: makefile.ne0bsd => NetBSD/cc makefile, PNGGCCRD, makes libpng0.so makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) - makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.5rc1) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.5rc2) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.5rc1) + (gcc, creates libpng12.so.0.1.2.5rc2) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.5rc1) + (gcc, creates libpng12.so.0.1.2.5rc2) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc @@ -248,9 +248,9 @@ Files in this distribution: mangle.in => Function-decoration macros added to png.h by the makefiles. makefile.linux => Linux/ELF makefile - (gcc, creates libpng12m.so.0.1.2.5rc1) + (gcc, creates libpng12m.so.0.1.2.5rc2) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0m.1.2.5rc1, uses assembler code + libpng12.so.0m.1.2.5rc2, uses assembler code tuned for Intel MMX platform) makefile.sgi => Silicon Graphics (cc, creates libpng12m.so) makefile.sggcc => Silicon Graphics (gcc, creates libpng12m.so) @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - August 24, 2002 + September 16, 2002 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.5rc1 are Y2K compliant. It is my belief that earlier + upward through 1.2.5rc2 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.5rc1. Instead, please + There is no \"configure\" script for Libpng-1.2.5rc2. Instead, please copy the appropriate makefile for your system from the \"scripts\" directory. Read the INSTALL file for more details. " @@ -282,7 +282,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */ /* This reduces the image to the palette supplied in the file */ else if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) { - png_uint_16p histogram; + png_uint_16p histogram = NULL; png_get_hIST(png_ptr, info_ptr, &histogram); @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "August 24, 2002" +.TH LIBPNG 3 "September 16, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5rc1 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5rc2 .SH SYNOPSIS \fI\fB @@ -791,7 +791,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.5rc1 - August 24, 2002 + libpng version 1.2.5rc2 - September 16, 2002 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998-2002 Glenn Randers-Pehrson @@ -1774,7 +1774,7 @@ histogram, it may not do as good a job. if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) { - png_uint_16p histogram; + png_uint_16p histogram = NULL; png_get_hIST(png_ptr, info_ptr, &histogram); @@ -3641,13 +3641,13 @@ application: .SH IX. Y2K Compliance in libpng -August 24, 2002 +September 16, 2002 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.5rc1 are Y2K compliant. It is my belief that earlier +upward through 1.2.5rc2 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 @@ -3783,6 +3783,8 @@ the first widely used release: 1.0.14 10 10014 10.so.0.1.0.14 1.2.4 13 10204 12.so.0.1.2.4 1.2.5beta1,2 13 10205 12.so.0.1.2.5beta1,2 + 1.2.5rc1,2 13 10205 12.so.0.1.2.5rc1,2 + 1.0.15rc1,2 10 10015 10.so.0.1.0.15rc1,2 Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3840,7 +3842,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.5rc1 - August 24, 2002: +Libpng version 1.2.5rc2 - September 16, 2002: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu). @@ -3857,7 +3859,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.5rc1, August 24, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.5rc2, September 16, 2002, are Copyright (c) 2000-2002 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 @@ -3949,7 +3951,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -August 24, 2002 +September 16, 2002 .\" end of man page diff --git a/libpng.txt b/libpng.txt index 276231cd2..3996b1847 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.5rc1 - August 24, 2002 + libpng version 1.2.5rc2 - September 16, 2002 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998-2002 Glenn Randers-Pehrson @@ -983,7 +983,7 @@ histogram, it may not do as good a job. if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) { - png_uint_16p histogram; + png_uint_16p histogram = NULL; png_get_hIST(png_ptr, info_ptr, &histogram); @@ -2850,13 +2850,13 @@ application: IX. Y2K Compliance in libpng -August 24, 2002 +September 16, 2002 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.5rc1 are Y2K compliant. It is my belief that earlier +upward through 1.2.5rc2 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 bdce1d21e..0a3cfc1a1 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "August 24, 2002" +.TH LIBPNGPF 3 "September 16, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5rc1 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5rc2 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "August 24, 2002" +.TH PNG 5 "September 16, 2002" .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.5rc1 - August 24, 2002 + * libpng version 1.2.5rc2 - September 16, 2002 * Copyright (c) 1998-2002 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_5rc1 Your_png_h_is_not_version_1_2_5rc1; +typedef version_1_2_5rc2 Your_png_h_is_not_version_1_2_5rc2; /* 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.5rc1"; +const char png_libpng_ver[18] = "1.2.5rc2"; /* png_sig was changed to a function in version 1.0.5c */ /* Place to hold the signature string for a PNG file. */ @@ -671,7 +671,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.5rc1 - August 24, 2002\n\ + return ((png_charp) "\n libpng version 1.2.5rc2 - September 16, 2002\n\ Copyright (c) 1998-2002 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); @@ -689,8 +689,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.5rc1"); - return((png_charp) "1.2.5rc1"); + return((png_charp) "1.2.5rc2"); + return((png_charp) "1.2.5rc2"); } png_charp PNGAPI @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.5rc1 - August 24, 2002 + * libpng version 1.2.5rc2 - September 16, 2002 * Copyright (c) 1998-2002 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.) @@ -8,7 +8,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.5rc1 - August 24, 2002: Glenn + * libpng versions 0.97, January 1998, through 1.2.5rc2 - September 16, 2002: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -94,7 +94,8 @@ * 1.0.14 10 10014 10.so.0.1.0.14 * 1.2.4 13 10204 12.so.0.1.2.4 * 1.2.5beta1-2 13 10205 12.so.0.1.2.5beta1-2 - * 1.0.15rc1 10 10015 10.so.0.1.0.15rc1 + * 1.2.5rc1-2 13 10205 12.so.0.1.2.5rc1-2 + * 1.0.15rc1-2 10 10015 10.so.0.1.0.15rc1-2 * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -124,7 +125,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.5rc1, August 24, 2002, are + * libpng versions 1.0.7, July 1, 2000, through 1.2.5rc2, September 16, 2002, are * Copyright (c) 2000-2002 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 @@ -229,13 +230,13 @@ * Y2K compliance in libpng: * ========================= * - * August 24, 2002 + * September 16, 2002 * * 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.5rc1 are Y2K compliant. It is my belief that earlier + * upward through 1.2.5rc2 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 @@ -291,7 +292,7 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.5rc1" +#define PNG_LIBPNG_VER_STRING "1.2.5rc2" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM %DLLNUM% @@ -303,7 +304,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 @@ -1281,9 +1282,9 @@ struct png_struct_def /* This prevents a compiler error in png.c if png.c and png.h are both at - version 1.2.5rc1 + version 1.2.5rc2 */ -typedef png_structp version_1_2_5rc1; +typedef png_structp version_1_2_5rc2; typedef png_struct FAR * FAR * png_structpp; @@ -2423,7 +2424,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.5rc1 - August 24, 2002 (header)\n" + " libpng version 1.2.5rc2 - September 16, 2002 (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 0bfabc16c..de3ce371d 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.5rc1 - August 24, 2002 + * libpng 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 2002 Glenn Randers-Pehrson * @@ -1,6 +1,6 @@ /* pngconf.h - machine configurable file for libpng * - * libpng 1.2.5rc1 - August 24, 2002 + * libpng 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index 7456764fe..4201bffa1 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.2.5rc1 - August 24, 2002 + * libpng 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pnggccrd.c b/pnggccrd.c index 427f51435..a7873279a 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.5rc1 - August 24, 2002 + * libpng version 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.2.5rc1 - August 24, 2002 + * libpng 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 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.5rc1 - August 24, 2002 + * libpng 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpread.c b/pngpread.c index b3a1104c5..acb3ebbcd 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.2.5rc1 - August 24, 2002 + * libpng 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 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.5rc1 - August 24, 2002 + * libpng 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -789,7 +789,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.5rc1 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.5rc2 */ void PNGAPI @@ -837,7 +837,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.5rc1 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.5rc2 */ 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.5rc1 - August 24, 2002 + * libpng 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index 1a343f041..3dc0cd1d4 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.5rc1 - August 24, 2002 + * libpng 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index 103dda008..61f153236 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.2.5rc1 - August 24, 2002 + * libpng 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 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.5rc1 - August 24, 2002 + * libpng 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 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.5rc1 - August 24, 2002 + * libpng 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1538,4 +1538,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_5rc1 your_png_h_is_not_version_1_2_5rc1; +typedef version_1_2_5rc2 your_png_h_is_not_version_1_2_5rc2; diff --git a/pngtrans.c b/pngtrans.c index a71933d3a..9d654c356 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.5rc1 - August 24, 2002 + * libpng 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 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 version 1.2.5rc1 - August 24, 2002 + * libpng version 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * libpng 1.2.5rc1 - August 24, 2002 + * libpng 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwrite.c b/pngwrite.c index 113f0911e..431b3b12d 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.2.5rc1 - August 24, 2002 + * libpng 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwtran.c b/pngwtran.c index 8799b4e16..16c91632d 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.5rc1 - August 24, 2002 + * libpng 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwutil.c b/pngwutil.c index 9296db8cc..d252cb801 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.2.5rc1 - August 24, 2002 + * libpng 1.2.5rc2 - September 16, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 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 4f115da1f..aaae15d11 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.5rc1 (August 24, 2002) and zlib +libpng 1.2.5rc2 (September 16, 2002) 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 23f86d45f..7df716bd8 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.5rc1 +;Version 1.2.5rc2 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/projects/netware.txt b/projects/netware.txt index 6b80ec97b..ae62fa099 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.5rc1-project-netware.zip from a libpng distribution +libpng-1.2.5rc2-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.5rc1-project-netware.zip" +"unzip -a libpng-1.2.5rc2-project-netware.zip" diff --git a/projects/wince.txt b/projects/wince.txt index 63d4aac77..9b051dbe7 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.5rc1-project-wince.zip from a libpng distribution +libpng-1.2.5rc2-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.5rc1-project-wince.zip" +"unzip -a libpng-1.2.5rc2-project-wince.zip" diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index ec1af3570..3f2fd10eb 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.5rc1 +version=1.2.5rc2 prefix="" cppflags="" cflags="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 90362f385..9f8ebcfb5 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -6,6 +6,6 @@ includedir=${exec_prefix}/include Name: libpng12 Description: Loads and saves PNG files -Version: 1.2.5rc1 +Version: 1.2.5rc2 Libs: -L${libdir} -lpng12 -lz -lm Cflags: -I${includedir}/libpng12 diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 9b30f2c7f..aaa05f319 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5rc1 +PNGMIN = 1.2.5rc2 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -106,11 +106,11 @@ $(LIBNAME).so.$(PNGVER): $(OBJSDLL) ;; \ esac $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBNAME).so.$(PNGMAJ) \ - -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL) -lz + -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL) libpng.so.3.$(PNGMIN): $(OBJS) $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h libpng.so.3 \ - -o libpng.so.3.$(PNGMIN) $(OBJSDLL) -lz + -o libpng.so.3.$(PNGMIN) $(OBJSDLL) pngtest: pngtest.o $(LIBNAME).so $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) @@ -150,7 +150,7 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ ln -f -s libpng.so.3 libpng.so; \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) - -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig + -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi -@/bin/rm -f $(DL)/pkgconfig/libpng12.pc -@/bin/rm -f $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/libpng12.pc diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index b7b9a11cc..5542dde93 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5rc1 +PNGMIN = 1.2.5rc2 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -106,11 +106,11 @@ $(LIBNAME).so.$(PNGVER): $(OBJSDLL) ;; \ esac $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBNAME).so.$(PNGMAJ) \ - -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL) -lz + -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL) libpng.so.3.$(PNGMIN): $(OBJSDLL) $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h libpng.so.3 \ - -o libpng.so.3.$(PNGMIN) $(OBJSDLL) -lz + -o libpng.so.3.$(PNGMIN) $(OBJSDLL) pngtest: pngtest.o $(LIBNAME).so $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 167fedb61..2ede410f6 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -17,7 +17,7 @@ RANLIB = ranlib RM = rm -f PNGMAJ = 0 -PNGMIN = 1.2.5rc1 +PNGMIN = 1.2.5rc2 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index b85154dc5..5592e5006 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -12,7 +12,7 @@ ZLIBLIB=/usr/local/lib ZLIBINC=/usr/local/include PNGMAJ = 0 -PNGMIN = 1.2.5rc1 +PNGMIN = 1.2.5rc2 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= @@ -92,11 +92,11 @@ $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER) ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so.$(PNGVER): $(OBJSDLL) - $(CC) -L$(ZLIBLIB) -lz -nostart -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) -o \ + $(CC) -nostart -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) -o \ $(LIBNAME).so.$(PNGVER) $(OBJSDLL) libpng.so.3.$(PNGMIN): $(OBJSDLL) - $(CC) -L$(ZLIBLIB) -lz -nostart -Wl,-soname,libpng.so.3 -o \ + $(CC) -nostart -Wl,-soname,libpng.so.3 -o \ libpng.so.3.$(PNGMIN) $(OBJSDLL) pngtest: pngtest.o $(LIBNAME).so diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 5c761cb8b..ec0aaa5b6 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -79,7 +79,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.5rc1 +PNGMIN = 1.2.5rc2 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index c48bbb741..40442c255 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -23,7 +23,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz RANLIB=ranlib PNGMAJ = 0 -PNGMIN = 1.2.5rc1 +PNGMIN = 1.2.5rc2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -89,14 +89,14 @@ $(LIBNAME).$(PNGVER).dylib: $(OBJSDLL) -install_name $(DL)/$(LIBNAME).$(PNGMAJ).dylib \ -current_version $(PNGMIN) -compatibility_version $(PNGMIN) \ -o $(LIBNAME).$(PNGVER).dylib \ - $(OBJSDLL) -L$(ZLIBLIB) -lz + $(OBJSDLL) libpng.3.$(PNGMIN).dylib: $(OBJSDLL) $(CC) -dynamiclib \ -install_name $(DL)/libpng.3.dylib \ -current_version $(PNGMIN) -compatibility_version $(PNGMIN) \ -o libpng.3.$(PNGMIN).dylib \ - $(OBJSDLL) -L$(ZLIBLIB) -lz + $(OBJSDLL) pngtest: pngtest.o $(LIBNAME).dylib $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) diff --git a/scripts/makefile.dec b/scripts/makefile.dec index d14d0b038..e7d7f42da 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -32,7 +32,7 @@ ZLIBLIB=../zlib ZLIBINC=../zlib PNGMAJ = 0 -PNGMIN = 1.2.5rc1 +PNGMIN = 1.2.5rc2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -74,11 +74,11 @@ $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGVER): $(OBJS) $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) - -soname $(LIBNAME).so.$(PNGMAJ) -lz -lm + -soname $(LIBNAME).so.$(PNGMAJ) libpng.so.3.$(PNGMIN): $(OBJS) $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) - -soname libpng.so.3 -lz -lm + -soname libpng.so.3 pngtest: pngtest.o libpng.a $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 54325281e..401516b9a 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -15,7 +15,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5rc1 +PNGMIN = 1.2.5rc2 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -127,11 +127,12 @@ $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGVER): $(OBJSDLL) $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \ -o $(LIBNAME).so.$(PNGVER) \ - $(OBJSDLL) -L$(ZLIBLIB) -lz -lm -lc + $(OBJSDLL) libpng.so.3.$(PNGMIN): $(OBJSDLL) $(CC) -shared -Wl,-soname,libpng.so.3 \ -o libpng.so.3.$(PNGMIN) \ + $(OBJSDLL) pngtest: pngtest.o $(LIBNAME).so $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index d89154f80..592ec0c0c 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -33,7 +33,7 @@ RANLIB=ranlib #RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.5rc1 +PNGMIN = 1.2.5rc2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -94,12 +94,12 @@ $(LIBNAME).sl.$(PNGMAJ): $(LIBNAME).sl.$(PNGVER) ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl.$(PNGVER): $(OBJSDLL) - $(LD) -b -L$(ZLIBLIB) +s +b $(ZLIBLIB) \ - +h $(LIBNAME).sl.$(PNGMAJ) -o $(LIBNAME).sl.$(PNGVER) $(OBJSDLL) -lz + $(LD) +s \ + +h $(LIBNAME).sl.$(PNGMAJ) -o $(LIBNAME).sl.$(PNGVER) $(OBJSDLL) libpng.sl.3.$(PNGMIN): $(OBJSDLL) - $(LD) -b -L$(ZLIBLIB) +s +b $(ZLIBLIB) \ - +h libpng.sl.3 -o libpng.sl.3.$(PNGMIN) $(OBJSDLL) -lz + $(LD) +s \ + +h libpng.sl.3 -o libpng.sl.3.$(PNGMIN) $(OBJSDLL) pngtest: pngtest.o $(LIBNAME).sl $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 0828b5898..c89450a96 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -17,7 +17,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm RANLIB=ranlib PNGMAJ = 0 -PNGMIN = 1.2.5rc1 +PNGMIN = 1.2.5rc2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -80,12 +80,12 @@ $(LIBNAME).sl.$(PNGMAJ): $(LIBNAME).sl.$(PNGVER) ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl.$(PNGVER): $(OBJSDLL) - $(LD) -b -L$(ZLIBLIB) +s +b $(ZLIBLIB) \ - +h $(LIBNAME).sl.$(PNGMAJ) -o $(LIBNAME).sl.$(PNGVER) $(OBJSDLL) -lz + $(LD) +s \ + +h $(LIBNAME).sl.$(PNGMAJ) -o $(LIBNAME).sl.$(PNGVER) $(OBJSDLL) libpng.sl.3.$(PNGMIN): $(OBJSDLL) - $(LD) -b -L$(ZLIBLIB) +s +b $(ZLIBLIB) \ - +h libpng.sl.3 o libpng.sl.3.$(PNGMIN) $(OBJSDLL) -lz + $(LD) +s \ + +h libpng.sl.3 o libpng.sl.3.$(PNGMIN) $(OBJSDLL) pngtest: pngtest.o libpng.a $(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 5c9c233c6..fbeb83bd2 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -5,7 +5,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5rc1 +PNGMIN = 1.2.5rc2 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -99,12 +99,12 @@ $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGVER): $(OBJSDLL) $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \ -o $(LIBNAME).so.$(PNGVER) \ - $(OBJSDLL) -L$(ZLIBLIB) -lz -lm -lc + $(OBJSDLL) libpng.so.3.$(PNGMIN): $(OBJSDLL) $(CC) -shared -Wl,-soname,libpng.so.3 \ -o libpng.so.3.$(PNGMIN) \ - $(OBJSDLL) -L$(ZLIBLIB) -lz -lm -lc + $(OBJSDLL) pngtest: pngtest.o $(LIBNAME).so $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx index d2402d99c..6e6b4939b 100644 --- a/scripts/makefile.macosx +++ b/scripts/makefile.macosx @@ -17,7 +17,7 @@ ZLIBINC=../zlib CC=cc PNGMAJ = 0 -PNGMIN = 1.2.5rc1 +PNGMIN = 1.2.5rc2 PNGVER = $(PNGMAJ).$(PNGMIN) CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 @@ -77,10 +77,10 @@ libpng.a: $(OBJS) $(RANLIB) $@ $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX): $(OBJS) - $(LDSHARED) -o $@ $(OBJS) + cc -dynamiclib -compatibility_version $(PNGMAJ) -o $@ $(OBJS) libpng.3.$(PNGMIN).$(SHAREDLIB_POSTFIX): $(OBJS) - $(LDSHARED) -o $@ $(OBJS) + cc -dynamiclib -compatibility_version 3 -o $@ $(OBJS) pngtest: pngtest.o libpng.a $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index e35bdd6f8..0878fa119 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.5rc1 +SHLIB_MINOR= 1.2.5rc2 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.netbsd b/scripts/makefile.netbsd index ef51d5e46..b98df7b72 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.5rc1 +SHLIB_MINOR= 1.2.5rc2 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.openbsd b/scripts/makefile.openbsd index 668afded0..8ed5cd390 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -7,7 +7,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.5rc1 +SHLIB_MINOR= 1.2.5rc2 LIB= png SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 11561035d..0888f31d2 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -24,7 +24,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.5rc1 +PNGMIN = 1.2.5rc2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index df2afd6f3..a5e2f6ae5 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -18,7 +18,7 @@ ZLIBINC=../zlib LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5rc1 +PNGMIN = 1.2.5rc2 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index cad97a365..01bbd0994 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -5,7 +5,7 @@ LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5rc1 +PNGMIN = 1.2.5rc2 PNGVER = $(PNGMAJ).$(PNGMIN) # Where make install puts libpng.a, libpng12.so, and libpng12/png.h diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 7046d533c..0d872e8d9 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -34,7 +34,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.5rc1 +PNGMIN = 1.2.5rc2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -107,12 +107,12 @@ $(LIBNAME).so.$(PNGVER): $(OBJSDLL) echo; \ ;; \ esac - $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBNAME).so.$(PNGMAJ) \ - -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL) -lz + $(LD) -G -h $(LIBNAME).so.$(PNGMAJ) \ + -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL) libpng.so.3.$(PNGMIN): $(OBJS) - $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h libpng.so.3 \ - -o libpng.so.3.$(PNGMIN) $(OBJSDLL) -lz + $(LD) -G -h libpng.so.3 \ + -o libpng.so.3.$(PNGMIN) $(OBJSDLL) pngtest: pngtest.o $(LIBNAME).so $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 0e02a3769..5da659f70 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -30,7 +30,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.5rc1 +PNGMIN = 1.2.5rc2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -104,12 +104,12 @@ $(LIBNAME).so.$(PNGVER): $(OBJSDLL) echo; \ ;; \ esac - $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBNAME).so.$(PNGMAJ) \ - -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL) -lz + $(LD) -G -h $(LIBNAME).so.$(PNGMAJ) \ + -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL) libpng.so.3.$(PNGMIN): $(OBJS) - $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h libpng.so.3 \ - -o libpng.so.3.$(PNGMIN) $(OBJSDLL) -lz + $(LD) -G -h libpng.so.3 \ + -o libpng.so.3.$(PNGMIN) $(OBJSDLL) pngtest: pngtest.o $(LIBNAME).so $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index c9b9ff861..382a2ae10 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -7,7 +7,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.2.5rc1'; + PNG_LIBPNG_VER_STRING = '1.2.5rc2'; PNG_LIBPNG_VER = 10205; type diff --git a/scripts/pngos2.def b/scripts/pngos2.def index bb542a6b9..4ea6fbd1f 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.5rc1 +; Version 1.2.5rc2 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" |