summaryrefslogtreecommitdiff
path: root/core/src/fxge/android
diff options
context:
space:
mode:
authorBo Xu <bo_xu@foxitsoftware.com>2014-05-24 12:20:17 -0700
committerBo Xu <bo_xu@foxitsoftware.com>2014-05-24 12:20:17 -0700
commit5dc4f24637d353d4d777c251f6d8c5746e062e7e (patch)
tree3b456ac537c2ff58afa268bd4a543a482dbdc1f1 /core/src/fxge/android
parent4201b2a5f38a6335d012aa4dc4cd19f6989d05f1 (diff)
downloadpdfium-5dc4f24637d353d4d777c251f6d8c5746e062e7e.tar.xz
Fix warnings in android build, fix font rendering issue, fix issue 357588: wrong characters representation, and addjust some code indent
BUG= R=jam@chromium.org Review URL: https://codereview.chromium.org/294353002
Diffstat (limited to 'core/src/fxge/android')
-rw-r--r--core/src/fxge/android/fpf_skiafontmgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp
index cf93e5beaf..4380732eb1 100644
--- a/core/src/fxge/android/fpf_skiafontmgr.cpp
+++ b/core/src/fxge/android/fpf_skiafontmgr.cpp
@@ -283,7 +283,7 @@ IFPF_Font* CFPF_SkiaFontMgr::CreateFont(FX_BSTR bsFamilyname, FX_BYTE uCharset,
{
FX_DWORD dwHash = FPF_SKIAGetFamilyHash(bsFamilyname, dwStyle, uCharset);
IFPF_Font *pFont = NULL;
- if (m_FamilyFonts.Lookup((void*)dwHash, (void*&)pFont)) {
+ if (m_FamilyFonts.Lookup((void*)(FX_UINTPTR)dwHash, (void*&)pFont)) {
if (pFont) {
return pFont->Retain();
}
@@ -355,7 +355,7 @@ IFPF_Font* CFPF_SkiaFontMgr::CreateFont(FX_BSTR bsFamilyname, FX_BYTE uCharset,
CFPF_SkiaFont *pFont = FX_NEW CFPF_SkiaFont;
if (pFont) {
if (pFont->InitFont(this, pFontDes, bsFamilyname, dwStyle, uCharset)) {
- m_FamilyFonts.SetAt((void*)dwHash, (void*)pFont);
+ m_FamilyFonts.SetAt((void*)(FX_UINTPTR)dwHash, (void*)pFont);
return pFont->Retain();
}
pFont->Release();