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

gdi32: Perform the world transform separately from font scaling.

This commit is contained in:
Dmitry Timoshkov 2008-06-24 16:11:40 +09:00 committed by Alexandre Julliard
parent 8a6628aea5
commit df76fe6f0c
1 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
dlls/gdi32/freetype.c
View File

@ -3482,8 +3482,7 @@ found:
it = lf.lfItalic ? 1 : 0; it = lf.lfItalic ? 1 : 0;
bd = lf.lfWeight > 550 ? 1 : 0; bd = lf.lfWeight > 550 ? 1 : 0;
height = GDI_ROUND( (double)lf.lfHeight * dc->xformWorld2Vport.eM22 ); height = lf.lfHeight;
height = lf.lfHeight < 0 ? -abs(height) : abs(height);
face = best = best_bitmap = NULL; face = best = best_bitmap = NULL;
LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry)
@ -4260,6 +4259,12 @@ DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count,
return count; return count;
} }
static inline BOOL is_identity_FMAT2(const FMAT2 *matrix)
{
static const FMAT2 identity = { 1.0, 0.0, 0.0, 1.0 };
return !memcmp(matrix, &identity, sizeof(FMAT2));
}
/************************************************************* /*************************************************************
* WineEngGetGlyphOutline * WineEngGetGlyphOutline
* *
@ -4340,7 +4345,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
/* Scaling factor */ /* Scaling factor */
if (font->aveWidth && font->potm) if (font->aveWidth && font->potm)
{ {
widthRatio = (double)font->aveWidth * font->font_desc.matrix.eM11; widthRatio = (double)font->aveWidth;
widthRatio /= (double)font->potm->otmTextMetrics.tmAveCharWidth; widthRatio /= (double)font->potm->otmTextMetrics.tmAveCharWidth;
} }
else else
@ -4393,6 +4398,18 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
needsTransform = TRUE; needsTransform = TRUE;
} }
/* World transform */
if (!is_identity_FMAT2(&font->font_desc.matrix))
{
FT_Matrix worldMat;
worldMat.xx = FT_FixedFromFloat(font->font_desc.matrix.eM11);
worldMat.xy = FT_FixedFromFloat(font->font_desc.matrix.eM21);
worldMat.yx = FT_FixedFromFloat(font->font_desc.matrix.eM12);
worldMat.yy = FT_FixedFromFloat(font->font_desc.matrix.eM22);
pFT_Matrix_Multiply(&worldMat, &transMat);
needsTransform = TRUE;
}
/* Extra transformation specified by caller */ /* Extra transformation specified by caller */
if (lpmat) { if (lpmat) {
FT_Matrix extraMat; FT_Matrix extraMat;
@ -4857,24 +4874,34 @@ static BOOL get_bitmap_text_metrics(GdiFont *font)
static void scale_font_metrics(const GdiFont *font, LPTEXTMETRICW ptm) static void scale_font_metrics(const GdiFont *font, LPTEXTMETRICW ptm)
{ {
double scale_x; double scale_x, scale_y;
if (font->aveWidth) if (font->aveWidth)
{ {
scale_x = (double)font->aveWidth * font->font_desc.matrix.eM11; scale_x = (double)font->aveWidth;
scale_x /= (double)font->potm->otmTextMetrics.tmAveCharWidth; scale_x /= (double)font->potm->otmTextMetrics.tmAveCharWidth;
} }
else else
scale_x = font->scale_y; scale_x = font->scale_y;
ptm->tmHeight = (double)ptm->tmHeight * font->scale_y; scale_x *= fabs(font->font_desc.matrix.eM11);
ptm->tmAscent = (double)ptm->tmAscent * font->scale_y; scale_y = font->scale_y * fabs(font->font_desc.matrix.eM22);
ptm->tmDescent = (double)ptm->tmDescent * font->scale_y;
ptm->tmInternalLeading = (double)ptm->tmInternalLeading * font->scale_y;
ptm->tmExternalLeading = (double)ptm->tmExternalLeading * font->scale_y;
ptm->tmAveCharWidth = (double)ptm->tmAveCharWidth * scale_x; #define SCALE_X(x) (x) = GDI_ROUND((double)(x) * (scale_x))
ptm->tmMaxCharWidth = (double)ptm->tmMaxCharWidth * scale_x; #define SCALE_Y(y) (y) = GDI_ROUND((double)(y) * (scale_y))
SCALE_Y(ptm->tmHeight);
SCALE_Y(ptm->tmAscent);
SCALE_Y(ptm->tmDescent);
SCALE_Y(ptm->tmInternalLeading);
SCALE_Y(ptm->tmExternalLeading);
SCALE_Y(ptm->tmOverhang);
SCALE_X(ptm->tmAveCharWidth);
SCALE_X(ptm->tmMaxCharWidth);
#undef SCALE_X
#undef SCALE_Y
} }
/************************************************************* /*************************************************************