Merge "Restore a width check that was removed from png.c (CVE-2015-0973)"