fix merge error
add png support
fix warning