summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2014-11-14 11:29:28 -0800
committerTom Sepez <tsepez@chromium.org>2014-11-14 11:29:28 -0800
commit56ba90c35c31c77be3f3249fcf2ecf26f6efc62f (patch)
treeab33b24305a8ab715fc652dd8666853e1ba8b467
parent3d9490126610b9474af088a1e024cb6deb2d3356 (diff)
downloadpdfium-56ba90c35c31c77be3f3249fcf2ecf26f6efc62f.tar.xz
Fix build warning on android under stricter compilation rules.
Error is "converting to non-pointer type 'FX_DWORD'". TBR=bo_xu@foxitsoftware.com Review URL: https://codereview.chromium.org/726033002
-rw-r--r--core/src/fxge/android/fpf_skiafontmgr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp
index 4380732eb1..1525293ab2 100644
--- a/core/src/fxge/android/fpf_skiafontmgr.cpp
+++ b/core/src/fxge/android/fpf_skiafontmgr.cpp
@@ -77,7 +77,7 @@ FX_DWORD FPF_SkiaGetSubstFont(FX_DWORD dwHash)
return pItem->dwSubSt;
}
}
- return NULL;
+ return 0;
}
static const FPF_SKIAFONTMAP g_SkiaSansFontMap[] = {
{0x58c5083, 0xd5b8d10f},