ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Restore the trimmed bitmap image by FT_Render_Glyph().

This commit is contained in:
Byeongsik Jeon 2008-12-27 17:56:32 +09:00 committed by Alexandre Julliard
parent 29b826b39e
commit f2e1b254ce
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/gdi32/freetype.c
View File

@ -4776,7 +4776,8 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
{ {
unsigned int *dst; unsigned int *dst;
BYTE *src; BYTE *src;
INT x, src_pitch, rgb_interval, hmul, vmul; INT x, src_pitch, src_width, src_height, rgb_interval, hmul, vmul;
INT x_shift, y_shift;
BOOL rgb; BOOL rgb;
FT_LcdFilter lcdfilter = FT_LCD_FILTER_DEFAULT; FT_LcdFilter lcdfilter = FT_LCD_FILTER_DEFAULT;
FT_Render_Mode render_mode = FT_Render_Mode render_mode =
@ -4810,13 +4811,16 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
if ( needsTransform ) if ( needsTransform )
pFT_Outline_Transform (&ft_face->glyph->outline, &transMat); pFT_Outline_Transform (&ft_face->glyph->outline, &transMat);
pFT_Outline_Translate (&ft_face->glyph->outline, -left, -bottom );
if ( pFT_Library_SetLcdFilter ) if ( pFT_Library_SetLcdFilter )
pFT_Library_SetLcdFilter( library, lcdfilter ); pFT_Library_SetLcdFilter( library, lcdfilter );
pFT_Render_Glyph (ft_face->glyph, render_mode); pFT_Render_Glyph (ft_face->glyph, render_mode);
src = ft_face->glyph->bitmap.buffer; src = ft_face->glyph->bitmap.buffer;
src_pitch = ft_face->glyph->bitmap.pitch; src_pitch = ft_face->glyph->bitmap.pitch;
src_width = ft_face->glyph->bitmap.width;
src_height = ft_face->glyph->bitmap.rows;
if ( render_mode == FT_RENDER_MODE_LCD) if ( render_mode == FT_RENDER_MODE_LCD)
{ {
rgb_interval = 1; rgb_interval = 1;
@ -4830,9 +4834,20 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
vmul = 3; vmul = 3;
} }
while ( height-- ) x_shift = ft_face->glyph->bitmap_left - lpgm->gmptGlyphOrigin.x;
if ( x_shift < 0 ) x_shift = 0;
if ( x_shift + (src_width / hmul) > width )
x_shift = width - (src_width / hmul);
y_shift = lpgm->gmptGlyphOrigin.y - ft_face->glyph->bitmap_top;
if ( y_shift < 0 ) y_shift = 0;
if ( y_shift + (src_height / vmul) > height )
y_shift = height - (src_height / vmul);
dst += x_shift + y_shift * ( pitch / 4 );
while ( src_height )
{ {
for ( x = 0; x < width; x++ ) for ( x = 0; x < src_width / hmul; x++ )
{ {
if ( rgb ) if ( rgb )
{ {
@ -4851,6 +4866,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
} }
src += src_pitch * vmul; src += src_pitch * vmul;
dst += pitch / 4; dst += pitch / 4;
src_height -= vmul;
} }
break; break;