diff options
author | David Tardon <dtardon@redhat.com> | 2013-06-12 12:32:21 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-06-12 12:33:00 +0200 |
commit | 4e0a8fc68bda2a88de5468a61218996a099d3302 (patch) | |
tree | 2c35e81af6de9453632616d294511f1d81c12405 | |
parent | ed31769088acc76eeed0f83b53227a429a5bf3a8 (diff) |
Revert "Revert "Fix fdo#64972 - strikethrough displays too high""
The underlying bug was fixed by the previous commit.
This reverts commit 1d34b905fad48b7aee7ccf39e33d952846f00fea.
Change-Id: I2333740ec623165b28253d20f0ba7fa2bcd19ac1
-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 |