core/src/fxge/ge/fx_ge_fontmap.cpp - Issue 809513002: XFA: merge patch from issue 801913002 and 804463003

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/src/fxge/ge/fx_ge_fontmap.cpp

Issue 809513002: XFA: merge patch from issue 801913002 and 804463003 (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: core/src/fxge/ge/fx_ge_fontmap.cpp

diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp

index fe790d8664675f240ddf5da8f44b38cd0d4b19f7..e27c51fcbbee46b8034aed8c513dc53368f3c9ea 100644

--- a/core/src/fxge/ge/fx_ge_fontmap.cpp

+++ b/core/src/fxge/ge/fx_ge_fontmap.cpp

@@ -1373,13 +1373,12 @@ CFontFileFaceInfo::~CFontFileFaceInfo()

m_Face = NULL;

}

extern FX_BOOL _LoadFile(FXFT_Library library, FXFT_Face* Face, IFX_FileRead* pFile, FXFT_Stream* stream);

-#if defined(_FPDFAPI_MINI_) || _FX_OS_ == _FX_ANDROID_

+#if _FX_OS_ == _FX_ANDROID_

IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault()

{

return NULL;

}

#endif

-#if !defined(_FPDFAPI_MINI_)

CFX_FolderFontInfo::CFX_FolderFontInfo()

{

}

@@ -1616,4 +1615,3 @@ FX_BOOL CFX_FolderFontInfo::GetFontCharset(void* hFont, int& charset)

{

return FALSE;

}

-#endif

« no previous file with comments | « core/src/fxge/ge/fx_ge_font.cpp ('k') | core/src/fxge/ge/fx_ge_linux.cpp » ('j') | no next file with comments »