summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pango/fonts.c2
-rw-r--r--pango/pango-layout.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/pango/fonts.c b/pango/fonts.c
index e83abbbe..1695366b 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -1799,7 +1799,7 @@ pango_font_get_glyph_extents (PangoFont *font,
}
if (logical_rect)
{
- logical_rect->x = logical_rect->y = 0;
+ logical_rect->x = 0;
logical_rect->y = - PANGO_UNKNOWN_GLYPH_HEIGHT * PANGO_SCALE;
logical_rect->height = PANGO_UNKNOWN_GLYPH_HEIGHT * PANGO_SCALE;
logical_rect->width = PANGO_UNKNOWN_GLYPH_WIDTH * PANGO_SCALE;
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 92d858b2..7d5b9b10 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -3609,6 +3609,9 @@ find_hyphen_width (PangoItem *item)
hb_font_t *hb_font;
hb_codepoint_t glyph;
+ if (!item->analysis.font)
+ return 0;
+
/* This is not technically correct, since
* a) we may end up inserting a different hyphen
* b) we should reshape the entire run