Fix fixed line-height adjustment.
Tested with our large collection of images and cstester. Pushed now to have
that patch in the nightly test-run. Will extend it tomorrow with comments
and unittests.