summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2009-05-30 23:03:55 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2009-06-03 07:16:58 +0100
commit634298af1326a39452c9432a2d9a8fd98c9c2d19 (patch)
tree62f48efc602d5568b71b9dc5a32cb87518c5d0f1
parent5c63efe5fd182212c3f382bbdc0179c9e99e636d (diff)
[ft] Fix vertical advance metrics of bitmap fonts (#21985)
-rw-r--r--src/cairo-ft-font.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 3675db681..22206bbcb 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -1993,7 +1993,7 @@ _cairo_ft_scaled_glyph_init (void *abstract_font,
FT_Pos x1, x2;
FT_Pos y1, y2;
FT_Pos advance;
-
+
if (!vertical_layout) {
x1 = (metrics->horiBearingX) & -64;
x2 = (metrics->horiBearingX + metrics->width + 63) & -64;
@@ -2048,7 +2048,7 @@ _cairo_ft_scaled_glyph_init (void *abstract_font,
if (hint_metrics || glyph->format != FT_GLYPH_FORMAT_OUTLINE)
fs_metrics.y_advance = DOUBLE_FROM_26_6 (metrics->vertAdvance) * y_factor;
else
- fs_metrics.y_advance = DOUBLE_FROM_26_6 (glyph->linearVertAdvance) * y_factor;
+ fs_metrics.y_advance = DOUBLE_FROM_16_16 (glyph->linearVertAdvance) * y_factor;
}
}