minecraft-pi-reborn/libpng
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Imported from libpng-0.99k.tar

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 1998-03-07 14:33:00 -06:00
parent 983ec160b4
commit ea3bcd7087
17 changed files with 43 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@ -262,3 +262,8 @@ version 0.99h [March 6, 1998, evening]
version 1.00 [March 7, 1998] version 1.00 [March 7, 1998]
Changed several typedefs in pngrutil.c Changed several typedefs in pngrutil.c
Added makefile.wat (Pawel Mrochen), updated makefile.tc3 (Willem van Schaik) Added makefile.wat (Pawel Mrochen), updated makefile.tc3 (Willem van Schaik)
replaced "while(1)" with "for(;;)"
added PNGARG() to prototypes in pngtest.c and removed some prototypes
updated some of the makefiles (Tom Lane)
changed some typedefs (s_start, etc.) in pngrutil.c
fixed dimensions of "short_months" array in pngwrite.c

1
TODO
View File

@ -1,5 +1,6 @@
TODO - list of things to do for libpng TODO - list of things to do for libpng
fix problem with C++ and EXTERN "C"
add "grayscale->palette" transformation and "palette->grayscale" detection add "grayscale->palette" transformation and "palette->grayscale" detection
improved dithering improved dithering
multi-lingual error and warning message support multi-lingual error and warning message support

8
pngmem.c
View File

@ -19,11 +19,11 @@
/* The following "hides" PNG_MALLOC and PNG_FREE thus allowing the pngtest /* The following "hides" PNG_MALLOC and PNG_FREE thus allowing the pngtest
application to put a wrapper on top of them. */ application to put a wrapper on top of them. */
#ifdef PNGTEST_MEMORY_DEBUG #ifdef PNGTEST_MEMORY_DEBUG
#define PNG_MALLOC png_debug_malloc #define PNG_MALLOC png_debug_malloc
#define PNG_FREE png_debug_free #define PNG_FREE png_debug_free
#else #else
#define PNG_MALLOC png_malloc #define PNG_MALLOC png_malloc
#define PNG_FREE png_free #define PNG_FREE png_free
#endif #endif
/* Borland DOS special memory handler */ /* Borland DOS special memory handler */

2
pngpread.c
View File

