new png_io.h
conflict fixed