Fix to the patching and added pngtest.png to the mainline source tree
back to the original hsct