diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2002-06-28 09:34:00 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:07:16 -0500 |
| commit | d020e9d826bfd772e82988a068c1914ef4b4fa97 (patch) | |
| tree | 5bc5a60f50f75fc8a638d61f920372a9c9843dcf | |
| parent | d1e8c8694dfc6a3e1ae6cbdc1982cc3f646bb7b3 (diff) | |
| download | libpng-1.2.4beta3.tar.gz | |
Imported from libpng-1.2.4beta3.tarv1.2.4beta3
62 files changed, 281 insertions, 134 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.4beta2 - June 20, 2002 +Libpng 1.2.4beta3 - June 28, 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. @@ -12,13 +12,19 @@ version 1.2.4beta1 [May 24, 2002] Added missing "\" before closing double quote in makefile.gcmmx. Plugged various memory leaks; added png_malloc_warn() and png_set_text_2() functions. -version 1.2.4beta2 [June 20, 2002] +version 1.2.4beta2 [June 25, 2002] Plugged memory leak of png_ptr->current_text (Matt Holgate). Check for buffer overflow before reading CRC in pngpread.c (Warwick Allison) Added -soname to the loader flags in makefile.dec, makefile.sgi, and makefile.sggcc. Added "test-installed" targets to makefile.linux, makefile.gcmmx, makefile.sgi, and makefile.sggcc. +version 1.2.4beta3 [June 28, 2002] + Plug memory leak of row_buf in pngtest.c when there is a png_error(). + Detect buffer overflow in pngpread.c when IDAT is corrupted with extra data. + Added "test-installed" target to makefile.32sunu, makefile.64sunu, + makefile.beos, makefile.darwin, makefile.dec, makefile.macosx, + makefile.solaris, and makefile.so9. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -1131,13 +1131,19 @@ version 1.2.4beta1 [May 24, 2002] Added missing "\" before closing double quote in makefile.gcmmx. Plugged various memory leaks; added png_malloc_warn() and png_set_text_2() functions. -version 1.2.4beta2 [June 20, 2002] +version 1.2.4beta2 [June 25, 2002] Plugged memory leak of png_ptr->current_text (Matt Holgate). Check for buffer overflow before reading CRC in pngpread.c (Warwick Allison) Added -soname to the loader flags in makefile.dec, makefile.sgi, and makefile.sggcc. - Added "test-installed" targets to makefile.linux, makefile.gcmmx, + Added "test-installed" target to makefile.linux, makefile.gcmmx, makefile.sgi, and makefile.sggcc. +version 1.2.4beta3 [June 28, 2002] + Plug memory leak of row_buf in pngtest.c when there is a png_error(). + Detect buffer overflow in pngpread.c when IDAT is corrupted with extra data. + Added "test-installed" target to makefile.32sunu, makefile.64sunu, + makefile.beos, makefile.darwin, makefile.dec, makefile.macosx, + makefile.solaris, and makefile.so9. 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.4beta2 - June 20, 2002 +Installing libpng version 1.2.4beta3 - June 28, 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.4beta2" or "lpng109" and "zlib-1.1.4" +might be called "libpng-1.2.4beta3" 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.4beta2) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.4beta2, + makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.4beta3) + makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.4beta3, 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.4beta2) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.4beta3) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.4beta2) - makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.4beta2) + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.4beta3) + makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.4beta3) 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.4beta2) + (gcc, creates libpng12m.so.0.1.2.4beta3) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0m.1.2.4beta2, uses assembler code + libpng12.so.0m.1.2.4beta3, 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.4beta2 +Known bugs in libpng version 1.2.4beta3 1. May 28, 2002: Makefile.so9 has bugs. The last line under the install-headers target should be @@ -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.4beta2, June 20, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.4beta3, June 28, 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 -June 20, 2002 +June 28, 2002 @@ -1,4 +1,4 @@ -README for libpng 1.2.4beta2 - June 20, 2002 (shared library 12.0) +README for libpng 1.2.4beta3 - June 28, 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.4beta2) + (gcc, creates libpng12.so.0.1.2.4beta3) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.4beta2, uses assembler code + libpng12.so.0.1.2.4beta3, 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.4beta2) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.4beta3) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.4beta2) + (gcc, creates libpng12.so.0.1.2.4beta3) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.4beta2) + (gcc, creates libpng12.so.0.1.2.4beta3) 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.4beta2) + (gcc, creates libpng12m.so.0.1.2.4beta3) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0m.1.2.4beta2, uses assembler code + libpng12.so.0m.1.2.4beta3, 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: ========================= - June 20, 2002 + June 28, 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.4beta2 are Y2K compliant. It is my belief that earlier + upward through 1.2.4beta3 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.4beta2. Instead, please + There is no \"configure\" script for Libpng-1.2.4beta3. Instead, please copy the appropriate makefile for your system from the \"scripts\" directory. Read the INSTALL file for more details. " diff --git a/contrib/gregbook/rpng2-x.c b/contrib/gregbook/rpng2-x.c index 1c61283d1..5fc29ea77 100644 --- a/contrib/gregbook/rpng2-x.c +++ b/contrib/gregbook/rpng2-x.c @@ -594,6 +594,7 @@ static void rpng2_x_init(void) * If we/it segfault instead, seems like a libpng bug... */ /* we're here via libpng callback, so if window fails, clean and bail */ +printf("readpng2_cleanup.\n"); readpng2_cleanup(&rpng2_info); rpng2_x_cleanup(); exit(2); @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "June 20, 2002" +.TH LIBPNG 3 "June 28, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.4beta2 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.4beta3 .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.4beta2 - June 20, 2002 + libpng version 1.2.4beta3 - June 28, 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 -June 20, 2002 +June 28, 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.4beta2 are Y2K compliant. It is my belief that earlier +upward through 1.2.4beta3 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 @@ -3778,7 +3778,7 @@ the first widely used release: 1.2.2 12 10202 12.so.0.1.2.2 1.2.3rc1-6 12 10203 12.so.0.1.2.3rc1-6 1.2.3 12 10203 12.so.0.1.2.3 - 1.2.4beta1-2 13 10204 12.so.0.1.2.4beta1-2 + 1.2.4beta1-3 13 10204 12.so.0.1.2.4beta1-3 Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3836,7 +3836,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.4beta2 - June 20, 2002: +Libpng version 1.2.4beta3 - June 28, 2002: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu). @@ -3853,7 +3853,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.4beta2, June 20, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.4beta3, June 28, 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 @@ -3945,7 +3945,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -June 20, 2002 +June 28, 2002 .\" end of man page diff --git a/libpng.txt b/libpng.txt index c65d059d5..835d03975 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.4beta2 - June 20, 2002 + libpng version 1.2.4beta3 - June 28, 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 -June 20, 2002 +June 28, 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.4beta2 are Y2K compliant. It is my belief that earlier +upward through 1.2.4beta3 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 5195dc4bb..06d55b4a8 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "June 20, 2002" +.TH LIBPNGPF 3 "June 28, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.4beta2 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.4beta3 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "June 20, 2002" +.TH PNG 5 "June 28, 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.4beta2 - June 20, 2002 + * libpng version 1.2.4beta3 - June 28, 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_4beta2 Your_png_h_is_not_version_1_2_4beta2; +typedef version_1_2_4beta3 Your_png_h_is_not_version_1_2_4beta3; /* 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.4beta2"; +const char png_libpng_ver[18] = "1.2.4beta3"; /* png_sig was changed to a function in version 1.0.5c */ /* Place to hold the signature string for a PNG file. */ @@ -663,7 +663,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.4beta2 - June 20, 2002\n\ + return ((png_charp) "\n libpng version 1.2.4beta3 - June 28, 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"); @@ -681,8 +681,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.4beta2"); - return((png_charp) "1.2.4beta2"); + return((png_charp) "1.2.4beta3"); + return((png_charp) "1.2.4beta3"); } png_charp PNGAPI @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.4beta2 - June 20, 2002 + * libpng version 1.2.4beta3 - June 28, 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.4beta2 - June 20, 2002: Glenn + * libpng versions 0.97, January 1998, through 1.2.4beta3 - June 28, 2002: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -88,7 +88,7 @@ * 1.2.2 12 10202 12.so.0.1.2.2 * 1.2.3rc1-6 12 10203 12.so.0.1.2.3rc1-6 * 1.2.3 12 10203 12.so.0.1.2.3 - * 1.2.4beta1-2 13 10204 12.so.0.1.2.4beta1-2 + * 1.2.4beta1-3 13 10204 12.so.0.1.2.4beta1-3 * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -118,7 +118,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.4beta2, June 20, 2002, are + * libpng versions 1.0.7, July 1, 2000, through 1.2.4beta3, June 28, 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 @@ -223,13 +223,13 @@ * Y2K compliance in libpng: * ========================= * - * June 20, 2002 + * June 28, 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.4beta2 are Y2K compliant. It is my belief that earlier + * upward through 1.2.4beta3 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 @@ -285,7 +285,7 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.4beta2" +#define PNG_LIBPNG_VER_STRING "1.2.4beta3" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM %DLLNUM% @@ -297,7 +297,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 @@ -1274,9 +1274,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.4beta2 + version 1.2.4beta3 */ -typedef png_structp version_1_2_4beta2; +typedef png_structp version_1_2_4beta3; typedef png_struct FAR * FAR * png_structpp; @@ -2403,7 +2403,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.4beta2 - June 20, 2002 (header)\n" + " libpng version 1.2.4beta3 - June 28, 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 51d8dc5bc..294d8fd83 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.4beta2 - June 20, 2002 + * libpng 1.2.4beta3 - June 28, 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.4beta2 - June 20, 2002 + * libpng 1.2.4beta3 - June 28, 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 931a69fb4..1d39647ee 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.2.4beta2 - June 20, 2002 + * libpng 1.2.4beta3 - June 28, 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 b65cf99ff..5c1a9cce1 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.4beta2 - June 20, 2002 + * libpng version 1.2.4beta3 - June 28, 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.4beta2 - June 20, 2002 + * libpng 1.2.4beta3 - June 28, 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.4beta2 - June 20, 2002 + * libpng 1.2.4beta3 - June 28, 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 78d75d121..f33172a0b 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.2.4beta2 - June 20, 2002 + * libpng 1.2.4beta3 - June 28, 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) @@ -746,6 +746,13 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer, } if (!(png_ptr->zstream.avail_out)) { + if (( +#if defined(PNG_READ_INTERLACING_SUPPORTED) + png_ptr->interlaced && png_ptr->pass > 6) || + (!png_ptr->interlaced && +#endif + png_ptr->row_number == png_ptr->num_rows-1)) + png_error(png_ptr, "Too much data in IDAT chunks"); png_push_process_row(png_ptr); png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes; png_ptr->zstream.next_out = png_ptr->row_buf; @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * libpng 1.2.4beta2 - June 20, 2002 + * libpng 1.2.4beta3 - June 28, 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) @@ -793,7 +793,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.4beta2 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.4beta3 */ void PNGAPI @@ -842,7 +842,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.4beta2 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.4beta3 */ 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.4beta2 - June 20, 2002 + * libpng 1.2.4beta3 - June 28, 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 f0cc8bde9..52e5ceee3 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.4beta2 - June 20, 2002 + * libpng 1.2.4beta3 - June 28, 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 757ce7a3d..dadbf384a 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.2.4beta2 - June 20, 2002 + * libpng 1.2.4beta3 - June 28, 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.4beta2 - June 20, 2002 + * libpng 1.2.4beta3 - June 28, 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.4beta2 - June 20, 2002 + * libpng 1.2.4beta3 - June 28, 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) @@ -663,6 +663,8 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) #endif { fprintf(STDERR, "%s -> %s: libpng read error\n", inname, outname); + if (row_buf) + png_free(read_ptr, row_buf); png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr); #ifdef PNG_WRITE_SUPPORTED png_destroy_info_struct(write_ptr, &write_end_info_ptr); @@ -1512,4 +1514,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_4beta2 your_png_h_is_not_version_1_2_4beta2; +typedef version_1_2_4beta3 your_png_h_is_not_version_1_2_4beta3; diff --git a/pngtrans.c b/pngtrans.c index 590bb4677..f9960f253 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.4beta2 - June 20, 2002 + * libpng 1.2.4beta3 - June 28, 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.4beta2 - June 20, 2002 + * libpng version 1.2.4beta3 - June 28, 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.4beta2 - June 20, 2002 + * libpng 1.2.4beta3 - June 28, 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 49da34696..8dac80947 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.2.4beta2 - June 20, 2002 + * libpng 1.2.4beta3 - June 28, 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 62ccd0018..2a7566a32 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.4beta2 - June 20, 2002 + * libpng 1.2.4beta3 - June 28, 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 aa9de13a2..d48ccf25c 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.2.4beta2 - June 20, 2002 + * libpng 1.2.4beta3 - June 28, 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 b26cb6058..19a86eba1 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.4beta2 (June 20, 2002) and zlib +libpng 1.2.4beta3 (June 28, 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 d29729e00..0447330fe 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.4beta2 +;Version 1.2.4beta3 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/projects/netware.txt b/projects/netware.txt index 38cc672a0..fd7ff6681 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.4beta2-project-netware.zip from a libpng distribution +libpng-1.2.4beta3-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.4beta2-project-netware.zip" +"unzip -a libpng-1.2.4beta3-project-netware.zip" diff --git a/projects/wince.txt b/projects/wince.txt index e6c518d0f..b378a37dc 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.4beta2-project-wince.zip from a libpng distribution +libpng-1.2.4beta3-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.4beta2-project-wince.zip" +"unzip -a libpng-1.2.4beta3-project-wince.zip" diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 5f54a4fbd..3101ecf16 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.4beta2 +version=1.2.4beta3 prefix="" cppflags="" cflags="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index fc811d5dd..05a8d17f5 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.4beta2 +Version: 1.2.4beta3 Libs: -L${libdir} -lpng12 -lz -lm Cflags: -I${includedir}/libpng12 diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 44a150a5d..727e57787 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -172,9 +172,21 @@ install-config: libpng-config install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +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` \ + $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) + pngtesti pngtest.png + clean: - /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ - pngtest pngout.png + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index e85c02b92..8df2aeefc 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -172,9 +172,21 @@ install-config: libpng-config install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +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` \ + $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) + pngtesti pngtest.png + clean: - /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ - pngtest pngout.png + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 00711cbbb..7c7d4372d 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -17,7 +17,7 @@ RANLIB = ranlib RM = rm -f PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 9ec5aae5c..accda9da0 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.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= @@ -160,9 +160,19 @@ install-config: libpng-config install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +test-installed: + $(CC) $(CFLAGS) \ + `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + pngtesti pngtest.png + clean: - /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ - pngtest pngout.png + /bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \ + $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtesti # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 67694c0cf..6039746d7 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -79,7 +79,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 PNGDLL = 13 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(PNGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index c55f8171e..55e9222c1 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.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -156,8 +156,19 @@ install-config: libpng-config install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +test-installed: + $(CC) $(CFLAGS) \ + `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + -L$(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + pngtesti pngtest.png + clean: - rm -f *.o libpng.a $(LIBNAME).*dylib pngtest pngout.png + rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \ + $(LIBNAME).*dylib pngtesti DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index c3694a1b7..d57877e68 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -32,7 +32,7 @@ ZLIBLIB=../zlib ZLIBINC=../zlib PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -140,8 +140,21 @@ install-config: libpng-config install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +test-installed: + echo + echo Testing installed dynamic shared library. + $(CC) -std -w1 -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + -L$(ZLIBLIB) -R$(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + pngtesti pngtest.png + clean: - /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest pngout.png + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index e9ea46ab2..4d9d0c41c 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -15,7 +15,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -203,11 +203,14 @@ install-config: libpng-config install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + test-installed: $(CC) -I$(ZLIBINC) \ `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \ - -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) + -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` pngtesti pngtest.png clean: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 218cb043d..895f7cc37 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -33,7 +33,7 @@ RANLIB=ranlib #RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -163,6 +163,22 @@ install-config: libpng-config install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +test-installed: + echo + echo Testing installed dynamic shared library. + $(CC) -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + pngtesti pngtest.png + +clean: + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + libpng-config $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* + clean: /bin/rm -f *.o libpng.a $(SHAREDLIB).sl $(SHAREDLIB).sl.$(PNGMAJ)* \ pngtest pngout.png diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 63cf2f7c7..8762163d1 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.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -148,9 +148,21 @@ install-config: libpng-config install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +test-installed: + echo + echo Testing installed dynamic shared library. + $(CC) $(CCFLAGS) \ + `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + -L$(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + pngtesti pngtest.png + clean: - /bin/rm -f *.o libpng.a $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* \ - pngtest pngout.png + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + libpng-config $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 8e242212e..2c73f5f36 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -5,7 +5,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -175,11 +175,14 @@ install-config: libpng-config install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + test-installed: $(CC) -I$(ZLIBINC) \ `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \ - -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) + -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` pngtesti pngtest.png clean: diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx index 5aec5e010..cf28ccc9f 100644 --- a/scripts/makefile.macosx +++ b/scripts/makefile.macosx @@ -17,7 +17,7 @@ ZLIBINC=../zlib CC=cc PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 @@ -150,8 +150,18 @@ install-config: libpng-config install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +test-installed: + $(CC) $(CFLAGS) \ + `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + -L$(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + pngtesti pngtest.png + clean: - rm -f *.o libpng.a pngtest pngout.png \ + rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \ $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) \ $(LIBNAME).$(SHAREDLIB_POSTFIX) diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 9a9ca1d27..0a1a24152 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.4beta2 +SHLIB_MINOR= 1.2.4beta3 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 40b022b5b..db4571116 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.4beta2 +SHLIB_MINOR= 1.2.4beta3 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 cfc89fef5..569c8c708 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.4beta2 +SHLIB_MINOR= 1.2.4beta3 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 77031ed59..6976f8720 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.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 7745e1804..bb17c837b 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -18,7 +18,7 @@ ZLIBINC=../zlib LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -165,8 +165,8 @@ install: install-static install-shared install-man install-config test-installed: $(CC) -I$(ZLIBINC) \ `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \ - -L$(ZLIBLIB) -rpath $(ZLIBLIB) + -L$(ZLIBLIB) -rpath $(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` echo echo Testing installed dynamic shared library. pngtesti pngtest.png diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 0380d69b0..94a452157 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -5,7 +5,7 @@ LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) # Where make install puts libpng.a, libpng12.so, and libpng12/png.h @@ -170,8 +170,8 @@ test-installed: echo Testing installed dynamic shared library. $(CC) -I$(ZLIBINC) \ `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \ - -L$(ZLIBLIB) -rpath $(ZLIBLIB) + -L$(ZLIBLIB) -rpath $(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` pngtesti pngtest.png clean: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 81b0bca5d..fcf16f0a3 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.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -174,10 +174,21 @@ install-config: libpng-config install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +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` \ + -L$(ZLIBLIB) -R$(ZLIBLIB) + pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ - pngtest pngout.png + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index ccdc3c76f..56111306e 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.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -171,9 +171,21 @@ install-config: libpng-config install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +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` \ + -L$(ZLIBLIB) -R$(ZLIBLIB) + pngtesti pngtest.png + clean: - /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ - pngtest pngout.png + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index 56d3d0b60..d366a2de0 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -7,7 +7,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.2.4beta2'; + PNG_LIBPNG_VER_STRING = '1.2.4beta3'; PNG_LIBPNG_VER = 10204; type diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 7dadb6c3a..a26c8af50 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.4beta2 +; Version 1.2.4beta3 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" |