From 4a28a7376367165404eeabdfb4274d30c2d6c040 Mon Sep 17 00:00:00 2001 From: Jun Fang Date: Tue, 8 Dec 2015 08:33:13 +0800 Subject: Merge to XFA: Fix rendering with built-in CID fonts The root cause is that FXFONT_SUBST_EXACT is wrongly set even no any subset font was found. It causes m_bCIDIsGID to be wrongly set as TRUE in CPDF_CIDFont::_Load(). BUG=534945 R=thestig@chromium.org, tsepez@chromium.org Review URL: https://codereview.chromium.org/1502083002 . Review URL: https://codereview.chromium.org/1504263002 . --- core/src/fxge/ge/fx_ge_fontmap.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'core') diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index 73f89c4c05..f16200a9ce 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -1052,7 +1052,6 @@ FXFT_Face CFX_FontMapper::FindSubstFont(const CFX_ByteString& name, : (nStyle & FX_FONT_STYLE_Bold ? FXFONT_FW_BOLD : FXFONT_FW_NORMAL); } if (!match.IsEmpty() || iBaseFont < 12) { - pSubstFont->m_SubstFlags |= FXFONT_SUBST_EXACT; if (!match.IsEmpty()) { family = match; } -- cgit v1.2.3