Skip to content

W
wine-winehq
Commit 238b4da3 authored by Huw D M Davies's avatar Huw D M Davies Committed by Alexandre Julliard
Browse files
Options

Correct font size for non MM_TEXT modes.

parent 1dc62b7e
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
dlls/wineps/type1.c
View file @ 238b4da3
...@@ -56,6 +56,7 @@ TYPE1 *T1_download_header(PSDRV_PDEVICE *physDev, LPOUTLINETEXTMETRICA potm, ...@@ -56,6 +56,7 @@ TYPE1 *T1_download_header(PSDRV_PDEVICE *physDev, LPOUTLINETEXTMETRICA potm,
char *buf; char *buf;
TYPE1 *t1; TYPE1 *t1;
LOGFONTW lf; LOGFONTW lf;
RECT rc;
char dict[] = /* name, emsquare, fontbbox */ char dict[] = /* name, emsquare, fontbbox */
"25 dict begin\n" "25 dict begin\n"
...@@ -85,7 +86,10 @@ TYPE1 *T1_download_header(PSDRV_PDEVICE *physDev, LPOUTLINETEXTMETRICA potm, ...@@ -85,7 +86,10 @@ TYPE1 *T1_download_header(PSDRV_PDEVICE *physDev, LPOUTLINETEXTMETRICA potm,
t1->emsize = potm->otmEMSquare; t1->emsize = potm->otmEMSquare;
GetObjectW(GetCurrentObject(physDev->hdc, OBJ_FONT), sizeof(lf), &lf); GetObjectW(GetCurrentObject(physDev->hdc, OBJ_FONT), sizeof(lf), &lf);
lf.lfHeight = -t1->emsize; rc.left = rc.right = rc.bottom = 0;
rc.top = t1->emsize;
DPtoLP(physDev->hdc, (POINT*)&rc, 2);
lf.lfHeight = -abs(rc.top - rc.bottom);
t1->unscaled_font = CreateFontIndirectW(&lf); t1->unscaled_font = CreateFontIndirectW(&lf);
t1->glyph_sent_size = GLYPH_SENT_INC; t1->glyph_sent_size = GLYPH_SENT_INC;
t1->glyph_sent = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, t1->glyph_sent = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
...@@ -191,7 +195,7 @@ BOOL T1_download_glyph(PSDRV_PDEVICE *physDev, DOWNLOAD *pdl, DWORD index, ...@@ -191,7 +195,7 @@ BOOL T1_download_glyph(PSDRV_PDEVICE *physDev, DOWNLOAD *pdl, DWORD index,
POINT curpos; POINT curpos;
TTPOLYGONHEADER *pph; TTPOLYGONHEADER *pph;
TTPOLYCURVE *ppc; TTPOLYCURVE *ppc;
char glyph_def_begin[] = char glyph_def_begin[] =
"/%s findfont dup\n" "/%s findfont dup\n"
"/Private get begin\n" "/Private get begin\n"
"/CharStrings get begin\n" "/CharStrings get begin\n"
......
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