diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-06-20 01:27:21 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-20 11:40:21 +0100 |
| commit | fa1122a42dad9d89ab608bdc0e0c4b064e431797 (patch) | |
| tree | 7f67f5ac1cea0058d80a98f8af599a4d078d6233 | |
| parent | 49eb6483d5fc8e241d73e17c5500d677b151c076 (diff) | |
Fix calculation of internal leading
Stupid me, I totally messed this up! God only knows how many non-bugs
people had to fix because of this typo.
Has the side effect of fixing fdo#64972 (among many others of course,
but this is the only one still open).
Change-Id: I9d8fdb6d37d4af9b0ac973902e469e0bd3a2408a
(cherry picked from commit 22d23d52b0f65636df3a1cb8fada9bf7de77eb78)
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index e34b38d3a73a..e3d65d901d86 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -993,7 +993,7 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const } } - rTo.mnIntLeading = (rTo.mnAscent + rTo.mnDescent) - ((maFaceFT->units_per_EM + 32) >> 6); + rTo.mnIntLeading = rTo.mnAscent + rTo.mnDescent - (maFaceFT->units_per_EM * fScale + 0.5); if( pOS2 && (pOS2->version != 0xFFFF) ) { |