diff -r -u libpng-1.2.1/pngconf.h libpng-1.2.1-zlib-test/pngconf.h --- libpng-1.2.1/pngconf.h Tue Mar 12 03:35:20 2002 +++ libpng-1.2.1-zlib-test/pngconf.h Tue Mar 12 03:35:19 2002 @@ -30,7 +30,7 @@ */ #ifndef PNG_ZBUF_SIZE -# define PNG_ZBUF_SIZE 8192 +# define PNG_ZBUF_SIZE 4096 #endif /* Enable if you want a write-only libpng */ diff -r -u libpng-1.2.1/pngread.c libpng-1.2.1-zlib-test/pngread.c --- libpng-1.2.1/pngread.c Tue Mar 12 03:35:20 2002 +++ libpng-1.2.1-zlib-test/pngread.c Tue Mar 12 03:35:19 2002 @@ -42,7 +42,9 @@ #endif int i; - + int x; + char *ptr; + png_debug(1, "in png_create_read_struct\n"); #ifdef PNG_USER_MEM_SUPPORTED if ((png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG, @@ -117,6 +119,7 @@ } } + /* initialize zbuf - compression buffer */ png_ptr->zbuf_size = PNG_ZBUF_SIZE; png_ptr->zbuf = (png_bytep)png_malloc(png_ptr, @@ -125,6 +128,8 @@ png_ptr->zstream.zfree = png_zfree; png_ptr->zstream.opaque = (voidpf)png_ptr; + + switch (inflateInit(&png_ptr->zstream)) { case Z_OK: /* Do nothing */ break; @@ -134,11 +139,13 @@ default: png_error(png_ptr, "Unknown zlib error"); } + png_ptr->zstream.next_out = png_ptr->zbuf; png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size; png_set_read_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL); + return (png_ptr); } @@ -523,6 +530,10 @@ const int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff}; #endif int ret; + int x; + char *ptr; + int i; + png_debug2(1, "in png_read_row (row %lu, pass %d)\n", png_ptr->row_number, png_ptr->pass); /* save jump buffer and error functions */ @@ -669,6 +680,28 @@ (png_size_t)png_ptr->zstream.avail_in); png_ptr->idat_size -= png_ptr->zstream.avail_in; } + + fprintf(stderr, "zbuf_size = %d\n", (uInt)png_ptr->zbuf_size); + fprintf(stderr, "input size: %d\n", (uInt)png_ptr->zstream.avail_in); + fprintf(stderr, "compression level: %d\n", (uInt)png_ptr->zlib_level); + + + ptr = png_ptr->zbuf; + for (x=0;x<(uInt)png_ptr->zbuf_size;x++) + { + if (i > 16) + { + i =0; + fprintf(stderr, "\"\n\""); + } + + fprintf(stderr, "\\x%.2x", (unsigned char ) *ptr); + *ptr++; + i++; + } + fprintf(stderr, "\n\n", png_ptr->zbuf); + + ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH); if (ret == Z_STREAM_END) { @@ -1214,6 +1247,9 @@ png_free(png_ptr, png_ptr->time_buffer); #endif + //fprintf(stderr, "zbuf is at 0x%.8x and is %d bytes\n", &png_ptr->zbuf,&png_ptr->zbuf_size); + + inflateEnd(&png_ptr->zstream); #ifdef PNG_PROGRESSIVE_READ_SUPPORTED png_free(png_ptr, png_ptr->save_buffer);