Skip to content

W
wine-winehq
Commit 6c9c9107 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard
Browse files
Options

gdi32: Return valid anti-alias format bitmaps if the glyph is a monochrome bitmap.

parent f3fab963
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
dlls/gdi32/freetype.c
View file @ 6c9c9107
...@@ -5289,9 +5289,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, ...@@ -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 && if(ft_face->glyph->format != ft_glyph_format_outline &&
(format == GGO_NATIVE || format == GGO_BEZIER || (format == GGO_NATIVE || format == GGO_BEZIER))
format == GGO_GRAY2_BITMAP || format == GGO_GRAY4_BITMAP ||
format == GGO_GRAY8_BITMAP))
{ {
TRACE("loaded a bitmap\n"); TRACE("loaded a bitmap\n");
return GDI_ERROR; return GDI_ERROR;
...@@ -5369,7 +5367,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, ...@@ -5369,7 +5367,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
memset( buf, 0, needed ); memset( buf, 0, needed );
while(h--) { while(h--) {
for(x = 0; x < pitch && x < ft_face->glyph->bitmap.width; x++) 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; src += ft_face->glyph->bitmap.pitch;
dst += pitch; dst += pitch;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment