mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng17] Relocate assert() in pngfix.c, update CHANGES and ANNOUNCE.

Browse Source
This commit is contained in:
Glenn Randers-Pehrson
2016-01-06 16:16:09 -06:00
parent f33fe44b9f
commit 4705951df1
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/libtests/pngvalid.c
View File

@@ -1,7 +1,7 @@
/* pngvalid.c - validate libpng by constructing then reading png files.
*
* Last changed in libpng 1.5.27 [(PENDING RELEASE)]
* Last changed in libpng 1.6.21 [(PENDING RELEASE)]
* Copyright (c) 2014-2016 Glenn Randers-Pehrson
* Written by John Cunningham Bowler
*

10
contrib/tools/pngfix.c
View File

@@ -1,8 +1,8 @@
/* pngfix.c
*
* Copyright (c) 2014-2015 John Cunningham Bowler
* Copyright (c) 2014-2016 John Cunningham Bowler
*
* Last changed in libpng 1.6.20 [(PENDING RELEASE)]
* Last changed in libpng 1.6.21 [(PENDING RELEASE)]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -319,13 +319,13 @@ uarb_mult32(uarb acc, int a_digits, uarb num, int n_digits, png_uint_32 val)
a_digits = uarb_mult_digit(acc, a_digits, num, n_digits,
(png_uint_16)(val & 0xffff));
/* Because n_digits and val are >0 the following must be true: */
assert(a_digits > 0);
val >>= 16;
if (val > 0)
a_digits = uarb_mult_digit(acc+1, a_digits-1, num, n_digits,
(png_uint_16)val) + 1;
/* Because n_digits and val are >0 the following must be true: */
assert(a_digits > 0);
}
return a_digits;