Dmitry Timoshkov : gdi32: Map glyph to Symbol range only if the font supports symbol encoding.

Alexandre Julliard julliard at winehq.org
Mon Apr 14 17:20:49 CDT 2008


Module: wine
Branch: master
Commit: baded8789d0b34b049312c052fa4a689e96444e8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=baded8789d0b34b049312c052fa4a689e96444e8

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Mon Apr 14 19:13:48 2008 +0900

gdi32: Map glyph to Symbol range only if the font supports symbol encoding.

---

 dlls/gdi32/freetype.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index aeb9c7d..bfa986d 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -4064,7 +4064,7 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph)
         return get_GSUB_vert_glyph(font,ret);
     }
 
-    if(font->charset == SYMBOL_CHARSET && glyph < 0x100)
+    if(font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL && glyph < 0x100)
         glyph = glyph + 0xf000;
     glyphId = pFT_Get_Char_Index(font->ft_face, glyph);
     return get_GSUB_vert_glyph(font,glyphId);




More information about the wine-cvs mailing list