Dmitry Timoshkov : gdi32: Improve detection of symbol charset for old truetype fonts.
Module: wine Branch: oldstable Commit: e4e4776291195adecec3eb1d1866eb7c4e64abb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e4776291195adecec3eb1d1... Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 29 12:28:15 2018 +0300 gdi32: Improve detection of symbol charset for old truetype fonts. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33117 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 57c44885e57dee810814bb9bdf39f53cb8250d93) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/freetype.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3244ad3..28d63cc 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2010,7 +2010,6 @@ static inline void get_bitmap_size( FT_Face ft_face, Bitmap_Size *face_size ) static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) { TT_OS2 *os2; - FT_UInt dummy; CHARSETINFO csi; FT_WinFNT_HeaderRec winfnt_header; int i; @@ -2027,10 +2026,10 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) if (os2->version == 0) { - if (pFT_Get_First_Char( ft_face, &dummy ) < 0x100) - fs->fsCsb[0] = FS_LATIN1; - else + if (os2->usFirstCharIndex >= 0xf000 && os2->usFirstCharIndex < 0xf100) fs->fsCsb[0] = FS_SYMBOL; + else + fs->fsCsb[0] = FS_LATIN1; } else {
participants (1)
-
Alexandre Julliard