diff options
| author | Tom Sepez <tsepez@chromium.org> | 2014-11-14 11:56:27 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2014-11-14 11:56:27 -0800 |
| commit | 00445c90e17e618ae2ea4cc72da9b91b2b4a5761 (patch) | |
| tree | c030b38103193a11313b7ce15404549197fef4c2 /core/src/fxge/android/fpf_skiafontmgr.cpp | |
| parent | 65edf5944fc0ec40b1721a79acefa0297287665d (diff) | |
| download | pdfium-00445c90e17e618ae2ea4cc72da9b91b2b4a5761.tar.xz | |
XFA: merge patch from issue 726033002
Fixes android build error under stricter compilation modes.
TBR=bo_xu@foxitsoftware.com
Review URL: https://codereview.chromium.org/728943002
Diffstat (limited to 'core/src/fxge/android/fpf_skiafontmgr.cpp')
| -rw-r--r-- | core/src/fxge/android/fpf_skiafontmgr.cpp | 2 |
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}, |