Commit d225fb8e authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard

wineps: Fix download font escapement.

parent 189606e4
...@@ -258,7 +258,6 @@ BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical) ...@@ -258,7 +258,6 @@ BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical)
LOGFONTW lf; LOGFONTW lf;
UINT ppem; UINT ppem;
XFORM xform; XFORM xform;
INT escapement;
assert(ctx->font.fontloc == Download); assert(ctx->font.fontloc == Download);
...@@ -281,7 +280,7 @@ BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical) ...@@ -281,7 +280,7 @@ BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical)
if(GetGraphicsMode(ctx->hdc) == GM_COMPATIBLE) if(GetGraphicsMode(ctx->hdc) == GM_COMPATIBLE)
{ {
if (xform.eM22 < 0) ctx->font.escapement = -ctx->font.escapement; if (xform.eM22 < 0) lf.lfEscapement = -lf.lfEscapement;
xform.eM11 = xform.eM22 = fabs(xform.eM22); xform.eM11 = xform.eM22 = fabs(xform.eM22);
xform.eM21 = xform.eM12 = 0; xform.eM21 = xform.eM12 = 0;
} }
...@@ -327,11 +326,10 @@ BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical) ...@@ -327,11 +326,10 @@ BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical)
} }
} }
escapement = ctx->font.escapement;
if (vertical) if (vertical)
escapement += 900; lf.lfEscapement += 900;
PSDRV_WriteSetFont(ctx, ps_name, ctx->font.size, escapement, PSDRV_WriteSetFont(ctx, ps_name, ctx->font.size, lf.lfEscapement,
is_fake_italic( ctx->hdc )); is_fake_italic( ctx->hdc ));
HeapFree(GetProcessHeap(), 0, ps_name); HeapFree(GetProcessHeap(), 0, ps_name);
......
...@@ -289,9 +289,6 @@ typedef struct { ...@@ -289,9 +289,6 @@ typedef struct {
matrix size; matrix size;
PSCOLOR color; PSCOLOR color;
enum fontset set; /* Have we done a setfont yet */ enum fontset set; /* Have we done a setfont yet */
/* These are needed by PSDRV_ExtTextOut */
int escapement;
} PSFONT; } PSFONT;
typedef struct { typedef struct {
......
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