[[ Bug 13295 ]] Modify image bitmap locking to use target image size ins...

...tead of scale.

[[ Bug 13295 ]] Tidy up image bitmap locking and copying