Konstantin L. Metlov : gdi32: Handle pre-Unicode symbol TTFs with symbols at U+00XX.
Alexandre Julliard
julliard at winehq.org
Wed May 11 13:02:58 CDT 2011
Module: wine
Branch: master
Commit: fb787da66afe35e3c5e2a3508d60bb38fbf21ab3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb787da66afe35e3c5e2a3508d60bb38fbf21ab3
Author: Konstantin L. Metlov <metlov at fti.dn.ua>
Date: Wed May 11 19:01:59 2011 +0300
gdi32: Handle pre-Unicode symbol TTFs with symbols at U+00XX.
---
dlls/gdi32/freetype.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index a3e9cec..79073a6 100644
--- 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);
More information about the wine-cvs
mailing list