Removed draw2d graphics as still does not make linux work.
Fix to 16-bit images.