From ab2ce717615e0b18bd8afccff5a45a01fd27edfb Mon Sep 17 00:00:00 2001 From: Andrew Olsen Date: Thu, 26 Nov 2015 16:35:03 +1100 Subject: Android: look for OTF files as well as TTF and TTC. BUG=pdfium:288 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1476173003 . --- core/src/fxge/android/fpf_skiafontmgr.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp index a263416521..f74d9ea2b7 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.cpp +++ b/core/src/fxge/android/fpf_skiafontmgr.cpp @@ -422,7 +422,8 @@ void CFPF_SkiaFontMgr::ScanPath(const CFX_ByteStringC& path) { } else { CFX_ByteString ext = filename.Right(4); ext.MakeLower(); - if (ext != FX_BSTRC(".ttf") && ext != FX_BSTRC(".ttc")) { + if (ext != FX_BSTRC(".ttf") && ext != FX_BSTRC(".ttc") && + ext != FX_BSTRC(".otf")) { continue; } } -- cgit v1.2.3