[libpng17] Restored a test on width that was removed from png.c at libpng-1.6.9

(Bug report by Alex Eubanks).
Fixed an overflow in png_combine_row with very wide interlaced images.