vcl/win/gdi/salfont.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 72002992a3c5213882fa4d60c7cd8fab10f0b009
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Tue Dec 20 23:35:28 2016 +0200
tdf#104733: Don't ignore OpenType-CFF fons on Windows
This is a folloup for ef4b9032de55e6b1b182e4ead1bbe6e590df296e, turns
out TRUTYPE_FONTTYPE does not cover CFF fonts like I thought (the
fonts that I was checking were actually TTF fonts).
Change-Id: I2d7b34b625aa03134421dc44a24e3c66be25df98
Reviewed-on: https://gerrit.libreoffice.org/32258
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledho...@eglug.org>
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 7c5fd4a..6be5acd 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -1054,8 +1054,13 @@ int CALLBACK SalEnumFontsProcExW( const LOGFONTW* lpelfe,
else
{
// Only SFNT fonts are supported, ignore anything else.
- if (!(nFontType & TRUETYPE_FONTTYPE))
+ if (!(nFontType & TRUETYPE_FONTTYPE) &&
+ !(pMetric->ntmTm.ntmFlags & NTM_PS_OPENTYPE) &&
+ !(pMetric->ntmTm.ntmFlags & NTM_TT_OPENTYPE))
+ {
+ SAL_INFO("vcl.gdi", "Unsupported font ignored: " <<
OUString(pLogFont->elfLogFont.lfFaceName));
return 1;
+ }
WinFontFace* pData = ImplLogMetricToDevFontDataW( pLogFont,
&(pMetric->ntmTm), nFontType );
pData->SetFontId( sal_IntPtr( pInfo->mnFontCount++ ) );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
