diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2002-10-31 19:53:20 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:07:36 -0500 |
| commit | 761bf9f06f3c544e6fb6ed46f3b08a363cf19b81 (patch) | |
| tree | e848ffcde9e499aa1c6e1fc65a62ae84041e68fb | |
| parent | c33ab4e8dfeb665b5670da0bae9abe3fa05ba92d (diff) | |
| download | libpng-1.2.6beta2.tar.gz | |
Imported from libpng-1.2.6beta2.tarv1.2.6beta2
71 files changed, 243 insertions, 194 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.6beta1 - October 22, 2002 +Libpng 1.2.6beta2 - November 1, 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. @@ -42,6 +42,10 @@ version 1.2.6beta1 [October 22, 2002] Revised makefile.dec, makefile.macosx, makefile.aix, makefile sg*, makefile.hp*, makefile.beos, makefile.*sunu (only affecting LDFLAGS used in running pngtest). +version 1.2.6beta2 [November 1, 2002] + Added libpng-config "--ldopts" output. + Added "AR=ar" and "ARFLAGS=rc" and changed "ar rc" to "$(AR) $(ARFLAGS)" + in makefiles. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -1185,6 +1185,10 @@ version 1.2.6beta1 [October 22, 2002] Revised makefile.dec, makefile.macosx, makefile.aix, makefile sg*, makefile.hp*, makefile.beos, makefile.*sunu (only affecting LDFLAGS used in running pngtest). +version 1.2.6beta2 [November 1, 2002] + Added libpng-config "--ldopts" output. + Added "AR=ar" and "ARFLAGS=rc" and changed "ar rc" to "$(AR) $(ARFLAGS)" + in makefiles. 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.6beta1 - October 22, 2002 +Installing libpng version 1.2.6beta2 - November 1, 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.6beta1" or "lpng109" and "zlib-1.1.4" +might be called "libpng-1.2.6beta2" 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: @@ -65,8 +65,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.6beta1) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.6beta1, + makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.6beta2) + makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.6beta2, 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 @@ -87,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 libpng12.so.0.1.2.6beta1) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.6beta2) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.6beta1) - makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.6beta1) + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.6beta2) + makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.6beta2) 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,5 +1,5 @@ -Known bugs in libpng version 1.2.6beta1 +Known bugs in libpng version 1.2.6beta2 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.6beta1, October 22, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.6beta2, November 1, 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 -October 22, 2002 +November 1, 2002 @@ -1,4 +1,4 @@ -README for libpng 1.2.6beta1 - October 22, 2002 (shared library 12.0) +README for libpng 1.2.6beta2 - November 1, 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.6beta1) + (gcc, creates libpng12.so.0.1.2.6beta2) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.6beta1, uses assembler code + libpng12.so.0.1.2.6beta2, 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.6beta1) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.6beta2) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.6beta1) + (gcc, creates libpng12.so.0.1.2.6beta2) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.6beta1) + (gcc, creates libpng12.so.0.1.2.6beta2) 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: ========================= - October 22, 2002 + November 1, 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.6beta1 are Y2K compliant. It is my belief that earlier + upward through 1.2.6beta2 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.6beta1. Instead, please + There is no \"configure\" script for Libpng-1.2.6beta2. 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 "October 22, 2002" +.TH LIBPNG 3 "November 1, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6beta1 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6beta2 .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.6beta1 - October 22, 2002 + libpng version 1.2.6beta2 - November 1, 2002 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998-2002 Glenn Randers-Pehrson @@ -3641,13 +3641,13 @@ application: .SH IX. Y2K Compliance in libpng -October 22, 2002 +November 1, 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.6beta1 are Y2K compliant. It is my belief that earlier +upward through 1.2.6beta2 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 @@ -3786,7 +3786,7 @@ the first widely used release: 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 - 1.2.6beta1 13 10206 12.so.0.1.2.6beta1 + 1.2.6beta1-2 13 10206 12.so.0.1.2.6beta1-2 Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3844,7 +3844,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.6beta1 - October 22, 2002: +Libpng version 1.2.6beta2 - November 1, 2002: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu). @@ -3861,7 +3861,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.6beta1, October 22, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.6beta2, November 1, 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 @@ -3953,7 +3953,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -October 22, 2002 +November 1, 2002 .\" end of man page diff --git a/libpng.txt b/libpng.txt index 3886478af..07a77cf23 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.6beta1 - October 22, 2002 + libpng version 1.2.6beta2 - November 1, 2002 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998-2002 Glenn Randers-Pehrson @@ -2850,13 +2850,13 @@ application: IX. Y2K Compliance in libpng -October 22, 2002 +November 1, 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.6beta1 are Y2K compliant. It is my belief that earlier +upward through 1.2.6beta2 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 b8f307374..65df6c155 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "October 22, 2002" +.TH LIBPNGPF 3 "November 1, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6beta1 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6beta2 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "October 22, 2002" +.TH PNG 5 "November 1, 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.6beta1 - October 22, 2002 + * libpng version 1.2.6beta2 - November 1, 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_6beta1 Your_png_h_is_not_version_1_2_6beta1; +typedef version_1_2_6beta2 Your_png_h_is_not_version_1_2_6beta2; /* 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.6beta1"; +const char png_libpng_ver[18] = "1.2.6beta2"; /* 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.6beta1 - October 22, 2002\n\ + return ((png_charp) "\n libpng version 1.2.6beta2 - November 1, 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.6beta1"); - return((png_charp) "1.2.6beta1"); + return((png_charp) "1.2.6beta2"); + return((png_charp) "1.2.6beta2"); } png_charp PNGAPI @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.6beta1 - October 22, 2002 + * libpng version 1.2.6beta2 - November 1, 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.6beta1 - October 22, 2002: Glenn + * libpng versions 0.97, January 1998, through 1.2.6beta2 - November 1, 2002: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -98,7 +98,7 @@ * 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 - * 1.2.6beta1 13 10206 12.so.0.1.2.6beta1 + * 1.2.6beta1-2 13 10206 12.so.0.1.2.6beta1-2 * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -128,7 +128,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.6beta1, October 22, 2002, are + * libpng versions 1.0.7, July 1, 2000, through 1.2.6beta2, November 1, 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 @@ -233,13 +233,13 @@ * Y2K compliance in libpng: * ========================= * - * October 22, 2002 + * November 1, 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.6beta1 are Y2K compliant. It is my belief that earlier + * upward through 1.2.6beta2 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 @@ -295,7 +295,7 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.6beta1" +#define PNG_LIBPNG_VER_STRING "1.2.6beta2" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM %DLLNUM% @@ -307,7 +307,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 @@ -1285,9 +1285,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.6beta1 + version 1.2.6beta2 */ -typedef png_structp version_1_2_6beta1; +typedef png_structp version_1_2_6beta2; typedef png_struct FAR * FAR * png_structpp; @@ -2427,7 +2427,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.6beta1 - October 22, 2002 (header)\n" + " libpng version 1.2.6beta2 - November 1, 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 8b371260f..b980f48cc 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.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 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.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 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 98ed86448..a76b2dd19 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 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 75529d832..8c193c5b8 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.6beta1 - October 22, 2002 + * libpng version 1.2.6beta2 - November 1, 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.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 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.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 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 76dbb283a..72459cba5 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 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.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 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.6beta1 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.6beta2 */ 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.6beta1 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.6beta2 */ 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.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 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 6b68979d8..240b168d5 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.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 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 92d276178..535f92419 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 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.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 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.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 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_6beta1 your_png_h_is_not_version_1_2_6beta1; +typedef version_1_2_6beta2 your_png_h_is_not_version_1_2_6beta2; diff --git a/pngtrans.c b/pngtrans.c index fbe31f0d6..1c213a800 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.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 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.6beta1 - October 22, 2002 + * libpng version 1.2.6beta2 - November 1, 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.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 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 8534eba85..55a958562 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 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 faecf3e88..f11818129 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.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 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 9fccf71c3..81acc2b06 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 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 e8863324b..b09214d20 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.6beta1 (October 22, 2002) and zlib +libpng 1.2.6beta2 (November 1, 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 fca8819c2..3d171b7fe 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.6beta1 +;Version 1.2.6beta2 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/projects/netware.txt b/projects/netware.txt index 2e5399924..50ea61913 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.6beta1-project-netware.zip from a libpng distribution +libpng-1.2.6beta2-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.6beta1-project-netware.zip" +"unzip -a libpng-1.2.6beta2-project-netware.zip" diff --git a/projects/wince.txt b/projects/wince.txt index e09b3084f..fcba96768 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.6beta1-project-wince.zip from a libpng distribution +libpng-1.2.6beta2-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.6beta1-project-wince.zip" +"unzip -a libpng-1.2.6beta2-project-wince.zip" diff --git a/scripts/libpng-config-body.in b/scripts/libpng-config-body.in index b466432d5..5267c1a1b 100755 --- a/scripts/libpng-config-body.in +++ b/scripts/libpng-config-body.in @@ -77,6 +77,10 @@ while test $# -gt 0; do echo ${R_opts} ;; + --ldopts) + echo ${ldopts} + ;; + --ldflags) echo ${ldflags} ${L_opts} ${R_opts} ${libs} ;; diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 50749e775..f7a5810c8 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.6beta1 +version=1.2.6beta2 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 864d019d4..f50823384 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.6beta1 +Version: 1.2.6beta2 Libs: -L${libdir} -lpng12 -lz -lm Cflags: -I${includedir}/libpng12 diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index bfc2405fe..804209cbb 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,6 +8,10 @@ CC=cc SUN_CC_FLAGS=-fast -xtarget=ultra SUN_LD_FLAGS=-fast -xtarget=ultra +AR=ar +ARFLAGS=rc +#RANLIB=ranlib +RANLIB=echo # where make install puts libpng.a, libpng12.so and libpng12/png.h prefix=/a @@ -28,12 +32,9 @@ CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm -#RANLIB=ranlib -RANLIB=echo - LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -70,7 +71,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ libpng.pc: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 9605cad43..283b22838 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,6 +8,10 @@ CC=cc SUN_CC_FLAGS=-fast -xtarget=ultra -xarch=v9 SUN_LD_FLAGS=-fast -xtarget=ultra -xarch=v9 +AR=ar +ARFLAGS=rc +#RANLIB=ranlib +RANLIB=echo # where make install puts libpng.a, libpng12.so and libpng12/png.h prefix=/a @@ -28,12 +32,9 @@ CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm -#RANLIB=ranlib -RANLIB=echo - LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -70,7 +71,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ libpng.pc: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 5f7330a83..15c1477c4 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -12,13 +12,14 @@ ZLIBLIB = ../zlib # Compiler, linker, lib and other tools CC = gcc LD = $(CC) -AR = ar rcs +AR=ar +ARFLAGS=rcs RANLIB = ranlib RM = rm -f LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local @@ -60,7 +61,7 @@ OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ all: $(LIBNAME)$(A) pngtest$(E) $(LIBNAME)$(A): $(OBJS) - $(AR) $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ test: pngtest$(E) diff --git a/scripts/makefile.amiga b/scripts/makefile.amiga index 79cb42499..c210973ce 100644 --- a/scripts/makefile.amiga +++ b/scripts/makefile.amiga @@ -9,6 +9,16 @@ ZLIB=/zlib #compiler CC=sc +# linker +LN= slink +# file deletion command +RM= delete quiet +# library (.lib) file creation command +AR= oml +ARFLAGS= +# make directory command +MKDIR= makedir + #compiler flags # WARNING: a bug in V6.51 causes bad code with OPTGO # So use V6.55 or set NOOPTGO!!!!!!!!! @@ -19,14 +29,6 @@ CFLAGS= NOSTKCHK PARMS=REG OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL\ LDFLAGS= SD ND BATCH #link libs LDLIBS= libpng.lib libgz.lib LIB:scm.lib LIB:sc.lib Lib:amiga.lib -# linker -LN= slink -# file deletion command -RM= delete quiet -# library (.lib) file creation command -AR= oml -# make directory command -MKDIR= makedir OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ @@ -36,7 +38,7 @@ all: libpng.lib pngtest libpng.lib: $(OBJS) -$(RM) libpng.lib -$(AR) libpng.lib r $(OBJS) +$(AR) $(ARFLAGS) libpng.lib r $(OBJS) pngtest: pngtest.o libpng.lib $(LN) <WITH < diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 6a6d7054e..a59c371f1 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -6,13 +6,17 @@ # For conditions of distribution and use, see copyright notice in png.h CC=gcc +AR=ar +ARFLAGS=rc +RANLIB=ranlib +#RANLIB=echo # Where the zlib library and include files are located ZLIBLIB=/usr/local/lib ZLIBINC=/usr/local/include PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= @@ -28,9 +32,6 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ CFLAGS=-I$(ZLIBINC) -Wall -O1 -funroll-loops \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 -RANLIB=ranlib -#RANLIB=echo - # where make install puts libpng.a, libpng12.so*, and png.h prefix=/usr/local INCPATH=$(prefix)/include @@ -66,7 +67,7 @@ OBJSDLL = $(OBJS) all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ libpng.pc: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index c3c6f0ce4..4bf80c0e3 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -36,6 +36,12 @@ DESTDIR= # list at the bottom of this makefile. CC=gcc +AR=ar +ARFLAGS=rc +RANLIB=ranlib +#RANLIB=echo +MKDIR=/bin/mkdir -pv + ifdef MINGW MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw @@ -79,7 +85,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll @@ -93,10 +99,6 @@ LDFLAGS=$(strip -L. $(MINGW_LDFLAGS) -lpng $(addprefix -L,$(ZLIBLIB)) -lz) LDSFLAGS=$(strip -shared -L. $(MINGW_LDFLAGS) -Wl,--export-all) LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz -MKDIR=/bin/mkdir -pv -RANLIB=ranlib -#RANLIB=echo - INCPATH=$(prefix)/include LIBPATH=$(prefix)/lib @@ -173,7 +175,7 @@ pnggccrd.pic.o: pnggccrd.c png.h pngconf.h $(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $< $(STATLIB): $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ $(SHAREDDEF): projects/msvc/png32ms.def diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index d067082e7..26a9986a3 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -16,14 +16,16 @@ ZLIBLIB=../zlib ZLIBINC=../zlib CC=cc -CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz - +AR=ar +ARFLAGS=rc #RANLIB=echo RANLIB=ranlib +CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops +LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz + PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -61,7 +63,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).dylib pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ libpng.pc: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 52f7b9317..aa1a67ef3 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -32,17 +32,19 @@ ZLIBLIB=../zlib ZLIBINC=../zlib PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 CC=cc -CFLAGS=-std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1 -LDFLAGS=-L$(ZLIBLIB) -rpath $(ZLIBLIB) libpng.a -lz -lm - +AR=ar +ARFLAGS=rc #RANLIB=echo RANLIB=ranlib +CFLAGS=-std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1 +LDFLAGS=-L$(ZLIBLIB) -rpath $(ZLIBLIB) libpng.a -lz -lm + OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngwtran.o pngmem.o pngerror.o pngpread.o @@ -50,7 +52,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: $(LIBNAME).so libpng.a pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ libpng.pc: diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2 index 09045c275..5ccb4ae2f 100644 --- a/scripts/makefile.dj2 +++ b/scripts/makefile.dj2 @@ -10,6 +10,8 @@ INCPATH=$(prefix)/include LIBPATH=$(prefix)/lib CC=gcc +AR=ar +ARFLAGS=rc CFLAGS=-I../zlib -O LDFLAGS=-L. -L../zlib/ -lpng -lz -lm @@ -22,7 +24,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: libpng.a pngtest libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ pngtest: pngtest.o libpng.a diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc index f7fc36874..52a77f3c7 100644 --- a/scripts/makefile.gcc +++ b/scripts/makefile.gcc @@ -10,7 +10,8 @@ ZLIBLIB = ../zlib # Compiler, linker, lib and other tools CC = gcc LD = $(CC) -AR = ar rcs +AR=ar +ARFLAGS=rcs RANLIB = ranlib RM = rm -f @@ -35,7 +36,7 @@ OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ all: libpng$(A) pngtest$(E) libpng$(A): $(OBJS) - $(AR) $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ test: pngtest$(E) diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 09d13fff0..899d10475 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -15,10 +15,14 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc +AR=ar +ARFLAGS=rc +RANLIB=ranlib +#RANLIB=echo # where "make install" puts libpng12.a, libpng12.so*, # libpng12/png.h and libpng12/pngconf.h @@ -58,9 +62,6 @@ CFLAGS=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall \ LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm -RANLIB=ranlib -#RANLIB=echo - INCPATH=$(prefix)/include LIBPATH=$(prefix)/lib MANPATH=$(prefix)/man @@ -95,7 +96,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).so pngtest pngtest-static libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ libpng.pc: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index ac7b5177a..4d0e60f64 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -6,7 +6,11 @@ # For conditions of distribution and use, see copyright notice in png.h CC=gcc +AR=ar +ARFLAGS=rc LD=ld +RANLIB=ranlib +#RANLIB=echo # where "make install" puts libpng.a, libpng.sl*, png.h and pngconf.h prefix=/usr/local @@ -37,11 +41,8 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ #LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm LDFLAGS=-L$(ZLIBLIB) libpng.a -lz -lm -RANLIB=ranlib -#RANLIB=echo - PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -79,7 +80,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).sl pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ libpng.pc: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index e9235ba4a..b9a5ec764 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -16,15 +16,17 @@ ZLIBINC=/opt/zlib/include # SHAREDLIB=libz.sl CC=cc +AR=ar +ARFLAGS=rc +RANLIB=ranlib + CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 # Caution: be sure you have built zlib with the same CFLAGS. CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 LDFLAGS=-L$(ZLIBLIB) libpng.a -lz -lm -RANLIB=ranlib - PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -64,7 +66,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).sl pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ libpng.pc: diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc index f09a62c9e..1a6030f98 100644 --- a/scripts/makefile.ibmc +++ b/scripts/makefile.ibmc @@ -16,6 +16,7 @@ ZLIBLIB = ../zlib CC = icc LD = ilink AR = ilib +ARFLAGS= RM = del CFLAGS = -I$(ZLIBINC) -Mc -O2 -W3 @@ -37,7 +38,7 @@ LIBS = libpng$(A) $(ZLIBLIB)/zlib$(A) all: libpng$(A) pngtest$(E) libpng$(A): $(OBJS) - $(AR) -out:$@ $(OBJS) + $(AR) $(ARFLAGS) -out:$@ $(OBJS) test: pngtest$(E) pngtest$(E) diff --git a/scripts/makefile.knr b/scripts/makefile.knr index 44ee538a3..463efca15 100644 --- a/scripts/makefile.knr +++ b/scripts/makefile.knr @@ -24,6 +24,8 @@ LIBPATH=$(prefix)/lib DESTDIR= CC=cc +AR=ar +ARFLAGS=rc CFLAGS=-I../zlib -O LDFLAGS=-L. -L../zlib/ -lpng -lz -lm # flags for ansi2knr @@ -49,7 +51,7 @@ ansi2knr: ansi2knr.c $(CC) $(CFLAGS) $(ANSI2KNRFLAGS) -o ansi2knr ansi2knr.c libpng.a: ansi2knr $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ pngtest: pngtest.o libpng.a diff --git a/scripts/makefile.linux b/scripts/makefile.linux index b15a5bfa3..4ef78987a 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -5,10 +5,14 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc +AR=ar +ARFLAGS=rc +RANLIB=ranlib +#RANLIB=echo # where "make install" puts libpng12.a, libpng12.so*, # libpng12/png.h and libpng12/pngconf.h @@ -37,9 +41,6 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm -RANLIB=ranlib -#RANLIB=echo - INCPATH=$(prefix)/include LIBPATH=$(prefix)/lib MANPATH=$(prefix)/man @@ -74,7 +75,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).so pngtest pngtest-static libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ libpng.pc: diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx index 6f98e2972..87c3541fc 100644 --- a/scripts/makefile.macosx +++ b/scripts/makefile.macosx @@ -15,9 +15,13 @@ ZLIBLIB=../zlib ZLIBINC=../zlib CC=cc +AR=ar +ARFLAGS=rc +#RANLIB=echo +RANLIB=ranlib PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 @@ -45,9 +49,6 @@ DI=$(DESTDIR)$(INCPATH) DL=$(DESTDIR)$(LIBPATH) DM=$(DESTDIR)$(MANPATH) -#RANLIB=echo -RANLIB=ranlib - OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngwtran.o pngmem.o pngerror.o pngpread.o @@ -70,7 +71,7 @@ libpng-config: chmod +x libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX): $(OBJS) diff --git a/scripts/makefile.mips b/scripts/makefile.mips index f1a557df7..4501d1e7d 100644 --- a/scripts/makefile.mips +++ b/scripts/makefile.mips @@ -19,6 +19,8 @@ LIBPATH=$(prefix)/lib DESTDIR= CC=cc +AR=ar +ARFLAGS=rc CFLAGS=-I../zlib -O -systype sysv -DSYSV -w -Dmips #CFLAGS=-O LDFLAGS=-L. -L../zlib/ -lpng -lz -lm @@ -33,7 +35,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: libpng.a pngtest libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ pngtest: pngtest.o libpng.a diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index f3d1f1fda..5b9fbcee3 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.6beta1 +SHLIB_MINOR= 1.2.6beta2 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 dd5a31f26..36c73f0d8 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.6beta1 +SHLIB_MINOR= 1.2.6beta2 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 2cf476f82..e81fe13ef 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.6beta1 +SHLIB_MINOR= 1.2.6beta2 LIB= png SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.os2 b/scripts/makefile.os2 index 588067d25..800428e84 100644 --- a/scripts/makefile.os2 +++ b/scripts/makefile.os2 @@ -16,6 +16,7 @@ CFLAGS=-I$(ZLIBINC) -Wall -O6 -funroll-loops -malign-loops=2 \ -malign-functions=2 #$(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lzdll -Zcrtdll AR=emxomfar +ARFLAGS=rc PNGLIB=png.lib IMPLIB=emximp @@ -31,7 +32,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: $(PNGLIB) $(SHAREDLIB) $(SHAREDLIBIMP) $(PNGLIB): $(OBJS) - $(AR) rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SHAREDLIB): $(OBJS) pngos2.def $(CC) $(LDFLAGS) -Zdll -o $@ $^ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index b2c9f0dba..0ff683931 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -7,6 +7,10 @@ # For conditions of distribution and use, see copyright notice in png.h CC=cc +AR=ar +ARFLAGS=rc +#RANLIB=ranlib +RANLIB=echo # where make install puts libpng.a, libpng.so*, and png.h prefix=/usr/local @@ -20,11 +24,8 @@ ZLIBINC=../zlib CFLAGS= -dy -belf -I$(ZLIBINC) -O3 LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm -#RANLIB=ranlib -RANLIB=echo - PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -62,7 +63,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ libpng.pc: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 85e4dc852..b48147a4e 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -18,9 +18,14 @@ ZLIBINC=../zlib LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) + CC=gcc +AR=ar +ARFLAGS=rc +RANLIB=echo +#RANLIB=ranlib # ABI can be blank to use default for your system, -32, -o32, -n32, or -64 # See "man abi". zlib must be built with the same ABI. @@ -35,9 +40,6 @@ LDLEGACY=cc $(ABI) -shared -soname libpng.so.3 \ -set_version sgi$3.0 # See "man dso" for info about shared objects -RANLIB=echo -#RANLIB=ranlib - INCPATH=$(prefix)/include LIBPATH=$(prefix)/lib #LIBPATH=$(prefix)/lib32 @@ -66,7 +68,7 @@ OBJS = pnggccrd.o png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: libpng.a pngtest shared libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ shared: $(LIBNAME).so.$(PNGVER) diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 385d16691..f556d1480 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -5,7 +5,7 @@ LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Where make install puts libpng.a, libpng12.so, and libpng12/png.h @@ -22,6 +22,10 @@ ZLIBLIB=../zlib ZLIBINC=../zlib CC=cc +AR=ar +ARFLAGS=rc +RANLIB=echo +#RANLIB=ranlib # ABI can be blank to use default for your system, -32, -o32, -n32, or -64 # See "man abi". zlib must be built with the same ABI. @@ -40,9 +44,6 @@ LDLEGACY=cc $(ABI) -shared -soname libpng.so.3 \ -set_version sgi$3.0 # See "man dso" for info about shared objects -RANLIB=echo -#RANLIB=ranlib - INCPATH=$(prefix)/include LIBPATH=$(prefix)/lib #LIBPATH=$(prefix)/lib32 @@ -71,7 +72,7 @@ OBJS = pnggccrd.o png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: libpng.a pngtest shared libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ shared: $(LIBNAME).so.$(PNGVER) diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 731ad514c..999ace4f5 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,6 +8,10 @@ # gcc 2.95 doesn't work. CC=cc +AR=ar +ARFLAGS=rc +#RANLIB=ranlib +RANLIB=echo # Where make install puts libpng.a, libpng.so*, and png.h prefix=/usr/local @@ -30,11 +34,8 @@ ZLIBINC=/usr/include CFLAGS=-I$(ZLIBINC) -O3 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm -#RANLIB=ranlib -RANLIB=echo - PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -72,7 +73,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ libpng.pc: diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 4a7e585fc..63d943381 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -6,6 +6,10 @@ # For conditions of distribution and use, see copyright notice in png.h CC=gcc +AR=ar +ARFLAGS=rc +#RANLIB=ranlib +RANLIB=echo # Where make install puts libpng.a, libpng12.so*, and png.h prefix=/usr/local @@ -26,11 +30,8 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm -#RANLIB=ranlib -RANLIB=echo - PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -68,7 +69,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ libpng.pc: diff --git a/scripts/makefile.std b/scripts/makefile.std index 5d1f5290d..e9fb76ecd 100644 --- a/scripts/makefile.std +++ b/scripts/makefile.std @@ -25,12 +25,14 @@ ZLIBLIB=../zlib ZLIBINC=../zlib CC=cc -CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 -LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm - +AR=ar +ARFLAGS=rc #RANLIB=echo RANLIB=ranlib +CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 +LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm + OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngwtran.o pngmem.o pngerror.o pngpread.o @@ -38,7 +40,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: libpng.a pngtest libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ pngtest: pngtest.o libpng.a diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos index 70a6e88af..77c8ad719 100644 --- a/scripts/makefile.sunos +++ b/scripts/makefile.sunos @@ -29,12 +29,14 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow -Wconversion \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes CC=gcc -CFLAGS=-I$(ZLIBINC) -O # $(WARNMORE) -DPNG_DEBUG=5 -LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm - +AR=ar +ARFLAGS=rc RANLIB=ranlib #RANLIB=echo +CFLAGS=-I$(ZLIBINC) -O # $(WARNMORE) -DPNG_DEBUG=5 +LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm + OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngwtran.o pngmem.o pngerror.o pngpread.o @@ -42,7 +44,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: libpng.a pngtest libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ pngtest: pngtest.o libpng.a diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index d49174181..14d68ca00 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -7,7 +7,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.2.6beta1'; + PNG_LIBPNG_VER_STRING = '1.2.6beta2'; PNG_LIBPNG_VER = 10206; type diff --git a/scripts/pngos2.def b/scripts/pngos2.def index ead951892..6c647977b 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.6beta1 +; Version 1.2.6beta2 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" |