Patch to reflect changes made to image.scale

Switched arguments of image.scale around at all appropriate places. Linux versions not verified - no linux machine :(