gdi32: Remove the code that doesn't work as intended around FcFontList().

Signed-off-by: Byeongsik Jeon <bsjeon@hanmail.net> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdi32: Remove the code that doesn't work as intended around FcFontList().
af90ab32 · Byeongsik Jeon · Alexandre Julliard · 2fe859b8 · af90ab32
Commit af90ab32 authored Oct 29, 2018 by Byeongsik Jeon Committed by Alexandre Julliard Oct 29, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 15 deletions

freetype.c dlls/gdi32/freetype.c +9 -15

No files found.
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -176,9 +176,6 @@ MAKE_FUNCPTR(FcConfigSubstitute);
 MAKE_FUNCPTR(FcFontList);
 MAKE_FUNCPTR(FcFontSetDestroy);
 MAKE_FUNCPTR(FcInit);
-MAKE_FUNCPTR(FcObjectSetAdd);
-MAKE_FUNCPTR(FcObjectSetCreate);
-MAKE_FUNCPTR(FcObjectSetDestroy);
 MAKE_FUNCPTR(FcPatternCreate);
 MAKE_FUNCPTR(FcPatternDestroy);
 MAKE_FUNCPTR(FcPatternGetBool);
@@ -2796,9 +2793,6 @@ static void init_fontconfig(void)
    LOAD_FUNCPTR(FcFontList);
    LOAD_FUNCPTR(FcFontSetDestroy);
    LOAD_FUNCPTR(FcInit);
-    LOAD_FUNCPTR(FcObjectSetAdd);
-    LOAD_FUNCPTR(FcObjectSetCreate);
-    LOAD_FUNCPTR(FcObjectSetDestroy);
    LOAD_FUNCPTR(FcPatternCreate);
    LOAD_FUNCPTR(FcPatternDestroy);
    LOAD_FUNCPTR(FcPatternGetBool);
@@ -2829,7 +2823,6 @@ static void init_fontconfig(void)
 static void load_fontconfig_fonts(void)
 {
    FcPattern *pat;
-    FcObjectSet *os;
    FcFontSet *fontset;
    int i, len;
    char *file;
@@ -2838,13 +2831,15 @@ static void load_fontconfig_fonts(void)
    if (!fontconfig_enabled) return;
    pat = pFcPatternCreate();
-    os = pFcObjectSetCreate();
+    if (!pat) return;
-    pFcObjectSetAdd(os, FC_FILE);
-    pFcObjectSetAdd(os, FC_SCALABLE);
+    fontset = pFcFontList(NULL, pat, NULL);
-    pFcObjectSetAdd(os, FC_ANTIALIAS);
+    if (!fontset)
-    pFcObjectSetAdd(os, FC_RGBA);
+    {
-    fontset = pFcFontList(NULL, pat, os);
+        pFcPatternDestroy(pat);
-    if(!fontset) return;
+        return;
+    }
    for(i = 0; i < fontset->nfont; i++) {
        FcBool scalable;
        DWORD aa_flags;
@@ -2875,7 +2870,6 @@ static void load_fontconfig_fonts(void)
                          ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE | ADDFONT_AA_FLAGS(aa_flags) );
    }
    pFcFontSetDestroy(fontset);
-    pFcObjectSetDestroy(os);
    pFcPatternDestroy(pat);
 }