diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2002-10-03 06:13:23 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-09-03 12:23:14 -0500 |
| commit | 4fc3118b594d4c3a8ba82179208b8766a7bb7dfe (patch) | |
| tree | 694895479a9916fe743df92b1df449b7eefce280 | |
| parent | 3bdb7fed6ef60c2d823282115aa2a94c749ac841 (diff) | |
| download | libpng-1.0.15.tar.gz | |
[libpng10] Imported from libpng-1.0.15.tarv1.0.15
61 files changed, 181 insertions, 143 deletions
@@ -1,20 +1,26 @@ -Libpng 1.0.15rc3 - September 18, 2002 +Libpng 1.0.15 - October 3, 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. +This is a public release of libpng, intended for use in production codes. Changes since the last public release (1.0.14): -version 1.2.5rc1 and 1.0.15rc1 [August 24, 2002] + Added code to contrib/gregbook/readpng2.c to ignore unused chunks. + Replaced toucan.png in contrib/gregbook (it has been corrupt since 1.0.11) + Removed some stray *.o files from contrib/gregbook. + Changed png_error() to png_warning() about "Too much data" in pngpread.c + and about "Extra compressed data" in pngrutil.c. + Prevent png_ptr->pass from exceeding 7 in png_push_finish_row(). + Updated makefile.hggcc + Updated png.c and pnggccrd.c handling of return from png_mmx_support() + Only issue png_warning() about "Too much data" in pngpread.c when avail_in + is nonzero. + Updated makefiles to install a separate libpng.so.2 with its own rpath. 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. -version 1.2.5rc3 and 1.0.15rc3 [September 18, 2002] Revised libpng-config script. + Relocated two misplaced PNGAPI lines in pngtest.c Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -1173,6 +1173,10 @@ version 1.2.5rc2 and 1.0.15rc2 [September 16, 2002] Added missing "; fi" to makefile.32sunu. version 1.2.5rc3 and 1.0.15rc3 [September 18, 2002] Revised libpng-config script. +version 1.2.5 and 1.0.15 [October 3, 2002] + Revised makefile.macosx, makefile.darwin, makefile.hpgcc, and makefile.hpux, + and makefile.aix. + Relocated two misplaced PNGAPI lines in pngtest.c Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -1,5 +1,5 @@ -Installing libpng version 1.0.15rc3 - September 18, 2002 +Installing libpng version 1.0.15 - October 3, 2002 Before installing libpng, you must first install zlib. zlib can usually be found wherever you got libpng. zlib can be @@ -10,8 +10,8 @@ zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.0.15rc3" or "lpng109" and "zlib-1.1.3" -or "zlib113") so that you have directories called "zlib" and "libpng". +might be called "libpng-1.0.15" 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: @@ -35,6 +35,7 @@ Your directory structure should look like this: wince.txt scripts makefile.* + libpng*.in pngtest.png etc. zlib @@ -64,14 +65,14 @@ 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 libpng10.so.0.1.0.15rc3) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng10.so.0.1.0.15rc3, + makefile.linux => Linux/ELF makefile (gcc, creates libpng10.so.0.1.0.15) + makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng10.so.0.1.0.15, 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 ansi2knr (Requires ansi2knr.c from ftp://ftp.cs.wisc.edu/ghost) - makefile.aix => AIX makefile + makefile.aix => AIX/gcc makefile makefile.cygwin => Cygwin/gcc makefile makefile.darwin => Darwin makefile makefile.dec => DEC Alpha UNIX makefile @@ -86,10 +87,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 libpng10.so.0.1.0.15rc3) + makefile.sggcc => Silicon Graphics (gcc, creates libpng10.so.0.1.0.15) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng10.so.0.1.0.15rc3) - makefile.so9 => Solaris 9 makefile (gcc, creates libpng10.so.0.1.0.15rc3) + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng10.so.0.1.0.15) + makefile.so9 => Solaris 9 makefile (gcc, creates libpng10.so.0.1.0.15) 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 @@ -142,6 +143,8 @@ your output with the result shown in contrib/pngsuite/README. Most of the makefiles will allow you to run "make install" to put the library in its final resting place (if you want to do that, run "make install" in the zlib directory first if necessary). +Some also allow you to run "make test-installed" after you have +run "make install". Further information can be found in the README and libpng.txt files, in the individual makefiles, in png.h, in the README files in @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.0.15rc3 +Known bugs in libpng version 1.0.15 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.0.15rc3, September 18, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.0.15, October 3, 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 -September 18, 2002 +October 3, 2002 @@ -1,4 +1,4 @@ -README for libpng 1.0.15rc3 - September 18, 2002 (shared library 2.1) +README for libpng 1.0.15 - October 3, 2002 (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 libpng10.so.0.1.0.15rc3) + (gcc, creates libpng10.so.0.1.0.15) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng10.so.0.1.0.15rc3, uses assembler code + libpng10.so.0.1.0.15, 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 libpng10.so.0.1.0.15rc3) + makefile.sggcc => Silicon Graphics (gcc, creates libpng10.so.0.1.0.15) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng10.so.0.1.0.15rc3) + (gcc, creates libpng10.so.0.1.0.15) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng10.so.0.1.0.15rc3) + (gcc, creates libpng10.so.0.1.0.15) 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 @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - September 18, 2002 + October 3, 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.0.15rc3 are Y2K compliant. It is my belief that earlier + upward through 1.0.15 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer @@ -1,5 +1,5 @@ echo " - There is no \"configure\" script for Libpng-1.0.15rc3. Instead, please + There is no \"configure\" script for Libpng-1.0.15. 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 "September 18, 2002" +.TH LIBPNG 3 "October 3, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.15rc3 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.15 .SH SYNOPSIS \fI\fB @@ -761,7 +761,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.0.15rc3 - September 18, 2002 + libpng version 1.0.15 - October 3, 2002 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998-2002 Glenn Randers-Pehrson @@ -3490,13 +3490,13 @@ application: .SH VII. Y2K Compliance in libpng -September 18, 2002 +October 3, 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.0.15rc3 are Y2K compliant. It is my belief that earlier +upward through 1.0.15 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 @@ -3631,8 +3631,11 @@ the first widely used release: 1.2.4rc1 13 10204 12.so.0.1.2.4rc1 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-3 13 10205 12.so.0.1.2.5beta1-3 + 1.2.5beta1-2 13 10205 12.so.0.1.2.5beta1-2 1.0.15rc1-3 10 10015 10.so.0.1.0.15rc1-3 + 1.2.5rc1-3 13 10205 12.so.0.1.2.5rc1-3 + 1.0.15 10 10015 10.so.0.1.0.15 + 1.2.5 13 10205 12.so.0.1.2.5 Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3690,7 +3693,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.15rc3 - September 18, 2002: +Libpng version 1.0.15 - October 3, 2002: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu). @@ -3707,7 +3710,7 @@ included in the libpng distribution, the latter shall prevail.) If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.0.7, July 1, 2000, through 1.0.15rc3, September 18, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.0.15, October 3, 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 @@ -3799,7 +3802,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -September 18, 2002 +October 3, 2002 .\" end of man page diff --git a/libpng.txt b/libpng.txt index cc69a50e6..e264f68bd 100644 --- a/libpng.txt +++ b/libpng.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.0.15rc3 - September 18, 2002 + libpng version 1.0.15 - October 3, 2002 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998-2002 Glenn Randers-Pehrson @@ -2729,13 +2729,13 @@ application: VII. Y2K Compliance in libpng -September 18, 2002 +October 3, 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.0.15rc3 are Y2K compliant. It is my belief that earlier +upward through 1.0.15 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 0ec94d99e..eed12e725 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "September 18, 2002" +.TH LIBPNGPF 3 "October 3, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.15rc3 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.15 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "September 18, 2002" +.TH PNG 5 "October 3, 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.0.15rc3 - September 18, 2002 + * libpng version 1.0.15 - October 3, 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_0_15rc3 Your_png_h_is_not_version_1_0_15rc3; +typedef version_1_0_15 Your_png_h_is_not_version_1_0_15; /* Version information for C files. This had better match the version * string defined in png.h. */ #ifdef PNG_USE_GLOBAL_ARRAYS /* png_libpng_ver was changed to a function in version 1.0.5c */ -const char png_libpng_ver[18] = "1.0.15rc3"; +const char png_libpng_ver[18] = "1.0.15"; /* 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.0.15rc3 - September 18, 2002\n\ + return ((png_charp) "\n libpng version 1.0.15 - October 3, 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.0.15rc3"); - return((png_charp) "1.0.15rc3"); + return((png_charp) "1.0.15"); + return((png_charp) "1.0.15"); } png_charp PNGAPI @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.0.15rc3 - September 18, 2002 + * libpng version 1.0.15 - October 3, 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.0.15rc3 - September 18, 2002: Glenn + * libpng versions 0.97, January 1998, through 1.0.15 - October 3, 2002: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -93,8 +93,11 @@ * 1.2.4rc1 13 10204 12.so.0.1.2.4rc1 * 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-3 13 10205 12.so.0.1.2.5beta1-3 + * 1.2.5beta1-2 13 10205 12.so.0.1.2.5beta1-2 * 1.0.15rc1-3 10 10015 10.so.0.1.0.15rc1-3 + * 1.2.5rc1-3 13 10205 12.so.0.1.2.5rc1-3 + * 1.0.15 10 10015 10.so.0.1.0.15 + * 1.2.5 13 10205 12.so.0.1.2.5 * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -124,7 +127,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.0.7, July 1, 2000, through 1.0.15rc3, September 18, 2002, are + * libpng versions 1.0.7, July 1, 2000, through 1.0.15, October 3, 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 +232,13 @@ * Y2K compliance in libpng: * ========================= * - * September 18, 2002 + * October 3, 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.0.15rc3 are Y2K compliant. It is my belief that earlier + * upward through 1.0.15 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 +294,7 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.0.15rc3" +#define PNG_LIBPNG_VER_STRING "1.0.15" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM %DLLNUM% @@ -303,7 +306,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 3 +#define PNG_LIBPNG_VER_BUILD 0 #define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_BETA 2 @@ -311,7 +314,7 @@ #define PNG_LIBPNG_BUILD_STABLE 4 #define PNG_LIBPNG_BUILD_TYPEMASK 7 #define PNG_LIBPNG_BUILD_PATCH 8 /* Can be OR'ed with STABLE only */ -#define PNG_LIBPNG_BUILD_TYPE 3 +#define PNG_LIBPNG_BUILD_TYPE 4 /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -1281,9 +1284,9 @@ struct png_struct_def /* This prevents a compiler error in png.c if png.c and png.h are both at - version 1.0.15rc3 + version 1.0.15 */ -typedef png_structp version_1_0_15rc3; +typedef png_structp version_1_0_15; typedef png_struct FAR * FAR * png_structpp; @@ -2423,7 +2426,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.0.15rc3 - September 18, 2002 (header)\n" + " libpng version 1.0.15 - October 3, 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 77919b5e1..357437450 100644 --- a/pngasmrd.h +++ b/pngasmrd.h @@ -1,6 +1,6 @@ /* pngasmrd.h - assembler version of utilities to read a PNG file * - * libpng 1.0.15rc3 - September 18, 2002 + * libpng 1.0.15 - October 3, 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.0.15rc3 - September 18, 2002 + * libpng 1.0.15 - October 3, 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 c2ac4c6e7..5eeefe7fe 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.0.15rc3 - September 18, 2002 + * libpng 1.0.15 - October 3, 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 a25b8ae6a..e9547dcb0 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.0.15rc3 - September 18, 2002 + * libpng version 1.0.15 - October 3, 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.0.15rc3 - September 18, 2002 + * libpng 1.0.15 - October 3, 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.0.15rc3 - September 18, 2002 + * libpng 1.0.15 - October 3, 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 03c5b53fc..7b8d37b35 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.0.15rc3 - September 18, 2002 + * libpng 1.0.15 - October 3, 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.0.15rc3 - September 18, 2002 + * libpng 1.0.15 - October 3, 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.0.15rc3 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.15 */ 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.0.15rc3 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.15 */ void PNGAPI png_read_image(png_structp png_ptr, png_bytepp image) @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * libpng 1.0.15rc3 - September 18, 2002 + * libpng 1.0.15 - October 3, 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 2e3f7f1db..c590074c6 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * libpng 1.0.15rc3 - September 18, 2002 + * libpng 1.0.15 - October 3, 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 2c67b7707..e4d23c82c 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.0.15rc3 - September 18, 2002 + * libpng 1.0.15 - October 3, 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.0.15rc3 - September 18, 2002 + * libpng 1.0.15 - October 3, 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.0.15rc3 - September 18, 2002 + * libpng 1.0.15 - October 3, 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) @@ -121,10 +121,10 @@ void PNGAPI #endif read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass); +void #ifdef PNG_1_0_X PNGAPI #endif -void read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass) { if(png_ptr == NULL || row_number > PNG_MAX_UINT) return; @@ -143,15 +143,15 @@ read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass) fprintf(stdout, "r"); } +void #ifdef PNG_1_0_X PNGAPI #endif -void write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass); +void #ifdef PNG_1_0_X PNGAPI #endif -void write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass) { if(png_ptr == NULL || row_number > PNG_MAX_UINT || pass > 7) return; @@ -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_0_15rc3 your_png_h_is_not_version_1_0_15rc3; +typedef version_1_0_15 your_png_h_is_not_version_1_0_15; diff --git a/pngtrans.c b/pngtrans.c index 1851bf9a9..a71bea448 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * libpng 1.0.15rc3 - September 18, 2002 + * libpng 1.0.15 - October 3, 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.0.15rc3 - September 18, 2002 + * libpng version 1.0.15 - October 3, 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.0.15rc3 - September 18, 2002 + * libpng 1.0.15 - October 3, 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 b5160da2d..9aa6fe125 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.0.15rc3 - September 18, 2002 + * libpng 1.0.15 - October 3, 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 dfbafd064..9caccc064 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * libpng 1.0.15rc3 - September 18, 2002 + * libpng 1.0.15 - October 3, 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 eb4430810..b96556da5 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.0.15rc3 - September 18, 2002 + * libpng 1.0.15 - October 3, 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 f15df2db0..8e288c367 100644 --- a/projects/msvc/README.txt +++ b/projects/msvc/README.txt @@ -1,5 +1,5 @@ Microsoft Developer Studio Build File, Format Version 6.00 for -libpng 1.0.15rc3 (September 18, 2002) and zlib +libpng 1.0.15 (October 3, 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 1232dfdde..69a1af196 100644 --- a/projects/msvc/png32ms.def +++ b/projects/msvc/png32ms.def @@ -6,7 +6,7 @@ LIBRARY DESCRIPTION "PNG image compression library for Windows" EXPORTS -;Version 1.0.15rc3 +;Version 1.0.15 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/projects/netware.txt b/projects/netware.txt index 467b4431b..6197853aa 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.0.15rc3-project-netware.zip from a libpng distribution +libpng-1.0.15-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.0.15rc3-project-netware.zip" +"unzip -a libpng-1.0.15-project-netware.zip" diff --git a/projects/wince.txt b/projects/wince.txt index 8a20b9536..b49deb4b3 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.0.15rc3-project-wince.zip from a libpng distribution +libpng-1.0.15-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.0.15rc3-project-wince.zip" +"unzip -a libpng-1.0.15-project-wince.zip" diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index e930dba49..03164890f 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.0.15rc3 +version=1.0.15 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 27d4e5974..8aac02b69 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -6,6 +6,6 @@ includedir=${exec_prefix}/include Name: libpng10 Description: Loads and saves PNG files -Version: 1.0.15rc3 +Version: 1.0.15 Libs: -L${libdir} -lpng10 -lz -lm Cflags: -I${includedir}/libpng10 diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index a95814275..f21c9986b 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.15rc3 +PNGMIN = 1.0.15 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 423c1b90d..f0a394e89 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.15rc3 +PNGMIN = 1.0.15 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -84,7 +84,7 @@ libpng-config: echo L_opts=\"-L$(LIBPATH)\"; \ echo R_opts=\"-R$(LIBPATH)\"; \ echo ccopts=\"-xtarget=ultra -xarch=v9\"; \ - echo ldopts=\"-xtarget=ultra -xarch=v9 \"; \ + echo ldopts=\"-xtarget=ultra -xarch=v9\"; \ echo libs=\"-lpng10 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 0d791e4a6..4e68dde66 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -17,7 +17,7 @@ RANLIB = ranlib RM = rm -f PNGMAJ = 0 -PNGMIN = 1.0.15rc3 +PNGMIN = 1.0.15 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 2b1bae324..5896b8901 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.0.15rc3 +PNGMIN = 1.0.15 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 1c720edcf..4d19355b3 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -79,7 +79,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng10 PNGMAJ = 0 CYGDLL = 10 -PNGMIN = 1.0.15rc3 +PNGMIN = 1.0.15 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 517b0cff8..0f68fa63f 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -23,7 +23,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng10 -lz RANLIB=ranlib PNGMAJ = 0 -PNGMIN = 1.0.15rc3 +PNGMIN = 1.0.15 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 @@ -86,14 +86,15 @@ $(LIBNAME).$(PNGMAJ).dylib: $(LIBNAME).$(PNGVER).dylib $(LIBNAME).$(PNGVER).dylib: $(OBJSDLL) $(CC) -dynamiclib \ -install_name $(DL)/$(LIBNAME).$(PNGMAJ).dylib \ - -current_version $(PNGMIN) -compatibility_version $(PNGMIN) \ + -flat_namespace -undefined suppress \ -o $(LIBNAME).$(PNGVER).dylib \ $(OBJSDLL) libpng.2.$(PNGMIN).dylib: $(OBJSDLL) $(CC) -dynamiclib \ -install_name $(DL)/libpng.2.dylib \ - -current_version $(PNGMIN) -compatibility_version $(PNGMIN) \ + -current_version 2 -compatibility_version 2 \ + -flat_namespace -undefined suppress \ -o libpng.2.$(PNGMIN).dylib \ $(OBJSDLL) diff --git a/scripts/makefile.dec b/scripts/makefile.dec index aff617db2..15f4a8f82 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -32,7 +32,7 @@ ZLIBLIB=../zlib ZLIBINC=../zlib PNGMAJ = 0 -PNGMIN = 1.0.15rc3 +PNGMIN = 1.0.15 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index f0ac434c3..309aab81e 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -15,7 +15,7 @@ LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.15rc3 +PNGMIN = 1.0.15 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 6aa253ec5..af892e549 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -1,4 +1,4 @@ -# makefile for libpng on HP-UX using GCC +# makefile for libpng on HP-UX using GCC with the HP ANSI/C linker. # Copyright (C) 2002, Glenn Randers-Pehrson # Copyright (C) 2001, Laurent faillie # Copyright (C) 1998, 1999 Greg Roelofs @@ -6,6 +6,7 @@ # For conditions of distribution and use, see copyright notice in png.h CC=gcc +LD=ld # where "make install" puts libpng.a, libpng.sl*, png.h and pngconf.h prefix=/usr/local @@ -14,6 +15,13 @@ prefix=/usr/local ZLIBLIB=/opt/zlib/lib ZLIBINC=/opt/zlib/include +# Note that if you plan to build a libpng shared library, zlib must also +# be a shared library, which zlib's configure does not do. After running +# zlib's configure, edit the appropriate lines of makefile to read: +# CFLAGS=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \ +# LDSHARED=ld -b +# SHAREDLIB=libz.sl + ALIGN= # for i386: #ALIGN=-malign-loops=2 -malign-functions=2 @@ -33,7 +41,7 @@ RANLIB=ranlib #RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.0.15rc3 +PNGMIN = 1.0.15 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 @@ -92,11 +100,11 @@ $(LIBNAME).sl.$(PNGMAJ): $(LIBNAME).sl.$(PNGVER) ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl.$(PNGVER): $(OBJSDLL) - $(LD) +s \ + $(LD) -b +s \ +h $(LIBNAME).sl.$(PNGMAJ) -o $(LIBNAME).sl.$(PNGVER) $(OBJSDLL) libpng.sl.2.$(PNGMIN): $(OBJSDLL) - $(LD) +s \ + $(LD) -b +s \ +h libpng.sl.2 -o libpng.sl.2.$(PNGMIN) $(OBJSDLL) pngtest: pngtest.o $(LIBNAME).sl diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index ee25a81d8..60f019166 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -1,4 +1,4 @@ -# makefile for libpng, HPUX (10.20 and 11.00) +# makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product. # Copyright (C) 1999-2002 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard @@ -8,6 +8,13 @@ ZLIBLIB=/opt/zlib/lib ZLIBINC=/opt/zlib/include +# Note that if you plan to build a libpng shared library, zlib must also +# be a shared library, which zlib's configure does not do. After running +# zlib's configure, edit the appropriate lines of makefile to read: +# CFLAGS=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \ +# LDSHARED=ld -b +# SHAREDLIB=libz.sl + CC=cc CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 # Caution: be sure you have built zlib with the same CFLAGS. @@ -17,7 +24,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm RANLIB=ranlib PNGMAJ = 0 -PNGMIN = 1.0.15rc3 +PNGMIN = 1.0.15 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 @@ -67,7 +74,7 @@ libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo ccopts=\"-Ae +DA1.1 +DS2.0"; \ + echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \ echo L_opts=\"-L$(LIBPATH)\"; \ echo libs=\"-lpng10 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config @@ -80,12 +87,12 @@ $(LIBNAME).sl.$(PNGMAJ): $(LIBNAME).sl.$(PNGVER) ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl.$(PNGVER): $(OBJSDLL) - $(LD) +s \ + $(LD) -b +s \ +h $(LIBNAME).sl.$(PNGMAJ) -o $(LIBNAME).sl.$(PNGVER) $(OBJSDLL) libpng.sl.2.$(PNGMIN): $(OBJSDLL) - $(LD) +s \ - +h libpng.sl.2 o libpng.sl.2.$(PNGMIN) $(OBJSDLL) + $(LD) -b +s \ + +h libpng.sl.2 -o libpng.sl.2.$(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 bbb265212..5a4bbeb04 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -5,7 +5,7 @@ LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.15rc3 +PNGMIN = 1.0.15 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx index a30513b7a..74a370a41 100644 --- a/scripts/makefile.macosx +++ b/scripts/makefile.macosx @@ -17,13 +17,11 @@ ZLIBINC=../zlib CC=cc PNGMAJ = 0 -PNGMIN = 1.0.15rc3 +PNGMIN = 1.0.15 PNGVER = $(PNGMAJ).$(PNGMIN) CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 -LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -LDSHARED=cc -lz -dynamiclib -compatibility_version $(PNGVER) \ --current_version $(PNGVER) +LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -current_version $(PNGVER) LIBNAME=libpng10 SHAREDLIB_POSTFIX=dylib @@ -76,10 +74,11 @@ libpng.a: $(OBJS) $(RANLIB) $@ $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX): $(OBJS) - cc -dynamiclib -compatibility_version $(PNGMAJ) -o $@ $(OBJS) + cc -dynamiclib -flat_namespace -undefined suppress -o $@ $(OBJS) libpng.2.$(PNGMIN).$(SHAREDLIB_POSTFIX): $(OBJS) - cc -dynamiclib -compatibility_version 2 -o $@ $(OBJS) + cc -dynamiclib -compatibility_version 2 -flat_namespace \ + -undefined suppress -o $@ $(OBJS) pngtest: pngtest.o libpng.a $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) diff --git a/scripts/makefile.ne10bsd b/scripts/makefile.ne10bsd index 295072ddd..f5a1a88ec 100644 --- a/scripts/makefile.ne10bsd +++ b/scripts/makefile.ne10bsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng10 LIB= png10 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.0.15rc3 +SHLIB_MINOR= 1.0.15 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 44146a549..0cab8e68d 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 2 -SHLIB_MINOR= 1.0.15rc3 +SHLIB_MINOR= 1.0.15 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 a6adbaa63..241d43a4b 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.0.15rc3 +SHLIB_MINOR= 1.0.15 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 5ef4b16e3..264aad777 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -24,7 +24,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng10 -lz -lm RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.0.15rc3 +PNGMIN = 1.0.15 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index a99237a52..e8c5a0835 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -18,7 +18,7 @@ ZLIBINC=../zlib LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.15rc3 +PNGMIN = 1.0.15 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -29,8 +29,10 @@ ABI= WARNMORE= # -g -DPNG_DEBUG=5 CFLAGS=$(ABI) -I$(ZLIBINC) -O2 $(WARNMORE) -fPIC -mabi=n32 LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm -LDSHARED=cc $(ABI) -shared -soname $(LIBNAME).so.$(PNGMAJ) -LDLEGACY=cc $(ABI) -shared -soname libpng.so.2 +LDSHARED=cc $(ABI) -shared -soname $(LIBNAME).so.$(PNGMAJ) \ + -set_version sgi$(PNGMAJ).0 +LDLEGACY=cc $(ABI) -shared -soname libpng.so.2 \ + -set_version sgi$2.0 # See "man dso" for info about shared objects RANLIB=echo @@ -76,11 +78,10 @@ libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo cppflags=\"-DPNG_USE_PNGGCCRD -DPNG_NO_ASSEMBLER_CODE\"; \ echo ccopts=\"$(ABI)\"; \ echo ldopts=\"$(ABI)\"; \ - echo L_opts=\"-L$(LIBPATH) \"; \ - echo libdir=\"$(LIBPATH) \"; \ + echo L_opts=\"-L$(LIBPATH)\"; \ + echo libdir=\"$(LIBPATH)\"; \ echo libs=\"-lpng10 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 9cd32fef6..a358fd489 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -5,7 +5,7 @@ LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.15rc3 +PNGMIN = 1.0.15 PNGVER = $(PNGMAJ).$(PNGMIN) # Where make install puts libpng.a, libpng10.so, and libpng10/png.h @@ -30,11 +30,14 @@ ABI= WARNMORE=-fullwarn # Note: -KPIC is the default anyhow #CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC -DPNG_USE_PNGGCCRD # -g -DPNG_DEBUG=5 -CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -DPNG_USE_PNGGCCRD -DPNG_NO_ASSEMBLER_CODE +CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -DPNG_USE_PNGGCCRD \ + -DPNG_NO_ASSEMBLER_CODE LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng10 -lz -lm LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm -LDSHARED=cc $(ABI) -shared -soname $(LIBNAME).so.$(PNGMAJ) -LDLEGACY=cc $(ABI) -shared -soname libpng.so.2 +LDSHARED=cc $(ABI) -shared -soname $(LIBNAME).so.$(PNGMAJ) \ + -set_version sgi$(PNGMAJ).0 +LDLEGACY=cc $(ABI) -shared -soname libpng.so.2 \ + -set_version sgi$2.0 # See "man dso" for info about shared objects RANLIB=echo @@ -83,8 +86,8 @@ libpng-config: echo cppflags=\"-DPNG_USE_PNGGCCRD -DPNG_NO_ASSEMBLER_CODE\"; \ echo ccopts=\"$(ABI)\"; \ echo ldopts=\"$(ABI)\"; \ - echo L_opts=\"-L$(LIBPATH) \"; \ - echo libdir=\"$(LIBPATH) \"; \ + echo L_opts=\"-L$(LIBPATH)\"; \ + echo libdir=\"$(LIBPATH)\"; \ echo libs=\"-lpng10 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 5a0dde45c..5e9d277ba 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -34,7 +34,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng10 -lz -lm RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.0.15rc3 +PNGMIN = 1.0.15 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index f5c273592..8832aa8c0 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -30,7 +30,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng10 -lz -lm RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.0.15rc3 +PNGMIN = 1.0.15 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index a0bd51c86..92e6f822c 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -7,7 +7,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.0.15rc3'; + PNG_LIBPNG_VER_STRING = '1.0.15'; PNG_LIBPNG_VER = 10015; type diff --git a/scripts/pngos2.def b/scripts/pngos2.def index a9c9a248d..82da4a69a 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.0.15rc3 +; Version 1.0.15 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" |