Nikolay Sivov : dwrite: Use usWin* values from OS/2 table as font ascent/ descent.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 87a9b51ccc8b82c72c55177777b4bffc8cd31f5f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=87a9b51ccc8b82c72c55177777...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Mon Nov 24 12:06:38 2014 +0300

dwrite: Use usWin* values from OS/2 table as font ascent/descent.

---

 dlls/dwrite/opentype.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c
index 1f5e178..a0f1c31 100644
--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -867,8 +867,8 @@ void opentype_get_font_metrics(const void *os2, const void *head, const void *po
     memset(metrics, 0, sizeof(*metrics));
 
     if (tt_os2) {
-        metrics->ascent    = GET_BE_WORD(tt_os2->sTypoAscender);
-        metrics->descent   = GET_BE_WORD(tt_os2->sTypoDescender);
+        metrics->ascent    = GET_BE_WORD(tt_os2->usWinAscent);
+        metrics->descent   = GET_BE_WORD(tt_os2->usWinDescent);
         metrics->lineGap   = GET_BE_WORD(tt_os2->sTypoLineGap);
         metrics->capHeight = GET_BE_WORD(tt_os2->sCapHeight);
         metrics->xHeight   = GET_BE_WORD(tt_os2->sxHeight);