Change path in PNG.h from canvas.h to canvas/canvas.h
fix win32 build
Merge remote-tracking branch 'muellni/master'