diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2002-07-07 19:15:20 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:07:21 -0500 |
| commit | 484a8a10fe72449fdae0bcabd4cec416777e0207 (patch) | |
| tree | 2b91a15a3375eafe008a6129f4ca2d80bb42e922 | |
| parent | 2ae022da7e88e330085f1ffa67b546a6df6ba717 (diff) | |
| download | libpng-1.2.4.tar.gz | |
Imported from libpng-1.2.4.tarv1.2.4
61 files changed, 125 insertions, 132 deletions
@@ -1,33 +1,28 @@ -Libpng 1.2.4rc1 - July 2, 2002 +Libpng 1.2.4 - July 8, 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. +This is a public release of libpng, intended for use in production codes. Changes since the last public release (1.2.3): -version 1.2.4beta1 [May 24, 2002] Added libpng.pc and libpng-config to "all:" target in 16 makefiles. Fixed bug in 16 makefiles: $(DESTDIR)/$(LIBPATH) to $(DESTDIR)$(LIBPATH) 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 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] + makefile.sgi, makefile.sggcc, makefile.32sunu, makefile.64sunu, + makefile.beos, makefile.darwin, makefile.dec, makefile.macosx, + makefile.solaris, makefile.sco, makefile.cygwin, makefile.hpux, + makefile.hpgcc, and makefile.so9. Plugged 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, makefile.hpux, makefile.hpgcc, and makefile.so9. -version 1.2.4rc1 [July 2, 2002] - Added "test-installed" target to makefile.cygwin and makefile.sco. Revised pnggccrd.c to be able to back out version 1.0.x via PNG_1_0_X macro. + Changed png_warning() to png_error() when width is too large to process. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -1147,6 +1147,8 @@ version 1.2.4beta3 [June 28, 2002] version 1.2.4rc1 [July 2, 2002] Added "test-installed" target to makefile.cygwin and makefile.sco. Revised pnggccrd.c to be able to back out version 1.0.x via PNG_1_0_X macro. +version 1.2.4 [July 8, 2002] + Changed png_warning() to png_error() when width is too large to process. 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.4rc1 - July 2, 2002 +Installing libpng version 1.2.4 - July 8, 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.4rc1" or "lpng109" and "zlib-1.1.4" +might be called "libpng-1.2.4" 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.4rc1) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.4rc1, + makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.4) + makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.4, 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.4rc1) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.4) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.4rc1) - makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.4rc1) + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.4) + makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.4) 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.4rc1) + (gcc, creates libpng12m.so.0.1.2.4) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0m.1.2.4rc1, uses assembler code + libpng12.so.0m.1.2.4, 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,8 +1,9 @@ -Known bugs in libpng version 1.2.4rc1 +Known bugs in libpng version 1.2.4 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when - reading interlaced PNG files, when assembler code is enabled. + reading interlaced PNG files, when assembler code is enabled but running + on a non-MMX i386 platform. STATUS: Under investigation. The change to pnggccrd.c in libpng-1.2.1 fixed a problem under FreeBSD but not the problem with NetBSD, which @@ -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.4rc1, July 2, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.4, July 8, 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 -July 2, 2002 +July 8, 2002 @@ -1,4 +1,4 @@ -README for libpng 1.2.4rc1 - July 2, 2002 (shared library 12.0) +README for libpng 1.2.4 - July 8, 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.4rc1) + (gcc, creates libpng12.so.0.1.2.4) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.4rc1, uses assembler code + libpng12.so.0.1.2.4, 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.4rc1) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.4) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.4rc1) + (gcc, creates libpng12.so.0.1.2.4) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.4rc1) + (gcc, creates libpng12.so.0.1.2.4) 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.4rc1) + (gcc, creates libpng12m.so.0.1.2.4) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0m.1.2.4rc1, uses assembler code + libpng12.so.0m.1.2.4, 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: ========================= - July 2, 2002 + July 8, 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.4rc1 are Y2K compliant. It is my belief that earlier + upward through 1.2.4 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.4rc1. Instead, please + There is no \"configure\" script for Libpng-1.2.4. 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 "July 2, 2002" +.TH LIBPNG 3 "July 8, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.4rc1 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.4 .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.4rc1 - July 2, 2002 + libpng version 1.2.4 - July 8, 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 -July 2, 2002 +July 8, 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.4rc1 are Y2K compliant. It is my belief that earlier +upward through 1.2.4 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 @@ -3780,6 +3780,8 @@ the first widely used release: 1.2.3 12 10203 12.so.0.1.2.3 1.2.4beta1-3 13 10204 12.so.0.1.2.4beta1-3 1.2.4rc1 13 10204 12.so.0.1.2.4rc1 + 1.0.14 10 10014 10.so.0.1.0.14 + 1.2.4 13 10204 12.so.0.1.2.4 Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3837,7 +3839,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.4rc1 - July 2, 2002: +Libpng version 1.2.4 - July 8, 2002: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu). @@ -3854,7 +3856,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.4rc1, July 2, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.4, July 8, 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 @@ -3946,7 +3948,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -July 2, 2002 +July 8, 2002 .\" end of man page diff --git a/libpng.txt b/libpng.txt index cb61618f0..66c89dc51 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.4rc1 - July 2, 2002 + libpng version 1.2.4 - July 8, 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 -July 2, 2002 +July 8, 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.4rc1 are Y2K compliant. It is my belief that earlier +upward through 1.2.4 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 d922e3c65..d4037d596 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "July 2, 2002" +.TH LIBPNGPF 3 "July 8, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.4rc1 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.4 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "July 2, 2002" +.TH PNG 5 "July 8, 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.4rc1 - July 2, 2002 + * libpng version 1.2.4 - July 8, 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_4rc1 Your_png_h_is_not_version_1_2_4rc1; +typedef version_1_2_4 Your_png_h_is_not_version_1_2_4; /* 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.4rc1"; +const char png_libpng_ver[18] = "1.2.4"; /* 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.4rc1 - July 2, 2002\n\ + return ((png_charp) "\n libpng version 1.2.4 - July 8, 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.4rc1"); - return((png_charp) "1.2.4rc1"); + return((png_charp) "1.2.4"); + return((png_charp) "1.2.4"); } png_charp PNGAPI @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.4rc1 - July 2, 2002 + * libpng version 1.2.4 - July 8, 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.4rc1 - July 2, 2002: Glenn + * libpng versions 0.97, January 1998, through 1.2.4 - July 8, 2002: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -91,6 +91,8 @@ * 1.2.4beta1-3 13 10204 12.so.0.1.2.4beta1-3 * 1.0.14rc1 13 10014 10.so.0.1.0.14rc1 * 1.2.4rc1 13 10204 12.so.0.1.2.4rc1 + * 1.0.14 10 10014 10.so.0.1.0.14 + * 1.2.4 13 10204 12.so.0.1.2.4 * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -120,7 +122,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.4rc1, July 2, 2002, are + * libpng versions 1.0.7, July 1, 2000, through 1.2.4, July 8, 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 @@ -225,13 +227,13 @@ * Y2K compliance in libpng: * ========================= * - * July 2, 2002 + * July 8, 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.4rc1 are Y2K compliant. It is my belief that earlier + * upward through 1.2.4 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 @@ -287,7 +289,7 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.4rc1" +#define PNG_LIBPNG_VER_STRING "1.2.4" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM %DLLNUM% @@ -299,7 +301,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 0 #define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_BETA 2 @@ -307,7 +309,7 @@ #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 3 +#define PNG_LIBPNG_BUILD_TYPE 4 /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -1277,9 +1279,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.4rc1 + version 1.2.4 */ -typedef png_structp version_1_2_4rc1; +typedef png_structp version_1_2_4; typedef png_struct FAR * FAR * png_structpp; @@ -2419,7 +2421,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.4rc1 - July 2, 2002 (header)\n" + " libpng version 1.2.4 - July 8, 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 2aa837cb9..a19d4ae5a 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.4rc1 - July 2, 2002 + * libpng 1.2.4 - July 8, 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.4rc1 - July 2, 2002 + * libpng 1.2.4 - July 8, 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 912aef2ff..e6c197357 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.2.4rc1 - July 2, 2002 + * libpng 1.2.4 - July 8, 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 eb35ab0ba..2d1d1d3b3 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.4rc1 - July 2, 2002 + * libpng version 1.2.4 - July 8, 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.4rc1 - July 2, 2002 + * libpng 1.2.4 - July 8, 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) @@ -574,9 +574,9 @@ png_get_IHDR(png_structp png_ptr, png_infop info_ptr, png_error(png_ptr, "Invalid image width"); if (height == 0 || *height > PNG_MAX_UINT) png_error(png_ptr, "Invalid image height"); - if ((*width > PNG_MAX_UINT/rowbytes_per_pixel)) + if (*width > PNG_MAX_UINT/rowbytes_per_pixel - 64) { - png_warning(png_ptr, + png_error(png_ptr, "Width too large for libpng to process image data."); } return (1); @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * libpng 1.2.4rc1 - July 2, 2002 + * libpng 1.2.4 - July 8, 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 33cc235ef..9a5b54dfb 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.2.4rc1 - July 2, 2002 + * libpng 1.2.4 - July 8, 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.4rc1 - July 2, 2002 + * libpng 1.2.4 - July 8, 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) @@ -300,7 +300,6 @@ void PNGAPI png_read_info(png_structp png_ptr, png_infop info_ptr) { png_debug(1, "in png_read_info\n"); - /* save jump buffer and error functions */ /* If we haven't checked all of the PNG signature bytes, do so now. */ if (png_ptr->sig_bytes < 8) { @@ -514,7 +513,6 @@ void PNGAPI png_read_update_info(png_structp png_ptr, png_infop info_ptr) { png_debug(1, "in png_read_update_info\n"); - /* save jump buffer and error functions */ if (!(png_ptr->flags & PNG_FLAG_ROW_INIT)) png_read_start_row(png_ptr); else @@ -532,7 +530,6 @@ void PNGAPI png_start_read_image(png_structp png_ptr) { png_debug(1, "in png_start_read_image\n"); - /* save jump buffer and error functions */ if (!(png_ptr->flags & PNG_FLAG_ROW_INIT)) png_read_start_row(png_ptr); } @@ -548,7 +545,6 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row) int ret; png_debug2(1, "in png_read_row (row %lu, pass %d)\n", png_ptr->row_number, png_ptr->pass); - /* save jump buffer and error functions */ if (!(png_ptr->flags & PNG_FLAG_ROW_INIT)) png_read_start_row(png_ptr); if (png_ptr->row_number == 0 && png_ptr->pass == 0) @@ -793,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.4rc1 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.4 */ void PNGAPI @@ -805,7 +801,6 @@ png_read_rows(png_structp png_ptr, png_bytepp row, png_bytepp dp; png_debug(1, "in png_read_rows\n"); - /* save jump buffer and error functions */ rp = row; dp = display_row; if (rp != NULL && dp != NULL) @@ -842,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.4rc1 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.4 */ void PNGAPI png_read_image(png_structp png_ptr, png_bytepp image) @@ -852,7 +847,6 @@ png_read_image(png_structp png_ptr, png_bytepp image) png_bytepp rp; png_debug(1, "in png_read_image\n"); - /* save jump buffer and error functions */ #ifdef PNG_READ_INTERLACING_SUPPORTED pass = png_set_interlace_handling(png_ptr); @@ -889,7 +883,6 @@ png_read_end(png_structp png_ptr, png_infop info_ptr) png_uint_32 length; png_debug(1, "in png_read_end\n"); - /* save jump buffer and error functions */ png_crc_finish(png_ptr, 0); /* Finish off CRC from last IDAT chunk */ do @@ -1079,7 +1072,6 @@ png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, #endif png_debug(1, "in png_destroy_read_struct\n"); - /* save jump buffer and error functions */ if (png_ptr_ptr != NULL) png_ptr = *png_ptr_ptr; @@ -1152,7 +1144,6 @@ png_read_destroy(png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr #endif png_debug(1, "in png_read_destroy\n"); - /* save jump buffer and error functions */ if (info_ptr != NULL) png_info_destroy(png_ptr, info_ptr); @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * libpng 1.2.4rc1 - July 2, 2002 + * libpng 1.2.4 - July 8, 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 5a0b7a130..f8142ebfc 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.4rc1 - July 2, 2002 + * libpng 1.2.4 - July 8, 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 dfc658ec1..974006311 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.2.4rc1 - July 2, 2002 + * libpng 1.2.4 - July 8, 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.4rc1 - July 2, 2002 + * libpng 1.2.4 - July 8, 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) @@ -322,7 +322,7 @@ png_set_IHDR(png_structp png_ptr, png_infop info_ptr, /* check for overflow */ rowbytes_per_pixel = (info_ptr->pixel_depth + 7) >> 3; - if (( width > PNG_MAX_UINT/rowbytes_per_pixel)) + if ( width > PNG_MAX_UINT/rowbytes_per_pixel - 64) { png_warning(png_ptr, "Width too large to process image data; rowbytes will overflow."); @@ -888,7 +888,7 @@ png_set_sPLT(png_structp png_ptr, (info_ptr->splt_palettes_num + nentries) * sizeof(png_sPLT_t)); if (np == NULL) { - png_warning(png_ptr, "No memory for splt palettes."); + png_warning(png_ptr, "No memory for sPLT palettes."); return; } @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * libpng 1.2.4rc1 - July 2, 2002 + * libpng 1.2.4 - July 8, 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_4rc1 your_png_h_is_not_version_1_2_4rc1; +typedef version_1_2_4 your_png_h_is_not_version_1_2_4; diff --git a/pngtrans.c b/pngtrans.c index eb480ddb9..d850ee7ac 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.4rc1 - July 2, 2002 + * libpng 1.2.4 - July 8, 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.4rc1 - July 2, 2002 + * libpng version 1.2.4 - July 8, 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.4rc1 - July 2, 2002 + * libpng 1.2.4 - July 8, 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 a21b595ab..ff62395cf 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.2.4rc1 - July 2, 2002 + * libpng 1.2.4 - July 8, 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 e46a40c15..d15c0c55c 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.4rc1 - July 2, 2002 + * libpng 1.2.4 - July 8, 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 642b37e6a..22155e93f 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.2.4rc1 - July 2, 2002 + * libpng 1.2.4 - July 8, 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 4a8ff693c..e1c94a793 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.4rc1 (July 2, 2002) and zlib +libpng 1.2.4 (July 8, 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 524a97a95..799440593 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.4rc1 +;Version 1.2.4 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/projects/netware.txt b/projects/netware.txt index 27025d2ea..2719c997d 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.4rc1-project-netware.zip from a libpng distribution +libpng-1.2.4-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.4rc1-project-netware.zip" +"unzip -a libpng-1.2.4-project-netware.zip" diff --git a/projects/wince.txt b/projects/wince.txt index e5600094a..d7e99b1c5 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.4rc1-project-wince.zip from a libpng distribution +libpng-1.2.4-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.4rc1-project-wince.zip" +"unzip -a libpng-1.2.4-project-wince.zip" diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 14b9f00d5..7a321a74c 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.4rc1 +version=1.2.4 prefix="" cppflags="" cflags="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index dee0b0fde..7f91cfcb3 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.4rc1 +Version: 1.2.4 Libs: -L${libdir} -lpng12 -lz -lm Cflags: -I${includedir}/libpng12 diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index d6c6c4bbe..de7c4b1c1 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4rc1 +PNGMIN = 1.2.4 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index e65bbfa4d..5f8e423fe 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4rc1 +PNGMIN = 1.2.4 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 7e225a665..24ab2bdb6 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -17,7 +17,7 @@ RANLIB = ranlib RM = rm -f PNGMAJ = 0 -PNGMIN = 1.2.4rc1 +PNGMIN = 1.2.4 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 7e5e22040..a8507c1a2 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.4rc1 +PNGMIN = 1.2.4 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index d4c4a2782..250d12d1a 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.4rc1 +PNGMIN = 1.2.4 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(PNGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index af57de544..217eb8219 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.4rc1 +PNGMIN = 1.2.4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 71cd35d63..9076e7608 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -32,7 +32,7 @@ ZLIBLIB=../zlib ZLIBINC=../zlib PNGMAJ = 0 -PNGMIN = 1.2.4rc1 +PNGMIN = 1.2.4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 2b0da02c2..0b6b14ce1 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -15,7 +15,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4rc1 +PNGMIN = 1.2.4 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 17f05a8de..0213ec8e2 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -33,7 +33,7 @@ RANLIB=ranlib #RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.4rc1 +PNGMIN = 1.2.4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 25f76141c..8226e16da 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.4rc1 +PNGMIN = 1.2.4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.linux b/scripts/makefile.linux index a4a44419a..3ddac27e3 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -5,7 +5,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4rc1 +PNGMIN = 1.2.4 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx index 3a0041df3..a9e8c0479 100644 --- a/scripts/makefile.macosx +++ b/scripts/makefile.macosx @@ -17,7 +17,7 @@ ZLIBINC=../zlib CC=cc PNGMAJ = 0 -PNGMIN = 1.2.4rc1 +PNGMIN = 1.2.4 PNGVER = $(PNGMAJ).$(PNGMIN) CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index d77c4db41..0ce38e56d 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.4rc1 +SHLIB_MINOR= 1.2.4 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 1345a4a92..b1eab1eb6 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.4rc1 +SHLIB_MINOR= 1.2.4 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 85825f68f..586166844 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.4rc1 +SHLIB_MINOR= 1.2.4 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 40ea9f5ff..d9e0a0767 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.4rc1 +PNGMIN = 1.2.4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 6f6334143..edae31725 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -18,7 +18,7 @@ ZLIBINC=../zlib LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4rc1 +PNGMIN = 1.2.4 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 0fb1bae01..71e954fe1 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -5,7 +5,7 @@ LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4rc1 +PNGMIN = 1.2.4 PNGVER = $(PNGMAJ).$(PNGMIN) # Where make install puts libpng.a, libpng12.so, and libpng12/png.h diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 0b3b336eb..0713b9798 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.4rc1 +PNGMIN = 1.2.4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 56004099f..d880ea4bb 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.4rc1 +PNGMIN = 1.2.4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index 6440aa17f..9bd62cd58 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -7,7 +7,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.2.4rc1'; + PNG_LIBPNG_VER_STRING = '1.2.4'; PNG_LIBPNG_VER = 10204; type diff --git a/scripts/pngos2.def b/scripts/pngos2.def index c9aa400cb..92cd5aafb 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.4rc1 +; Version 1.2.4 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" |