[Emacs-diffs] master dded2c4: * src/ftcrfont.c (ftcrfont_glyph_extents): Fix last change.

[YAMAMOTO Mitsuharu]

branch: master
commit dded2c4cf30fbdb5e90c44bc76a26970d00e0f22
Author: YAMAMOTO Mitsuharu <address@hidden>
Commit: YAMAMOTO Mitsuharu <address@hidden>

    * src/ftcrfont.c (ftcrfont_glyph_extents): Fix last change.
---
 src/ftcrfont.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ftcrfont.c b/src/ftcrfont.c
index 31ff8e8..18f9c2d 100644
--- a/src/ftcrfont.c
+++ b/src/ftcrfont.c
@@ -75,7 +75,7 @@ ftcrfont_glyph_extents (struct font *font,
 
   if (METRICS_STATUS (cache) == METRICS_INVALID)
     {
-      cairo_glyph_t cr_glyph = {.index = glyph, .x = 0, . y = 0};
+      cairo_glyph_t cr_glyph = {.index = glyph};
       cairo_text_extents_t extents;
 
       cairo_scaled_font_glyph_extents (ftcrfont_info->cr_scaled_font,
@@ -83,8 +83,8 @@ ftcrfont_glyph_extents (struct font *font,
       cache->lbearing = floor (extents.x_bearing);
       cache->rbearing = ceil (extents.width + extents.x_bearing);
       cache->width = lround (extents.x_advance);
-      cache->ascent = ceil (extents.y_bearing);
-      cache->descent = ceil (extents.height - extents.y_bearing);
+      cache->ascent = ceil (- extents.y_bearing);
+      cache->descent = ceil (extents.height + extents.y_bearing);
     }
 
   if (metrics)