aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2019-04-18 11:30:17 +0900
committerYAMAMOTO Mitsuharu2019-04-18 11:30:17 +0900
commitdded2c4cf30fbdb5e90c44bc76a26970d00e0f22 (patch)
treefe0e6554aeb4b335fb36539106a1112b9eacf6dd /src
parent774da19789b650fbce969c975bbb78920b7b2c66 (diff)
downloademacs-dded2c4cf30fbdb5e90c44bc76a26970d00e0f22.tar.gz
emacs-dded2c4cf30fbdb5e90c44bc76a26970d00e0f22.zip
* src/ftcrfont.c (ftcrfont_glyph_extents): Fix last change.
Diffstat (limited to 'src')
-rw-r--r--src/ftcrfont.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ftcrfont.c b/src/ftcrfont.c
index 31ff8e87c01..18f9c2dd31b 100644
--- a/src/ftcrfont.c
+++ b/src/ftcrfont.c
@@ -75,7 +75,7 @@ ftcrfont_glyph_extents (struct font *font,
75 75
76 if (METRICS_STATUS (cache) == METRICS_INVALID) 76 if (METRICS_STATUS (cache) == METRICS_INVALID)
77 { 77 {
78 cairo_glyph_t cr_glyph = {.index = glyph, .x = 0, . y = 0}; 78 cairo_glyph_t cr_glyph = {.index = glyph};
79 cairo_text_extents_t extents; 79 cairo_text_extents_t extents;
80 80
81 cairo_scaled_font_glyph_extents (ftcrfont_info->cr_scaled_font, 81 cairo_scaled_font_glyph_extents (ftcrfont_info->cr_scaled_font,
@@ -83,8 +83,8 @@ ftcrfont_glyph_extents (struct font *font,
83 cache->lbearing = floor (extents.x_bearing); 83 cache->lbearing = floor (extents.x_bearing);
84 cache->rbearing = ceil (extents.width + extents.x_bearing); 84 cache->rbearing = ceil (extents.width + extents.x_bearing);
85 cache->width = lround (extents.x_advance); 85 cache->width = lround (extents.x_advance);
86 cache->ascent = ceil (extents.y_bearing); 86 cache->ascent = ceil (- extents.y_bearing);
87 cache->descent = ceil (extents.height - extents.y_bearing); 87 cache->descent = ceil (extents.height + extents.y_bearing);
88 } 88 }
89 89
90 if (metrics) 90 if (metrics)