8031352: Enhance PNG handling

Reviewed-by: prr, mschoene
2 files changed