@ -591,7 +591,7 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
png_ptr->zstream.next_in = buffer; png_ptr->zstream.next_in = buffer;
png_ptr->zstream.avail_in = (uInt)buffer_length; png_ptr->zstream.avail_in = (uInt)buffer_length;
while(1) for(;;)
{ {
ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH); ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
if (ret == Z_STREAM_END) if (ret == Z_STREAM_END)

2
pngread.c
View File

@ -154,7 +154,7 @@ png_read_info(png_structp png_ptr, png_infop info_ptr)
} }
} }
while (1) for(;;)
{ {
png_byte chunk_length[4]; png_byte chunk_length[4];
png_uint_32 length; png_uint_32 length;

4
pngrutil.c
View File

@ -2059,7 +2059,7 @@ png_read_finish_row(png_structp png_ptr)
png_ptr->zstream.next_out = (Byte *)&extra; png_ptr->zstream.next_out = (Byte *)&extra;
png_ptr->zstream.avail_out = (uInt)1; png_ptr->zstream.avail_out = (uInt)1;
do for(;;)
{ {
if (!(png_ptr->zstream.avail_in)) if (!(png_ptr->zstream.avail_in))
{ {
@ -2102,7 +2102,7 @@ png_read_finish_row(png_structp png_ptr)
if (!(png_ptr->zstream.avail_out)) if (!(png_ptr->zstream.avail_out))
png_error(png_ptr, "Extra compressed data"); png_error(png_ptr, "Extra compressed data");
} while (1); }
png_ptr->zstream.avail_out = 0; png_ptr->zstream.avail_out = 0;
} }

40
pngtest.c
View File

@ -32,12 +32,12 @@
/* Makes pngtest verbose so we can find problems (needs to be before png.h) */ /* Makes pngtest verbose so we can find problems (needs to be before png.h) */
#ifndef PNG_DEBUG #ifndef PNG_DEBUG
#endif
#define PNG_DEBUG 0 #define PNG_DEBUG 0
#endif
#include "png.h" #include "png.h"
int test_one_file(PNG_CONST char *inname, PNG_CONST char *outname); int test_one_file PNGARG((PNG_CONST char *inname, PNG_CONST char *outname));
#ifdef __TURBOC__ #ifdef __TURBOC__
#include <mem.h> #include <mem.h>
@ -51,7 +51,7 @@ int test_one_file(PNG_CONST char *inname, PNG_CONST char *outname);
static int status_pass=1; static int status_pass=1;
static int status_dots_requested=0; static int status_dots_requested=0;
static int status_dots=1; static int status_dots=1;
void read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
void read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass) void read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
{ {
if(png_ptr == NULL || row_number > 0x3fffffffL) return; if(png_ptr == NULL || row_number > 0x3fffffffL) return;
@ -69,7 +69,7 @@ void read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
} }
fprintf(stdout, "r"); fprintf(stdout, "r");
} }
void write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
void write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass) void write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
{ {
if(png_ptr == NULL || row_number > 0x3fffffffL || pass > 7) return; if(png_ptr == NULL || row_number > 0x3fffffffL || pass > 7) return;
@ -83,10 +83,9 @@ void write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
but merely count the black pixels) */ but merely count the black pixels) */
static png_uint_32 black_pixels; static png_uint_32 black_pixels;
void count_black_pixels(png_structp png_ptr, png_row_infop row_info, void count_black_pixels(png_structp png_ptr, png_row_infop row_info,
png_bytep data); png_bytep data)
void count_black_pixels(png_structp png_ptr, png_row_infop row_info,
png_bytep data)
{ {
png_bytep dp = data; png_bytep dp = data;
if(png_ptr == NULL)return; if(png_ptr == NULL)return;
@ -180,8 +179,6 @@ static int wrote_question = 0;
than changing the library. */ than changing the library. */
#ifndef USE_FAR_KEYWORD #ifndef USE_FAR_KEYWORD
static void static void
png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length);
static void
png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length) png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
{ {
png_size_t check; png_size_t check;
@ -206,10 +203,8 @@ png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
#define NEAR_BUF_SIZE 1024 #define NEAR_BUF_SIZE 1024
#define MIN(a,b) (a <= b ? a : b) #define MIN(a,b) (a <= b ? a : b)
static void static void png_default_read_data(png_structp png_ptr, png_bytep data,
png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length); png_size_t length)
static void
png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
{ {
int check; int check;
png_byte *n_data; png_byte *n_data;
@ -250,10 +245,7 @@ png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
#endif /* USE_FAR_KEYWORD */ #endif /* USE_FAR_KEYWORD */
#if defined(PNG_WRITE_FLUSH_SUPPORTED) #if defined(PNG_WRITE_FLUSH_SUPPORTED)
static void static void png_default_flush(png_structp png_ptr)
png_default_flush(png_structp png_ptr);
static void
png_default_flush(png_structp png_ptr)
{ {
FILE *io_ptr; FILE *io_ptr;
io_ptr = (FILE *)CVT_PTR((png_ptr->io_ptr)); io_ptr = (FILE *)CVT_PTR((png_ptr->io_ptr));
@ -268,8 +260,6 @@ png_default_flush(png_structp png_ptr)
than changing the library. */ than changing the library. */
#ifndef USE_FAR_KEYWORD #ifndef USE_FAR_KEYWORD
static void static void
png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length);
static void
png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length) png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
{ {
png_uint_32 check; png_uint_32 check;
@ -289,8 +279,6 @@ png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
#define NEAR_BUF_SIZE 1024 #define NEAR_BUF_SIZE 1024
#define MIN(a,b) (a <= b ? a : b) #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);
static void static void
png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length) png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
{ {
@ -808,7 +796,7 @@ int test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
return (1); return (1);
} }
while (1) for(;;)
{ {
png_size_t num_in, num_out; png_size_t num_in, num_out;
@ -886,13 +874,13 @@ main(int argc, char *argv[])
not sure this matters, but it is nice to know, the first of these 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 tests should be impossible because of the way the macros are set
in pngconf.h */ in pngconf.h */
#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K) #if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
fprintf(STDERR, " NOTE: Zlib compiled for max 64k, libpng not\n"); fprintf(STDERR, " NOTE: Zlib compiled for max 64k, libpng not\n");
#endif #endif
/* I think the following can happen. */ /* I think the following can happen. */
#if !defined(MAXSEG_64K) && defined(PNG_MAX_MALLOC_64K) #if !defined(MAXSEG_64K) && defined(PNG_MAX_MALLOC_64K)
fprintf(STDERR, " NOTE: libpng compiled for max 64k, zlib not\n"); fprintf(STDERR, " NOTE: libpng compiled for max 64k, zlib not\n");
#endif #endif
if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING)) if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING))
{ {

5
pngwrite.c
View File

@ -225,8 +225,9 @@ png_write_end(png_structp png_ptr, png_infop info_ptr)
png_charp png_charp
png_convert_to_rfc1123(png_structp png_ptr, png_timep ptime) png_convert_to_rfc1123(png_structp png_ptr, png_timep ptime)
{ {
const char *short_months[12] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", static const char *short_months[12][4] =
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
if (png_ptr->time_buffer == NULL) if (png_ptr->time_buffer == NULL)
{ {

6
pngwutil.c
View File

@ -1383,10 +1383,10 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)
* been specified by the application, and then writes the row out with the * been specified by the application, and then writes the row out with the
* chosen filter. * chosen filter.
*/ */
#define PNG_MAXSUM (png_uint_32)(~0x0UL >> 1) #define PNG_MAXSUM (~((png_uint_32)0) >> 1)
#define PNG_HISHIFT 10 #define PNG_HISHIFT 10
#define PNG_LOMASK (png_uint_32)0xffffL #define PNG_LOMASK ((png_uint_32)0xffffL)
#define PNG_HIMASK (png_uint_32)(~PNG_LOMASK >> PNG_HISHIFT) #define PNG_HIMASK ((png_uint_32)(~PNG_LOMASK >> PNG_HISHIFT))
void void
png_write_find_filter(png_structp png_ptr, png_row_infop row_info) png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
{ {

2
scripts/makefile.dec
View File

@ -29,7 +29,7 @@ libpng.a: $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
pngtest: pngtest.o libpng.a pngtest: pngtest.o libpng.a
$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
test: pngtest test: pngtest
./pngtest ./pngtest

2
scripts/makefile.dj2
View File

@ -23,7 +23,7 @@ libpng.a: $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
pngtest: pngtest.o libpng.a pngtest: pngtest.o libpng.a
$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
coff2exe pngtest coff2exe pngtest
test: pngtest test: pngtest

4
scripts/makefile.knr
View File

@ -34,8 +34,8 @@ libpng.a: ansi2knr $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
pngtest: pngtest.o libpng.a ansi2knr pngtest: pngtest.o libpng.a
cc -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
test: pngtest test: pngtest
./pngtest ./pngtest

2
scripts/makefile.lnx
View File

@ -56,7 +56,7 @@ libpng.so.$(PNGMAJ): libpng.so.$(PNGVER)
ln -sf libpng.so.$(PNGVER) libpng.so.$(PNGMAJ) ln -sf libpng.so.$(PNGVER) libpng.so.$(PNGMAJ)
libpng.so.$(PNGVER): $(OBJSDLL) libpng.so.$(PNGVER): $(OBJSDLL)
gcc -shared -Wl,-soname,libpng.so.$(PNGMAJ) -o libpng.so.$(PNGVER) \ $(CC) -shared -Wl,-soname,libpng.so.$(PNGMAJ) -o libpng.so.$(PNGVER) \
$(OBJSDLL) $(OBJSDLL)
pngtest: pngtest.o libpng.so pngtest: pngtest.o libpng.so

2
scripts/makefile.mip
View File

@ -24,7 +24,7 @@ libpng.a: $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
pngtest: pngtest.o libpng.a pngtest: pngtest.o libpng.a
cc -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
test: pngtest test: pngtest
./pngtest ./pngtest

2
scripts/makefile.sgi
View File

@ -30,7 +30,7 @@ libpng.a: $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
pngtest: pngtest.o libpng.a pngtest: pngtest.o libpng.a
$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
test: pngtest test: pngtest
./pngtest ./pngtest

2
scripts/makefile.std
View File

@ -29,7 +29,7 @@ libpng.a: $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
pngtest: pngtest.o libpng.a pngtest: pngtest.o libpng.a
$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
test: pngtest test: pngtest
./pngtest ./pngtest

2
scripts/makefile.sun
View File

@ -33,7 +33,7 @@ libpng.a: $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
pngtest: pngtest.o libpng.a pngtest: pngtest.o libpng.a
$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
test: pngtest test: pngtest
./pngtest ./pngtest