diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-11-16 20:48:50 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-11-19 14:05:29 +0200 |
| commit | 5b5ab82dc881d3063f791bcb6192672f737f24c3 (patch) | |
| tree | 45459807df1af1e22f531ccc51c82e9bef17f39f /vcl/generic | |
| parent | 0e6e0cea8fd5c02191f529b946c4df294072477f (diff) | |
Add ImplFontMetricData::mbTrueTypeFont
Indicates that the font truly is a TrueType one (FT_IS_SFNT in
FreeType, TMPF_TRUETYPE in Win32).
Change-Id: Ic9dbf5e5239ae2ca597c454091fc36073a3b19cc
Diffstat (limited to 'vcl/generic')
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 3 | ||||
| -rw-r--r-- | vcl/generic/print/genpspgraphics.cxx | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index bef54776e6b8..2e874e51eccc 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -636,7 +636,8 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const { static_cast<ImplFontAttributes&>(rTo) = mpFontInfo->GetFontAttributes(); - rTo.mbScalableFont = true; + rTo.mbScalableFont = true; // FIXME: Shouldn't this check FT_IS_SCALABLE( maFaceFT )? + rTo.mbTrueTypeFont = FT_IS_SFNT( maFaceFT ) != 0; rTo.mbDevice = true; rTo.mbKernableFont = FT_HAS_KERNING( maFaceFT ) != 0; rTo.mnOrientation = GetFontSelData().mnOrientation; diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index c0e214d51e51..f1f92020e7d0 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -923,6 +923,7 @@ void GenPspGraphics::GetFontMetric( ImplFontMetricData *pMetric, int ) static_cast<ImplFontAttributes&>(*pMetric) = aDFA; pMetric->mbDevice = aDFA.mbDevice; pMetric->mbScalableFont = true; + pMetric->mbTrueTypeFont = false; // FIXME, needed? pMetric->mnOrientation = m_pPrinterGfx->GetFontAngle(); pMetric->mnSlant = 0; |