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

* commit '549b976132cd82ac53c7bd200496f09f3c50863e':
  Restore a width check that was removed from png.c (CVE-2015-0973)