summaryrefslogtreecommitdiff
path: root/core/src/fxge/android/fpf_skiafontmgr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/fxge/android/fpf_skiafontmgr.cpp')
-rw-r--r--core/src/fxge/android/fpf_skiafontmgr.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp
index f74d9ea2b7..254f806fec 100644
--- a/core/src/fxge/android/fpf_skiafontmgr.cpp
+++ b/core/src/fxge/android/fpf_skiafontmgr.cpp
@@ -247,7 +247,7 @@ void CFPF_SkiaFontMgr::LoadSystemFonts() {
if (m_bLoaded) {
return;
}
- ScanPath(FX_BSTRC("/system/fonts"));
+ ScanPath("/system/fonts");
OutputSystemFonts();
m_bLoaded = TRUE;
}
@@ -416,14 +416,13 @@ void CFPF_SkiaFontMgr::ScanPath(const CFX_ByteStringC& path) {
FX_BOOL bFolder = FALSE;
while (FX_GetNextFile(handle, filename, bFolder)) {
if (bFolder) {
- if (filename == FX_BSTRC(".") || filename == FX_BSTRC("..")) {
+ if (filename == "." || filename == "..") {
continue;
}
} else {
CFX_ByteString ext = filename.Right(4);
ext.MakeLower();
- if (ext != FX_BSTRC(".ttf") && ext != FX_BSTRC(".ttc") &&
- ext != FX_BSTRC(".otf")) {
+ if (ext != ".ttf" && ext != ".ttc" && ext != ".otf") {
continue;
}
}