summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorJun Fang <jun_fang@foxitsoftware.com>2015-12-08 08:33:13 +0800
committerJun Fang <jun_fang@foxitsoftware.com>2015-12-08 08:33:13 +0800
commit4a28a7376367165404eeabdfb4274d30c2d6c040 (patch)
tree18b3950adb510486ed5595dba6423653d93ca12b /core/src
parent5e4f290e939ded90a518ff8eab1db59930655e11 (diff)
downloadpdfium-4a28a7376367165404eeabdfb4274d30c2d6c040.tar.xz
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 .
Diffstat (limited to 'core/src')
-rw-r--r--core/src/fxge/ge/fx_ge_fontmap.cpp1
1 files changed, 0 insertions, 1 deletions
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;
}