gdi32: Remove runtime check for FT_Set_Charmap().

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdi32: Remove runtime check for FT_Set_Charmap().
2bd5f6e0 · Nikolay Sivov · Alexandre Julliard · fae0570a · 2bd5f6e0
Commit 2bd5f6e0 authored Sep 26, 2017 by Nikolay Sivov Committed by Alexandre Julliard Sep 26, 2017
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 9 deletions

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

No files found.
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -159,7 +159,6 @@ MAKE_FUNCPTR(FT_Outline_Get_CBox);
 MAKE_FUNCPTR(FT_Outline_Transform);
 MAKE_FUNCPTR(FT_Outline_Translate);
 MAKE_FUNCPTR(FT_Render_Glyph);
-MAKE_FUNCPTR(FT_Select_Charmap);
 MAKE_FUNCPTR(FT_Set_Charmap);
 MAKE_FUNCPTR(FT_Set_Pixel_Sizes);
 MAKE_FUNCPTR(FT_Vector_Length);
@@ -4139,7 +4138,6 @@ static BOOL init_freetype(void)
    LOAD_FUNCPTR(FT_Outline_Transform)
    LOAD_FUNCPTR(FT_Outline_Translate)
    LOAD_FUNCPTR(FT_Render_Glyph)
-    LOAD_FUNCPTR(FT_Select_Charmap)
    LOAD_FUNCPTR(FT_Set_Charmap)
    LOAD_FUNCPTR(FT_Set_Pixel_Sizes)
    LOAD_FUNCPTR(FT_Vector_Length)
@@ -5059,11 +5057,8 @@ static BOOL create_child_font_list(GdiFont *font)
 static BOOL select_charmap(FT_Face ft_face, FT_Encoding encoding)
 {
    FT_Error ft_err = FT_Err_Invalid_CharMap_Handle;
-
-    if (pFT_Set_Charmap)
-    {
-        FT_Int i;
    FT_CharMap cmap0, cmap1, cmap2, cmap3, cmap_def;
+    FT_Int i;

    cmap0 = cmap1 = cmap2 = cmap3 = cmap_def = NULL;

@@ -5105,10 +5100,8 @@ static BOOL select_charmap(FT_Face ft_face, FT_Encoding encoding)
        else if (cmap_def)
            ft_err = pFT_Set_Charmap(ft_face, cmap_def);
    }
-        return ft_err == FT_Err_Ok;
-    }

-    return pFT_Select_Charmap(ft_face, encoding) == FT_Err_Ok;
+    return ft_err == FT_Err_Ok;
 }