From: Rodger Combs <rodger.combs@gmail.com>
Date: Sat, 23 Mar 2019 13:30:16 +0000 (-0500)
Subject: fontselect: expose the freetype-provided family as well
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c2120a7cb4a6fd648ef37ad8f0d961cbd60f500;p=libass

fontselect: expose the freetype-provided family as well
---

diff --git a/libass/ass_fontselect.c b/libass/ass_fontselect.c
index 651fc7a..9c4bb3b 100644
--- a/libass/ass_fontselect.c
+++ b/libass/ass_fontselect.c
@@ -766,6 +766,13 @@ get_font_info(FT_Library lib, FT_Face face, ASS_FontProviderMetaData *info)
     if (!(face->face_flags & FT_FACE_FLAG_SCALABLE))
         return false;
 
+    if (face->family_name) {
+        families[0] = strdup(face->family_name);
+        if (families[0] == NULL)
+            goto error;
+        num_family++;
+    }
+
     for (i = 0; i < num_names; i++) {
         FT_SfntName name;
 
@@ -793,15 +800,6 @@ get_font_info(FT_Library lib, FT_Face face, ASS_FontProviderMetaData *info)
                 num_family++;
             }
         }
-
-    }
-
-    // check if we got a valid family - if not use whatever FreeType gives us
-    if (num_family == 0 && face->family_name) {
-        families[0] = strdup(face->family_name);
-        if (families[0] == NULL)
-            goto error;
-        num_family++;
     }
 
     // we absolutely need a name