diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-05-25 13:14:59 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2013-05-25 13:23:03 +0200 |
| commit | 5e2d59e4b910631c802d5c7c42b7411e5a8b8db6 (patch) | |
| tree | 5aab6a93f57764939f448e1c548c538b3eea3917 | |
| parent | c72955bcb196574f7bc682e7aa301264a8a54635 (diff) | |
Fix fdo#64972 - strikethrough displays too high
I was calculating the leading before setting the ascent and descent,
oops.
Change-Id: Ic58ecb1a65cb33715ea06f5e3214c4acbcff1e40
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 162ba1108eea..e34b38d3a73a 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -940,7 +940,6 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const rTo.mnDescent = 0; rTo.mnExtLeading = 0; rTo.mnSlant = 0; - rTo.mnIntLeading = (rTo.mnAscent + rTo.mnDescent) - ((maFaceFT->units_per_EM + 32) >> 6); rTo.mnWidth = mnWidth; // Calculating ascender and descender: @@ -994,6 +993,8 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const } } + rTo.mnIntLeading = (rTo.mnAscent + rTo.mnDescent) - ((maFaceFT->units_per_EM + 32) >> 6); + if( pOS2 && (pOS2->version != 0xFFFF) ) { // map the panose info from the OS2 table to their VCL counterparts |