summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2013-06-20 01:27:21 +0200
committerKhaled Hosny <khaledhosny@eglug.org>2013-06-20 01:34:02 +0200
commit22d23d52b0f65636df3a1cb8fada9bf7de77eb78 (patch)
treec2ccf4aa3f4ceb34bf58cff3aab134bb69500196
parentfe444d1f74abe417962be0bcd3340f40f2446b58 (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
-rw-r--r--vcl/generic/glyphs/gcach_ftyp.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index cdcfe4ca5fde..d75c7d2738a6 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -989,7 +989,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) )
{