diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-28 16:39:19 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-28 16:39:19 -0700 |
| commit | 4e57057c361897834b77b4c84b412f949427f974 (patch) | |
| tree | d5f3da97eb81be22cd244fa6b2e2078cfd2438f9 /core/src/fxge/android | |
| parent | 0b133988474ad5682db606e3aa9f0722e82eaa32 (diff) | |
| download | pdfium-4e57057c361897834b77b4c84b412f949427f974.tar.xz | |
Merge to XFA: Missing bExact -> iExact conversions
(cherry picked from commit 452bafebc358d9a1d57266b31a5869584c0fbfb7)
Original Review URL: https://codereview.chromium.org/1262683003 .
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1265543002 .
Diffstat (limited to 'core/src/fxge/android')
| -rw-r--r-- | core/src/fxge/android/fx_android_font.cpp | 2 | ||||
| -rw-r--r-- | core/src/fxge/android/fx_android_font.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxge/android/fx_android_font.cpp b/core/src/fxge/android/fx_android_font.cpp index 3e2fc45854..fd72e47478 100644 --- a/core/src/fxge/android/fx_android_font.cpp +++ b/core/src/fxge/android/fx_android_font.cpp @@ -23,7 +23,7 @@ FX_BOOL CFX_AndroidFontInfo::EnumFontList(CFX_FontMapper* pMapper) { return FALSE; } -void* CFX_AndroidFontInfo::MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* face, FX_BOOL& bExact) +void* CFX_AndroidFontInfo::MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* face, int& iExact) { if (!m_pFontMgr) { return NULL; diff --git a/core/src/fxge/android/fx_android_font.h b/core/src/fxge/android/fx_android_font.h index 83c04a03a4..e0101b380b 100644 --- a/core/src/fxge/android/fx_android_font.h +++ b/core/src/fxge/android/fx_android_font.h @@ -20,7 +20,7 @@ public: virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper); - virtual void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* face, FX_BOOL& bExact); + virtual void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* face, int& bExact); virtual void* GetFont(const FX_CHAR* face); virtual FX_DWORD GetFontData(void* hFont, FX_DWORD table, uint8_t* buffer, FX_DWORD size); |