am f6d8228e: Merge "Avoid a harmless potential integer overflow in png_XYZ_from_xy()."

* commit 'f6d8228e2e47a1b797828735797941a174757d6f':
  Avoid a harmless potential integer overflow in png_XYZ_from_xy().