diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2002-10-22 08:28:43 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:07:34 -0500 |
| commit | c33ab4e8dfeb665b5670da0bae9abe3fa05ba92d (patch) | |
| tree | f69b4ea2b5d486d08a49b33a6d2e4d14adf8ba08 | |
| parent | 0cc2f95a9d87ae903a9842f1121384e3b2e5bbdc (diff) | |
| download | libpng-1.2.6beta1.tar.gz | |
Imported from libpng-1.2.6beta1.tarv1.2.6beta1
61 files changed, 170 insertions, 143 deletions
@@ -1,11 +1,14 @@ -Libpng 1.2.5 - October 3, 2002 +Libpng 1.2.6beta1 - October 22, 2002 -This is a public release of libpng, intended for use in production codes. +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. Changes since the last public release (1.2.4): +version 1.2.4patch01 [July 20, 2002] Revised makefile.cygwin to use DLL number 12 instead of 13. +version 1.2.5beta1 [August 6, 2002] Added code to contrib/gregbook/readpng2.c to ignore unused chunks. Replaced toucan.png in contrib/gregbook (it has been corrupt since 1.0.11) Removed some stray *.o files from contrib/gregbook. @@ -14,14 +17,31 @@ Changes since the last public release (1.2.4): Prevent png_ptr->pass from exceeding 7 in png_push_finish_row(). Updated makefile.hggcc Updated png.c and pnggccrd.c handling of return from png_mmx_support() +version 1.2.5beta2 [August 15, 2002] Only issue png_warning() about "Too much data" in pngpread.c when avail_in is nonzero. Updated makefiles to install a separate libpng.so.3 with its own rpath. +version 1.2.5rc1 and 1.0.15rc1 [August 24, 2002] Revised makefiles to not remove previous minor versions of shared libraries. +version 1.2.5rc2 and 1.0.15rc2 [September 16, 2002] Revised 13 makefiles to remove "-lz" and "-L$(ZLIBLIB)", etc., from shared library loader directive. + Added missing "$OBJSDLL" line to makefile.gcmmx. + Added missing "; fi" to makefile.32sunu. +version 1.2.5rc3 and 1.0.15rc3 [September 18, 2002] Revised libpng-config script. +version 1.2.5 and 1.0.15 [October 3, 2002] + Revised makefile.macosx, makefile.darwin, makefile.hpgcc, and makefile.hpux, + and makefile.aix. Relocated two misplaced PNGAPI lines in pngtest.c +version 1.2.6beta1 [October 22, 2002] + Commented out warning about uninitialized mmx_support in pnggccrd.c. + Changed "IBMCPP__" flag to "__IBMCPP__" in pngconf.h. + Added missing backslashes in makefile.dec. + Fixed install-shared target dependency in makefile.32sunu. + Revised makefile.dec, makefile.macosx, makefile.aix, makefile sg*, + makefile.hp*, makefile.beos, makefile.*sunu (only affecting LDFLAGS + used in running pngtest). Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -1177,6 +1177,14 @@ version 1.2.5 and 1.0.15 [October 3, 2002] Revised makefile.macosx, makefile.darwin, makefile.hpgcc, and makefile.hpux, and makefile.aix. Relocated two misplaced PNGAPI lines in pngtest.c +version 1.2.6beta1 [October 22, 2002] + Commented out warning about uninitialized mmx_support in pnggccrd.c. + Changed "IBMCPP__" flag to "__IBMCPP__" in pngconf.h. + Added missing backslashes in makefile.dec. + Fixed install-shared target dependency in makefile.32sunu. + Revised makefile.dec, makefile.macosx, makefile.aix, makefile sg*, + makefile.hp*, makefile.beos, makefile.*sunu (only affecting LDFLAGS + used in running pngtest). 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.5 - October 3, 2002 +Installing libpng version 1.2.6beta1 - October 22, 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.5" or "lpng109" and "zlib-1.1.4" +might be called "libpng-1.2.6beta1" 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.5) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.5, + 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, 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.5) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.6beta1) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.5) - makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.5) + 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.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.5 +Known bugs in libpng version 1.2.6beta1 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.5, October 3, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.6beta1, October 22, 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 3, 2002 +October 22, 2002 @@ -1,4 +1,4 @@ -README for libpng 1.2.5 - October 3, 2002 (shared library 12.0) +README for libpng 1.2.6beta1 - October 22, 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.5) + (gcc, creates libpng12.so.0.1.2.6beta1) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.5, uses assembler code + libpng12.so.0.1.2.6beta1, 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.5) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.6beta1) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.5) + (gcc, creates libpng12.so.0.1.2.6beta1) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.5) + (gcc, creates libpng12.so.0.1.2.6beta1) 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 @@ -244,16 +244,6 @@ Files in this distribution: makevms.com => VMS build script pngdef.pas => Defines for a png32bd.dll with Borland C++ 4.5 SCOPTIONS.ppc => Used with smakefile.ppc - mangle => Directory containing scripts to build libpng12m.so: - mangle.in => Function-decoration macros added to png.h by the - makefiles. - makefile.linux => Linux/ELF makefile - (gcc, creates libpng12m.so.0.1.2.5) - makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0m.1.2.5, uses assembler code - tuned for Intel MMX platform) - makefile.sgi => Silicon Graphics (cc, creates libpng12m.so) - makefile.sggcc => Silicon Graphics (gcc, creates libpng12m.so) Good luck, and happy coding. @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - October 3, 2002 + October 22, 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.5 are Y2K compliant. It is my belief that earlier + upward through 1.2.6beta1 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.5. Instead, please + There is no \"configure\" script for Libpng-1.2.6beta1. 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 3, 2002" +.TH LIBPNG 3 "October 22, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6beta1 .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.5 - October 3, 2002 + libpng version 1.2.6beta1 - October 22, 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 3, 2002 +October 22, 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.5 are Y2K compliant. It is my belief that earlier +upward through 1.2.6beta1 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,6 +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 Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3843,7 +3844,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.5 - October 3, 2002: +Libpng version 1.2.6beta1 - October 22, 2002: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu). @@ -3860,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.5, October 3, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.6beta1, October 22, 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 @@ -3952,7 +3953,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -October 3, 2002 +October 22, 2002 .\" end of man page diff --git a/libpng.txt b/libpng.txt index 689b56481..3886478af 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.5 - October 3, 2002 + libpng version 1.2.6beta1 - October 22, 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 3, 2002 +October 22, 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.5 are Y2K compliant. It is my belief that earlier +upward through 1.2.6beta1 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 3c1f37971..b8f307374 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "October 3, 2002" +.TH LIBPNGPF 3 "October 22, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6beta1 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "October 3, 2002" +.TH PNG 5 "October 22, 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.5 - October 3, 2002 + * libpng version 1.2.6beta1 - October 22, 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_5 Your_png_h_is_not_version_1_2_5; +typedef version_1_2_6beta1 Your_png_h_is_not_version_1_2_6beta1; /* 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.5"; +const char png_libpng_ver[18] = "1.2.6beta1"; /* 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.5 - October 3, 2002\n\ + return ((png_charp) "\n libpng version 1.2.6beta1 - October 22, 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.5"); - return((png_charp) "1.2.5"); + return((png_charp) "1.2.6beta1"); + return((png_charp) "1.2.6beta1"); } png_charp PNGAPI @@ -740,7 +740,7 @@ png_uint_32 PNGAPI png_access_version_number(void) { /* Version of *.c files used when building libpng */ - return((png_uint_32) 10205L); + return((png_uint_32) 10206L); } @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.5 - October 3, 2002 + * libpng version 1.2.6beta1 - October 22, 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.5 - October 3, 2002: Glenn + * libpng versions 0.97, January 1998, through 1.2.6beta1 - October 22, 2002: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -98,6 +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 * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -127,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.5, October 3, 2002, are + * libpng versions 1.0.7, July 1, 2000, through 1.2.6beta1, October 22, 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 @@ -232,13 +233,13 @@ * Y2K compliance in libpng: * ========================= * - * October 3, 2002 + * October 22, 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.5 are Y2K compliant. It is my belief that earlier + * upward through 1.2.6beta1 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 @@ -294,7 +295,7 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.5" +#define PNG_LIBPNG_VER_STRING "1.2.6beta1" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM %DLLNUM% @@ -302,11 +303,11 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 2 -#define PNG_LIBPNG_VER_RELEASE 5 +#define PNG_LIBPNG_VER_RELEASE 6 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 0 +#define PNG_LIBPNG_VER_BUILD 1 #define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_BETA 2 @@ -314,14 +315,14 @@ #define PNG_LIBPNG_BUILD_STABLE 4 #define PNG_LIBPNG_BUILD_TYPEMASK 7 #define PNG_LIBPNG_BUILD_PATCH 8 /* Can be OR'ed with STABLE only */ -#define PNG_LIBPNG_BUILD_TYPE 4 +#define PNG_LIBPNG_BUILD_TYPE 2 /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only * version 1.0.0 was mis-numbered 100 instead of 10000). From * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ -#define PNG_LIBPNG_VER 10205 /* 1.2.5 */ +#define PNG_LIBPNG_VER 10206 /* 1.2.6 */ #ifndef PNG_VERSION_INFO_ONLY @@ -1284,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.5 + version 1.2.6beta1 */ -typedef png_structp version_1_2_5; +typedef png_structp version_1_2_6beta1; typedef png_struct FAR * FAR * png_structpp; @@ -2426,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.5 - October 3, 2002 (header)\n" + " libpng version 1.2.6beta1 - October 22, 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 d086d8c4d..8b371260f 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.5 - October 3, 2002 + * libpng 1.2.6beta1 - October 22, 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.5 - October 3, 2002 + * libpng 1.2.6beta1 - October 22, 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) @@ -1228,7 +1228,7 @@ typedef z_stream FAR * png_zstreamp; # endif # endif /* PNG_IMPEXP */ #else /* !(DLL || non-cygwin WINDOWS) */ -# if (defined(__IBMC__) || defined(IBMCPP__)) && defined(__OS2__) +# if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__) # define PNGAPI _System # define PNG_IMPEXP # else diff --git a/pngerror.c b/pngerror.c index fc3c30477..98ed86448 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.2.5 - October 3, 2002 + * libpng 1.2.6beta1 - October 22, 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 8d81c3147..75529d832 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.5 - October 3, 2002 + * libpng version 1.2.6beta1 - October 22, 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 @@ -412,8 +412,10 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask) #if defined(PNG_ASSEMBLER_CODE_SUPPORTED) if (_mmx_supported == 2) { +#if !defined(PNG_1_0_X) /* this should have happened in png_init_mmx_flags() already */ png_warning(png_ptr, "asm_flags may not have been initialized"); +#endif png_mmx_support(); } #endif @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.2.5 - October 3, 2002 + * libpng 1.2.6beta1 - October 22, 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.5 - October 3, 2002 + * libpng 1.2.6beta1 - October 22, 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 9f924c34c..76dbb283a 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.2.5 - October 3, 2002 + * libpng 1.2.6beta1 - October 22, 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.5 - October 3, 2002 + * libpng 1.2.6beta1 - October 22, 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.5 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.6beta1 */ 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.5 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.6beta1 */ 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.5 - October 3, 2002 + * libpng 1.2.6beta1 - October 22, 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 3de91202c..6b68979d8 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.5 - October 3, 2002 + * libpng 1.2.6beta1 - October 22, 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 9cbfed65f..92d276178 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.2.5 - October 3, 2002 + * libpng 1.2.6beta1 - October 22, 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.5 - October 3, 2002 + * libpng 1.2.6beta1 - October 22, 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.5 - October 3, 2002 + * libpng 1.2.6beta1 - October 22, 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_5 your_png_h_is_not_version_1_2_5; +typedef version_1_2_6beta1 your_png_h_is_not_version_1_2_6beta1; diff --git a/pngtrans.c b/pngtrans.c index f08fb4ecf..fbe31f0d6 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.5 - October 3, 2002 + * libpng 1.2.6beta1 - October 22, 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.5 - October 3, 2002 + * libpng version 1.2.6beta1 - October 22, 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.5 - October 3, 2002 + * libpng 1.2.6beta1 - October 22, 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 10c9ea406..8534eba85 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.2.5 - October 3, 2002 + * libpng 1.2.6beta1 - October 22, 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 c28da116b..faecf3e88 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.5 - October 3, 2002 + * libpng 1.2.6beta1 - October 22, 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 4b5ab6c87..9fccf71c3 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.2.5 - October 3, 2002 + * libpng 1.2.6beta1 - October 22, 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 c680fd828..e8863324b 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.5 (October 3, 2002) and zlib +libpng 1.2.6beta1 (October 22, 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 c99537143..fca8819c2 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.5 +;Version 1.2.6beta1 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/projects/netware.txt b/projects/netware.txt index 178361da8..2e5399924 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.5-project-netware.zip from a libpng distribution +libpng-1.2.6beta1-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.5-project-netware.zip" +"unzip -a libpng-1.2.6beta1-project-netware.zip" diff --git a/projects/wince.txt b/projects/wince.txt index a1a26c0bc..e09b3084f 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.5-project-wince.zip from a libpng distribution +libpng-1.2.6beta1-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.5-project-wince.zip" +"unzip -a libpng-1.2.6beta1-project-wince.zip" diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 0f64fa4d5..50749e775 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.5 +version=1.2.6beta1 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 32ed4a9a8..864d019d4 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.5 +Version: 1.2.6beta1 Libs: -L${libdir} -lpng12 -lz -lm Cflags: -I${includedir}/libpng12 diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 5bd0941b3..bfc2405fe 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -26,14 +26,14 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ # $(WARNMORE) -g -DPNG_DEBUG=5 -LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm +LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm #RANLIB=ranlib RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5 +PNGMIN = 1.2.6beta1 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -138,7 +138,7 @@ install-static: install-headers libpng.a (cd $(DL); ln -f -s $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ - libpng.so.3 + libpng.so.3.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so -@/bin/rm -f $(DL)/libpng.so diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index a9b40f25c..9605cad43 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -26,14 +26,14 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ # $(WARNMORE) -g -DPNG_DEBUG=5 -LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm +LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm #RANLIB=ranlib RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5 +PNGMIN = 1.2.6beta1 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 29cc6ebf4..5f7330a83 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -18,7 +18,7 @@ RM = rm -f LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5 +PNGMIN = 1.2.6beta1 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local @@ -35,8 +35,8 @@ LIBPATH=$(prefix)/lib # you execute make install. DESTDIR= -DI=$(DESTDIR)/$(INCPATH) -DL=$(DESTDIR)/$(LIBPATH) +DI=$(DESTDIR)$(INCPATH) +DL=$(DESTDIR)$(LIBPATH) CDEBUG = -g -DPNG_DEBUG=5 LDDEBUG = @@ -44,7 +44,7 @@ CRELEASE = -O2 LDRELEASE = -s WARNMORE=-Wall CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE) -LDFLAGS = -L. -L$(ZLIBLIB) -lpng -lz -lm $(LDRELEASE) +LDFLAGS = -L. -L$(ZLIBLIB) -lpng12 -lz -lm $(LDRELEASE) # File extensions O=.o @@ -57,7 +57,7 @@ OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O) # Targets -all: libpng$(A) pngtest$(E) +all: $(LIBNAME)$(A) pngtest$(E) $(LIBNAME)$(A): $(OBJS) $(AR) $@ $(OBJS) @@ -71,15 +71,22 @@ pngtest$(E): pngtest$(O) $(LIBNAME)$(A) install: $(LIBNAME)$(A) -@if [ ! -d $(DI) ]; then mkdir $(DI); fi - -@if [ ! -d $(DI)/libpng ]; then mkdir $(DI)/libpng; fi + -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@rm $(DI)/png.h - -@rm $(DI)/pngconf.h - cp png.h pngconf.h $(DI)/libpng - chmod 644 $(DI)/libpng/png.h \ - cp $(LIBNAME)$(A) $(DL) + -@rm -f $(DI)/$(LIBNAME)/png.h + -@rm -f $(DI)/$(LIBNAME)/pngconf.h + -@rm -f $(DI)/png.h + -@rm -f $(DI)/pngconf.h + cp png.h pngconf.h $(DI)/$(LIBNAME) + chmod 644 $(DI)/$(LIBNAME)/png.h \ + $(DI)/$(LIBNAME)/pngconf.h + -@rm -rf $(DI)/libpng + (cd $(DI); ln -f -s $(LIBNAME) libpng; ln -f -s $(LIBNAME)/* .) + -@rm -f $(DL)/$(LIBNAME)$(A) + -@rm -f $(DL)/libpng$(A) + cp $(LIBNAME)$(A) $(DL)/$(LIBNAME)$(A) + chmod 644 $(DL)/$(LIBNAME)$(A) (cd $(DL); ln -f -s $(LIBNAME)$(A) libpng$(A)) - $(DI)/libpng/pngconf.h (cd $(DI); ln -f -s libpng/* .;) clean: diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 2609f036c..6a6d7054e 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.5 +PNGMIN = 1.2.6beta1 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= @@ -27,8 +27,6 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ # still here in R4.5 CFLAGS=-I$(ZLIBINC) -Wall -O1 -funroll-loops \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 -# LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm -LDFLAGS=-L. -Wl,-soname=$(LIBNAME).so.$(PNGMAJ) -L$(ZLIBLIB) -lz -lm RANLIB=ranlib #RANLIB=echo diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index a282bef61..c3c6f0ce4 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.5 +PNGMIN = 1.2.6beta1 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index b04044f32..d067082e7 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.5 +PNGMIN = 1.2.6beta1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 5d7a11e15..52f7b9317 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -32,13 +32,13 @@ ZLIBLIB=../zlib ZLIBINC=../zlib PNGMAJ = 0 -PNGMIN = 1.2.5 +PNGMIN = 1.2.6beta1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 CC=cc CFLAGS=-std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1 -LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm +LDFLAGS=-L$(ZLIBLIB) -rpath $(ZLIBLIB) libpng.a -lz -lm #RANLIB=echo RANLIB=ranlib @@ -73,11 +73,11 @@ $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER) ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so.$(PNGVER): $(OBJS) - $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) + $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) \ -soname $(LIBNAME).so.$(PNGMAJ) libpng.so.3.$(PNGMIN): $(OBJS) - $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) + $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) \ -soname libpng.so.3 pngtest: pngtest.o libpng.a diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index d0dfdd9bc..09d13fff0 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -15,7 +15,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5 +PNGMIN = 1.2.6beta1 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index f677308c1..ac7b5177a 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -35,13 +35,13 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 #LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm -LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm +LDFLAGS=-L$(ZLIBLIB) libpng.a -lz -lm RANLIB=ranlib #RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.5 +PNGMIN = 1.2.6beta1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index a9c4d35cc..e9235ba4a 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -19,12 +19,12 @@ CC=cc 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. -L$(ZLIBLIB) -lpng -lz -lm +LDFLAGS=-L$(ZLIBLIB) libpng.a -lz -lm RANLIB=ranlib PNGMAJ = 0 -PNGMIN = 1.2.5 +PNGMIN = 1.2.6beta1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 7ec812500..b15a5bfa3 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -5,7 +5,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5 +PNGMIN = 1.2.6beta1 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx index e348ecf27..6f98e2972 100644 --- a/scripts/makefile.macosx +++ b/scripts/makefile.macosx @@ -17,11 +17,11 @@ ZLIBINC=../zlib CC=cc PNGMAJ = 0 -PNGMIN = 1.2.5 +PNGMIN = 1.2.6beta1 PNGVER = $(PNGMAJ).$(PNGMIN) CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 -LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -current_version $(PNGVER) +LDFLAGS=-L$(ZLIBLIB) libpng.a -lz LIBNAME=libpng12 SHAREDLIB_POSTFIX=dylib diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 4cccc6d15..f3d1f1fda 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.5 +SHLIB_MINOR= 1.2.6beta1 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 6b53c4e2f..dd5a31f26 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.5 +SHLIB_MINOR= 1.2.6beta1 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 af94f4060..2cf476f82 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.5 +SHLIB_MINOR= 1.2.6beta1 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 74068a2cc..b2c9f0dba 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.5 +PNGMIN = 1.2.6beta1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 082de1b89..85e4dc852 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -18,7 +18,7 @@ ZLIBINC=../zlib LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5 +PNGMIN = 1.2.6beta1 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -28,7 +28,7 @@ ABI= WARNMORE= # -g -DPNG_DEBUG=5 CFLAGS=$(ABI) -I$(ZLIBINC) -O2 $(WARNMORE) -fPIC -mabi=n32 -LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm +LDFLAGS=$(ABI) -L$(ZLIBLIB) libpng.a -lz -lm LDSHARED=cc $(ABI) -shared -soname $(LIBNAME).so.$(PNGMAJ) \ -set_version sgi$(PNGMAJ).0 LDLEGACY=cc $(ABI) -shared -soname libpng.so.3 \ diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 219b8adfb..385d16691 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -5,7 +5,7 @@ LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5 +PNGMIN = 1.2.6beta1 PNGVER = $(PNGMAJ).$(PNGMIN) # Where make install puts libpng.a, libpng12.so, and libpng12/png.h @@ -32,7 +32,7 @@ WARNMORE=-fullwarn #CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC -DPNG_USE_PNGGCCRD # -g -DPNG_DEBUG=5 CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -DPNG_USE_PNGGCCRD \ -DPNG_NO_ASSEMBLER_CODE -LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng12 -lz -lm +LDFLAGS_A=$(ABI) -L$(ZLIBLIB) libpng.a -lz -lm LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm LDSHARED=cc $(ABI) -shared -soname $(LIBNAME).so.$(PNGMAJ) \ -set_version sgi$(PNGMAJ).0 diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index f1ca8078e..731ad514c 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.5 +PNGMIN = 1.2.6beta1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 9c5a844d5..4a7e585fc 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.5 +PNGMIN = 1.2.6beta1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index 6e2068317..d49174181 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -7,8 +7,8 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.2.5'; - PNG_LIBPNG_VER = 10205; + PNG_LIBPNG_VER_STRING = '1.2.6beta1'; + PNG_LIBPNG_VER = 10206; type png_uint_32 = Cardinal; diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 3c4a3c8d9..ead951892 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.5 +; Version 1.2.6beta1 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" |