cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libpng16] Tidied up pngfix inits and fixed non-write pngtest.

Browse Source
This commit is contained in:
John Bowler 2013-12-01 15:07:09 -06:00 committed by Glenn Randers-Pehrson
parent 1f23775d10
commit 81dfd007b2
4 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.6.8beta03 - November 30, 2013 Libpng 1.6.8beta03 - December 1, 2013
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -26,7 +26,7 @@ Other information:
Changes since the last public release (1.6.7): Changes since the last public release (1.6.7):
Version 1.6.8beta01 [November 30, 2013] Version 1.6.8beta01 [December 1, 2013]
Changed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpread.c to Changed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpread.c to
#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED to be consistent with #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED to be consistent with
what is in pngpriv.h. what is in pngpriv.h.
@ -51,7 +51,8 @@ Version 1.6.8beta02 [November 30, 2013]
to '"%s" m' to improve portability among compilers. to '"%s" m' to improve portability among compilers.
Changed png_free_default() to free() in pngtest.c Changed png_free_default() to free() in pngtest.c
Version 1.6.8beta03 [November 30, 2013] Version 1.6.8beta03 [December 1, 2013]
Tidied up pngfix inits and fixed pngtest no-write builds.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

3
CHANGES
View File

@ -4737,7 +4737,8 @@ Version 1.6.8beta02 [November 30, 2013]
to '"%s" m' to improve portability among compilers. to '"%s" m' to improve portability among compilers.
Changed png_free_default() to free() in pngtest.c Changed png_free_default() to free() in pngtest.c
Version 1.6.8beta03 [November 30, 2013] Version 1.6.8beta03 [December 1, 2013]
Tidied up pngfix inits and fixed pngtest no-write builds.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

16
contrib/tools/pngfix.c
View File

@ -1575,7 +1575,7 @@ chunk_end(struct chunk **chunk_var)
} }
static void static void
chunk_init(struct chunk *chunk, struct file *file) chunk_init(struct chunk * const chunk, struct file * const file)
/* When a chunk is initialized the file length/type/pos are copied into the /* When a chunk is initialized the file length/type/pos are copied into the
* corresponding chunk fields and the new chunk is registered in the file * corresponding chunk fields and the new chunk is registered in the file
* structure. There can only be one chunk at a time. * structure. There can only be one chunk at a time.
@ -1784,7 +1784,7 @@ IDAT_end(struct IDAT **idat_var)
} }
static void static void
IDAT_init(struct IDAT *idat, struct file *file) IDAT_init(struct IDAT * const idat, struct file * const file)
/* When the chunk is png_IDAT instantiate an IDAT control structure in place /* When the chunk is png_IDAT instantiate an IDAT control structure in place
* of a chunk control structure. The IDAT will instantiate a chunk control * of a chunk control structure. The IDAT will instantiate a chunk control
* structure using the file alloc routine. * structure using the file alloc routine.
@ -3545,22 +3545,14 @@ allocate(struct file *file, int allocate_idat)
if (allocate_idat) if (allocate_idat)
{ {
struct IDAT *idat;
assert(file->idat == NULL); assert(file->idat == NULL);
idat = &control->idat; IDAT_init(&control->idat, file);
IDAT_init(idat, file);
file->idat = idat;
} }
else /* chunk */ else /* chunk */
{ {
struct chunk *chunk;
assert(file->chunk == NULL); assert(file->chunk == NULL);
chunk = &control->chunk; chunk_init(&control->chunk, file);
chunk_init(chunk, file);
file->chunk = chunk;
} }
} }

4
pngtest.c
View File

@ -115,9 +115,6 @@ static int relaxed = 0;
static int unsupported_chunks = 0; /* chunk unsupported by libpng in input */ static int unsupported_chunks = 0; /* chunk unsupported by libpng in input */
static int error_count = 0; /* count calls to png_error */ static int error_count = 0; /* count calls to png_error */
static int warning_count = 0; /* count calls to png_warning */ static int warning_count = 0; /* count calls to png_warning */
#ifdef PNG_WRITE_SUPPORTED
static int wrote_question = 0;
#endif
#ifdef __TURBOC__ #ifdef __TURBOC__
#include <mem.h> #include <mem.h>
@ -1585,6 +1582,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
{ {
for (;;) for (;;)
{ {
static int wrote_question = 0;
png_size_t num_in, num_out; png_size_t num_in, num_out;
char inbuf[256], outbuf[256]; char inbuf[256], outbuf[256];