Here is the patch to fix issue making cursor hollow under non-mask image, but containing margins.  This patch keeps box cursor to be box in case image has margins.

Thanks

--