From 343f2fc5e2789d7a64cb80c814b3b2b24d06e9d7 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 5 Jan 2016 15:49:53 -0800 Subject: Merge 3d8f56d back to xfa Required to build XFA branch in non-xfa mode. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1560313002 . --- core/src/fxge/ge/fx_ge_fontmap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/src') diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index 4105e79a69..be71f6bfac 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -1286,6 +1286,7 @@ FXFT_Face CFX_FontMapper::FindSubstFontByUnicode(FX_DWORD dwUnicode, m_pFontInfo->DeleteFont(hFont); return face; } +#endif // PDF_ENABLE_XFA FX_BOOL CFX_FontMapper::IsBuiltinFace(const FXFT_Face face) const { for (int i = 0; i < MM_FACE_COUNT; ++i) { @@ -1300,7 +1301,6 @@ FX_BOOL CFX_FontMapper::IsBuiltinFace(const FXFT_Face face) const { } return FALSE; } -#endif // PDF_ENABLE_XFA extern "C" { unsigned long _FTStreamRead(FXFT_Stream stream, -- cgit v1.2.3