diff options
Diffstat (limited to 'core/fxge/fx_ge_linux.cpp')
-rw-r--r-- | core/fxge/fx_ge_linux.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/core/fxge/fx_ge_linux.cpp b/core/fxge/fx_ge_linux.cpp index d9fac3f54c..0552f1c58c 100644 --- a/core/fxge/fx_ge_linux.cpp +++ b/core/fxge/fx_ge_linux.cpp @@ -45,17 +45,18 @@ size_t GetJapanesePreference(const char* facearr, int weight, int pitch_family) { CFX_ByteString face = facearr; - if (face.Find("Gothic") >= 0 || - face.Find("\x83\x53\x83\x56\x83\x62\x83\x4e") >= 0) { - if (face.Find("PGothic") >= 0 || - face.Find("\x82\x6f\x83\x53\x83\x56\x83\x62\x83\x4e") >= 0) { + if (face.Find("Gothic") != FX_STRNPOS || + face.Find("\x83\x53\x83\x56\x83\x62\x83\x4e") != FX_STRNPOS) { + if (face.Find("PGothic") != FX_STRNPOS || + face.Find("\x82\x6f\x83\x53\x83\x56\x83\x62\x83\x4e") != FX_STRNPOS) { return 0; } return 1; } - if (face.Find("Mincho") >= 0 || face.Find("\x96\xbe\x92\xa9") >= 0) { - if (face.Find("PMincho") >= 0 || - face.Find("\x82\x6f\x96\xbe\x92\xa9") >= 0) { + if (face.Find("Mincho") != FX_STRNPOS || + face.Find("\x96\xbe\x92\xa9") != FX_STRNPOS) { + if (face.Find("PMincho") != FX_STRNPOS || + face.Find("\x82\x6f\x96\xbe\x92\xa9") != FX_STRNPOS) { return 2; } return 3; |