gdi32: Handle pre-Unicode "broken" symbol TTFs with symbols at U+00XX.

83437818 · Konstantin L. Metlov · Alexandre Julliard · a82f7cf4 · 83437818
Commit 83437818 authored May 06, 2011 by Konstantin L. Metlov Committed by Alexandre Julliard May 09, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

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

No files found.
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -4554,8 +4554,14 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph)
    }

    if(font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL && glyph < 0x100)
-        glyph = glyph + 0xf000;
-    glyphId = pFT_Get_Char_Index(font->ft_face, glyph);
+    {
+        /* there is a number of old pre-Unicode "broken" TTFs, which
+           do have symbols at U+00XX instead of U+f0XX */
+        if (!(glyphId = pFT_Get_Char_Index(font->ft_face, glyph + 0xf000)))
+            glyphId = pFT_Get_Char_Index(font->ft_face, glyph);
+    }
+    else glyphId = pFT_Get_Char_Index(font->ft_face, glyph);
+
    return get_GSUB_vert_glyph(font,glyphId);
 }