in png_set_cHRM_XYZ_fixed().

The old code incorrectly calculated the output rowbytes when the
application decreased either the number of channels or the bit depth (or
both) in a user transform.  This was safe; libpng overallocated buffer
space (potentially by quite a lot; up to 4 times the amount required)
but, from 1.5.4 on, resulted in a png_error.
Signed-off-by: NJohn Bowler <jbowler@acm.org>

Signed-off-by: NJohn Bowler <jbowler@acm.org>

This reverts commit 9517f7b6.

inadvertently replaced with libpng17 versions).

attempts to ignore the errors in the code aren't quite enough to
deal with the 'channel selection' encoding added to libpng 1.7; abort.

The previous attempts to ignore the errors in the code aren't quite enough to
deal with the 'channel selection' encoding added to libpng 1.7; abort.
pngvalid.c is changed to drop this encoding in prior versions.
Signed-off-by: NJohn Bowler <jbowler@acm.org>

Signed-off-by: NJohn Bowler <jbowler@acm.org>

Signed-off-by: NJohn Bowler <jbowler@acm.org>

Remove the '--strict' in 1.6 because of the double-gamma-correction warning,
update pngstest-errors.h for the errors detected with the new contrib/testspngs
PNG test files.
Signed-off-by: NJohn Bowler <jbowler@acm.org>

Back ported from libpng 1.7
Signed-off-by: NJohn Bowler <jbowler@acm.org>

tests/pngstest-* are changed so that the new test files are divided into 8
groups by gamma and alpha channel.  This makes each test take just under 5
seconds on a moderately up-to-date x86_64 system using libpng16 (test times are
somewhat variable under libpng17 at present because of the lack of optimization
in some gamma processing paths.)

These tests have considerably better code and pixel-value coverage than
contrib/pngsuite however coverage is still incomplete.
Signed-off-by: NJohn Bowler <jbowler@acm.org>

functions. They unnecessarily duplicate png_set_filler() and png_set_add_alpha()
which now work properly with 16-bit images.

input that was made in version 1.6.17beta01, to preserve legacy
behavior even though it was incorrect.  Instead, added new API
png_set_filter_16() and png_set_add_alpha_16() that set a flag to
make png_do_read_filter() interpret the filler bytes properly.

This update incorporates errors resulting from the more extensive image test
suite used in libpng 1.7
Signed-off-by: NJohn Bowler <jbowler@acm.org>

Splitting the machine generated error structs out to a file allows the values to
be updated without changing pngstest.c itself, since libpng 1.6 and 1.7 have
slightly different error limits this simplifies maintenance.
Signed-off-by: NJohn Bowler <jbowler@acm.org>