Query FC_CAPABILITY once per pattern

Change-Id: I5f1219d5a476f1bd09e8c01847fe886f342b28a0 Reviewed-by: Eskil Abrahamsen Blomfeldt <[email protected]>
HamedMasafi · Apr 27, 2016 · 75bd795 · 75bd795
1 parent 6493bca
commit 75bd795
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
@@ -436,11 +436,12 @@ static void populateFromPattern(FcPattern *pattern)
     }
 
 #if FC_VERSION >= 20297
+    FcChar8 *cap = Q_NULLPTR;
     for (int j = 1; j < QFontDatabase::WritingSystemsCount; ++j) {
         if (writingSystems.supported(QFontDatabase::WritingSystem(j))
             && requiresOpenType(j) && openType[j]) {
-            FcChar8 *cap;
-            res = FcPatternGetString (pattern, FC_CAPABILITY, 0, &cap);
+            if (cap == Q_NULLPTR)
+                res = FcPatternGetString(pattern, FC_CAPABILITY, 0, &cap);
             if (res == FcResultMatch && strstr(reinterpret_cast<const char *>(cap), openType[j]) == 0)
                 writingSystems.setSupported(QFontDatabase::WritingSystem(j),false);
         }