fonts: fix GetCharABCWidths for bitmap fonts

Huw D M Davies h.davies1 at physics.ox.ac.uk
Mon Aug 9 11:55:56 CDT 2004


This time with the patch applied to the right function.

     Huw Davies <huw at codeweavers.com>
     GetCharABCWidths should fail for non-scalable fonts
-- 
Huw Davies
huw at codeweavers.com

Index: dlls/gdi/freetype.c
===================================================================
RCS file: /home/wine/wine/dlls/gdi/freetype.c,v
retrieving revision 1.65
diff -u -p -r1.65 freetype.c
--- dlls/gdi/freetype.c	6 Aug 2004 17:31:39 -0000	1.65
+++ dlls/gdi/freetype.c	9 Aug 2004 16:45:17 -0000
@@ -2967,6 +2967,9 @@ BOOL WineEngGetCharABCWidths(GdiFont fon
     FT_UInt glyph_index;
 
     TRACE("%p, %d, %d, %p\n", font, firstChar, lastChar, buffer);
+
+    if(!FT_IS_SCALABLE(font->ft_face))
+        return FALSE;
 
     for(c = firstChar; c <= lastChar; c++) {
         glyph_index = get_glyph_index(font, c);



More information about the wine-patches mailing list