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

gdi32: Make sure that all the glyph metrics are transformed before caching them.

This commit is contained in:
Dmitry Timoshkov 2010-07-28 17:07:09 +09:00 committed by Alexandre Julliard
parent 0c7ead578e
commit 213d84be15
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/gdi32/freetype.c
View File

@ -4704,14 +4704,11 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
return GDI_ERROR; return GDI_ERROR;
} }
left = (INT)(ft_face->glyph->metrics.horiBearingX) & -64;
right = (INT)((ft_face->glyph->metrics.horiBearingX + ft_face->glyph->metrics.width) + 63) & -64;
adv = (INT)((ft_face->glyph->metrics.horiAdvance) + 63) >> 6;
lsb = left >> 6;
bbx = (right - left) >> 6;
if(!needsTransform) { if(!needsTransform) {
left = (INT)(ft_face->glyph->metrics.horiBearingX) & -64;
right = (INT)((ft_face->glyph->metrics.horiBearingX + ft_face->glyph->metrics.width) + 63) & -64;
adv = (INT)(ft_face->glyph->metrics.horiAdvance + 63) >> 6;
top = (ft_face->glyph->metrics.horiBearingY + 63) & -64; top = (ft_face->glyph->metrics.horiBearingY + 63) & -64;
bottom = (ft_face->glyph->metrics.horiBearingY - bottom = (ft_face->glyph->metrics.horiBearingY -
ft_face->glyph->metrics.height) & -64; ft_face->glyph->metrics.height) & -64;
@ -4720,6 +4717,9 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
} else { } else {
INT xc, yc; INT xc, yc;
FT_Vector vec; FT_Vector vec;
left = right = 0;
for(xc = 0; xc < 2; xc++) { for(xc = 0; xc < 2; xc++) {
for(yc = 0; yc < 2; yc++) { for(yc = 0; yc < 2; yc++) {
vec.x = (ft_face->glyph->metrics.horiBearingX + vec.x = (ft_face->glyph->metrics.horiBearingX +
@ -4756,6 +4756,9 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
pFT_Vector_Transform(&vec, &transMatUnrotated); pFT_Vector_Transform(&vec, &transMatUnrotated);
adv = (vec.x+63) >> 6; adv = (vec.x+63) >> 6;
} }
lsb = left >> 6;
bbx = (right - left) >> 6;
lpgm->gmBlackBoxX = (right - left) >> 6; lpgm->gmBlackBoxX = (right - left) >> 6;
lpgm->gmBlackBoxY = (top - bottom) >> 6; lpgm->gmBlackBoxY = (top - bottom) >> 6;
lpgm->gmptGlyphOrigin.x = left >> 6; lpgm->gmptGlyphOrigin.x = left >> 6;