Commit 21cdaeea authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard

gdi32: Replace DC transform by font scaling for bitmap fonts.

parent f322f70a
......@@ -3555,6 +3555,12 @@ found:
/* Windows uses integer scaling factors for bitmap fonts */
INT scale, scaled_height;
/* FIXME: rotation of bitmap fonts is ignored */
height = abs(GDI_ROUND( (double)height * ret->font_desc.matrix.eM22 ));
if (ret->aveWidth)
ret->aveWidth = (double)ret->aveWidth * ret->font_desc.matrix.eM11;
ret->font_desc.matrix.eM11 = ret->font_desc.matrix.eM22 = 1.0;
if (height != 0) height = diff;
height += face->size.height;
......
......@@ -30,7 +30,7 @@
#include "wine/test.h"
#define near_match(a, b) (abs((a) - (b)) <= 4)
#define near_match(a, b) (abs((a) - (b)) <= 6)
#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got)
LONG (WINAPI *pGdiGetCharDimensions)(HDC hdc, LPTEXTMETRICW lptm, LONG *height);
......
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