David Tardon
12 years ago
parent
601ee4aaa0
commit
81742ab91b
@ -0,0 +1,29 @@
|
||||
From ed31769088acc76eeed0f83b53227a429a5bf3a8 Mon Sep 17 00:00:00 2001
|
||||
From: David Tardon <dtardon@redhat.com>
|
||||
Date: Wed, 12 Jun 2013 11:33:41 +0200
|
||||
Subject: [PATCH 1/2] fdo#65132 compute font height correctly
|
||||
|
||||
Change-Id: I8da66b102a554c9d5d275ff46e40dd707199d4f4
|
||||
(cherry picked from commit 3a6513047409b8e8f6295152b33385ad8ef93681)
|
||||
|
||||
Signed-off-by: David Tardon <dtardon@redhat.com>
|
||||
---
|
||||
vcl/source/gdi/outdev3.cxx | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
|
||||
index d5d019a..cf37e01 100644
|
||||
--- a/vcl/source/gdi/outdev3.cxx
|
||||
+++ b/vcl/source/gdi/outdev3.cxx
|
||||
@@ -7084,7 +7084,7 @@ FontMetric OutputDevice::GetFontMetric() const
|
||||
// set aMetric with info from font
|
||||
aMetric.SetName( maFont.GetName() );
|
||||
aMetric.SetStyleName( pMetric->GetStyleName() );
|
||||
- aMetric.SetSize( PixelToLogic( Size( pMetric->mnWidth, pMetric->mnAscent+pMetric->mnDescent-pMetric->mnIntLeading ) ) );
|
||||
+ aMetric.SetSize( PixelToLogic( Size( pMetric->mnWidth, pMetric->mnAscent+pMetric->mnDescent ) ) );
|
||||
aMetric.SetCharSet( pMetric->IsSymbolFont() ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE );
|
||||
aMetric.SetFamily( pMetric->GetFamilyType() );
|
||||
aMetric.SetPitch( pMetric->GetPitch() );
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
From 4e0a8fc68bda2a88de5468a61218996a099d3302 Mon Sep 17 00:00:00 2001
|
||||
From: David Tardon <dtardon@redhat.com>
|
||||
Date: Wed, 12 Jun 2013 12:32:21 +0200
|
||||
Subject: [PATCH 2/2] 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
|
||||
---
|
||||
vcl/generic/glyphs/gcach_ftyp.cxx | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
|
||||
index 162ba11..e34b38d 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
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
Loading…
Reference in new issue