diff --git a/ANNOUNCE b/ANNOUNCE index a2ec644f..a21de74e 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.6beta1 - October 22, 2002 +Libpng 1.2.6beta2 - November 1, 2002 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -42,6 +42,10 @@ version 1.2.6beta1 [October 22, 2002] Revised makefile.dec, makefile.macosx, makefile.aix, makefile sg*, makefile.hp*, makefile.beos, makefile.*sunu (only affecting LDFLAGS used in running pngtest). +version 1.2.6beta2 [November 1, 2002] + Added libpng-config "--ldopts" output. + Added "AR=ar" and "ARFLAGS=rc" and changed "ar rc" to "$(AR) $(ARFLAGS)" + in makefiles. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu diff --git a/CHANGES b/CHANGES index 42026a88..694002bd 100644 --- a/CHANGES +++ b/CHANGES @@ -1185,6 +1185,10 @@ version 1.2.6beta1 [October 22, 2002] Revised makefile.dec, makefile.macosx, makefile.aix, makefile sg*, makefile.hp*, makefile.beos, makefile.*sunu (only affecting LDFLAGS used in running pngtest). +version 1.2.6beta2 [November 1, 2002] + Added libpng-config "--ldopts" output. + Added "AR=ar" and "ARFLAGS=rc" and changed "ar rc" to "$(AR) $(ARFLAGS)" + in makefiles. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu diff --git a/INSTALL b/INSTALL index d285bfde..d4669c28 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.6beta1 - October 22, 2002 +Installing libpng version 1.2.6beta2 - November 1, 2002 Before installing libpng, you must first install zlib. zlib can usually be found wherever you got libpng. zlib can be @@ -10,7 +10,7 @@ zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.2.6beta1" or "lpng109" and "zlib-1.1.4" +might be called "libpng-1.2.6beta2" or "lpng109" and "zlib-1.1.4" or "zlib114") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -65,8 +65,8 @@ The files that are presently available in the scripts directory include makefile.std => Generic UNIX makefile (cc, creates static libpng.a) - makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.6beta1) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.6beta1, + makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.6beta2) + makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.6beta2, uses assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -87,10 +87,10 @@ include makefile.ne0bsd => NetBSD/cc makefile, uses PNGGCCRD, makes libpng0.so makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) - makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.6beta1) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.6beta2) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.6beta1) - makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.6beta1) + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.6beta2) + makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.6beta2) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc diff --git a/KNOWNBUG b/KNOWNBUG index 2a2d4760..ea67090d 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.6beta1 +Known bugs in libpng version 1.2.6beta2 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when reading interlaced PNG files, when assembler code is enabled but running diff --git a/LICENSE b/LICENSE index 34db227c..59f2cb95 100644 --- a/LICENSE +++ b/LICENSE @@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.0.7, July 1, 2000, through 1.2.6beta1, October 22, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.6beta2, November 1, 2002, are Copyright (c) 2000-2002 Glenn Randers-Pehrson and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors @@ -99,4 +99,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -October 22, 2002 +November 1, 2002 diff --git a/README b/README index cad3f4ce..1a593c64 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng 1.2.6beta1 - October 22, 2002 (shared library 12.0) +README for libpng 1.2.6beta2 - November 1, 2002 (shared library 12.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -187,9 +187,9 @@ Files in this distribution: descrip.mms => VMS makefile for MMS or MMK makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.6beta1) + (gcc, creates libpng12.so.0.1.2.6beta2) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.6beta1, uses assembler code + libpng12.so.0.1.2.6beta2, uses assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -210,12 +210,12 @@ Files in this distribution: makefile.ne0bsd => NetBSD/cc makefile, PNGGCCRD, makes libpng0.so makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) - makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.6beta1) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.6beta2) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.6beta1) + (gcc, creates libpng12.so.0.1.2.6beta2) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.6beta1) + (gcc, creates libpng12.so.0.1.2.6beta2) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc diff --git a/Y2KINFO b/Y2KINFO index 145b1999..20171bbb 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - October 22, 2002 + November 1, 2002 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and - upward through 1.2.6beta1 are Y2K compliant. It is my belief that earlier + upward through 1.2.6beta2 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer diff --git a/configure b/configure index a4b5c25d..e1da59a5 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ echo " - There is no \"configure\" script for Libpng-1.2.6beta1. Instead, please + There is no \"configure\" script for Libpng-1.2.6beta2. Instead, please copy the appropriate makefile for your system from the \"scripts\" directory. Read the INSTALL file for more details. " diff --git a/libpng.3 b/libpng.3 index 90665f58..8008e2e9 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "October 22, 2002" +.TH LIBPNG 3 "November 1, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6beta1 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6beta2 .SH SYNOPSIS \fI\fB @@ -791,7 +791,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.2.6beta1 - October 22, 2002 + libpng version 1.2.6beta2 - November 1, 2002 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2002 Glenn Randers-Pehrson @@ -3641,13 +3641,13 @@ application: .SH IX. Y2K Compliance in libpng -October 22, 2002 +November 1, 2002 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.2.6beta1 are Y2K compliant. It is my belief that earlier +upward through 1.2.6beta2 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that @@ -3786,7 +3786,7 @@ the first widely used release: 1.2.5rc1-3 13 10205 12.so.0.1.2.5rc1-3 1.0.15 10 10015 10.so.0.1.0.15 1.2.5 13 10205 12.so.0.1.2.5 - 1.2.6beta1 13 10206 12.so.0.1.2.6beta1 + 1.2.6beta1-2 13 10206 12.so.0.1.2.6beta1-2 Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3844,7 +3844,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.6beta1 - October 22, 2002: +Libpng version 1.2.6beta2 - November 1, 2002: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu). @@ -3861,7 +3861,7 @@ included in the libpng distribution, the latter shall prevail.) If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.0.7, July 1, 2000, through 1.2.6beta1, October 22, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.6beta2, November 1, 2002, are Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors @@ -3953,7 +3953,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -October 22, 2002 +November 1, 2002 .\" end of man page diff --git a/libpng.txt b/libpng.txt index 3886478a..07a77cf2 100644 --- a/libpng.txt +++ b/libpng.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.6beta1 - October 22, 2002 + libpng version 1.2.6beta2 - November 1, 2002 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2002 Glenn Randers-Pehrson @@ -2850,13 +2850,13 @@ application: IX. Y2K Compliance in libpng -October 22, 2002 +November 1, 2002 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.2.6beta1 are Y2K compliant. It is my belief that earlier +upward through 1.2.6beta2 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpngpf.3 b/libpngpf.3 index b8f30737..65df6c15 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "October 22, 2002" +.TH LIBPNGPF 3 "November 1, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6beta1 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.6beta2 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index a283d3f8..b9379acc 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "October 22, 2002" +.TH PNG 5 "November 1, 2002" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 6200dea5..46dd1165 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * libpng version 1.2.6beta1 - October 22, 2002 + * libpng version 1.2.6beta2 - November 1, 2002 * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -13,14 +13,14 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_6beta1 Your_png_h_is_not_version_1_2_6beta1; +typedef version_1_2_6beta2 Your_png_h_is_not_version_1_2_6beta2; /* Version information for C files. This had better match the version * string defined in png.h. */ #ifdef PNG_USE_GLOBAL_ARRAYS /* png_libpng_ver was changed to a function in version 1.0.5c */ -const char png_libpng_ver[18] = "1.2.6beta1"; +const char png_libpng_ver[18] = "1.2.6beta2"; /* png_sig was changed to a function in version 1.0.5c */ /* Place to hold the signature string for a PNG file. */ @@ -671,7 +671,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { if (png_ptr != NULL || png_ptr == NULL) /* silence compiler warning */ - return ((png_charp) "\n libpng version 1.2.6beta1 - October 22, 2002\n\ + return ((png_charp) "\n libpng version 1.2.6beta2 - November 1, 2002\n\ Copyright (c) 1998-2002 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); @@ -689,8 +689,8 @@ png_get_libpng_ver(png_structp png_ptr) { /* Version of *.c files used when building libpng */ if(png_ptr != NULL) /* silence compiler warning about unused png_ptr */ - return((png_charp) "1.2.6beta1"); - return((png_charp) "1.2.6beta1"); + return((png_charp) "1.2.6beta2"); + return((png_charp) "1.2.6beta2"); } png_charp PNGAPI diff --git a/png.h b/png.h index 7c5ad7ae..73fe8caa 100644 --- a/png.h +++ b/png.h @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.6beta1 - October 22, 2002 + * libpng version 1.2.6beta2 - November 1, 2002 * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -8,7 +8,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.2.6beta1 - October 22, 2002: Glenn + * libpng versions 0.97, January 1998, through 1.2.6beta2 - November 1, 2002: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -98,7 +98,7 @@ * 1.2.5rc1-3 13 10205 12.so.0.1.2.5rc1-3 * 1.0.15 10 10015 10.so.0.1.0.15 * 1.2.5 13 10205 12.so.0.1.2.5 - * 1.2.6beta1 13 10206 12.so.0.1.2.6beta1 + * 1.2.6beta1-2 13 10206 12.so.0.1.2.6beta1-2 * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -128,7 +128,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.0.7, July 1, 2000, through 1.2.6beta1, October 22, 2002, are + * libpng versions 1.0.7, July 1, 2000, through 1.2.6beta2, November 1, 2002, are * Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.0.6 * with the following individuals added to the list of Contributing Authors @@ -233,13 +233,13 @@ * Y2K compliance in libpng: * ========================= * - * October 22, 2002 + * November 1, 2002 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.2.6beta1 are Y2K compliant. It is my belief that earlier + * upward through 1.2.6beta2 are Y2K compliant. It is my belief that earlier * versions were also Y2K compliant. * * Libpng only has three year fields. One is a 2-byte unsigned integer @@ -295,7 +295,7 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.6beta1" +#define PNG_LIBPNG_VER_STRING "1.2.6beta2" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM %DLLNUM% @@ -307,7 +307,7 @@ /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 1 +#define PNG_LIBPNG_VER_BUILD 2 #define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_BETA 2 @@ -1285,9 +1285,9 @@ struct png_struct_def /* This prevents a compiler error in png.c if png.c and png.h are both at - version 1.2.6beta1 + version 1.2.6beta2 */ -typedef png_structp version_1_2_6beta1; +typedef png_structp version_1_2_6beta2; typedef png_struct FAR * FAR * png_structpp; @@ -2427,7 +2427,7 @@ extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp /* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */ #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.6beta1 - October 22, 2002 (header)\n" + " libpng version 1.2.6beta2 - November 1, 2002 (header)\n" #ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED /* With these routines we avoid an integer divide, which will be slower on diff --git a/pngasmrd.h b/pngasmrd.h index 8b371260..b980f48c 100644 --- a/pngasmrd.h +++ b/pngasmrd.h @@ -1,6 +1,6 @@ /* pngasmrd.h - assembler version of utilities to read a PNG file * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 2002 Glenn Randers-Pehrson * diff --git a/pngconf.h b/pngconf.h index 9000d57a..8f3f26fa 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,6 +1,6 @@ /* pngconf.h - machine configurable file for libpng * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index 98ed8644..a76b2dd1 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pnggccrd.c b/pnggccrd.c index 75529d83..8c193c5b 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -6,7 +6,7 @@ * and http://www.intel.com/drg/pentiumII/appnotes/923/923.htm * for Intel's performance analysis of the MMX vs. non-MMX code. * - * libpng version 1.2.6beta1 - October 22, 2002 + * libpng version 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation diff --git a/pngget.c b/pngget.c index 2726bbf3..f6398da7 100644 --- a/pngget.c +++ b/pngget.c @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngmem.c b/pngmem.c index 66aca385..28661c01 100644 --- a/pngmem.c +++ b/pngmem.c @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpread.c b/pngpread.c index 76dbb283..72459cba 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngread.c b/pngread.c index 1339c0aa..9f909783 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -789,7 +789,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row) * not called png_set_interlace_handling(), the display_row buffer will * be ignored, so pass NULL to it. * - * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.6beta1 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.6beta2 */ void PNGAPI @@ -837,7 +837,7 @@ png_read_rows(png_structp png_ptr, png_bytepp row, * only call this function once. If you desire to have an image for * each pass of a interlaced image, use png_read_rows() instead. * - * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.6beta1 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.6beta2 */ void PNGAPI png_read_image(png_structp png_ptr, png_bytepp image) diff --git a/pngrio.c b/pngrio.c index c66bcf54..81504d33 100644 --- a/pngrio.c +++ b/pngrio.c @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index 6b68979d..240b168d 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index 92d27617..535f9241 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngset.c b/pngset.c index f9f2c2a6..38377b89 100644 --- a/pngset.c +++ b/pngset.c @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 05a714a4..f9ff7d8d 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1538,4 +1538,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_6beta1 your_png_h_is_not_version_1_2_6beta1; +typedef version_1_2_6beta2 your_png_h_is_not_version_1_2_6beta2; diff --git a/pngtrans.c b/pngtrans.c index fbe31f0d..1c213a80 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngvcrd.c b/pngvcrd.c index dfc3d373..6bdca00c 100644 --- a/pngvcrd.c +++ b/pngvcrd.c @@ -2,7 +2,7 @@ * * For Intel x86 CPU and Microsoft Visual C++ compiler * - * libpng version 1.2.6beta1 - October 22, 2002 + * libpng version 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation diff --git a/pngwio.c b/pngwio.c index b777b7d7..b52970d1 100644 --- a/pngwio.c +++ b/pngwio.c @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwrite.c b/pngwrite.c index 8534eba8..55a95856 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwtran.c b/pngwtran.c index faecf3e8..f1181812 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwutil.c b/pngwutil.c index 9fccf71c..81acc2b0 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.2.6beta1 - October 22, 2002 + * libpng 1.2.6beta2 - November 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/projects/msvc/README.txt b/projects/msvc/README.txt index e8863324..b09214d2 100644 --- a/projects/msvc/README.txt +++ b/projects/msvc/README.txt @@ -1,5 +1,5 @@ Microsoft Developer Studio Build File, Format Version 6.00 for -libpng 1.2.6beta1 (October 22, 2002) and zlib +libpng 1.2.6beta2 (November 1, 2002) and zlib Copyright (C) 2000 Simon-Pierre Cadieux For conditions of distribution and use, see copyright notice in png.h diff --git a/projects/msvc/png32ms.def b/projects/msvc/png32ms.def index fca8819c..3d171b7f 100644 --- a/projects/msvc/png32ms.def +++ b/projects/msvc/png32ms.def @@ -6,7 +6,7 @@ LIBRARY DESCRIPTION "PNG image compression library for Windows" EXPORTS -;Version 1.2.6beta1 +;Version 1.2.6beta2 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/projects/netware.txt b/projects/netware.txt index 2e539992..50ea6191 100644 --- a/projects/netware.txt +++ b/projects/netware.txt @@ -1,6 +1,6 @@ A set of project files is available for Netware. Get -libpng-1.2.6beta1-project-netware.zip from a libpng distribution +libpng-1.2.6beta2-project-netware.zip from a libpng distribution site such as http://libpng.sourceforge.net Put the zip file in this directory (projects) and then run -"unzip -a libpng-1.2.6beta1-project-netware.zip" +"unzip -a libpng-1.2.6beta2-project-netware.zip" diff --git a/projects/wince.txt b/projects/wince.txt index e09b3084..fcba9676 100644 --- a/projects/wince.txt +++ b/projects/wince.txt @@ -1,6 +1,6 @@ A set of project files is available for WinCE. Get -libpng-1.2.6beta1-project-wince.zip from a libpng distribution +libpng-1.2.6beta2-project-wince.zip from a libpng distribution site such as http://libpng.sourceforge.net Put the zip file in this directory (projects) and then run -"unzip -a libpng-1.2.6beta1-project-wince.zip" +"unzip -a libpng-1.2.6beta2-project-wince.zip" diff --git a/scripts/libpng-config-body.in b/scripts/libpng-config-body.in index b466432d..5267c1a1 100755 --- a/scripts/libpng-config-body.in +++ b/scripts/libpng-config-body.in @@ -77,6 +77,10 @@ while test $# -gt 0; do echo ${R_opts} ;; + --ldopts) + echo ${ldopts} + ;; + --ldflags) echo ${ldflags} ${L_opts} ${R_opts} ${libs} ;; diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 50749e77..f7a5810c 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.6beta1 +version=1.2.6beta2 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 864d019d..f5082338 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -6,6 +6,6 @@ includedir=${exec_prefix}/include Name: libpng12 Description: Loads and saves PNG files -Version: 1.2.6beta1 +Version: 1.2.6beta2 Libs: -L${libdir} -lpng12 -lz -lm Cflags: -I${includedir}/libpng12 diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index bfc2405f..804209cb 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,6 +8,10 @@ CC=cc SUN_CC_FLAGS=-fast -xtarget=ultra SUN_LD_FLAGS=-fast -xtarget=ultra +AR=ar +ARFLAGS=rc +#RANLIB=ranlib +RANLIB=echo # where make install puts libpng.a, libpng12.so and libpng12/png.h prefix=/a @@ -28,12 +32,9 @@ CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm -#RANLIB=ranlib -RANLIB=echo - LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -70,7 +71,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ libpng.pc: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 9605cad4..283b2283 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,6 +8,10 @@ CC=cc SUN_CC_FLAGS=-fast -xtarget=ultra -xarch=v9 SUN_LD_FLAGS=-fast -xtarget=ultra -xarch=v9 +AR=ar +ARFLAGS=rc +#RANLIB=ranlib +RANLIB=echo # where make install puts libpng.a, libpng12.so and libpng12/png.h prefix=/a @@ -28,12 +32,9 @@ CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm -#RANLIB=ranlib -RANLIB=echo - LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -70,7 +71,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ libpng.pc: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 5f7330a8..15c1477c 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -12,13 +12,14 @@ ZLIBLIB = ../zlib # Compiler, linker, lib and other tools CC = gcc LD = $(CC) -AR = ar rcs +AR=ar +ARFLAGS=rcs RANLIB = ranlib RM = rm -f LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.6beta1 +PNGMIN = 1.2.6beta2 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local @@ -60,7 +61,7 @@ OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ all: $(LIBNAME)$(A) pngtest$(E) $(LIBNAME)$(A): $(OBJS) - $(AR) $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ test: pngtest$(E) diff --git a/scripts/makefile.amiga b/scripts/makefile.amiga index 79cb4249..c210973c 100644 --- a/scripts/makefile.amiga +++ b/scripts/makefile.amiga @@ -9,6 +9,16 @@ ZLIB=/zlib #compiler CC=sc +# linker +LN= slink +# file deletion command +RM= delete quiet +# library (.lib) file creation command +AR= oml +ARFLAGS= +# make directory command +MKDIR= makedir + #compiler flags # WARNING: a bug in V6.51 causes bad code with OPTGO # So use V6.55 or set NOOPTGO!!!!!!!!! @@ -19,14 +29,6 @@ CFLAGS= NOSTKCHK PARMS=REG OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL\ LDFLAGS= SD ND BATCH #link libs LDLIBS= libpng.lib libgz.lib LIB:scm.lib LIB:sc.lib Lib:amiga.lib -# linker -LN= slink -# file deletion command -RM= delete quiet -# library (.lib) file creation command -AR= oml -# make directory command -MKDIR= makedir OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ @@ -36,7 +38,7 @@ all: libpng.lib pngtest libpng.lib: $(OBJS) -$(RM) libpng.lib -$(AR) libpng.lib r $(OBJS) +$(AR) $(ARFLAGS) libpng.lib r $(OBJS) pngtest: pngtest.o libpng.lib $(LN)