diff options
| -rw-r--r-- | ANNOUNCE | 3 | ||||
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | INSTALL | 65 | ||||
| -rw-r--r-- | README | 68 | ||||
| -rw-r--r-- | libpng.3 | 8 | ||||
| -rw-r--r-- | libpng.txt | 2 | ||||
| -rw-r--r-- | png.5 | 2 | ||||
| -rw-r--r-- | png.c | 4 | ||||
| -rw-r--r-- | png.h | 8 | ||||
| -rw-r--r-- | pngasmrd.h | 4 | ||||
| -rw-r--r-- | pngconf.h | 34 | ||||
| -rw-r--r-- | pngerror.c | 2 | ||||
| -rw-r--r-- | pngget.c | 2 | ||||
| -rw-r--r-- | pngmem.c | 2 | ||||
| -rw-r--r-- | pngpread.c | 2 | ||||
| -rw-r--r-- | pngread.c | 2 | ||||
| -rw-r--r-- | pngrio.c | 2 | ||||
| -rw-r--r-- | pngrtran.c | 2 | ||||
| -rw-r--r-- | pngrutil.c | 2 | ||||
| -rw-r--r-- | pngset.c | 2 | ||||
| -rw-r--r-- | pngtest.c | 2 | ||||
| -rw-r--r-- | pngtrans.c | 2 | ||||
| -rw-r--r-- | pngvcrd.c | 2 | ||||
| -rw-r--r-- | pngwio.c | 2 | ||||
| -rw-r--r-- | pngwrite.c | 2 | ||||
| -rw-r--r-- | pngwtran.c | 2 | ||||
| -rw-r--r-- | pngwutil.c | 2 | ||||
| -rw-r--r-- | scripts/makefile.acorn (renamed from scripts/makefile.aco) | 0 | ||||
| -rw-r--r-- | scripts/makefile.amiga (renamed from scripts/makefile.ama) | 0 | ||||
| -rw-r--r-- | scripts/makefile.atari (renamed from scripts/makefile.atr) | 0 | ||||
| -rw-r--r-- | scripts/makefile.beos (renamed from scripts/makefile.beo) | 4 | ||||
| -rw-r--r-- | scripts/makefile.borland (renamed from scripts/makefile.bor) | 0 | ||||
| -rw-r--r-- | scripts/makefile.hpux (renamed from scripts/makefile.hux) | 0 | ||||
| -rw-r--r-- | scripts/makefile.linux (renamed from scripts/makefile.lnx) | 14 | ||||
| -rw-r--r-- | scripts/makefile.mips (renamed from scripts/makefile.mip) | 0 | ||||
| -rw-r--r-- | scripts/makefile.solaris (renamed from scripts/makefile.s2x) | 0 | ||||
| -rw-r--r-- | scripts/makefile.sunos (renamed from scripts/makefile.sun) | 0 | ||||
| -rw-r--r-- | scripts/makefile.turboc3 (renamed from scripts/makefile.tc3) | 0 | ||||
| -rw-r--r-- | scripts/makefile.watcom (renamed from scripts/makefile.wat) | 0 | ||||
| -rw-r--r-- | scripts/makefile.win32vc (renamed from scripts/makefile.w32) | 0 | ||||
| -rw-r--r-- | scripts/pngdef.pas | 4 |
41 files changed, 135 insertions, 120 deletions
@@ -1,5 +1,5 @@ -Libpng 1.0.4 - September 17, 1999 +Libpng 1.0.4 - September 18, 1999 This is a public release of libpng, intended for use in production codes. @@ -49,6 +49,7 @@ Changes since the last public release (1.0.3): Define PNG_ALWAYS_EXTERN in pngconf.h if __STDC__ is defined Made several minor corrections to pngtest.c Changed "hptr += 16L" to "hptr = hptr + 16L" in pngmem.c for Turbo 3.0 + Renamed the makefiles with longer but more user friendly extensions Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -436,7 +436,8 @@ version 1.0.3d [September 4, 1999] Fixed type casting of igamma in pngrutil.c Added new png_expand functions to scripts/pngdef.pas and pngos2.def Added a demo read_user_transform_fn that examines the row filters in pngtest.c -version 1.0.4 [September 17, 1999] +version 1.0.4 [September 18, 1999] Define PNG_ALWAYS_EXTERN in pngconf.h if __STDC__ is defined Delete #define PNG_INTERNAL and include "png.h" from pngasmrd.h Made several minor corrections to pngtest.c + Renamed the makefiles with longer but more user friendly extensions @@ -1,5 +1,5 @@ -Installing libpng version 1.0.4 - September 17, 1999 +Installing libpng version 1.0.4 - September 18, 1999 Before installing libpng, you must first install zlib. zlib can usually be found wherever you got libpng. zlib can be @@ -38,37 +38,38 @@ appropriate makefile.sys in the scripts directory. The files that are presently available in the scripts directory include - descrip.mms => VMS makefile for MMS or MMK - makefile.std => Generic UNIX makefile - makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr - (Requires ansi2knr.c from ftp://ftp.cs.wisc.edu/ghost) - makefile.dec => DEC Alpha UNIX makefile - makefile.hux => HPUX (10.20 and 11.00) makefile - makefile.sgi => Silicon Graphics IRIX makefile - makefile.sun => Sun makefile - makefile.s2x => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.4) - makefile.lnx => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.4) - makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc - makefile.mip => MIPS makefile - makefile.aco => Acorn makefile - makefile.ama => Amiga makefile - smakefile.ppc => AMIGA smakefile for SAS C V6.58/7.00 PPC compiler - (Requires SCOPTIONS, copied from scripts/SCOPTIONS.ppc) - makefile.atr => Atari makefile - makefile.beo => BEOS makefile for X86 - makefile.bor => Borland makefile - build.bat => MS-DOS batch file for Borland compiler - makefile.dj2 => DJGPP 2 makefile - makefile.msc => Microsoft C makefile - makefile.w32 => makefile for Microsoft Visual C++ 4.0 and later - makefile.tc3 => Turbo C 3.0 makefile - makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def) - pngos2.def => OS/2 module definition file used by makefile.os2 - makefile.wat => Watcom 10a+ Makefile, 32-bit flat memory model - makevms.com => VMS build script - pngdll.mak => To make a png32bd.dll with Borland C++ 4.5 - pngdef.pas => Defines for a png32bd.dll with Borland C++ 4.5 - SCOPTIONS.ppc => Used with smakefile.ppc + descrip.mms => VMS makefile for MMS or MMK + makefile.std => Generic UNIX makefile + makefile.knr => Archaic UNIX Makefile that converts files with + ansi2knr (Requires ansi2knr.c from + ftp://ftp.cs.wisc.edu/ghost) + makefile.dec => DEC Alpha UNIX makefile + makefile.hpux => HPUX (10.20 and 11.00) makefile + makefile.sgi => Silicon Graphics IRIX makefile + makefile.sunos => Sun makefile + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.4) + makefile.linux => Linux/ELF makefile (gcc, creates libpng.so.2.1.0.4) + makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc + makefile.mips => MIPS makefile + makefile.acorn => Acorn makefile + makefile.amiga => Amiga makefile + smakefile.ppc => AMIGA smakefile for SAS C V6.58/7.00 PPC compiler + (Requires SCOPTIONS, copied from scripts/SCOPTIONS.ppc) + makefile.atari => Atari makefile + makefile.beos => BEOS makefile for X86 + makefile.borland => Borland makefile + build.bat => MS-DOS batch file for Borland compiler + makefile.dj2 => DJGPP 2 makefile + makefile.msc => Microsoft C makefile + makefile.win32vc => makefile for Microsoft Visual C++ 4.0 and later + makefile.turboc3 => Turbo C 3.0 makefile + makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def) + pngos2.def => OS/2 module definition file used by makefile.os2 + makefile.watcom => Watcom 10a+ Makefile, 32-bit flat memory model + makevms.com => VMS build script + pngdll.mak => To make a png32bd.dll with Borland C++ 4.5 + pngdef.pas => Defines for a png32bd.dll with Borland C++ 4.5 + SCOPTIONS.ppc => Used with smakefile.ppc Copy the file (or files) that you need from the scripts directory into this directory, for example @@ -1,4 +1,4 @@ -README for libpng 1.0.4 - September 17, 1999 (shared library 2.1) +README for libpng 1.0.4 - September 18, 1999 (shared library 2.1) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -153,37 +153,41 @@ Files in this distribution: pngwtran.c => Write data transformations pngwutil.c => Write utility functions scripts => Directory containing scripts for building libpng: - descrip.mms => VMS makefile for MMS or MMK - makefile.std => Generic UNIX makefile - makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr - (Requires ansi2knr.c from ftp://ftp.cs.wisc.edu/ghost) - makefile.dec => DEC Alpha UNIX makefile - makefile.hux => HPUX (10.20 and 11.00) makefile - makefile.sgi => Silicon Graphics IRIX makefile - makefile.sun => Sun makefile - makefile.s2x => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0) - makefile.lnx => Linux/ELF makefile (gcc, creates libpng.so.2.1.0) - makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc - makefile.mip => MIPS makefile - makefile.aco => Acorn makefile - makefile.ama => Amiga makefile - smakefile.ppc => AMIGA smakefile for SAS C V6.58/7.00 PPC compiler - (Requires SCOPTIONS, copied from scripts/SCOPTIONS.ppc) - makefile.atr => Atari makefile - makefile.beo => BEOS makefile for X86 - makefile.bor => Borland makefile - build.bat => MS-DOS batch file for Borland compiler - makefile.dj2 => DJGPP 2 makefile - makefile.msc => Microsoft C makefile - makefile.w32 => makefile for Microsoft Visual C++ 4.0 and later - makefile.tc3 => Turbo C 3.0 makefile - makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def) - pngos2.def => OS/2 module definition file used by makefile.os2 - makefile.wat => Watcom 10a+ Makefile, 32-bit flat memory model - makevms.com => VMS build script - pngdll.mak => To make a png32bd.dll with Borland C++ 4.5 - pngdef.pas => Defines for a png32bd.dll with Borland C++ 4.5 - SCOPTIONS.ppc => Used with smakefile.ppc + descrip.mms => VMS makefile for MMS or MMK + makefile.std => Generic UNIX makefile + makefile.knr => Archaic UNIX Makefile that converts files with + ansi2knr (Requires ansi2knr.c from + ftp://ftp.cs.wisc.edu/ghost) + makefile.dec => DEC Alpha UNIX makefile + makefile.hpux => HPUX (10.20 and 11.00) makefile + makefile.sgi => Silicon Graphics IRIX makefile + makefile.sunos => Sun makefile + makefile.solaris => Solaris 2.X makefile + (gcc, creates libpng.so.2.1.0.4) + makefile.linux => Linux/ELF makefile + (gcc, creates libpng.so.2.1.0.4) + makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc + makefile.mips => MIPS makefile + makefile.acorn => Acorn makefile + makefile.amiga => Amiga makefile + smakefile.ppc => AMIGA smakefile for SAS C V6.58/7.00 PPC + compiler (Requires SCOPTIONS, copied from + scripts/SCOPTIONS.ppc) + makefile.atari => Atari makefile + makefile.beos => BEOS makefile for X86 + makefile.borland => Borland makefile + build.bat => MS-DOS batch file for Borland compiler + makefile.dj2 => DJGPP 2 makefile + makefile.msc => Microsoft C makefile + makefile.win32vc => makefile for Microsoft Visual C++ 4.0 and later + makefile.turboc3 => Turbo C 3.0 makefile + makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def) + pngos2.def => OS/2 module definition file used by makefile.os2 + makefile.watcom => Watcom 10a+ Makefile, 32-bit flat memory model + makevms.com => VMS build script + pngdll.mak => To make a png32bd.dll with Borland C++ 4.5 + pngdef.pas => Defines for a png32bd.dll with Borland C++ 4.5 + SCOPTIONS.ppc => Used with smakefile.ppc Good luck, and happy coding. @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "September 17, 1999" +.TH LIBPNG 3 "September 18, 1999" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.4 - September 17, 1999 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.4 - September 18, 1999 .SH SYNOPSIS \fI\fB @@ -617,7 +617,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.0.4 - September 17, 1999 + libpng version 1.0.4 - September 18, 1999 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998, 1999 Glenn Randers-Pehrson @@ -2815,7 +2815,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.4 - September 17, 1999: +Libpng version 1.0.4 - September 18, 1999: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu). diff --git a/libpng.txt b/libpng.txt index f0171b1a7..a68f33556 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.0.4 - September 17, 1999 + libpng version 1.0.4 - September 18, 1999 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998, 1999 Glenn Randers-Pehrson @@ -1,4 +1,4 @@ -.TH PNG 5 "September 17, 1999" +.TH PNG 5 "September 18, 1999" .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.0.4 - September 17, 1999 + * libpng version 1.0.4 - September 18, 1999 * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, 1999 Glenn Randers-Pehrson @@ -352,7 +352,7 @@ png_get_copyright(png_structp png_ptr) { if(png_ptr == NULL) /* silence compiler warning about unused png_ptr */ ; - return("\n libpng version 1.0.4 - September 17, 1999\n\ + return("\n libpng version 1.0.4 - September 18, 1999\n\ Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.\n\ Copyright (c) 1996, 1997 Andreas Dilger\n\ Copyright (c) 1998, 1999 Glenn Randers-Pehrson\n"); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.0.4 - September 17, 1999 + * libpng version 1.0.4 - September 18, 1999 * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, 1999 Glenn Randers-Pehrson @@ -9,7 +9,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.89c, May 1996: Guy Schalnat * libpng versions 0.90, December 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.0.4 - September 17, 1999: Glenn R-P + * libpng versions 0.97, January 1998, through 1.0.4 - September 18, 1999: Glenn R-P * See also "Contributing Authors", below. * * Y2K compliance in libpng: @@ -137,7 +137,7 @@ * Copyright (c) 1996, 1997 Andreas Dilger * (libpng versions 0.90, December 1996, through 0.96, May 1997) * Copyright (c) 1998, 1999 Glenn Randers-Pehrson - * (libpng versions 0.97, January 1998, through 1.0.4 - September 17, 1999) + * (libpng versions 0.97, January 1998, through 1.0.4 - September 18, 1999) * * The PNG Reference Library is supplied "AS IS". The Contributing Authors * and Group 42, Inc. disclaim all warranties, expressed or implied, @@ -1605,7 +1605,7 @@ png_get_header_version(png_structp png_ptr) { if(png_ptr == NULL) /* silence compiler warning about unused png_ptr */ ; - return("\n libpng version 1.0.4 - September 17, 1999 (header)\n"); + return("\n libpng version 1.0.4 - September 18, 1999 (header)\n"); } #endif diff --git a/pngasmrd.h b/pngasmrd.h index 50bc2296e..1b3c96251 100644 --- a/pngasmrd.h +++ b/pngasmrd.h @@ -1,6 +1,6 @@ /* pngasmrd.h - assembler version of utilities to read a PNG file * - * libpng 1.0.4 - September 17, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1999 Glenn Randers-Pehrson * @@ -21,7 +21,7 @@ /* Set this in the makefile for gcc on Pentium, not in pngconf.h */ #ifdef PNG_USE_PNGGCCRD /* Platform must be Pentium. Makefile must assemble and load pnggccrd.c - * (not available in libpng-1.0.3a). + * (not available in libpng 1.0.4). * MMX will be detected at run time and used if present. */ #define PNG_HAVE_ASSEMBLER_COMBINE_ROW @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng 1.0.4 - September 17, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger @@ -658,23 +658,31 @@ typedef charf * png_zcharp; typedef charf * FAR * png_zcharpp; typedef z_stream FAR * png_zstreamp; -/* allow for compilation as dll under MS Windows */ -#ifdef __WIN32DLL__ -#define PNG_EXPORT(type,symbol) __declspec(dllexport) type symbol -#endif -/* allow for compilation as dll with BORLAND C++ 5.0 */ -#if defined(__BORLANDC__) && defined(_Windows) && defined(__DLL__) -# define PNG_EXPORT(type,symbol) type _export symbol -#endif +#ifndef PNG_EXPORT + /* allow for compilation as dll under MS Windows */ +# ifdef __WIN32DLL__ +# define PNG_EXPORT(type,symbol) __declspec(dllexport) type symbol +# endif -/* allow for compilation as shared lib under BeOS */ -#ifdef __BEOSDLL__ -#define PNG_EXPORT(type,symbol) __declspec(export) type symbol + /* this variant is used in Mozilla; may correspond to MSVC++ 6.0 changes */ +# ifdef ALT_WIN32_DLL +# define PNG_EXPORT(type,symbol) type __attribute__((dllexport)) symbol +# endif + + /* allow for compilation as dll with Borland C++ 5.0 */ +# if defined(__BORLANDC__) && defined(_Windows) && defined(__DLL__) +# define PNG_EXPORT(type,symbol) type _export symbol +# endif + + /* allow for compilation as shared lib under BeOS */ +# ifdef __BEOSDLL__ +# define PNG_EXPORT(type,symbol) __declspec(export) type symbol +# endif #endif #ifndef PNG_EXPORT -#define PNG_EXPORT(type,symbol) type symbol +# define PNG_EXPORT(type,symbol) type symbol #endif diff --git a/pngerror.c b/pngerror.c index 73b2f9635..ae113a7c9 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.0.4 - September 17, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.0.4 - September 17, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * libpng 1.0.4 - September 17, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngpread.c b/pngpread.c index efc55e9dd..2429dba50 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.0.4 - September 17, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * libpng 1.0.4 - September 17, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * libpng 1.0.4 - September 17, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngrtran.c b/pngrtran.c index 8a4d6d292..f86d83c91 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * libpng 1.0.4 - September 17, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngrutil.c b/pngrutil.c index 3919fce0f..3e9c7089b 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.0.3b - August 26, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * libpng 1.0.4 - September 17, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * libpng 1.0.4 - September 17, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngtrans.c b/pngtrans.c index 998d363bc..e5d8770f0 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.0.4 - September 17, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger @@ -2,7 +2,7 @@ * * For Intel CPU and Microsoft Visual C++ compiler * - * libpng 1.0.4 - September 17, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998, Intel Corporation * Copyright (c) 1998, 1999 Glenn Randers-Pehrson @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * libpng 1.0.4 - September 17, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngwrite.c b/pngwrite.c index 8809123a2..5afad37ea 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.0.4 - September 17, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngwtran.c b/pngwtran.c index 7fed23347..d4ba4febc 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * libpng 1.0.4 - September 17, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/pngwutil.c b/pngwutil.c index e7a6a3c0e..35ab55824 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.0.4 - September 17, 1999 + * libpng 1.0.4 - September 18, 1999 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger diff --git a/scripts/makefile.aco b/scripts/makefile.acorn index 504a17fc6..504a17fc6 100644 --- a/scripts/makefile.aco +++ b/scripts/makefile.acorn diff --git a/scripts/makefile.ama b/scripts/makefile.amiga index 4a456049f..4a456049f 100644 --- a/scripts/makefile.ama +++ b/scripts/makefile.amiga diff --git a/scripts/makefile.atr b/scripts/makefile.atari index 2d14ff8c1..2d14ff8c1 100644 --- a/scripts/makefile.atr +++ b/scripts/makefile.atari diff --git a/scripts/makefile.beo b/scripts/makefile.beos index 82650123a..bc7be4af3 100644 --- a/scripts/makefile.beo +++ b/scripts/makefile.beos @@ -11,7 +11,7 @@ ZLIBLIB=/usr/local/lib ZLIBINC=/usr/local/include ALIGN= -# For I-386: +# For i386: # ALIGN=-malign-loops=2 -malign-functions=2 WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ @@ -31,7 +31,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.3 +PNGMIN = 1.0.4 PNGVER = $(PNGMAJ).$(PNGMIN) # where make install puts libpng.a, libpng.so*, and png.h diff --git a/scripts/makefile.bor b/scripts/makefile.borland index 57f374f60..57f374f60 100644 --- a/scripts/makefile.bor +++ b/scripts/makefile.borland diff --git a/scripts/makefile.hux b/scripts/makefile.hpux index 780bfe5db..780bfe5db 100644 --- a/scripts/makefile.hux +++ b/scripts/makefile.hpux diff --git a/scripts/makefile.lnx b/scripts/makefile.linux index 95564b6eb..42012015c 100644 --- a/scripts/makefile.lnx +++ b/scripts/makefile.linux @@ -1,11 +1,11 @@ # makefile for libpng on Linux ELF with gcc # Copyright (C) 1996, 1997 Andreas Dilger -# Copyright (C) 1998 Greg Roelofs +# Copyright (C) 1998, 1999 Greg Roelofs # For conditions of distribution and use, see copyright notice in png.h CC=gcc -# where make install puts libpng.a, libpng.so*, and png.h +# where "make install" puts libpng.a, libpng.so*, png.h and pngconf.h prefix=/usr/local # Where the zlib library and include files are located @@ -15,7 +15,7 @@ ZLIBLIB=../zlib ZLIBINC=../zlib ALIGN= -# For I-386: +# for i386: #ALIGN=-malign-loops=2 -malign-functions=2 WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ @@ -56,10 +56,10 @@ libpng.a: $(OBJS) $(RANLIB) $@ libpng.so: libpng.so.$(PNGMAJ) - ln -f -s libpng.so.$(PNGMAJ) libpng.so + ln -sf libpng.so.$(PNGMAJ) libpng.so libpng.so.$(PNGMAJ): libpng.so.$(PNGVER) - ln -f -s libpng.so.$(PNGVER) libpng.so.$(PNGMAJ) + ln -sf libpng.so.$(PNGVER) libpng.so.$(PNGMAJ) libpng.so.$(PNGVER): $(OBJSDLL) $(CC) -shared -Wl,-soname,libpng.so.$(PNGMAJ) -o libpng.so.$(PNGVER) \ @@ -78,8 +78,8 @@ install: libpng.a libpng.so.$(PNGVER) cp libpng.a libpng.so.$(PNGVER) $(LIBPATH) chmod 755 $(LIBPATH)/libpng.so.$(PNGVER) -@/bin/rm -f $(LIBPATH)/libpng.so.$(PNGMAJ) $(LIBPATH)/libpng.so - (cd $(LIBPATH); ln -f -s libpng.so.$(PNGVER) libpng.so.$(PNGMAJ); \ - ln -f -s libpng.so.$(PNGMAJ) libpng.so) + (cd $(LIBPATH); ln -sf libpng.so.$(PNGVER) libpng.so.$(PNGMAJ); \ + ln -sf libpng.so.$(PNGMAJ) libpng.so) clean: /bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png diff --git a/scripts/makefile.mip b/scripts/makefile.mips index 06ca02ff3..06ca02ff3 100644 --- a/scripts/makefile.mip +++ b/scripts/makefile.mips diff --git a/scripts/makefile.s2x b/scripts/makefile.solaris index 5f3a412c9..5f3a412c9 100644 --- a/scripts/makefile.s2x +++ b/scripts/makefile.solaris diff --git a/scripts/makefile.sun b/scripts/makefile.sunos index f2ce329dc..f2ce329dc 100644 --- a/scripts/makefile.sun +++ b/scripts/makefile.sunos diff --git a/scripts/makefile.tc3 b/scripts/makefile.turboc3 index c925831d4..c925831d4 100644 --- a/scripts/makefile.tc3 +++ b/scripts/makefile.turboc3 diff --git a/scripts/makefile.wat b/scripts/makefile.watcom index a7d99c224..a7d99c224 100644 --- a/scripts/makefile.wat +++ b/scripts/makefile.watcom diff --git a/scripts/makefile.w32 b/scripts/makefile.win32vc index 52934c34a..52934c34a 100644 --- a/scripts/makefile.w32 +++ b/scripts/makefile.win32vc diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index 2c8eaa454..94e859acf 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -3,8 +3,8 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.0.3b'; - PNG_LIBPNG_VER = 10001; + PNG_LIBPNG_VER_STRING = '1.0.4'; + PNG_LIBPNG_VER = 10004; type png_uint_32 = Cardinal; |