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

fb787da6 · Konstantin L. Metlov · Alexandre Julliard · 92563de3 · fb787da6
Commit fb787da6 authored May 11, 2011 by Konstantin L. Metlov Committed by Alexandre Julliard May 11, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

freetype.c dlls/gdi32/freetype.c +4 -3

No files found.
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -4553,12 +4553,13 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph)
        return get_GSUB_vert_glyph(font,ret);
    }

-    if(font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL && glyph < 0x100)
+    if(font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL)
    {
+        if (glyph < 0x100) glyph += 0xf000;
        /* 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);
+        if (!(glyphId = pFT_Get_Char_Index(font->ft_face, glyph)))
+            glyphId = pFT_Get_Char_Index(font->ft_face, glyph-0xf000);
    }
    else glyphId = pFT_Get_Char_Index(font->ft_face, glyph);