Move canvas.rotate before draw image
Merge branch 'fix-canvas'