[libpng16] In pngtest, treat benign errors as errors if "-strict" is present.

This commit is contained in:
Glenn Randers-Pehrson 2012-03-10 19:42:03 -06:00
parent 945cb1f9be
commit 35f2e1768b
3 changed files with 16 additions and 3 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.6.0beta18 - March 10, 2012 Libpng 1.6.0beta18 - March 11, 2012
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.
@ -298,8 +298,9 @@ Version 1.6.0beta17 [March 10, 2012]
chunks could end up with a too-small windowBits value in the deflate chunks could end up with a too-small windowBits value in the deflate
header. header.
Version 1.6.0beta18 [March 10, 2012] Version 1.6.0beta18 [March 11, 2012]
Issue a png_benign_error() instead of png_warning() about bad palette index. Issue a png_benign_error() instead of png_warning() about bad palette index.
In pngtest, treat benign errors as errors if "-strict" is present.
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

@ -4049,8 +4049,9 @@ Version 1.6.0beta17 [March 10, 2012]
chunks could end up with a too-small windowBits value in the deflate chunks could end up with a too-small windowBits value in the deflate
header. header.
Version 1.6.0beta18 [March 10, 2012] Version 1.6.0beta18 [March 11, 2012]
Issue a png_benign_error() instead of png_warning() about bad palette index. Issue a png_benign_error() instead of png_warning() about bad palette index.
In pngtest, treat benign errors as errors if "-strict" is present.
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

@ -745,6 +745,17 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
#endif #endif
#endif #endif
if (strict)
{
/* Treat png_benign_error() as errors on read */
png_set_benign_errors(read_ptr, 0);
/* Treat them as errors on write */
png_set_benign_errors(write_ptr, 0);
/* if strict is not set, then both are treated as warnings. */
}
pngtest_debug("Initializing input and output streams"); pngtest_debug("Initializing input and output streams");
#ifdef PNG_STDIO_SUPPORTED #ifdef PNG_STDIO_SUPPORTED
png_init_io(read_ptr, fpin); png_init_io(read_ptr, fpin);