diff options
| author | Andrew Olsen <olsen@google.com> | 2015-11-26 16:35:03 +1100 |
|---|---|---|
| committer | Andrew Olsen <olsen@google.com> | 2015-11-26 16:35:03 +1100 |
| commit | ab2ce717615e0b18bd8afccff5a45a01fd27edfb (patch) | |
| tree | 1c5dd92c452ca5391a6acf822807a4511c10bc2b | |
| parent | c3e4ae5fe5067723b58a2029a95c6411c92bed15 (diff) | |
| download | pdfium-ab2ce717615e0b18bd8afccff5a45a01fd27edfb.tar.xz | |
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 .
| -rw-r--r-- | core/src/fxge/android/fpf_skiafontmgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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; } } |