From 452bafebc358d9a1d57266b31a5869584c0fbfb7 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 28 Jul 2015 16:27:37 -0700 Subject: Missing bExact -> iExact conversions This is the cause of the mac embeddertest failure when fx_bool is replaced by bool (an incorrect overload). The types still match on master, prior to the conversion, so it's not noticed. Find other instances as well. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1262683003 . --- core/src/fxge/android/fx_android_font.cpp | 2 +- core/src/fxge/android/fx_android_font.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/fxge/android') 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); -- cgit v1.2.3