Improved selection of freetype face charmap.

2925d6ad · Dave Belanger · Alexandre Julliard · 53f2e61e · 2925d6ad
Commit 2925d6ad authored Oct 15, 2003 by Dave Belanger Committed by Alexandre Julliard Oct 15, 2003
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

freetype.c dlls/gdi/freetype.c +11 -2

No files found.
--- a/dlls/gdi/freetype.c
+++ b/dlls/gdi/freetype.c
@@ -1250,8 +1250,17 @@ not_found:
        return 0;
    }
 	
-    if(ret->charset == SYMBOL_CHARSET)
-        pFT_Select_Charmap(ret->ft_face, ft_encoding_symbol);
+    if (ret->charset == SYMBOL_CHARSET && 
+        !pFT_Select_Charmap(ret->ft_face, FT_ENCODING_MS_SYMBOL)) {
+        /* No ops */
+    }
+    else if (!pFT_Select_Charmap(ret->ft_face, FT_ENCODING_UNICODE)) {
+        /* No ops */
+    }
+    else {
+        pFT_Select_Charmap(ret->ft_face, FT_ENCODING_APPLE_ROMAN);
+    }
+
    ret->orientation = lf.lfOrientation;
    ret->name = strdupW(family->FamilyName);