[libpng15] Quieted Coverity issues in pngvalid.c.

This commit is contained in:
Glenn Randers-Pehrson 2015-06-03 16:12:36 -05:00
parent 5ce5cb7a9a
commit ab096c961b
3 changed files with 9 additions and 4 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.5.23beta02 - June 1, 2015 Libpng 1.5.23beta02 - June 2, 2015
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.
@ -38,12 +38,13 @@ Version 1.5.23beta01 [May 21, 2015]
Avoid a harmless potential integer overflow in png_XYZ_from_xy() (Bug Avoid a harmless potential integer overflow in png_XYZ_from_xy() (Bug
report from Christopher Ferris). report from Christopher Ferris).
Version 1.5.23beta02 [June 1, 2015] Version 1.5.23beta02 [June 2, 2015]
Removed WRITE_WEIGHTED_FILTERED code, to save a few kbytes of the Removed WRITE_WEIGHTED_FILTERED code, to save a few kbytes of the
compiled library size. It never worked properly and as far as we can compiled library size. It never worked properly and as far as we can
tell, no one uses it. The png_set_filter_heuristics() and tell, no one uses it. The png_set_filter_heuristics() and
png_set_filter_heuristics_fixed() APIs are retained but deprecated png_set_filter_heuristics_fixed() APIs are retained but deprecated
and do nothing. and do nothing.
Quieted Coverity issues in pngvalid.c.
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

View File

@ -4350,12 +4350,13 @@ Version 1.5.23beta01 [May 21, 2015]
Avoid a harmless potential integer overflow in png_XYZ_from_xy() (Bug Avoid a harmless potential integer overflow in png_XYZ_from_xy() (Bug
report from Christopher Ferris). report from Christopher Ferris).
Version 1.5.23beta02 [June 1, 2015] Version 1.5.23beta02 [June 2, 2015]
Removed WRITE_WEIGHTED_FILTERED code, to save a few kbytes of the Removed WRITE_WEIGHTED_FILTERED code, to save a few kbytes of the
compiled library size. It never worked properly and as far as we can compiled library size. It never worked properly and as far as we can
tell, no one uses it. The png_set_filter_heuristics() and tell, no one uses it. The png_set_filter_heuristics() and
png_set_filter_heuristics_fixed() APIs are retained but deprecated png_set_filter_heuristics_fixed() APIs are retained but deprecated
and do nothing. and do nothing.
Quieted Coverity issues in pngvalid.c.
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

View File

@ -1275,7 +1275,10 @@ store_current_palette(png_store *ps, int *npalette)
* operation.) * operation.)
*/ */
if (ps->current == NULL) if (ps->current == NULL)
{
store_log(ps, ps->pread, "no current stream for palette", 1); store_log(ps, ps->pread, "no current stream for palette", 1);
return NULL;
}
/* The result may be null if there is no palette. */ /* The result may be null if there is no palette. */
*npalette = ps->current->npalette; *npalette = ps->current->npalette;
@ -5667,7 +5670,7 @@ image_transform_mod_end(PNG_CONST image_transform *this, image_pixel *that,
else else
{ {
that->alpha = scale; /* opaque */ that->alpha = scale; /* opaque */
that->alpha = 1; /* Override this. */ that->alphaf = 1; /* Override this. */
that->alphae = 0; /* It's exact ;-) */ that->alphae = 0; /* It's exact ;-) */
} }
} }