marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dwrite: Improve strikethrough and underline thickness extraction logic. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Nikolay Sivov 2016-12-20 12:37:03 +03:00 committed by Alexandre Julliard
parent 6d0fa4cebc
commit 6e356742e3
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/dwrite/opentype.c
View File

@ -1243,17 +1243,10 @@ void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT
metrics->underlineThickness = GET_BE_WORD(tt_post->underlineThickness);
}
/* use any of thickness values if another one is zero, if both are zero use estimate */
if (metrics->strikethroughThickness || metrics->underlineThickness) {
if (!metrics->strikethroughThickness)
metrics->strikethroughThickness = metrics->underlineThickness;
if (!metrics->underlineThickness)
metrics->underlineThickness = metrics->strikethroughThickness;
}
else {
metrics->strikethroughThickness = metrics->designUnitsPerEm / 14;
if (metrics->underlineThickness == 0)
metrics->underlineThickness = metrics->designUnitsPerEm / 14;
}
if (metrics->strikethroughThickness == 0)
metrics->strikethroughThickness = metrics->underlineThickness;
/* estimate missing metrics */
if (metrics->xHeight == 0)

12
dlls/dwrite/tests/font.c
View File

@ -1725,16 +1725,10 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET
metrics->underlineThickness = GET_BE_WORD(tt_post->underlineThickness);
}
if (metrics->strikethroughThickness || metrics->underlineThickness) {
if (!metrics->strikethroughThickness)
metrics->strikethroughThickness = metrics->underlineThickness;
if (!metrics->underlineThickness)
metrics->underlineThickness = metrics->strikethroughThickness;
}
else {
metrics->strikethroughThickness = metrics->designUnitsPerEm / 14;
if (metrics->underlineThickness == 0)
metrics->underlineThickness = metrics->designUnitsPerEm / 14;
}
if (metrics->strikethroughThickness == 0)
metrics->strikethroughThickness = metrics->underlineThickness;
if (tt_os2)
IDWriteFontFace_ReleaseFontTable(fontface, os2_context);