diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2002-09-17 23:38:46 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:07:30 -0500 |
| commit | 5ff38d3e1625888719c3c173168e4792211c0089 (patch) | |
| tree | 54f91b8546aa0ffb5c7bf108dd057224ed405edc | |
| parent | 865f4f073a692279c4aecbce7c9b9ed5a27372cf (diff) | |
| download | libpng-1.2.5rc3.tar.gz | |
Imported from libpng-1.2.5rc3.tarv1.2.5rc3
62 files changed, 250 insertions, 216 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.5rc2 - September 16, 2002 +Libpng 1.2.5rc3 - September 18, 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. @@ -28,6 +28,8 @@ version 1.2.5rc2 and 1.0.15rc2 [September 16, 2002] 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. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -1171,6 +1171,8 @@ version 1.2.5rc2 and 1.0.15rc2 [September 16, 2002] 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. 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.5rc2 - September 16, 2002 +Installing libpng version 1.2.5rc3 - September 18, 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.5rc2" or "lpng109" and "zlib-1.1.4" +might be called "libpng-1.2.5rc3" or "lpng109" and "zlib-1.1.4" or "zlib114") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -68,8 +68,8 @@ The files that are presently available in the scripts directory include makefile.std => Generic UNIX makefile (cc, creates static libpng.a) - makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.5rc2) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.5rc2, + makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.5rc3) + makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.5rc3, uses assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -90,10 +90,10 @@ include makefile.ne0bsd => NetBSD/cc makefile, uses PNGGCCRD, makes libpng0.so makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) - makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.5rc2) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.5rc3) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.5rc2) - makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.5rc2) + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.5rc3) + makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.5rc3) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc @@ -158,9 +158,9 @@ in the scripts directory when you run "make", "make install", or mangle.in => Function-decoration macros added to png.h by the makefiles. makefile.linux => Linux/ELF makefile - (gcc, creates libpng12m.so.0.1.2.5rc2) + (gcc, creates libpng12m.so.0.1.2.5rc3) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0m.1.2.5rc2, uses assembler code + libpng12.so.0m.1.2.5rc3, uses assembler code tuned for Intel MMX platform) makefile.sgi => Silicon Graphics (cc, creates libpng12m.so) makefile.sggcc => Silicon Graphics (gcc, creates libpng12m.so) @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.5rc2 +Known bugs in libpng version 1.2.5rc3 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.5rc2, September 16, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.5rc3, September 18, 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 16, 2002 +September 18, 2002 @@ -1,4 +1,4 @@ -README for libpng 1.2.5rc2 - September 16, 2002 (shared library 12.0) +README for libpng 1.2.5rc3 - September 18, 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.5rc2) + (gcc, creates libpng12.so.0.1.2.5rc3) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.5rc2, uses assembler code + libpng12.so.0.1.2.5rc3, 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.5rc2) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.5rc3) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.5rc2) + (gcc, creates libpng12.so.0.1.2.5rc3) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.5rc2) + (gcc, creates libpng12.so.0.1.2.5rc3) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc @@ -248,9 +248,9 @@ Files in this distribution: mangle.in => Function-decoration macros added to png.h by the makefiles. makefile.linux => Linux/ELF makefile - (gcc, creates libpng12m.so.0.1.2.5rc2) + (gcc, creates libpng12m.so.0.1.2.5rc3) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0m.1.2.5rc2, uses assembler code + libpng12.so.0m.1.2.5rc3, uses assembler code tuned for Intel MMX platform) makefile.sgi => Silicon Graphics (cc, creates libpng12m.so) makefile.sggcc => Silicon Graphics (gcc, creates libpng12m.so) @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - September 16, 2002 + September 18, 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.5rc2 are Y2K compliant. It is my belief that earlier + upward through 1.2.5rc3 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.5rc2. Instead, please + There is no \"configure\" script for Libpng-1.2.5rc3. 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 16, 2002" +.TH LIBPNG 3 "September 18, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5rc2 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5rc3 .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.5rc2 - September 16, 2002 + libpng version 1.2.5rc3 - September 18, 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 -September 16, 2002 +September 18, 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.5rc2 are Y2K compliant. It is my belief that earlier +upward through 1.2.5rc3 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that @@ -3783,8 +3783,8 @@ the first widely used release: 1.0.14 10 10014 10.so.0.1.0.14 1.2.4 13 10204 12.so.0.1.2.4 1.2.5beta1,2 13 10205 12.so.0.1.2.5beta1,2 - 1.2.5rc1,2 13 10205 12.so.0.1.2.5rc1,2 - 1.0.15rc1,2 10 10015 10.so.0.1.0.15rc1,2 + 1.2.5rc1,3 13 10205 12.so.0.1.2.5rc1,3 + 1.0.15rc1,3 10 10015 10.so.0.1.0.15rc1,3 Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3842,7 +3842,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.5rc2 - September 16, 2002: +Libpng version 1.2.5rc3 - September 18, 2002: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu). @@ -3859,7 +3859,7 @@ included in the libpng distribution, the latter shall prevail.) If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.0.7, July 1, 2000, through 1.2.5rc2, September 16, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.5rc3, September 18, 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 @@ -3951,7 +3951,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -September 16, 2002 +September 18, 2002 .\" end of man page diff --git a/libpng.txt b/libpng.txt index 3996b1847..07fc3cd28 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.5rc2 - September 16, 2002 + libpng version 1.2.5rc3 - September 18, 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 -September 16, 2002 +September 18, 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.5rc2 are Y2K compliant. It is my belief that earlier +upward through 1.2.5rc3 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 0a3cfc1a1..4f6d3d6ed 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "September 16, 2002" +.TH LIBPNGPF 3 "September 18, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5rc2 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5rc3 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "September 16, 2002" +.TH PNG 5 "September 18, 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.5rc2 - September 16, 2002 + * libpng version 1.2.5rc3 - September 18, 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_5rc2 Your_png_h_is_not_version_1_2_5rc2; +typedef version_1_2_5rc3 Your_png_h_is_not_version_1_2_5rc3; /* 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.5rc2"; +const char png_libpng_ver[18] = "1.2.5rc3"; /* 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.5rc2 - September 16, 2002\n\ + return ((png_charp) "\n libpng version 1.2.5rc3 - September 18, 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.5rc2"); - return((png_charp) "1.2.5rc2"); + return((png_charp) "1.2.5rc3"); + return((png_charp) "1.2.5rc3"); } png_charp PNGAPI @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.5rc2 - September 16, 2002 + * libpng version 1.2.5rc3 - September 18, 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.5rc2 - September 16, 2002: Glenn + * libpng versions 0.97, January 1998, through 1.2.5rc3 - September 18, 2002: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -94,8 +94,8 @@ * 1.0.14 10 10014 10.so.0.1.0.14 * 1.2.4 13 10204 12.so.0.1.2.4 * 1.2.5beta1-2 13 10205 12.so.0.1.2.5beta1-2 - * 1.2.5rc1-2 13 10205 12.so.0.1.2.5rc1-2 - * 1.0.15rc1-2 10 10015 10.so.0.1.0.15rc1-2 + * 1.2.5rc1-3 13 10205 12.so.0.1.2.5rc1-3 + * 1.0.15rc1-3 10 10015 10.so.0.1.0.15rc1-3 * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -125,7 +125,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.0.7, July 1, 2000, through 1.2.5rc2, September 16, 2002, are + * libpng versions 1.0.7, July 1, 2000, through 1.2.5rc3, September 18, 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 @@ -230,13 +230,13 @@ * Y2K compliance in libpng: * ========================= * - * September 16, 2002 + * September 18, 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.5rc2 are Y2K compliant. It is my belief that earlier + * upward through 1.2.5rc3 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 @@ -292,7 +292,7 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.5rc2" +#define PNG_LIBPNG_VER_STRING "1.2.5rc3" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM %DLLNUM% @@ -304,7 +304,7 @@ /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 2 +#define PNG_LIBPNG_VER_BUILD 3 #define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_BETA 2 @@ -1282,9 +1282,9 @@ struct png_struct_def /* This prevents a compiler error in png.c if png.c and png.h are both at - version 1.2.5rc2 + version 1.2.5rc3 */ -typedef png_structp version_1_2_5rc2; +typedef png_structp version_1_2_5rc3; typedef png_struct FAR * FAR * png_structpp; @@ -2424,7 +2424,7 @@ extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp /* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */ #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.5rc2 - September 16, 2002 (header)\n" + " libpng version 1.2.5rc3 - September 18, 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 de3ce371d..a2bf8f29c 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.5rc2 - September 16, 2002 + * libpng 1.2.5rc3 - September 18, 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.5rc2 - September 16, 2002 + * libpng 1.2.5rc3 - September 18, 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 4201bffa1..38938a66d 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.2.5rc2 - September 16, 2002 + * libpng 1.2.5rc3 - September 18, 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 a7873279a..5dbe52568 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.5rc2 - September 16, 2002 + * libpng version 1.2.5rc3 - September 18, 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.5rc2 - September 16, 2002 + * libpng 1.2.5rc3 - September 18, 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.5rc2 - September 16, 2002 + * libpng 1.2.5rc3 - September 18, 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 acb3ebbcd..cadbc922d 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.2.5rc2 - September 16, 2002 + * libpng 1.2.5rc3 - September 18, 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.5rc2 - September 16, 2002 + * libpng 1.2.5rc3 - September 18, 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.5rc2 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.5rc3 */ 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.5rc2 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.5rc3 */ 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.5rc2 - September 16, 2002 + * libpng 1.2.5rc3 - September 18, 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 3dc0cd1d4..ed02e10fe 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.5rc2 - September 16, 2002 + * libpng 1.2.5rc3 - September 18, 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 61f153236..d0a4964cd 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.2.5rc2 - September 16, 2002 + * libpng 1.2.5rc3 - September 18, 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.5rc2 - September 16, 2002 + * libpng 1.2.5rc3 - September 18, 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.5rc2 - September 16, 2002 + * libpng 1.2.5rc3 - September 18, 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_5rc2 your_png_h_is_not_version_1_2_5rc2; +typedef version_1_2_5rc3 your_png_h_is_not_version_1_2_5rc3; diff --git a/pngtrans.c b/pngtrans.c index 9d654c356..59bd606b3 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.5rc2 - September 16, 2002 + * libpng 1.2.5rc3 - September 18, 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.5rc2 - September 16, 2002 + * libpng version 1.2.5rc3 - September 18, 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.5rc2 - September 16, 2002 + * libpng 1.2.5rc3 - September 18, 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 431b3b12d..17444bbe3 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.2.5rc2 - September 16, 2002 + * libpng 1.2.5rc3 - September 18, 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 16c91632d..1ce2a6d44 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.5rc2 - September 16, 2002 + * libpng 1.2.5rc3 - September 18, 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 d252cb801..0ecaae5a2 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.2.5rc2 - September 16, 2002 + * libpng 1.2.5rc3 - September 18, 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 aaae15d11..4a9c4e05a 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.5rc2 (September 16, 2002) and zlib +libpng 1.2.5rc3 (September 18, 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 7df716bd8..5917cfe62 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.5rc2 +;Version 1.2.5rc3 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/projects/netware.txt b/projects/netware.txt index ae62fa099..3436ecb0a 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.5rc2-project-netware.zip from a libpng distribution +libpng-1.2.5rc3-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.5rc2-project-netware.zip" +"unzip -a libpng-1.2.5rc3-project-netware.zip" diff --git a/projects/wince.txt b/projects/wince.txt index 9b051dbe7..5a94b4902 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.5rc2-project-wince.zip from a libpng distribution +libpng-1.2.5rc3-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.5rc2-project-wince.zip" +"unzip -a libpng-1.2.5rc3-project-wince.zip" diff --git a/scripts/libpng-config-body.in b/scripts/libpng-config-body.in index 8995df879..b466432d5 100755 --- a/scripts/libpng-config-body.in +++ b/scripts/libpng-config-body.in @@ -6,14 +6,20 @@ Usage: libpng-config [OPTION] ... Known values for OPTION are: - --prefix print libpng prefix - --libs print library linking information - --cflags print compiler flags - --cppflags print pre-processor flags - --ldflags print loader flags - --rpath print path to shared library - --help display this help and exit - --version output version information + --prefix print libpng prefix + --libdir print path to directory containing library + --libs print library linking information + --ccopts print compiler options + --cppflags print pre-processor flags + --cflags print preprocessor flags, I_opts, and compiler options + --I_opts print "-I" include options + --L_opts print linker "-L" flags for dynamic linking + --R_opts print dynamic linker "-R" or "-rpath" flags + --ldopts print linker options + --ldflags print linker flags (ldopts, L_opts, R_opts, and libs) + --static revise subsequent outputs for static linking + --help print this help and exit + --version print version information EOF exit $1 @@ -39,24 +45,44 @@ while test $# -gt 0; do usage 0 ;; - --cflags) - echo ${cflags} + --ccopts) + echo ${ccopts} ;; --cppflags) echo ${cppflags} ;; + --cflags) + echo ${I_opts} ${cppflags} ${ccopts} + ;; + + --libdir) + echo ${libdir} + ;; + --libs) echo ${libs} ;; - --rpath) - echo ${rpath} + --I_opts) + echo ${I_opts} + ;; + + --L_opts) + echo ${L_opts} + ;; + + --R_opts) + echo ${R_opts} ;; --ldflags) - echo ${ldflags} + echo ${ldflags} ${L_opts} ${R_opts} ${libs} + ;; + + --static) + R_opts="" ;; *) diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 3f2fd10eb..3264b99d9 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,11 +8,14 @@ # Modeled after libxml-config. -version=1.2.5rc2 +version=1.2.5rc3 prefix="" -cppflags="" -cflags="" -ldflags="" +libdir="" libs="" -rpath="" +I_opts="" +L_opts="" +R_opts="" +cppflags="" +ccopts="" +ldopts="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 9f8ebcfb5..2065d3a65 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.5rc2 +Version: 1.2.5rc3 Libs: -L${libdir} -lpng12 -lz -lm Cflags: -I${includedir}/libpng12 diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index aaa05f319..087c990bd 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5rc2 +PNGMIN = 1.2.5rc3 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -79,9 +79,12 @@ libpng.pc: libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ - echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo cflags=\"-xtarget=ultra\"; \ - echo ldflags=\"-xtarget=ultra -L$(LIBPATH) -R$(LIBPATH)\"; \ + echo libdir=\"$(LIBPATH)\"; \ + echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ + echo L_opts=\"-L$(LIBPATH)\"; \ + echo R_opts=\"-R$(LIBPATH)\"; \ + echo ccopts=\"-xtarget=ultra\"; \ + echo ldopts=\"-xtarget=ultra\"; \ echo libs=\"-lpng12 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -185,8 +188,8 @@ test-installed: echo echo Testing installed dynamic shared library. $(CC) $(SUN_CC_FLAGS) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags` \ $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) ./pngtesti pngtest.png diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 5542dde93..0f8a55f06 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5rc2 +PNGMIN = 1.2.5rc3 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -79,9 +79,12 @@ libpng.pc: libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ - echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo cflags=\"-xtarget=ultra -xarch=v9\"; \ - echo ldflags=\"-xtarget=ultra -xarch=v9 -L$(LIBPATH) -R$(LIBPATH)\"; \ + echo libdir=\"$(LIBPATH)\"; \ + echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ + echo L_opts=\"-L$(LIBPATH)\"; \ + echo R_opts=\"-R$(LIBPATH)\"; \ + echo ccopts=\"-xtarget=ultra -xarch=v9\"; \ + echo ldopts=\"-xtarget=ultra -xarch=v9 \"; \ echo libs=\"-lpng12 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -185,8 +188,8 @@ test-installed: echo echo Testing installed dynamic shared library. $(CC) $(SUN_CC_FLAGS) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags ` \ $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) ./pngtesti pngtest.png diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 2ede410f6..794f3919d 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -17,7 +17,7 @@ RANLIB = ranlib RM = rm -f PNGMAJ = 0 -PNGMIN = 1.2.5rc2 +PNGMIN = 1.2.5rc3 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 5592e5006..969975b19 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -12,7 +12,7 @@ ZLIBLIB=/usr/local/lib ZLIBINC=/usr/local/include PNGMAJ = 0 -PNGMIN = 1.2.5rc2 +PNGMIN = 1.2.5rc3 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= @@ -77,9 +77,7 @@ libpng.pc: libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ - echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo cflags=\"\"; \ - echo ldflags=\"-Wl,-soname=$(LIBNAME).so.$(PNGMAJ)\"; \ + echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo libs=\"-lpng12 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -170,9 +168,9 @@ install: install-static install-shared install-man install-config test-installed: $(CC) $(CFLAGS) \ - `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + -o pngtesti `$(BINPATH)/libpng12-config --ldflags` ./pngtesti pngtest.png clean: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index ec0aaa5b6..bfc19b9a6 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -79,7 +79,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.5rc2 +PNGMIN = 1.2.5rc3 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll @@ -147,9 +147,8 @@ libpng-config: scripts/libpng-config-head.in scripts/libpng-config-body.in installation..'\n' using PREFIX=\"$(prefix)\"'\n' ( cat $(S)/scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ - echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo cflags=\"\"; \ - echo ldflags=\"-L$(LIBPATH)\"; \ + echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ + echo L_opts=\"-L$(LIBPATH)\"; \ echo libs=\"-lpng$(CYGDLL) -lz\"; \ cat $(S)/scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -265,9 +264,9 @@ install: install-static install-shared install-man install-config test-installed: $(CC) $(CFLAGS) \ - `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ -L$(ZLIBLIB) \ - -o pngtesti$(EXE) `$(BINPATH)/libpng12-config --ldflags --libs` + -o pngtesti$(EXE) `$(BINPATH)/libpng12-config --ldflags` ./pngtesti$(EXE) pngtest.png clean: diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 40442c255..cde2154e8 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -23,7 +23,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz RANLIB=ranlib PNGMAJ = 0 -PNGMIN = 1.2.5rc2 +PNGMIN = 1.2.5rc3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -71,9 +71,8 @@ libpng.pc: libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ - echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo cflags=\"\"; \ - echo ldflags=\"-L$(LIBPATH)\"; \ + echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ + echo L_opts=\"-L$(LIBPATH)\"; \ echo libs=\"-lpng12 -lz\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -170,9 +169,9 @@ install: install-static install-shared install-man install-config test-installed: $(CC) $(CFLAGS) \ - `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ -L$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + -o pngtesti `$(BINPATH)/libpng12-config --ldflags` ./pngtesti pngtest.png clean: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index e7d7f42da..b36da9c71 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -32,7 +32,7 @@ ZLIBLIB=../zlib ZLIBINC=../zlib PNGMAJ = 0 -PNGMIN = 1.2.5rc2 +PNGMIN = 1.2.5rc3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -59,9 +59,9 @@ libpng.pc: libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ - echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo cflags=\"-std\"; \ - echo ldflags=\"-L$(LIBPATH)\"; \ + echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ + echo ccopts=\"-std\"; \ + echo L_opts=\"-L$(LIBPATH)\"; \ echo libs=\"-lpng12 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -152,10 +152,10 @@ install: install-static install-shared install-man install-config test-installed: echo echo Testing installed dynamic shared library. - $(CC) -std -w1 -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + $(CC) -w1 -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ -L$(ZLIBLIB) -R$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + -o pngtesti `$(BINPATH)/libpng12-config --ldflags` ./pngtesti pngtest.png clean: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 401516b9a..10dd44e54 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -15,7 +15,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5rc2 +PNGMIN = 1.2.5rc3 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -104,10 +104,10 @@ libpng.pc: libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ - echo cppflags=\"-I$(INCPATH)/$(LIBNAME) -DPNG_THREAD_UNSAFE_OK \ - -DPNG_USE_PNGGCCRD\"; \ - echo cflags=\"\"; \ - echo ldflags=\"-L$(LIBPATH) -Wl,-rpath,$(LIBPATH)\"; \ + echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ + echo cppflags=\"-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD\"; \ + echo L_opts=\"-L$(LIBPATH)\"; \ + echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \ echo libs=\"-lpng12 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -215,9 +215,9 @@ install: install-static install-shared install-man install-config test-installed: $(CC) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + -o pngtesti `$(BINPATH)/libpng12-config --ldflags` ./pngtesti pngtest.png clean: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 592ec0c0c..34476ebf7 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -33,7 +33,7 @@ RANLIB=ranlib #RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.5rc2 +PNGMIN = 1.2.5rc3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -80,9 +80,7 @@ libpng.pc: libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ - echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo cflags=\"\"; \ - echo ldflags=\"\"; \ + echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo libs=\"-lpng12 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -175,9 +173,9 @@ test-installed: echo echo Testing installed dynamic shared library. $(CC) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + -o pngtesti `$(BINPATH)/libpng12-config --ldflags` ./pngtesti pngtest.png clean: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index c89450a96..2573f6156 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -17,7 +17,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm RANLIB=ranlib PNGMAJ = 0 -PNGMIN = 1.2.5rc2 +PNGMIN = 1.2.5rc3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -66,9 +66,9 @@ libpng.pc: libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ - echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo cflags=\"-Ae +DA1.1 +DS2.0"; \ - echo ldflags=\"-L$(LIBPATH)\"; \ + echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ + echo ccopts=\"-Ae +DA1.1 +DS2.0"; \ + echo L_opts=\"-L$(LIBPATH)\"; \ echo libs=\"-lpng12 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -160,9 +160,9 @@ test-installed: echo echo Testing installed dynamic shared library. $(CC) $(CCFLAGS) \ - `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ -L$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + -o pngtesti `$(BINPATH)/libpng12-config --ldflags` ./pngtesti pngtest.png clean: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index fbeb83bd2..e8596ec87 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -5,7 +5,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5rc2 +PNGMIN = 1.2.5rc3 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -83,9 +83,9 @@ libpng.pc: libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ - echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo cflags=\"\"; \ - echo ldflags=\"-L$(LIBPATH) -Wl,-rpath,$(LIBPATH)\"; \ + echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ + echo L_opts=\"-L$(LIBPATH)\"; \ + echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \ echo libs=\"-lpng12 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -187,9 +187,9 @@ install: install-static install-shared install-man install-config test-installed: $(CC) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + -o pngtesti `$(BINPATH)/libpng12-config --ldflags` ./pngtesti pngtest.png clean: diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx index 6e6b4939b..7a3cbd009 100644 --- a/scripts/makefile.macosx +++ b/scripts/makefile.macosx @@ -17,7 +17,7 @@ ZLIBINC=../zlib CC=cc PNGMAJ = 0 -PNGMIN = 1.2.5rc2 +PNGMIN = 1.2.5rc3 PNGVER = $(PNGMAJ).$(PNGMIN) CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 @@ -65,9 +65,8 @@ libpng.pc: libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ - echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo cflags=\"\"; \ - echo ldflags=\"-L$(LIBPATH)\"; \ + echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ + echo L_opts=\"-L$(LIBPATH)\"; \ echo libs=\"-lpng12 -lz\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -162,9 +161,9 @@ install: install-static install-shared install-man install-config test-installed: $(CC) $(CFLAGS) \ - `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ -L$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + -o pngtesti `$(BINPATH)/libpng12-config --ldflags` ./pngtesti pngtest.png clean: diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 0878fa119..ecd36b626 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.5rc2 +SHLIB_MINOR= 1.2.5rc3 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 b98df7b72..e7ffdf1a8 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.5rc2 +SHLIB_MINOR= 1.2.5rc3 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 8ed5cd390..0e2594c2c 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.5rc2 +SHLIB_MINOR= 1.2.5rc3 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 0888f31d2..82ed35c05 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -24,7 +24,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.5rc2 +PNGMIN = 1.2.5rc3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -71,9 +71,9 @@ libpng.pc: libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ - echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo cflags=\"-belf\"; \ - echo ldflags=\"-L$(LIBPATH)\"; \ + echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ + echo ccopts=\"-belf\"; \ + echo L_opts=\"-L$(LIBPATH)\"; \ echo libs=\"-lpng12 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -165,9 +165,9 @@ install: install-static install-shared install-man install-config test-installed: $(CC) $(CFLAGS) \ - `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ -L$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + -o pngtesti `$(BINPATH)/libpng12-config --ldflags` ./pngtesti pngtest.png clean: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index a5e2f6ae5..8538082fd 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -18,7 +18,7 @@ ZLIBINC=../zlib LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5rc2 +PNGMIN = 1.2.5rc3 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -75,11 +75,12 @@ libpng.pc: libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ - echo cppflags=\"-I$(INCPATH)/$(LIBNAME) -DPNG_USE_PNGGCCRD \ - -DPNG_NO_ASSEMBLER_CODE\"; \ - echo cflags=\"$(ABI)\"; \ - echo ldflags=\"-L$(LIBPATH) \"; \ - echo rpath=\"$(LIBPATH) \"; \ + 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 libs=\"-lpng12 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -172,9 +173,9 @@ test-installed: echo echo Testing installed dynamic shared library. $(CC) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ - -L$(ZLIBLIB) -rpath $(ZLIBLIB):`$(BINPATH)/libpng12-config --rpath` \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -L$(ZLIBLIB) -rpath $(ZLIBLIB):`$(BINPATH)/libpng12-config --libdir` \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags` ./pngtesti pngtest.png clean: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 01bbd0994..88992c5d9 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -5,7 +5,7 @@ LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5rc2 +PNGMIN = 1.2.5rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # Where make install puts libpng.a, libpng12.so, and libpng12/png.h @@ -79,11 +79,12 @@ libpng.pc: libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ - echo cppflags=\"-I$(INCPATH)/$(LIBNAME) -DPNG_USE_PNGGCCRD \ - -DPNG_NO_ASSEMBLER_CODE\"; \ - echo cflags=\"$(ABI)\"; \ - echo ldflags=\"-L$(LIBPATH) \"; \ - echo rpath=\"$(LIBPATH) \"; \ + 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 libs=\"-lpng12 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -176,9 +177,9 @@ test-installed: echo echo Testing installed dynamic shared library. $(CC) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ - -L$(ZLIBLIB) -rpath $(ZLIBLIB):`$(BINPATH)/libpng12-config --rpath` \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -L$(ZLIBLIB) -rpath $(ZLIBLIB):`$(BINPATH)/libpng12-config --libdir` \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags` ./pngtesti pngtest.png clean: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 0d872e8d9..ad25816d1 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -34,7 +34,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.5rc2 +PNGMIN = 1.2.5rc3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -81,9 +81,9 @@ libpng.pc: libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ - echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo cflags=\"\"; \ - echo ldflags=\"-L$(LIBPATH) -R$(LIBPATH)\"; \ + echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ + echo L_opts=\"-L$(LIBPATH)\"; \ + echo R_opts=\"-R$(LIBPATH)\"; \ echo libs=\"-lpng12 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -187,8 +187,8 @@ test-installed: echo echo Testing installed dynamic shared library. $(CC) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags` \ -L$(ZLIBLIB) -R$(ZLIBLIB) ./pngtesti pngtest.png diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 5da659f70..58092398f 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -30,7 +30,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.5rc2 +PNGMIN = 1.2.5rc3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -77,10 +77,10 @@ libpng.pc: libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ - echo cppflags=\"-I$(INCPATH)/$(LIBNAME) -DPNG_USE_PNGGCCRD \ - -DPNG_NO_ASSEMBLER_CODE\"; \ - echo cflags=\"$(ABI)\"; \ - echo ldflags=\"-L$(LIBPATH) -R$(LIBPATH)\"; \ + echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ + echo cppflags=\"-DPNG_USE_PNGGCCRD -DPNG_NO_ASSEMBLER_CODE\"; \ + echo L_opts=\"-L$(LIBPATH)\"; \ + echo R_opts=\"-R$(LIBPATH)\"; \ echo libs=\"-lpng12 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -184,8 +184,8 @@ test-installed: echo echo Testing installed dynamic shared library. $(CC) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \ + `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags` \ -L$(ZLIBLIB) -R$(ZLIBLIB) ./pngtesti pngtest.png diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index 382a2ae10..6f4c7ab06 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -7,7 +7,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.2.5rc2'; + PNG_LIBPNG_VER_STRING = '1.2.5rc3'; PNG_LIBPNG_VER = 10205; type diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 4ea6fbd1f..006f2e44b 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.5rc2 +; Version 1.2.5rc3 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" |