1997-01-17 02:34:35 -05:00
|
|
|
|
1996-01-16 02:51:56 -05:00
|
|
|
/* pngtest.c - a simple test program to test libpng
|
1998-01-01 08:13:13 -05:00
|
|
|
*
|
1999-09-17 13:27:26 -04:00
|
|
|
* libpng 1.0.4 - September 17, 1999
|
1998-01-01 08:13:13 -05:00
|
|
|
* 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
|
1999-01-06 22:50:16 -05:00
|
|
|
* Copyright (c) 1998, 1999 Glenn Randers-Pehrson
|
1998-01-01 08:13:13 -05:00
|
|
|
*
|
|
|
|
* 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
|
|
|
|
* the basic chunk handling, filtering, and (de)compression code is working
|
|
|
|
* properly. It does not currently test all of the transforms, although
|
|
|
|
* it probably should.
|
|
|
|
*
|
1998-06-14 15:43:31 -04:00
|
|
|
* The program will report "FAIL" in certain legitimate cases:
|
1998-01-01 08:13:13 -05:00
|
|
|
* 1) when the compression level or filter selection method is changed.
|
1998-06-06 16:31:35 -04:00
|
|
|
* 2) when the chunk size is not 8K.
|
1998-01-01 08:13:13 -05:00
|
|
|
* 3) unknown ancillary chunks exist in the input file.
|
|
|
|
* 4) others not listed here...
|
|
|
|
* In these cases, it is best to check with another tool such as "pngcheck"
|
|
|
|
* to see what the differences between the two images are.
|
|
|
|
*
|
|
|
|
* If a filename is given on the command-line, then this file is used
|
|
|
|
* for the input, rather than the default "pngtest.png". This allows
|
1998-06-06 16:31:35 -04:00
|
|
|
* testing a wide variety of files easily. You can also test a number
|
|
|
|
* of files at once by typing "pngtest -m file1.png file2.png ..."
|
1998-01-01 08:13:13 -05:00
|
|
|
*/
|
1995-07-20 03:43:20 -04:00
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
1997-05-16 03:46:07 -04:00
|
|
|
|
|
|
|
/* Makes pngtest verbose so we can find problems (needs to be before png.h) */
|
|
|
|
#ifndef PNG_DEBUG
|
1998-03-07 07:06:55 -05:00
|
|
|
#define PNG_DEBUG 0
|
1998-03-07 15:33:00 -05:00
|
|
|
#endif
|
1997-05-16 03:46:07 -04:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
#include "png.h"
|
|
|
|
|
1998-06-06 16:31:35 -04:00
|
|
|
#if defined(PNG_TIME_RFC1123_SUPPORTED)
|
|
|
|
static int tIME_chunk_present=0;
|
1998-06-14 15:43:31 -04:00
|
|
|
static char tIME_string[30] = "no tIME chunk present in file";
|
1998-06-06 16:31:35 -04:00
|
|
|
#endif /* PNG_TIME_RFC1123_SUPPORTED */
|
|
|
|
|
1999-09-17 13:27:26 -04:00
|
|
|
static int verbose = 0;
|
|
|
|
|
1998-03-07 15:33:00 -05:00
|
|
|
int test_one_file PNGARG((PNG_CONST char *inname, PNG_CONST char *outname));
|
1998-01-16 23:06:18 -05:00
|
|
|
|
1995-07-20 03:43:20 -04:00
|
|
|
#ifdef __TURBOC__
|
|
|
|
#include <mem.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* defined so I can write to a file on gui/windowing platforms */
|
1995-12-19 04:22:19 -05:00
|
|
|
/* #define STDERR stderr */
|
1996-01-26 02:38:47 -05:00
|
|
|
#define STDERR stdout /* for DOS */
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1998-03-07 07:06:55 -05:00
|
|
|
/* example of using row callbacks to make a simple progress meter */
|
|
|
|
static int status_pass=1;
|
|
|
|
static int status_dots_requested=0;
|
|
|
|
static int status_dots=1;
|
1998-03-07 15:33:00 -05:00
|
|
|
|
1998-03-07 17:17:42 -05:00
|
|
|
void
|
|
|
|
read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
|
1998-03-07 07:06:55 -05:00
|
|
|
{
|
1999-09-17 13:27:26 -04:00
|
|
|
if(png_ptr == NULL || row_number > PNG_MAX_UINT) return;
|
1998-03-07 07:06:55 -05:00
|
|
|
if(status_pass != pass)
|
|
|
|
{
|
|
|
|
fprintf(stdout,"\n Pass %d: ",pass);
|
|
|
|
status_pass = pass;
|
1999-09-17 13:27:26 -04:00
|
|
|
status_dots = 31;
|
1998-03-07 07:06:55 -05:00
|
|
|
}
|
|
|
|
status_dots--;
|
|
|
|
if(status_dots == 0)
|
|
|
|
{
|
|
|
|
fprintf(stdout, "\n ");
|
|
|
|
status_dots=30;
|
|
|
|
}
|
|
|
|
fprintf(stdout, "r");
|
|
|
|
}
|
1998-03-07 15:33:00 -05:00
|
|
|
|
1998-03-07 17:17:42 -05:00
|
|
|
void
|
|
|
|
write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
|
1998-03-07 07:06:55 -05:00
|
|
|
{
|
1999-09-17 13:27:26 -04:00
|
|
|
if(png_ptr == NULL || row_number > PNG_MAX_UINT || pass > 7) return;
|
1998-03-07 07:06:55 -05:00
|
|
|
fprintf(stdout, "w");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-09-17 13:27:26 -04:00
|
|
|
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
|
|
|
|
/* Example of using user transform callback (we don't transform anything,
|
|
|
|
but merely examine the row filters. We set this to 256 rather than
|
|
|
|
5 in case illegal filter values are present.) */
|
|
|
|
static png_uint_32 filters_used[256];
|
|
|
|
void
|
|
|
|
count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data)
|
|
|
|
{
|
|
|
|
if(png_ptr != NULL && row_info != NULL)
|
|
|
|
++filters_used[*(data-1)];
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1998-03-07 22:30:44 -05:00
|
|
|
#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
|
1998-03-07 07:06:55 -05:00
|
|
|
/* example of using user transform callback (we don't transform anything,
|
1998-04-21 16:03:57 -04:00
|
|
|
but merely count the zero samples) */
|
1998-03-07 07:06:55 -05:00
|
|
|
|
1998-04-21 16:03:57 -04:00
|
|
|
static png_uint_32 zero_samples;
|
1998-03-07 15:33:00 -05:00
|
|
|
|
1998-03-07 17:17:42 -05:00
|
|
|
void
|
1998-04-21 16:03:57 -04:00
|
|
|
count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)
|
1998-03-07 07:06:55 -05:00
|
|
|
{
|
|
|
|
png_bytep dp = data;
|
1998-12-29 12:47:59 -05:00
|
|
|
if(png_ptr == NULL)return;
|
1998-03-07 07:06:55 -05:00
|
|
|
|
|
|
|
/* contents of row_info:
|
|
|
|
* png_uint_32 width width of row
|
|
|
|
* png_uint_32 rowbytes number of bytes in row
|
|
|
|
* png_byte color_type color type of pixels
|
|
|
|
* png_byte bit_depth bit depth of samples
|
|
|
|
* png_byte channels number of channels (1-4)
|
|
|
|
* png_byte pixel_depth bits per pixel (depth*channels)
|
|
|
|
*/
|
|
|
|
|
1999-09-17 13:27:26 -04:00
|
|
|
|
1998-04-21 16:03:57 -04:00
|
|
|
/* counts the number of zero samples (or zero pixels if color_type is 3 */
|
1998-03-07 07:06:55 -05:00
|
|
|
|
|
|
|
if(row_info->color_type == 0 || row_info->color_type == 3)
|
|
|
|
{
|
|
|
|
int pos=0;
|
1998-04-21 16:03:57 -04:00
|
|
|
png_uint_32 n, nstop;
|
|
|
|
for (n=0, nstop=row_info->width; n<nstop; n++)
|
1998-03-07 07:06:55 -05:00
|
|
|
{
|
|
|
|
if(row_info->bit_depth == 1)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
|
|
|
if(((*dp << pos++ )& 0x80) == 0) zero_samples++;
|
1998-03-07 07:06:55 -05:00
|
|
|
if(pos == 8)
|
|
|
|
{
|
1998-04-21 16:03:57 -04:00
|
|
|
pos = 0;
|
1998-03-07 07:06:55 -05:00
|
|
|
dp++;
|
|
|
|
}
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
1998-03-07 07:06:55 -05:00
|
|
|
if(row_info->bit_depth == 2)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
|
|
|
if(((*dp << (pos+=2))& 0xc0) == 0) zero_samples++;
|
1998-03-07 07:06:55 -05:00
|
|
|
if(pos == 8)
|
|
|
|
{
|
1998-04-21 16:03:57 -04:00
|
|
|
pos = 0;
|
1998-03-07 07:06:55 -05:00
|
|
|
dp++;
|
|
|
|
}
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
1998-03-07 07:06:55 -05:00
|
|
|
if(row_info->bit_depth == 4)
|
1998-04-21 16:03:57 -04:00
|
|
|
{
|
|
|
|
if(((*dp << (pos+=4))& 0xf0) == 0) zero_samples++;
|
1998-03-07 07:06:55 -05:00
|
|
|
if(pos == 8)
|
|
|
|
{
|
1998-04-21 16:03:57 -04:00
|
|
|
pos = 0;
|
1998-03-07 07:06:55 -05:00
|
|
|
dp++;
|
|
|
|
}
|
1998-04-21 16:03:57 -04:00
|
|
|
}
|
1998-03-07 07:06:55 -05:00
|
|
|
if(row_info->bit_depth == 8)
|
1998-04-21 16:03:57 -04:00
|
|
|
if(*dp++ == 0) zero_samples++;
|
1998-03-07 07:06:55 -05:00
|
|
|
if(row_info->bit_depth == 16)
|
|
|
|
{
|
1998-04-21 16:03:57 -04:00
|
|
|
if((*dp | *(dp+1)) == 0) zero_samples++;
|
1998-03-07 07:06:55 -05:00
|
|
|
dp+=2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else /* other color types */
|
|
|
|
{
|
1998-04-21 16:03:57 -04:00
|
|
|
png_uint_32 n, nstop;
|
1998-03-07 07:06:55 -05:00
|
|
|
int channel;
|
|
|
|
int color_channels = row_info->channels;
|
|
|
|
if(row_info->color_type > 3)color_channels--;
|
|
|
|
|
1998-04-21 16:03:57 -04:00
|
|
|
for (n=0, nstop=row_info->width; n<nstop; n++)
|
1998-03-07 07:06:55 -05:00
|
|
|
{
|
|
|
|
for (channel = 0; channel < color_channels; channel++)
|
|
|
|
{
|
|
|
|
if(row_info->bit_depth == 8)
|
1998-04-21 16:03:57 -04:00
|
|
|
if(*dp++ == 0) zero_samples++;
|
1998-03-07 07:06:55 -05:00
|
|
|
if(row_info->bit_depth == 16)
|
|
|
|
{
|
1998-04-21 16:03:57 -04:00
|
|
|
if((*dp | *(dp+1)) == 0) zero_samples++;
|
1998-03-07 07:06:55 -05:00
|
|
|
dp+=2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(row_info->color_type > 3)
|
|
|
|
{
|
|
|
|
dp++;
|
|
|
|
if(row_info->bit_depth == 16)dp++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1998-03-07 22:30:44 -05:00
|
|
|
#endif /* PNG_WRITE_USER_TRANSFORM_SUPPORTED */
|
1998-03-07 07:06:55 -05:00
|
|
|
|
1998-02-28 08:00:24 -05:00
|
|
|
static int wrote_question = 0;
|
1998-01-30 22:45:12 -05:00
|
|
|
|
1998-01-16 23:06:18 -05:00
|
|
|
#if defined(PNG_NO_STDIO)
|
1998-01-03 23:40:55 -05:00
|
|
|
/* START of code to validate stdio-free compilation */
|
|
|
|
/* These copies of the default read/write functions come from pngrio.c and */
|
|
|
|
/* pngwio.c. They allow "don't include stdio" testing of the library. */
|
1998-05-21 10:27:50 -04:00
|
|
|
/* This is the function that does the actual reading of data. If you are
|
1998-01-03 23:40:55 -05:00
|
|
|
not reading from a standard C stream, you should create a replacement
|
|
|
|
read_data function and use it at run time with png_set_read_fn(), rather
|
|
|
|
than changing the library. */
|
|
|
|
#ifndef USE_FAR_KEYWORD
|
|
|
|
static void
|
|
|
|
png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
|
|
|
|
{
|
|
|
|
png_size_t check;
|
|
|
|
|
|
|
|
/* fread() returns 0 on error, so it is OK to store this in a png_size_t
|
|
|
|
* instead of an int, which is what fread() actually returns.
|
|
|
|
*/
|
|
|
|
check = (png_size_t)fread(data, (png_size_t)1, length,
|
|
|
|
(FILE *)png_ptr->io_ptr);
|
|
|
|
|
|
|
|
if (check != length)
|
|
|
|
{
|
|
|
|
png_error(png_ptr, "Read Error");
|
|
|
|
}
|
|
|
|
}
|
1996-06-05 16:50:50 -04:00
|
|
|
#else
|
1998-01-03 23:40:55 -05:00
|
|
|
/* this is the model-independent version. Since the standard I/O library
|
|
|
|
can't handle far buffers in the medium and small models, we have to copy
|
|
|
|
the data.
|
|
|
|
*/
|
1998-12-29 12:47:59 -05:00
|
|
|
|
1998-01-03 23:40:55 -05:00
|
|
|
#define NEAR_BUF_SIZE 1024
|
|
|
|
#define MIN(a,b) (a <= b ? a : b)
|
1998-12-29 12:47:59 -05:00
|
|
|
|
1998-03-07 17:17:42 -05:00
|
|
|
static void
|
|
|
|
png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
|
1998-01-03 23:40:55 -05:00
|
|
|
{
|
|
|
|
int check;
|
|
|
|
png_byte *n_data;
|
|
|
|
FILE *io_ptr;
|
|
|
|
|
|
|
|
/* Check if data really is near. If so, use usual code. */
|
|
|
|
n_data = (png_byte *)CVT_PTR_NOCHECK(data);
|
|
|
|
io_ptr = (FILE *)CVT_PTR(png_ptr->io_ptr);
|
|
|
|
if ((png_bytep)n_data == data)
|
|
|
|
{
|
|
|
|
check = fread(n_data, 1, length, io_ptr);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
png_byte buf[NEAR_BUF_SIZE];
|
|
|
|
png_size_t read, remaining, err;
|
|
|
|
check = 0;
|
|
|
|
remaining = length;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
read = MIN(NEAR_BUF_SIZE, remaining);
|
|
|
|
err = fread(buf, (png_size_t)1, read, io_ptr);
|
|
|
|
png_memcpy(data, buf, read); /* copy far buffer to near buffer */
|
|
|
|
if(err != read)
|
|
|
|
break;
|
|
|
|
else
|
|
|
|
check += err;
|
|
|
|
data += read;
|
|
|
|
remaining -= read;
|
|
|
|
}
|
|
|
|
while (remaining != 0);
|
|
|
|
}
|
|
|
|
if (check != length)
|
|
|
|
{
|
|
|
|
png_error(png_ptr, "read Error");
|
|
|
|
}
|
|
|
|
}
|
1998-01-16 23:06:18 -05:00
|
|
|
#endif /* USE_FAR_KEYWORD */
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1998-01-03 23:40:55 -05:00
|
|
|
#if defined(PNG_WRITE_FLUSH_SUPPORTED)
|
1998-03-07 17:17:42 -05:00
|
|
|
static void
|
|
|
|
png_default_flush(png_structp png_ptr)
|
1998-01-03 23:40:55 -05:00
|
|
|
{
|
|
|
|
FILE *io_ptr;
|
|
|
|
io_ptr = (FILE *)CVT_PTR((png_ptr->io_ptr));
|
|
|
|
if (io_ptr != NULL)
|
|
|
|
fflush(io_ptr);
|
|
|
|
}
|
|
|
|
#endif
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1998-05-21 10:27:50 -04:00
|
|
|
/* This is the function that does the actual writing of data. If you are
|
1998-01-03 23:40:55 -05:00
|
|
|
not writing to a standard C stream, you should create a replacement
|
|
|
|
write_data function and use it at run time with png_set_write_fn(), rather
|
|
|
|
than changing the library. */
|
|
|
|
#ifndef USE_FAR_KEYWORD
|
|
|
|
static void
|
|
|
|
png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
|
|
|
|
{
|
|
|
|
png_uint_32 check;
|
|
|
|
|
|
|
|
check = fwrite(data, 1, length, (FILE *)(png_ptr->io_ptr));
|
|
|
|
if (check != length)
|
|
|
|
{
|
|
|
|
png_error(png_ptr, "Write Error");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
/* this is the model-independent version. Since the standard I/O library
|
|
|
|
can't handle far buffers in the medium and small models, we have to copy
|
|
|
|
the data.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define NEAR_BUF_SIZE 1024
|
|
|
|
#define MIN(a,b) (a <= b ? a : b)
|
|
|
|
|
|
|
|
static void
|
|
|
|
png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
|
|
|
|
{
|
|
|
|
png_uint_32 check;
|
|
|
|
png_byte *near_data; /* Needs to be "png_byte *" instead of "png_bytep" */
|
|
|
|
FILE *io_ptr;
|
|
|
|
|
|
|
|
/* Check if data really is near. If so, use usual code. */
|
|
|
|
near_data = (png_byte *)CVT_PTR_NOCHECK(data);
|
|
|
|
io_ptr = (FILE *)CVT_PTR(png_ptr->io_ptr);
|
|
|
|
if ((png_bytep)near_data == data)
|
|
|
|
{
|
|
|
|
check = fwrite(near_data, 1, length, io_ptr);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
png_byte buf[NEAR_BUF_SIZE];
|
|
|
|
png_size_t written, remaining, err;
|
|
|
|
check = 0;
|
|
|
|
remaining = length;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
written = MIN(NEAR_BUF_SIZE, remaining);
|
|
|
|
png_memcpy(buf, data, written); /* copy far buffer to near buffer */
|
|
|
|
err = fwrite(buf, 1, written, io_ptr);
|
|
|
|
if (err != written)
|
|
|
|
break;
|
|
|
|
else
|
|
|
|
check += err;
|
|
|
|
data += written;
|
|
|
|
remaining -= written;
|
|
|
|
}
|
|
|
|
while (remaining != 0);
|
|
|
|
}
|
|
|
|
if (check != length)
|
|
|
|
{
|
|
|
|
png_error(png_ptr, "Write Error");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-01-16 23:06:18 -05:00
|
|
|
#endif /* USE_FAR_KEYWORD */
|
1998-01-03 23:40:55 -05:00
|
|
|
|
|
|
|
/* This function is called when there is a warning, but the library thinks
|
|
|
|
* it can continue anyway. Replacement functions don't have to do anything
|
|
|
|
* here if you don't want to. In the default configuration, png_ptr is
|
|
|
|
* not used, but it is passed in case it may be useful.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
png_default_warning(png_structp png_ptr, png_const_charp message)
|
|
|
|
{
|
|
|
|
PNG_CONST char *name = "UNKNOWN (ERROR!)";
|
|
|
|
if (png_ptr != NULL && png_ptr->error_ptr != NULL)
|
|
|
|
name = png_ptr->error_ptr;
|
|
|
|
fprintf(STDERR, "%s: libpng warning: %s\n", name, message);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is the default error handling function. Note that replacements for
|
|
|
|
* this function MUST NOT RETURN, or the program will likely crash. This
|
|
|
|
* function is used by default, or if the program supplies NULL for the
|
|
|
|
* error function pointer in png_set_error_fn().
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
png_default_error(png_structp png_ptr, png_const_charp message)
|
|
|
|
{
|
|
|
|
png_default_warning(png_ptr, message);
|
1998-05-21 10:27:50 -04:00
|
|
|
/* We can return because png_error calls the default handler, which is
|
|
|
|
* actually OK in this case. */
|
1998-01-03 23:40:55 -05:00
|
|
|
}
|
1998-01-16 23:06:18 -05:00
|
|
|
#endif /* PNG_NO_STDIO */
|
1998-01-03 23:40:55 -05:00
|
|
|
/* END of code to validate stdio-free compilation */
|
|
|
|
|
1998-01-30 22:45:12 -05:00
|
|
|
/* START of code to validate memory allocation and deallocation */
|
1998-06-06 16:31:35 -04:00
|
|
|
#ifdef PNG_USER_MEM_SUPPORTED
|
1998-01-30 22:45:12 -05:00
|
|
|
|
|
|
|
/* Allocate memory. For reasonable files, size should never exceed
|
|
|
|
64K. However, zlib may allocate more then 64K if you don't tell
|
|
|
|
it not to. See zconf.h and png.h for more information. zlib does
|
|
|
|
need to allocate exactly 64K, so whatever you call here must
|
|
|
|
have the ability to do that.
|
|
|
|
|
|
|
|
This piece of code can be compiled to validate max 64K allocations
|
|
|
|
by setting MAXSEG_64K in zlib zconf.h *or* PNG_MAX_MALLOC_64K. */
|
|
|
|
typedef struct memory_information {
|
|
|
|
png_uint_32 size;
|
1998-06-06 16:31:35 -04:00
|
|
|
png_voidp pointer;
|
1998-01-30 22:45:12 -05:00
|
|
|
struct memory_information FAR *next;
|
|
|
|
} memory_information;
|
|
|
|
typedef memory_information FAR *memory_infop;
|
|
|
|
|
|
|
|
static memory_infop pinformation = NULL;
|
|
|
|
static int current_allocation = 0;
|
|
|
|
static int maximum_allocation = 0;
|
|
|
|
|
|
|
|
extern PNG_EXPORT(png_voidp,png_debug_malloc) PNGARG((png_structp png_ptr,
|
|
|
|
png_uint_32 size));
|
|
|
|
extern PNG_EXPORT(void,png_debug_free) PNGARG((png_structp png_ptr,
|
|
|
|
png_voidp ptr));
|
|
|
|
|
|
|
|
png_voidp
|
1998-06-06 16:31:35 -04:00
|
|
|
png_debug_malloc(png_structp png_ptr, png_uint_32 size) {
|
|
|
|
|
|
|
|
/* png_malloc has already tested for NULL; png_create_struct calls
|
|
|
|
png_debug_malloc directly, with png_ptr == NULL which is OK */
|
|
|
|
|
1998-01-30 22:45:12 -05:00
|
|
|
if (size == 0)
|
1998-02-07 11:20:57 -05:00
|
|
|
return (png_voidp)(NULL);
|
1998-01-30 22:45:12 -05:00
|
|
|
|
|
|
|
/* This calls the library allocator twice, once to get the requested
|
|
|
|
buffer and once to get a new free list entry. */
|
|
|
|
{
|
1998-06-06 16:31:35 -04:00
|
|
|
memory_infop pinfo = png_malloc_default(png_ptr, sizeof *pinfo);
|
1998-01-30 22:45:12 -05:00
|
|
|
pinfo->size = size;
|
|
|
|
current_allocation += size;
|
|
|
|
if (current_allocation > maximum_allocation)
|
|
|
|
maximum_allocation = current_allocation;
|
1998-06-06 16:31:35 -04:00
|
|
|
pinfo->pointer = png_malloc_default(png_ptr, size);
|
1998-01-30 22:45:12 -05:00
|
|
|
pinfo->next = pinformation;
|
|
|
|
pinformation = pinfo;
|
|
|
|
/* Make sure the caller isn't assuming zeroed memory. */
|
|
|
|
png_memset(pinfo->pointer, 0xdd, pinfo->size);
|
1998-02-07 11:20:57 -05:00
|
|
|
return (png_voidp)(pinfo->pointer);
|
1998-01-30 22:45:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Free a pointer. It is removed from the list at the same time. */
|
|
|
|
void
|
1998-06-06 16:31:35 -04:00
|
|
|
png_debug_free(png_structp png_ptr, png_voidp ptr)
|
1998-01-30 22:45:12 -05:00
|
|
|
{
|
|
|
|
if (png_ptr == NULL)
|
1998-06-06 16:31:35 -04:00
|
|
|
fprintf(STDERR, "NULL pointer to png_debug_free.\n");
|
1998-01-30 22:45:12 -05:00
|
|
|
if (ptr == 0) {
|
|
|
|
#if 0 /* This happens all the time. */
|
|
|
|
fprintf(STDERR, "WARNING: freeing NULL pointer\n");
|
|
|
|
#endif
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Unlink the element from the list. */
|
|
|
|
{
|
|
|
|
memory_infop FAR *ppinfo = &pinformation;
|
|
|
|
for (;;) {
|
|
|
|
memory_infop pinfo = *ppinfo;
|
|
|
|
if (pinfo->pointer == ptr) {
|
|
|
|
*ppinfo = pinfo->next;
|
|
|
|
current_allocation -= pinfo->size;
|
|
|
|
if (current_allocation < 0)
|
|
|
|
fprintf(STDERR, "Duplicate free of memory\n");
|
|
|
|
/* We must free the list element too, but first kill
|
1998-05-21 10:27:50 -04:00
|
|
|
the memory that is to be freed. */
|
1998-01-30 22:45:12 -05:00
|
|
|
memset(ptr, 0x55, pinfo->size);
|
1998-06-06 16:31:35 -04:00
|
|
|
png_free_default(png_ptr, pinfo);
|
1998-01-30 22:45:12 -05:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (pinfo->next == NULL) {
|
|
|
|
fprintf(STDERR, "Pointer %x not found\n", ptr);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ppinfo = &pinfo->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Finally free the data. */
|
1998-06-06 16:31:35 -04:00
|
|
|
png_free_default(png_ptr, ptr);
|
1998-01-30 22:45:12 -05:00
|
|
|
}
|
1998-06-06 16:31:35 -04:00
|
|
|
#endif /* PNG_USER_MEM_SUPPORTED */
|
1998-01-30 22:45:12 -05:00
|
|
|
/* END of code to test memory allocation/deallocation */
|
|
|
|
|
1998-01-03 23:40:55 -05:00
|
|
|
/* Test one file */
|
1998-03-07 17:17:42 -05:00
|
|
|
int
|
|
|
|
test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
|
1995-07-20 03:43:20 -04:00
|
|
|
{
|
1998-01-16 23:06:18 -05:00
|
|
|
static FILE *fpin, *fpout; /* "static" prevents setjmp corruption */
|
1997-05-16 03:46:07 -04:00
|
|
|
png_structp read_ptr, write_ptr;
|
|
|
|
png_infop read_info_ptr, write_info_ptr, end_info_ptr;
|
1996-01-26 02:38:47 -05:00
|
|
|
png_bytep row_buf;
|
1995-07-20 03:43:20 -04:00
|
|
|
png_uint_32 y;
|
1997-05-16 03:46:07 -04:00
|
|
|
png_uint_32 width, height;
|
|
|
|
int num_pass, pass;
|
|
|
|
int bit_depth, color_type;
|
1997-01-17 02:34:35 -05:00
|
|
|
#ifdef USE_FAR_KEYWORD
|
|
|
|
jmp_buf jmpbuf;
|
|
|
|
#endif
|
1998-12-29 12:47:59 -05:00
|
|
|
|
1998-01-03 23:40:55 -05:00
|
|
|
char inbuf[256], outbuf[256];
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1998-01-03 23:40:55 -05:00
|
|
|
row_buf = (png_bytep)NULL;
|
1996-06-05 16:50:50 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
if ((fpin = fopen(inname, "rb")) == NULL)
|
1995-11-28 12:22:13 -05:00
|
|
|
{
|
|
|
|
fprintf(STDERR, "Could not find input file %s\n", inname);
|
1998-01-31 21:07:59 -05:00
|
|
|
return (1);
|
1995-11-28 12:22:13 -05:00
|
|
|
}
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
if ((fpout = fopen(outname, "wb")) == NULL)
|
1995-11-28 12:22:13 -05:00
|
|
|
{
|
1996-06-05 16:50:50 -04:00
|
|
|
fprintf(STDERR, "Could not open output file %s\n", outname);
|
1995-11-28 12:22:13 -05:00
|
|
|
fclose(fpin);
|
1998-01-31 21:07:59 -05:00
|
|
|
return (1);
|
1995-11-28 12:22:13 -05:00
|
|
|
}
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(0, "Allocating read and write structures\n");
|
1998-06-06 16:31:35 -04:00
|
|
|
#ifdef PNG_USER_MEM_SUPPORTED
|
|
|
|
read_ptr = png_create_read_struct_2(PNG_LIBPNG_VER_STRING, (png_voidp)NULL,
|
|
|
|
(png_error_ptr)NULL, (png_error_ptr)NULL, (png_voidp)NULL,
|
|
|
|
(png_malloc_ptr)png_debug_malloc, (png_free_ptr)png_debug_free);
|
|
|
|
#else
|
1997-01-17 02:34:35 -05:00
|
|
|
read_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, (png_voidp)NULL,
|
1997-05-16 03:46:07 -04:00
|
|
|
(png_error_ptr)NULL, (png_error_ptr)NULL);
|
1998-06-06 16:31:35 -04:00
|
|
|
#endif
|
1998-01-03 23:40:55 -05:00
|
|
|
#if defined(PNG_NO_STDIO)
|
1998-01-16 23:06:18 -05:00
|
|
|
png_set_error_fn(read_ptr, (png_voidp)inname, png_default_error,
|
|
|
|
png_default_warning);
|
1998-01-03 23:40:55 -05:00
|
|
|
#endif
|
1998-06-06 16:31:35 -04:00
|
|
|
#ifdef PNG_USER_MEM_SUPPORTED
|
|
|
|
write_ptr = png_create_write_struct_2(PNG_LIBPNG_VER_STRING, (png_voidp)NULL,
|
|
|
|
(png_error_ptr)NULL, (png_error_ptr)NULL, (png_voidp)NULL,
|
|
|
|
(png_malloc_ptr)png_debug_malloc, (png_free_ptr)png_debug_free);
|
|
|
|
#else
|
1997-01-17 02:34:35 -05:00
|
|
|
write_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, (png_voidp)NULL,
|
1996-06-05 16:50:50 -04:00
|
|
|
(png_error_ptr)NULL, (png_error_ptr)NULL);
|
1998-06-06 16:31:35 -04:00
|
|
|
#endif
|
1998-01-03 23:40:55 -05:00
|
|
|
#if defined(PNG_NO_STDIO)
|
1998-01-16 23:06:18 -05:00
|
|
|
png_set_error_fn(write_ptr, (png_voidp)inname, png_default_error,
|
|
|
|
png_default_warning);
|
1998-01-03 23:40:55 -05:00
|
|
|
#endif
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(0, "Allocating read_info, write_info and end_info structures\n");
|
|
|
|
read_info_ptr = png_create_info_struct(read_ptr);
|
1998-01-16 23:06:18 -05:00
|
|
|
write_info_ptr = png_create_info_struct(write_ptr);
|
1997-05-16 03:46:07 -04:00
|
|
|
end_info_ptr = png_create_info_struct(read_ptr);
|
1998-06-06 16:31:35 -04:00
|
|
|
#ifdef PNG_USER_MEM_SUPPORTED
|
|
|
|
#endif
|
1996-06-05 16:50:50 -04:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(0, "Setting jmpbuf for read struct\n");
|
1997-01-17 02:34:35 -05:00
|
|
|
#ifdef USE_FAR_KEYWORD
|
|
|
|
if (setjmp(jmpbuf))
|
|
|
|
#else
|
1996-06-05 16:50:50 -04:00
|
|
|
if (setjmp(read_ptr->jmpbuf))
|
1997-01-17 02:34:35 -05:00
|
|
|
#endif
|
1995-11-28 12:22:13 -05:00
|
|
|
{
|
1998-01-03 23:40:55 -05:00
|
|
|
fprintf(STDERR, "%s -> %s: libpng read error\n", inname, outname);
|
1997-05-16 03:46:07 -04:00
|
|
|
png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
|
|
|
|
png_destroy_write_struct(&write_ptr, &write_info_ptr);
|
1995-11-28 12:22:13 -05:00
|
|
|
fclose(fpin);
|
|
|
|
fclose(fpout);
|
1998-01-31 21:07:59 -05:00
|
|
|
return (1);
|
1995-11-28 12:22:13 -05:00
|
|
|
}
|
1998-12-29 12:47:59 -05:00
|
|
|
#ifdef USE_FAR_KEYWORD
|
|
|
|
png_memcpy(read_ptr->jmpbuf,jmpbuf,sizeof(jmp_buf));
|
|
|
|
#endif
|
1997-05-16 03:46:07 -04:00
|
|
|
|
|
|
|
png_debug(0, "Setting jmpbuf for write struct\n");
|
1997-01-17 02:34:35 -05:00
|
|
|
#ifdef USE_FAR_KEYWORD
|
|
|
|
if (setjmp(jmpbuf))
|
|
|
|
#else
|
1996-06-05 16:50:50 -04:00
|
|
|
if (setjmp(write_ptr->jmpbuf))
|
1997-01-17 02:34:35 -05:00
|
|
|
#endif
|
1996-01-26 02:38:47 -05:00
|
|
|
{
|
1998-01-03 23:40:55 -05:00
|
|
|
fprintf(STDERR, "%s -> %s: libpng write error\n", inname, outname);
|
1997-05-16 03:46:07 -04:00
|
|
|
png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
|
|
|
|
png_destroy_write_struct(&write_ptr, &write_info_ptr);
|
1995-11-28 12:22:13 -05:00
|
|
|
fclose(fpin);
|
|
|
|
fclose(fpout);
|
1998-01-31 21:07:59 -05:00
|
|
|
return (1);
|
1995-11-28 12:22:13 -05:00
|
|
|
}
|
1997-01-17 02:34:35 -05:00
|
|
|
#ifdef USE_FAR_KEYWORD
|
|
|
|
png_memcpy(write_ptr->jmpbuf,jmpbuf,sizeof(jmp_buf));
|
|
|
|
#endif
|
1998-12-29 12:47:59 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(0, "Initializing input and output streams\n");
|
1998-01-03 23:40:55 -05:00
|
|
|
#if !defined(PNG_NO_STDIO)
|
1996-06-05 16:50:50 -04:00
|
|
|
png_init_io(read_ptr, fpin);
|
|
|
|
png_init_io(write_ptr, fpout);
|
1998-01-03 23:40:55 -05:00
|
|
|
#else
|
|
|
|
png_set_read_fn(read_ptr, (png_voidp)fpin, png_default_read_data);
|
|
|
|
png_set_write_fn(write_ptr, (png_voidp)fpout, png_default_write_data,
|
|
|
|
#if defined(PNG_WRITE_FLUSH_SUPPORTED)
|
|
|
|
png_default_flush);
|
|
|
|
#else
|
|
|
|
NULL);
|
|
|
|
#endif
|
1998-03-07 07:06:55 -05:00
|
|
|
#endif
|
|
|
|
if(status_dots_requested == 1)
|
|
|
|
{
|
|
|
|
png_set_write_status_fn(write_ptr, write_row_callback);
|
|
|
|
png_set_read_status_fn(read_ptr, read_row_callback);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
png_set_write_status_fn(write_ptr, NULL);
|
|
|
|
png_set_read_status_fn(read_ptr, NULL);
|
|
|
|
}
|
|
|
|
|
1999-09-17 13:27:26 -04:00
|
|
|
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for(i=0; i<256; i++)
|
|
|
|
filters_used[i]=0;
|
|
|
|
png_set_read_user_transform_fn(read_ptr, count_filters);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
|
|
|
|
zero_samples=0;
|
|
|
|
png_set_write_user_transform_fn(write_ptr, count_zero_samples);
|
|
|
|
#endif
|
1995-11-28 12:22:13 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(0, "Reading info struct\n");
|
|
|
|
png_read_info(read_ptr, read_info_ptr);
|
1995-11-28 12:22:13 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(0, "Transferring info struct\n");
|
|
|
|
{
|
|
|
|
int interlace_type, compression_type, filter_type;
|
1995-11-28 12:22:13 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
if (png_get_IHDR(read_ptr, read_info_ptr, &width, &height, &bit_depth,
|
|
|
|
&color_type, &interlace_type, &compression_type, &filter_type))
|
|
|
|
{
|
|
|
|
png_set_IHDR(write_ptr, write_info_ptr, width, height, bit_depth,
|
1998-01-30 22:45:12 -05:00
|
|
|
#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
|
1997-05-16 03:46:07 -04:00
|
|
|
color_type, interlace_type, compression_type, filter_type);
|
1998-01-30 22:45:12 -05:00
|
|
|
#else
|
|
|
|
color_type, PNG_INTERLACE_NONE, compression_type, filter_type);
|
|
|
|
#endif
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#if defined(PNG_READ_bKGD_SUPPORTED) && defined(PNG_WRITE_bKGD_SUPPORTED)
|
1995-11-28 12:22:13 -05:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_color_16p background;
|
|
|
|
|
|
|
|
if (png_get_bKGD(read_ptr, read_info_ptr, &background))
|
|
|
|
{
|
|
|
|
png_set_bKGD(write_ptr, write_info_ptr, background);
|
|
|
|
}
|
1995-11-28 12:22:13 -05:00
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_cHRM_SUPPORTED) && defined(PNG_WRITE_cHRM_SUPPORTED)
|
|
|
|
{
|
|
|
|
double white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;
|
1995-11-28 12:22:13 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
if (png_get_cHRM(read_ptr, read_info_ptr, &white_x, &white_y, &red_x,
|
|
|
|
&red_y, &green_x, &green_y, &blue_x, &blue_y))
|
|
|
|
{
|
|
|
|
png_set_cHRM(write_ptr, write_info_ptr, white_x, white_y, red_x,
|
|
|
|
red_y, green_x, green_y, blue_x, blue_y);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_gAMA_SUPPORTED) && defined(PNG_WRITE_gAMA_SUPPORTED)
|
1995-11-28 12:22:13 -05:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
double gamma;
|
|
|
|
|
|
|
|
if (png_get_gAMA(read_ptr, read_info_ptr, &gamma))
|
|
|
|
{
|
|
|
|
png_set_gAMA(write_ptr, write_info_ptr, gamma);
|
|
|
|
}
|
1995-11-28 12:22:13 -05:00
|
|
|
}
|
1998-01-01 08:13:13 -05:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_sRGB_SUPPORTED) && defined(PNG_WRITE_sRGB_SUPPORTED)
|
|
|
|
{
|
1998-01-16 23:06:18 -05:00
|
|
|
int intent;
|
1998-01-01 08:13:13 -05:00
|
|
|
|
|
|
|
if (png_get_sRGB(read_ptr, read_info_ptr, &intent))
|
|
|
|
{
|
|
|
|
png_set_sRGB(write_ptr, write_info_ptr, intent);
|
|
|
|
}
|
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_hIST_SUPPORTED) && defined(PNG_WRITE_hIST_SUPPORTED)
|
1995-11-28 12:22:13 -05:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_uint_16p hist;
|
|
|
|
|
|
|
|
if (png_get_hIST(read_ptr, read_info_ptr, &hist))
|
|
|
|
{
|
|
|
|
png_set_hIST(write_ptr, write_info_ptr, hist);
|
|
|
|
}
|
1995-11-28 12:22:13 -05:00
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_oFFs_SUPPORTED) && defined(PNG_WRITE_oFFs_SUPPORTED)
|
|
|
|
{
|
|
|
|
png_uint_32 offset_x, offset_y;
|
|
|
|
int unit_type;
|
1995-11-28 12:22:13 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
if (png_get_oFFs(read_ptr, read_info_ptr,&offset_x,&offset_y,&unit_type))
|
|
|
|
{
|
|
|
|
png_set_oFFs(write_ptr, write_info_ptr, offset_x, offset_y, unit_type);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_pCAL_SUPPORTED) && defined(PNG_WRITE_pCAL_SUPPORTED)
|
|
|
|
{
|
|
|
|
png_charp purpose, units;
|
|
|
|
png_charpp params;
|
|
|
|
png_int_32 X0, X1;
|
|
|
|
int type, nparams;
|
|
|
|
|
|
|
|
if (png_get_pCAL(read_ptr, read_info_ptr, &purpose, &X0, &X1, &type,
|
|
|
|
&nparams, &units, ¶ms))
|
|
|
|
{
|
|
|
|
png_set_pCAL(write_ptr, write_info_ptr, purpose, X0, X1, type,
|
|
|
|
nparams, units, params);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_pHYs_SUPPORTED) && defined(PNG_WRITE_pHYs_SUPPORTED)
|
|
|
|
{
|
|
|
|
png_uint_32 res_x, res_y;
|
|
|
|
int unit_type;
|
|
|
|
|
|
|
|
if (png_get_pHYs(read_ptr, read_info_ptr, &res_x, &res_y, &unit_type))
|
|
|
|
{
|
|
|
|
png_set_pHYs(write_ptr, write_info_ptr, res_x, res_y, unit_type);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
png_colorp palette;
|
|
|
|
int num_palette;
|
|
|
|
|
|
|
|
if (png_get_PLTE(read_ptr, read_info_ptr, &palette, &num_palette))
|
|
|
|
{
|
|
|
|
png_set_PLTE(write_ptr, write_info_ptr, palette, num_palette);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#if defined(PNG_READ_sBIT_SUPPORTED) && defined(PNG_WRITE_sBIT_SUPPORTED)
|
1995-11-28 12:22:13 -05:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_color_8p sig_bit;
|
|
|
|
|
|
|
|
if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit))
|
1995-11-28 12:22:13 -05:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_set_sBIT(write_ptr, write_info_ptr, sig_bit);
|
|
|
|
}
|
|
|
|
}
|
1996-01-16 02:51:56 -05:00
|
|
|
#endif
|
1997-05-16 03:46:07 -04:00
|
|
|
#if (defined(PNG_READ_tEXt_SUPPORTED) && defined(PNG_WRITE_tEXt_SUPPORTED)) || \
|
|
|
|
(defined(PNG_READ_zTXt_SUPPORTED) && defined(PNG_WRITE_zTXt_SUPPORTED))
|
|
|
|
{
|
|
|
|
png_textp text_ptr;
|
|
|
|
int num_text;
|
|
|
|
|
|
|
|
if (png_get_text(read_ptr, read_info_ptr, &text_ptr, &num_text) > 0)
|
|
|
|
{
|
|
|
|
png_debug1(0, "Handling %d tEXt/zTXt chunks\n", num_text);
|
|
|
|
png_set_text(write_ptr, write_info_ptr, text_ptr, num_text);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_tIME_SUPPORTED) && defined(PNG_WRITE_tIME_SUPPORTED)
|
|
|
|
{
|
|
|
|
png_timep mod_time;
|
|
|
|
|
|
|
|
if (png_get_tIME(read_ptr, read_info_ptr, &mod_time))
|
|
|
|
{
|
|
|
|
png_set_tIME(write_ptr, write_info_ptr, mod_time);
|
1998-06-06 16:31:35 -04:00
|
|
|
#if defined(PNG_TIME_RFC1123_SUPPORTED)
|
|
|
|
/* we have to use png_strcpy instead of "=" because the string
|
|
|
|
pointed to by png_convert_to_rfc1123() gets free'ed before
|
|
|
|
we use it */
|
|
|
|
png_strcpy(tIME_string,png_convert_to_rfc1123(read_ptr, mod_time));
|
|
|
|
tIME_chunk_present++;
|
|
|
|
#endif /* PNG_TIME_RFC1123_SUPPORTED */
|
1999-01-06 22:50:16 -05:00
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#if defined(PNG_READ_tRNS_SUPPORTED) && defined(PNG_WRITE_tRNS_SUPPORTED)
|
|
|
|
{
|
|
|
|
png_bytep trans;
|
|
|
|
int num_trans;
|
|
|
|
png_color_16p trans_values;
|
|
|
|
|
|
|
|
if (png_get_tRNS(read_ptr, read_info_ptr, &trans, &num_trans,
|
|
|
|
&trans_values))
|
|
|
|
{
|
|
|
|
png_set_tRNS(write_ptr, write_info_ptr, trans, num_trans,
|
|
|
|
trans_values);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
png_debug(0, "\nWriting info struct\n");
|
|
|
|
png_write_info(write_ptr, write_info_ptr);
|
|
|
|
|
1998-02-07 11:20:57 -05:00
|
|
|
png_debug(0, "\nAllocating row buffer \n");
|
1998-12-29 12:47:59 -05:00
|
|
|
row_buf = (png_bytep)png_malloc(read_ptr,
|
1997-05-16 03:46:07 -04:00
|
|
|
png_get_rowbytes(read_ptr, read_info_ptr));
|
|
|
|
if (row_buf == NULL)
|
|
|
|
{
|
|
|
|
fprintf(STDERR, "No memory to allocate row buffer\n");
|
|
|
|
png_destroy_read_struct(&read_ptr, &read_info_ptr, (png_infopp)NULL);
|
|
|
|
png_destroy_write_struct(&write_ptr, &write_info_ptr);
|
|
|
|
fclose(fpin);
|
|
|
|
fclose(fpout);
|
1998-01-31 21:07:59 -05:00
|
|
|
return (1);
|
1997-05-16 03:46:07 -04:00
|
|
|
}
|
1998-02-07 11:20:57 -05:00
|
|
|
png_debug(0, "Writing row data\n");
|
1997-05-16 03:46:07 -04:00
|
|
|
|
|
|
|
num_pass = png_set_interlace_handling(read_ptr);
|
|
|
|
png_set_interlace_handling(write_ptr);
|
|
|
|
|
|
|
|
for (pass = 0; pass < num_pass; pass++)
|
|
|
|
{
|
1998-02-07 11:20:57 -05:00
|
|
|
png_debug1(0, "Writing row data for pass %d\n",pass);
|
1997-05-16 03:46:07 -04:00
|
|
|
for (y = 0; y < height; y++)
|
|
|
|
{
|
|
|
|
png_read_rows(read_ptr, (png_bytepp)&row_buf, (png_bytepp)NULL, 1);
|
1996-06-05 16:50:50 -04:00
|
|
|
png_write_rows(write_ptr, (png_bytepp)&row_buf, 1);
|
1995-11-28 12:22:13 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(0, "Reading and writing end_info data\n");
|
|
|
|
png_read_end(read_ptr, end_info_ptr);
|
|
|
|
png_write_end(write_ptr, end_info_ptr);
|
1998-12-29 12:47:59 -05:00
|
|
|
|
1998-01-30 22:45:12 -05:00
|
|
|
#ifdef PNG_EASY_ACCESS_SUPPORTED
|
|
|
|
if(verbose)
|
|
|
|
{
|
|
|
|
png_uint_32 iwidth, iheight;
|
|
|
|
iwidth = png_get_image_width(write_ptr, write_info_ptr);
|
|
|
|
iheight = png_get_image_height(write_ptr, write_info_ptr);
|
|
|
|
fprintf(STDERR, "Image width = %lu, height = %lu\n",
|
|
|
|
iwidth, iheight);
|
|
|
|
}
|
|
|
|
#endif
|
1995-11-28 12:22:13 -05:00
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(0, "Destroying data structs\n");
|
1998-01-16 23:06:18 -05:00
|
|
|
png_free(read_ptr, row_buf);
|
1997-05-16 03:46:07 -04:00
|
|
|
png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
|
|
|
|
png_destroy_write_struct(&write_ptr, &write_info_ptr);
|
1995-11-28 12:22:13 -05:00
|
|
|
|
|
|
|
fclose(fpin);
|
|
|
|
fclose(fpout);
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
png_debug(0, "Opening files for comparison\n");
|
|
|
|
if ((fpin = fopen(inname, "rb")) == NULL)
|
1995-11-28 12:22:13 -05:00
|
|
|
{
|
1996-06-05 16:50:50 -04:00
|
|
|
fprintf(STDERR, "Could not find file %s\n", inname);
|
1998-01-31 21:07:59 -05:00
|
|
|
return (1);
|
1995-11-28 12:22:13 -05:00
|
|
|
}
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
if ((fpout = fopen(outname, "rb")) == NULL)
|
1995-11-28 12:22:13 -05:00
|
|
|
{
|
1996-06-05 16:50:50 -04:00
|
|
|
fprintf(STDERR, "Could not find file %s\n", outname);
|
1995-11-28 12:22:13 -05:00
|
|
|
fclose(fpin);
|
1998-01-31 21:07:59 -05:00
|
|
|
return (1);
|
1995-11-28 12:22:13 -05:00
|
|
|
}
|
1997-05-16 03:46:07 -04:00
|
|
|
|
1998-03-07 15:33:00 -05:00
|
|
|
for(;;)
|
1995-11-28 12:22:13 -05:00
|
|
|
{
|
1997-05-16 03:46:07 -04:00
|
|
|
png_size_t num_in, num_out;
|
1995-11-28 12:22:13 -05:00
|
|
|
|
1997-01-17 02:34:35 -05:00
|
|
|
num_in = fread(inbuf, 1, 1, fpin);
|
|
|
|
num_out = fread(outbuf, 1, 1, fpout);
|
1995-11-28 12:22:13 -05:00
|
|
|
|
|
|
|
if (num_in != num_out)
|
|
|
|
{
|
1996-06-05 16:50:50 -04:00
|
|
|
fprintf(STDERR, "Files %s and %s are of a different size\n",
|
|
|
|
inname, outname);
|
1998-02-28 08:00:24 -05:00
|
|
|
if(wrote_question == 0)
|
|
|
|
{
|
|
|
|
fprintf(STDERR,
|
|
|
|
" Was %s written with the same chunk size (8k),",inname);
|
|
|
|
fprintf(STDERR,
|
|
|
|
" filtering\n heuristic (libpng default), compression");
|
|
|
|
fprintf(STDERR,
|
|
|
|
" level (zlib default)\n and zlib version (%s)?\n\n",
|
|
|
|
ZLIB_VERSION);
|
|
|
|
wrote_question=1;
|
|
|
|
}
|
1995-11-28 12:22:13 -05:00
|
|
|
fclose(fpin);
|
|
|
|
fclose(fpout);
|
1998-02-28 08:00:24 -05:00
|
|
|
return (0);
|
1995-11-28 12:22:13 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!num_in)
|
|
|
|
break;
|
|
|
|
|
1997-05-16 03:46:07 -04:00
|
|
|
if (png_memcmp(inbuf, outbuf, num_in))
|
1995-11-28 12:22:13 -05:00
|
|
|
{
|
1999-09-17 13:27:26 -04:00
|
|
|
fprintf(STDERR, "\nFiles %s and %s are different\n", inname, outname);
|
1998-02-28 08:00:24 -05:00
|
|
|
if(wrote_question == 0)
|
|
|
|
{
|
|
|
|
fprintf(STDERR,
|
|
|
|
" Was %s written with the same chunk size (8k),",inname);
|
|
|
|
fprintf(STDERR,
|
|
|
|
" filtering\n heuristic (libpng default), compression");
|
|
|
|
fprintf(STDERR,
|
|
|
|
" level (zlib default)\n and zlib version (%s)?\n\n",
|
|
|
|
ZLIB_VERSION);
|
|
|
|
wrote_question=1;
|
|
|
|
}
|
1995-11-28 12:22:13 -05:00
|
|
|
fclose(fpin);
|
|
|
|
fclose(fpout);
|
1998-02-28 08:00:24 -05:00
|
|
|
return (0);
|
1995-11-28 12:22:13 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fclose(fpin);
|
|
|
|
fclose(fpout);
|
1995-07-20 03:43:20 -04:00
|
|
|
|
1998-01-31 21:07:59 -05:00
|
|
|
return (0);
|
1995-07-20 03:43:20 -04:00
|
|
|
}
|
1995-09-26 06:22:39 -04:00
|
|
|
|
1998-01-03 23:40:55 -05:00
|
|
|
/* input and output filenames */
|
|
|
|
#ifdef RISCOS
|
1999-09-17 13:27:26 -04:00
|
|
|
static PNG_CONST char *inname = "pngtest/png";
|
|
|
|
static PNG_CONST char *outname = "pngout/png";
|
1998-01-03 23:40:55 -05:00
|
|
|
#else
|
1998-03-07 12:24:03 -05:00
|
|
|
static PNG_CONST char *inname = "pngtest.png";
|
|
|
|
static PNG_CONST char *outname = "pngout.png";
|
1998-01-03 23:40:55 -05:00
|
|
|
#endif
|
|
|
|
|
|
|
|
int
|
|
|
|
main(int argc, char *argv[])
|
|
|
|
{
|
|
|
|
int multiple = 0;
|
|
|
|
int ierror = 0;
|
|
|
|
|
|
|
|
fprintf(STDERR, "Testing libpng version %s\n", PNG_LIBPNG_VER_STRING);
|
1998-01-30 22:45:12 -05:00
|
|
|
fprintf(STDERR, " with zlib version %s\n", ZLIB_VERSION);
|
1998-12-29 12:47:59 -05:00
|
|
|
fprintf(STDERR,"%s",png_get_copyright(NULL));
|
1998-01-30 22:45:12 -05:00
|
|
|
|
|
|
|
/* Do some consistency checking on the memory allocation settings, I'm
|
|
|
|
not sure this matters, but it is nice to know, the first of these
|
|
|
|
tests should be impossible because of the way the macros are set
|
|
|
|
in pngconf.h */
|
1998-03-07 15:33:00 -05:00
|
|
|
#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
|
1998-01-30 22:45:12 -05:00
|
|
|
fprintf(STDERR, " NOTE: Zlib compiled for max 64k, libpng not\n");
|
1998-03-07 15:33:00 -05:00
|
|
|
#endif
|
1998-01-30 22:45:12 -05:00
|
|
|
/* I think the following can happen. */
|
1998-03-07 15:33:00 -05:00
|
|
|
#if !defined(MAXSEG_64K) && defined(PNG_MAX_MALLOC_64K)
|
1998-01-30 22:45:12 -05:00
|
|
|
fprintf(STDERR, " NOTE: libpng compiled for max 64k, zlib not\n");
|
1998-03-07 15:33:00 -05:00
|
|
|
#endif
|
1998-01-03 23:40:55 -05:00
|
|
|
|
|
|
|
if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING))
|
|
|
|
{
|
|
|
|
fprintf(STDERR,
|
|
|
|
"Warning: versions are different between png.h and png.c\n");
|
|
|
|
fprintf(STDERR, " png.h version: %s\n", PNG_LIBPNG_VER_STRING);
|
|
|
|
fprintf(STDERR, " png.c version: %s\n\n", png_libpng_ver);
|
|
|
|
++ierror;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (argc > 1)
|
|
|
|
{
|
1998-01-30 22:45:12 -05:00
|
|
|
if (strcmp(argv[1], "-m") == 0)
|
1998-03-07 07:06:55 -05:00
|
|
|
{
|
1998-01-30 22:45:12 -05:00
|
|
|
multiple = 1;
|
1998-03-07 07:06:55 -05:00
|
|
|
status_dots_requested = 0;
|
|
|
|
}
|
1998-01-30 22:45:12 -05:00
|
|
|
else if (strcmp(argv[1], "-mv") == 0 ||
|
|
|
|
strcmp(argv[1], "-vm") == 0 )
|
|
|
|
{
|
|
|
|
multiple = 1;
|
|
|
|
verbose = 1;
|
1998-03-07 07:06:55 -05:00
|
|
|
status_dots_requested = 1;
|
1998-01-30 22:45:12 -05:00
|
|
|
}
|
|
|
|
else if (strcmp(argv[1], "-v") == 0)
|
|
|
|
{
|
|
|
|
verbose = 1;
|
1998-03-07 07:06:55 -05:00
|
|
|
status_dots_requested = 1;
|
1998-01-30 22:45:12 -05:00
|
|
|
inname = argv[2];
|
|
|
|
}
|
|
|
|
else
|
1998-03-07 07:06:55 -05:00
|
|
|
{
|
1998-01-30 22:45:12 -05:00
|
|
|
inname = argv[1];
|
1998-03-07 07:06:55 -05:00
|
|
|
status_dots_requested = 0;
|
|
|
|
}
|
1998-01-03 23:40:55 -05:00
|
|
|
}
|
|
|
|
|
1998-01-30 22:45:12 -05:00
|
|
|
if (!multiple && argc == 3+verbose)
|
|
|
|
outname = argv[2+verbose];
|
1998-01-03 23:40:55 -05:00
|
|
|
|
1998-01-30 22:45:12 -05:00
|
|
|
if ((!multiple && argc > 3+verbose) || (multiple && argc < 2))
|
1998-01-03 23:40:55 -05:00
|
|
|
{
|
1998-01-16 23:06:18 -05:00
|
|
|
fprintf(STDERR,
|
|
|
|
"usage: %s [infile.png] [outfile.png]\n\t%s -m {infile.png}\n",
|
1998-01-03 23:40:55 -05:00
|
|
|
argv[0], argv[0]);
|
1998-01-16 23:06:18 -05:00
|
|
|
fprintf(STDERR,
|
|
|
|
" reads/writes one PNG file (without -m) or multiple files (-m)\n");
|
|
|
|
fprintf(STDERR,
|
|
|
|
" with -m %s is used as a temporary file\n", outname);
|
1998-01-03 23:40:55 -05:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (multiple)
|
|
|
|
{
|
|
|
|
int i;
|
1998-06-06 16:31:35 -04:00
|
|
|
#ifdef PNG_USER_MEM_SUPPORTED
|
1998-01-30 22:45:12 -05:00
|
|
|
int allocation_now = current_allocation;
|
|
|
|
#endif
|
1998-01-03 23:40:55 -05:00
|
|
|
for (i=2; i<argc; ++i)
|
1998-01-30 22:45:12 -05:00
|
|
|
{
|
1999-09-17 13:27:26 -04:00
|
|
|
int k, kerror;
|
1998-01-16 23:06:18 -05:00
|
|
|
fprintf(STDERR, "Testing %s:",argv[i]);
|
|
|
|
kerror = test_one_file(argv[i], outname);
|
1998-12-29 12:47:59 -05:00
|
|
|
if (kerror == 0)
|
1998-06-06 16:31:35 -04:00
|
|
|
{
|
1998-03-07 22:30:44 -05:00
|
|
|
#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
|
1998-04-21 16:03:57 -04:00
|
|
|
fprintf(STDERR, " PASS (%lu zero samples)\n",zero_samples);
|
1998-03-07 07:06:55 -05:00
|
|
|
#else
|
1998-01-30 22:45:12 -05:00
|
|
|
fprintf(STDERR, " PASS\n");
|
1998-12-29 12:47:59 -05:00
|
|
|
#endif
|
1999-09-17 13:27:26 -04:00
|
|
|
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
|
|
|
|
for (k=0; k<256; k++)
|
|
|
|
if(filters_used[k])
|
|
|
|
fprintf(STDERR, " Filter %d was used %lu times\n",
|
|
|
|
k,filters_used[k]);
|
|
|
|
#endif
|
1998-06-06 16:31:35 -04:00
|
|
|
#if defined(PNG_TIME_RFC1123_SUPPORTED)
|
|
|
|
if(tIME_chunk_present != 0)
|
|
|
|
fprintf(STDERR, " tIME = %s\n",tIME_string);
|
|
|
|
tIME_chunk_present = 0;
|
|
|
|
#endif /* PNG_TIME_RFC1123_SUPPORTED */
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
1998-01-16 23:06:18 -05:00
|
|
|
fprintf(STDERR, " FAIL\n");
|
|
|
|
ierror += kerror;
|
1998-06-06 16:31:35 -04:00
|
|
|
}
|
|
|
|
#ifdef PNG_USER_MEM_SUPPORTED
|
1998-01-30 22:45:12 -05:00
|
|
|
if (allocation_now != current_allocation)
|
|
|
|
fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
|
|
|
|
current_allocation-allocation_now);
|
|
|
|
if (current_allocation != 0) {
|
|
|
|
memory_infop pinfo = pinformation;
|
|
|
|
|
|
|
|
fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
|
|
|
|
current_allocation);
|
|
|
|
while (pinfo != NULL) {
|
|
|
|
fprintf(STDERR, " %d bytes at %x\n", pinfo->size, pinfo->pointer);
|
|
|
|
pinfo = pinfo->next;
|
|
|
|
}
|
1998-01-07 21:54:20 -05:00
|
|
|
}
|
1998-01-30 22:45:12 -05:00
|
|
|
#endif
|
|
|
|
}
|
1998-06-06 16:31:35 -04:00
|
|
|
#ifdef PNG_USER_MEM_SUPPORTED
|
1998-01-30 22:45:12 -05:00
|
|
|
fprintf(STDERR, "Maximum memory allocation: %d bytes\n",
|
|
|
|
maximum_allocation);
|
|
|
|
#endif
|
1998-01-03 23:40:55 -05:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
1998-01-16 23:06:18 -05:00
|
|
|
int i;
|
|
|
|
for (i=0; i<3; ++i) {
|
|
|
|
int kerror;
|
1998-06-06 16:31:35 -04:00
|
|
|
#ifdef PNG_USER_MEM_SUPPORTED
|
1998-01-30 22:45:12 -05:00
|
|
|
int allocation_now = current_allocation;
|
|
|
|
#endif
|
1998-03-07 07:06:55 -05:00
|
|
|
if (i == 1) status_dots_requested = 1;
|
|
|
|
else if(verbose == 0)status_dots_requested = 0;
|
1998-01-30 22:45:12 -05:00
|
|
|
if (i == 0 || verbose == 1 || ierror != 0)
|
|
|
|
fprintf(STDERR, "Testing %s:",inname);
|
1998-01-16 23:06:18 -05:00
|
|
|
kerror = test_one_file(inname, outname);
|
1998-01-30 22:45:12 -05:00
|
|
|
if(kerror == 0)
|
|
|
|
{
|
1998-03-07 07:06:55 -05:00
|
|
|
if(verbose == 1 || i == 2)
|
1998-06-06 16:31:35 -04:00
|
|
|
{
|
1999-09-17 13:27:26 -04:00
|
|
|
int k;
|
1998-03-07 22:30:44 -05:00
|
|
|
#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
|
1998-04-21 16:03:57 -04:00
|
|
|
fprintf(STDERR, " PASS (%lu zero samples)\n",zero_samples);
|
1998-03-07 07:06:55 -05:00
|
|
|
#else
|
|
|
|
fprintf(STDERR, " PASS\n");
|
|
|
|
#endif
|
1999-09-17 13:27:26 -04:00
|
|
|
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
|
|
|
|
for (k=0; k<256; k++)
|
|
|
|
if(filters_used[k])
|
|
|
|
fprintf(STDERR, " Filter %d was used %lu times\n",
|
|
|
|
k,filters_used[k]);
|
|
|
|
#endif
|
1998-06-06 16:31:35 -04:00
|
|
|
#if defined(PNG_TIME_RFC1123_SUPPORTED)
|
1999-09-17 13:27:26 -04:00
|
|
|
if(tIME_chunk_present != 0)
|
|
|
|
fprintf(STDERR, " tIME = %s\n",tIME_string);
|
1998-06-06 16:31:35 -04:00
|
|
|
#endif /* PNG_TIME_RFC1123_SUPPORTED */
|
|
|
|
}
|
1998-01-30 22:45:12 -05:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if(verbose == 0 && i != 2)
|
|
|
|
fprintf(STDERR, "Testing %s:",inname);
|
1998-01-16 23:06:18 -05:00
|
|
|
fprintf(STDERR, " FAIL\n");
|
|
|
|
ierror += kerror;
|
1998-01-30 22:45:12 -05:00
|
|
|
}
|
1998-06-06 16:31:35 -04:00
|
|
|
#ifdef PNG_USER_MEM_SUPPORTED
|
1998-01-30 22:45:12 -05:00
|
|
|
if (allocation_now != current_allocation)
|
|
|
|
fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
|
|
|
|
current_allocation-allocation_now);
|
|
|
|
if (current_allocation != 0) {
|
|
|
|
memory_infop pinfo = pinformation;
|
1998-12-29 12:47:59 -05:00
|
|
|
|
1998-01-30 22:45:12 -05:00
|
|
|
fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
|
|
|
|
current_allocation);
|
|
|
|
while (pinfo != NULL) {
|
|
|
|
fprintf(STDERR, " %d bytes at %x\n", pinfo->size, pinfo->pointer);
|
|
|
|
pinfo = pinfo->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
1998-01-16 23:06:18 -05:00
|
|
|
}
|
1998-06-06 16:31:35 -04:00
|
|
|
#ifdef PNG_USER_MEM_SUPPORTED
|
1998-01-30 22:45:12 -05:00
|
|
|
fprintf(STDERR, "Maximum memory allocation: %d bytes\n",
|
|
|
|
maximum_allocation);
|
|
|
|
#endif
|
1998-01-03 23:40:55 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
if (ierror == 0)
|
|
|
|
fprintf(STDERR, "libpng passes test\n");
|
|
|
|
else
|
|
|
|
fprintf(STDERR, "libpng FAILS test\n");
|
1998-02-07 11:20:57 -05:00
|
|
|
return (int)(ierror != 0);
|
1998-01-03 23:40:55 -05:00
|
|
|
}
|
1998-06-06 16:31:35 -04:00
|
|
|
|