Put back code which displays cv->gi bitmap when not using cairo.
Merge pull request #1112 from blipvert/fixes/28

Put back code which displays cv->gi bitmap when not using cairo.