diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-23 16:07:32 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-23 16:07:32 -0700 |
| commit | 1f3442ce5c035d22e2cc9fffc203892f2f749373 (patch) | |
| tree | 7c66063cf1e29cc48c81ca84e9d766a2e23f4b95 /core/src/fxge/ge/fx_ge_linux.cpp | |
| parent | 2f2ffece124e4ed4b96d2846263015d4b5ad6c00 (diff) | |
| download | pdfium-1f3442ce5c035d22e2cc9fffc203892f2f749373.tar.xz | |
Merge to XFA: FX_BOOL combo patch.
Original Review URL: https://codereview.chromium.org/1257503002
Original Review URL: https://codereview.chromium.org/1253603002
Manual merge for:
core/include/fxge/fx_font.h
core/src/fxcodec/codec/codec_int.h
fpdfsdk/src/javascript/PublicMethods.cpp
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1248153004 .
Diffstat (limited to 'core/src/fxge/ge/fx_ge_linux.cpp')
| -rw-r--r-- | core/src/fxge/ge/fx_ge_linux.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/fxge/ge/fx_ge_linux.cpp b/core/src/fxge/ge/fx_ge_linux.cpp index 51c0e64912..25ad49cbce 100644 --- a/core/src/fxge/ge/fx_ge_linux.cpp +++ b/core/src/fxge/ge/fx_ge_linux.cpp @@ -30,7 +30,7 @@ Base14Substs[] = { class CFX_LinuxFontInfo : public CFX_FolderFontInfo { public: - virtual void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* family, FX_BOOL& bExact); + void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* family, int& iExact) override; FX_BOOL ParseFontCfg(); void* FindFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* family, FX_BOOL bMatchName); }; @@ -77,14 +77,14 @@ static int32_t GetJapanesePreference(const FX_CHAR* facearr, int weight, int pic } return 2; } -void* CFX_LinuxFontInfo::MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* cstr_face, FX_BOOL& bExact) +void* CFX_LinuxFontInfo::MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* cstr_face, int& iExact) { CFX_ByteString face = cstr_face; int iBaseFont; for (iBaseFont = 0; iBaseFont < 12; iBaseFont ++) if (face == CFX_ByteStringC(Base14Substs[iBaseFont].m_pName)) { face = Base14Substs[iBaseFont].m_pSubstName; - bExact = TRUE; + iExact = 1; break; } if (iBaseFont < 12) { |