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

Merge branch 'libpng16' of git://github.com/jbowler/libpng into libpng16

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2016-09-01 17:11:57 -05:00
commit a744b11975
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/tools/pngfix.c
View File

@ -1824,7 +1824,7 @@ IDAT_init(struct IDAT * const idat, struct file * const file)
} }
static png_uint_32 static png_uint_32
rechunk_length(struct IDAT *idat) rechunk_length(struct IDAT *idat, int start)
/* Return the length for the next IDAT chunk, taking into account /* Return the length for the next IDAT chunk, taking into account
* rechunking. * rechunking.
*/ */
@ -1836,7 +1836,7 @@ rechunk_length(struct IDAT *idat)
const struct IDAT_list *cur; const struct IDAT_list *cur;
unsigned int count; unsigned int count;
if (idat->idat_index == 0) /* at the new chunk (first time) */ if (start)
return idat->idat_length; /* use the cache */ return idat->idat_length; /* use the cache */
/* Otherwise rechunk_length is called at the end of a chunk for the length /* Otherwise rechunk_length is called at the end of a chunk for the length
@ -1995,7 +1995,7 @@ process_IDAT(struct file *file)
idat->idat_index = 0; /* Index into chunk data */ idat->idat_index = 0; /* Index into chunk data */
/* Update the chunk length to the correct value for the IDAT chunk: */ /* Update the chunk length to the correct value for the IDAT chunk: */
file->chunk->chunk_length = rechunk_length(idat); file->chunk->chunk_length = rechunk_length(idat, 1/*start*/);
/* Change the state to writing IDAT chunks */ /* Change the state to writing IDAT chunks */
file->state = STATE_IDAT; file->state = STATE_IDAT;
@ -3473,7 +3473,8 @@ read_callback(png_structp png_ptr, png_bytep buffer, size_t count)
/* Write another IDAT chunk. Call rechunk_length to /* Write another IDAT chunk. Call rechunk_length to
* calculate the length required. * calculate the length required.
*/ */
length = chunk->chunk_length = rechunk_length(file->idat); length = chunk->chunk_length =
rechunk_length(file->idat, 0/*end*/);
assert(type == png_IDAT); assert(type == png_IDAT);
file->write_count = 0; /* for the new chunk */ file->write_count = 0; /* for the new chunk */
--(file->write_count); /* fake out the increment below */ --(file->write_count); /* fake out the increment below */