| Index: core/fxge/android/fx_android_font.cpp
|
| diff --git a/core/fxge/android/fx_android_font.cpp b/core/fxge/android/fx_android_font.cpp
|
| index 7218b5e7d0fb52df05e2bb2ee2af09e93c3a7a04..d663ac0f4f60cc0242f6c47c39158abec9bf62fe 100644
|
| --- a/core/fxge/android/fx_android_font.cpp
|
| +++ b/core/fxge/android/fx_android_font.cpp
|
| @@ -32,7 +32,7 @@ void* CFX_AndroidFontInfo::MapFont(int weight,
|
| if (!m_pFontMgr) {
|
| return NULL;
|
| }
|
| - FX_DWORD dwStyle = 0;
|
| + uint32_t dwStyle = 0;
|
| if (weight >= 700) {
|
| dwStyle |= FXFONT_BOLD;
|
| }
|
| @@ -54,10 +54,10 @@ void* CFX_AndroidFontInfo::MapFont(int weight,
|
| void* CFX_AndroidFontInfo::GetFont(const FX_CHAR* face) {
|
| return NULL;
|
| }
|
| -FX_DWORD CFX_AndroidFontInfo::GetFontData(void* hFont,
|
| - FX_DWORD table,
|
| +uint32_t CFX_AndroidFontInfo::GetFontData(void* hFont,
|
| + uint32_t table,
|
| uint8_t* buffer,
|
| - FX_DWORD size) {
|
| + uint32_t size) {
|
| if (!hFont) {
|
| return 0;
|
| }
|
|
|