From 6c9c9107d4b542c7cd1c3ecf9bce53106d0419af Mon Sep 17 00:00:00 2001 From: Huw Davies Date: Wed, 16 Nov 2011 11:20:51 +0000 Subject: [PATCH] gdi32: Return valid anti-alias format bitmaps if the glyph is a monochrome bitmap. --- dlls/gdi32/freetype.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9ec778521e3..5fb8cdaa343 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5289,9 +5289,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } if(ft_face->glyph->format != ft_glyph_format_outline && - (format == GGO_NATIVE || format == GGO_BEZIER || - format == GGO_GRAY2_BITMAP || format == GGO_GRAY4_BITMAP || - format == GGO_GRAY8_BITMAP)) + (format == GGO_NATIVE || format == GGO_BEZIER)) { TRACE("loaded a bitmap\n"); return GDI_ERROR; @@ -5369,7 +5367,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, memset( buf, 0, needed ); while(h--) { for(x = 0; x < pitch && x < ft_face->glyph->bitmap.width; x++) - if (src[x / 8] & (1 << ( (7 - (x % 8))))) dst[x] = 0xff; + if (src[x / 8] & (1 << ( (7 - (x % 8))))) dst[x] = max_level; src += ft_face->glyph->bitmap.pitch; dst += pitch; } -- 2.11.4.GIT