diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | README | 2 | ||||
| l--------- | libpng-1.0.0b | 1 | ||||
| -rw-r--r-- | libpng.3 | 6 | ||||
| -rw-r--r-- | libpng.txt | 2 | ||||
| -rw-r--r-- | libpngpf.3 | 2 | ||||
| -rw-r--r-- | lpng100a | 0 | ||||
| -rw-r--r-- | png.5 | 2 | ||||
| -rw-r--r-- | png.c | 6 | ||||
| -rw-r--r-- | png.h | 8 | ||||
| -rw-r--r-- | pngconf.h | 4 | ||||
| -rw-r--r-- | pngerror.c | 4 | ||||
| -rw-r--r-- | pngget.c | 4 | ||||
| -rw-r--r-- | pngmem.c | 4 | ||||
| -rw-r--r-- | pngpread.c | 4 | ||||
| -rw-r--r-- | pngread.c | 4 | ||||
| -rw-r--r-- | pngrio.c | 4 | ||||
| -rw-r--r-- | pngrtran.c | 4 | ||||
| -rw-r--r-- | pngrutil.c | 14 | ||||
| -rw-r--r-- | pngset.c | 4 | ||||
| -rw-r--r-- | pngtest.c | 4 | ||||
| -rw-r--r-- | pngtrans.c | 4 | ||||
| -rw-r--r-- | pngwio.c | 4 | ||||
| -rw-r--r-- | pngwrite.c | 4 | ||||
| -rw-r--r-- | pngwtran.c | 4 | ||||
| -rw-r--r-- | pngwutil.c | 4 | ||||
| -rw-r--r-- | scripts/makefile.s2x | 13 |
28 files changed, 65 insertions, 58 deletions
@@ -278,3 +278,6 @@ version 1.0.0a [March 9, 1998] for major, minor, and bugfix releases. This is 10001. (Adam Costello, Tom Lane) Make months range from 1-12 in png_convert_to_rfc1123 +version 1.0.0b [March 13, 1998] + Quieted compiler complaints about two empty "for" loops in pngrutil.c + Minor changes to makefile.s2x @@ -1,5 +1,5 @@ -Installing libpng version 1.0.0a March 9, 1998 +Installing libpng version 1.0.0b March 13, 1998 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.0.0a or "lpng100" and "zlib-1.1.1" +might be called "libpng-1.0.0b or "lpng100" and "zlib-1.1.1" or "zlib111") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -1,4 +1,4 @@ -README for libpng 1.0.0a (shared library 2.1) +README for libpng 1.0.0b (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. diff --git a/libpng-1.0.0b b/libpng-1.0.0b new file mode 120000 index 000000000..848ef9fd1 --- /dev/null +++ b/libpng-1.0.0b @@ -0,0 +1 @@ +libpng-1.0.0b
\ No newline at end of file @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "March 9, 1998" +.TH LIBPNG 3 "March 13, 1998" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library .SH SYNOPSIS @@ -396,7 +396,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.0a March 9, 1998 + libpng version 1.0.0b March 13, 1998 Updated and distributed by Glenn Randers-Pehrson <randeg@alumni.rpi.edu> Copyright (c) 1998, Glenn Randers-Pehrson @@ -2366,7 +2366,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.0a March 9, 1998: +Libpng version 1.0.0b March 13, 1998: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alumni.rpi.edu). diff --git a/libpng.txt b/libpng.txt index 602efd872..cc580117b 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.0a March 9, 1998 + libpng version 1.0.0b March 13, 1998 Updated and distributed by Glenn Randers-Pehrson <randeg@alumni.rpi.edu> Copyright (c) 1998, Glenn Randers-Pehrson diff --git a/libpngpf.3 b/libpngpf.3 index 00730b90c..4458ba882 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "March 9, 1998" +.TH LIBPNGPF 3 "March 13, 1998" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library (private functions) diff --git a/lpng100a b/lpng100a deleted file mode 100644 index e69de29bb..000000000 --- a/lpng100a +++ /dev/null @@ -1,4 +1,4 @@ -.TH PNG 5 "March 9, 1998" +.TH PNG 5 "March 13, 1998" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -1,12 +1,12 @@ /* png.c - location for general purpose libpng functions * - * libpng 1.0.0a + * libpng 1.0.0b * 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 * Copyright (c) 1998, Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 */ #define PNG_INTERNAL @@ -16,7 +16,7 @@ /* Version information for C files. This had better match the version * string defined in png.h. */ -char png_libpng_ver[12] = "1.0.0a"; +char png_libpng_ver[12] = "1.0.0b"; /* Place to hold the signature string for a PNG file. */ png_byte FARDATA png_sig[8] = {137, 80, 78, 71, 13, 10, 26, 10}; @@ -1,12 +1,12 @@ /* png.h - header file for PNG reference library * - * libpng 1.0.0a + * libpng 1.0.0b * For conditions of distribution and use, see the COPYRIGHT NOTICE below. * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998 Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 * * Note about libpng version numbers: * @@ -118,14 +118,14 @@ extern "C" { */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.0.0a" +#define PNG_LIBPNG_VER_STRING "1.0.0b" /* Gareful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeroes. * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only * version 1.0.0 was mis-numbered 100 instead of 10000). From * version 1.0.1 it's xxyyzz, where x=major, y=minor, z-bugfix*/ -#define PNG_LIBPNG_VER 10001 +#define PNG_LIBPNG_VER 10001 /* 1.0.1 */ /* variables declared in png.c - only it needs to define PNG_NO_EXTERN */ #if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN) @@ -1,12 +1,12 @@ /* pngconf.h - machine configurable file for libpng * - * libpng 1.0.0a + * libpng 1.0.0b * 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 * Copyright (c) 1998, Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 */ /* Any machine specific code is near the front of this file, so if you diff --git a/pngerror.c b/pngerror.c index 3358d400d..74b27334a 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,12 +1,12 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.0.0a + * libpng 1.0.0b * 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 * Copyright (c) 1998, Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 * * This file provides a location for all error handling. Users which * need special error handling are expected to write replacement functions @@ -1,12 +1,12 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.0.0a + * libpng 1.0.0b * 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 * Copyright (c) 1998, Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 */ #define PNG_INTERNAL @@ -1,12 +1,12 @@ /* pngmem.c - stub functions for memory allocation * - * libpng 1.0.0a + * libpng 1.0.0b * 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 * Copyright (c) 1998, Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 * * This file provides a location for all memory allocation. Users which * need special memory handling are expected to modify the code in this file diff --git a/pngpread.c b/pngpread.c index c8b488798..dad9a91fb 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,12 +1,12 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.0.0a + * libpng 1.0.0b * 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 * Copyright (c) 1998, Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 */ #define PNG_INTERNAL @@ -1,12 +1,12 @@ /* pngread.c - read a PNG file * - * libpng 1.0.0a + * libpng 1.0.0b * 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 * Copyright (c) 1998, Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 * * This file contains routines that an application calls directly to * read a PNG file or stream. @@ -1,12 +1,12 @@ /* pngrio.c - functions for data input * - * libpng 1.0.0a + * libpng 1.0.0b * 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 * Copyright (c) 1998, Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 * * This file provides a location for all input. Users which need * special handling are expected to write a function which has the same diff --git a/pngrtran.c b/pngrtran.c index 9f02191cd..3db732634 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,12 +1,12 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * libpng 1.0.0a + * libpng 1.0.0b * 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 * Copyright (c) 1998, Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 * * This file contains functions optionally called by an application * in order to tell libpng how to handle data when reading a PNG. diff --git a/pngrutil.c b/pngrutil.c index 7394e152a..3591b0e8c 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,12 +1,12 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.0.0a + * libpng 1.0.0b * 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 * Copyright (c) 1998, Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 * * This file contains routines which are only called from within * libpng itself during the course of reading an image. @@ -1076,7 +1076,7 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) png_debug(3, "Finding end of pCAL purpose string\n"); for (buf = purpose; *buf != '\0'; buf++) - /* empty loop */; + /* empty loop */ ; endptr = purpose + slength; @@ -1113,8 +1113,8 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) png_warning(png_ptr, "Unrecognized equation type for pCAL chunk"); } - /* Empty loop to move past the units string. */ - for (buf = units; *buf != 0x00; buf++); + for (buf = units; *buf != 0x00; buf++) + /* Empty loop to move past the units string. */ ; png_debug(3, "Allocating pCAL parameters array\n"); params = (png_charpp)png_malloc(png_ptr, (png_uint_32)(nparams @@ -1126,8 +1126,8 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) buf++; /* Skip the null string terminator from previous parameter. */ png_debug1(3, "Reading pCAL parameter %d\n", i); - /* Empty loop to move past each paramter string */ - for (params[i] = buf; *buf != 0x00 && buf <= endptr; buf++); + for (params[i] = buf; *buf != 0x00 && buf <= endptr; buf++) + /* Empty loop to move past each parameter string */ ; /* Make sure we haven't run out of data yet */ if (buf > endptr) @@ -1,12 +1,12 @@ /* pngset.c - storage of image information into info struct * - * libpng 1.0.0a + * libpng 1.0.0b * 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 * Copyright (c) 1998, Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 * * The functions here are used during reads to store data from the file * into the info struct, and during writes to store application data @@ -1,12 +1,12 @@ /* pngtest.c - a simple test program to test libpng * - * libpng 1.0.0a + * libpng 1.0.0b * 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 * Copyright (c) 1998, Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 * * This program reads in a PNG image, writes it out again, and then * compares the two files. If the files are identical, this shows that diff --git a/pngtrans.c b/pngtrans.c index c6b4ff0d7..2d83ca8fd 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,12 +1,12 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * libpng 1.0.0a + * libpng 1.0.0b * 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 * Copyright (c) 1998, Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 */ #define PNG_INTERNAL @@ -1,12 +1,12 @@ /* pngwio.c - functions for data output * - * libpng 1.0.0a + * libpng 1.0.0b * 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 * Copyright (c) 1998, Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 * * This file provides a location for all output. Users which need * special handling are expected to write functions which have the same diff --git a/pngwrite.c b/pngwrite.c index 4a9a41347..c2f9d6a31 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,12 +1,12 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.0.0a + * libpng 1.0.0b * 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 * Copyright (c) 1998, Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 */ /* get internal access to png.h */ diff --git a/pngwtran.c b/pngwtran.c index fbf268985..fa2750654 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,12 +1,12 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * libpng 1.0.0a + * libpng 1.0.0b * 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 * Copyright (c) 1998, Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 */ #define PNG_INTERNAL diff --git a/pngwutil.c b/pngwutil.c index 2a76304e1..775f3da8b 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,12 +1,12 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.0.0a + * libpng 1.0.0b * 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 * Copyright (c) 1998, Glenn Randers-Pehrson - * March 9, 1998 + * March 13, 1998 */ #define PNG_INTERNAL diff --git a/scripts/makefile.s2x b/scripts/makefile.s2x index 0503890af..1a34a17f9 100644 --- a/scripts/makefile.s2x +++ b/scripts/makefile.s2x @@ -1,4 +1,4 @@ - makefile for libpng on Solaris 2.x with gcc +# makefile for libpng on Solaris 2.x with gcc # Contributed by William L. Sebok, based on makefile.lnx # Copyright (C) 1996, 1997 Andreas Dilger # Copyright (C) 1998 Greg Roelofs @@ -7,8 +7,11 @@ CC=gcc # Where the zlib library and include files are located -ZLIBLIB=/usr/local/lib -ZLIBINC=/usr/local/include +# ZLIBLIB=/usr/local/lib +# ZLIBINC=/usr/local/include +ZLIBLIB=../zlib +ZLIBINC=../zlib + WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ @@ -27,7 +30,7 @@ PNGMIN = 1.0 PNGVER = $(PNGMAJ).$(PNGMIN) # where make install puts libpng.a, libpng.so*, and png.h -prefix=/local +prefix=/usr/local INCPATH=$(prefix)/include LIBPATH=$(prefix)/lib @@ -55,7 +58,7 @@ libpng.so.$(PNGMAJ): libpng.so.$(PNGVER) ln -sf libpng.so.$(PNGVER) libpng.so.$(PNGMAJ) libpng.so.$(PNGVER): $(OBJSDLL) - $(LD) -G -L$(LIBPATH) -R$(LIBPATH) -h libpng.so.$(PNGMAJ) \ + $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h libpng.so.$(PNGMAJ) \ -o libpng.so.$(PNGVER) $(OBJSDLL) -lz pngtest: pngtest.o libpng.so |