Merge pull request #7341 from AdmiralCurtiss/simplified-libpng Use simplified libpng PNG reading API to avoid PNG reading bugs.
