dwrite: Improve strikethrough and underline thickness extraction logic.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dwrite: Improve strikethrough and underline thickness extraction logic.
6e356742 · Nikolay Sivov · Alexandre Julliard · 6d0fa4ce · 6e356742 · 6e356742
Commit 6e356742 authored Dec 20, 2016 by Nikolay Sivov Committed by Alexandre Julliard Dec 20, 2016
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 19 deletions

opentype.c dlls/dwrite/opentype.c +3 -10

font.c dlls/dwrite/tests/font.c +3 -9

No files found.
--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -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)

--- a/dlls/dwrite/tests/font.c
+++ b/dlls/dwrite/tests/font.c
@@ -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);