OSDN Git Service

ignore return value of FcPatternGetBool()
authorIvailo Monev <xakepa10@gmail.com>
Sat, 5 Feb 2022 19:21:45 +0000 (21:21 +0200)
committerIvailo Monev <xakepa10@gmail.com>
Sat, 5 Feb 2022 19:21:45 +0000 (21:21 +0200)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/gui/text/qfontdatabase.cpp
src/gui/text/qfontengine_ft.cpp

index d780dbc..c1ea443 100644 (file)
@@ -782,7 +782,8 @@ QFontDatabase::QFontDatabase()
 
             if (FcPatternGetString(fonts->fonts[i], FC_FAMILY, 0, &family_value) != FcResultMatch)
                 continue;
-            if (FcPatternGetBool(fonts->fonts[i], FC_SCALABLE, 0, &scalable_value) != FcResultMatch || scalable_value != FcTrue)
+            FcPatternGetBool(fonts->fonts[i], FC_SCALABLE, 0, &scalable_value);
+            if (scalable_value != FcTrue)
                 continue;
 
             if (FcPatternGetString(fonts->fonts[i], FC_FOUNDRY, 0, &foundry_value) != FcResultMatch)
index 9175c0c..2f25c05 100644 (file)
@@ -184,12 +184,9 @@ QFontEngineFT::QFontEngineFT(const QFontDef &fd, FcPattern *pattern)
     }
 
 #if defined(FC_AUTOHINT) && defined(FT_LOAD_FORCE_AUTOHINT)
-    bool autohint = false;
-    FcBool b = FcFalse;
-    if (FcPatternGetBool(pattern, FC_AUTOHINT, 0, &b) == FcResultMatch) {
-        autohint = b;
-    }
-    if (autohint) {
+    FcBool autohint = FcFalse;
+    FcPatternGetBool(pattern, FC_AUTOHINT, 0, &autohint);
+    if (autohint == FcTrue) {
         default_load_flags |= FT_LOAD_FORCE_AUTOHINT;
     }
 #endif