From 523c7dbf6db85e75624ae111179dedb570212bb2 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 28 Feb 2008 18:53:08 -0500 Subject: [PATCH] [cairo-scaled-font] Pedantic check for zero-area glyphs --- src/cairo-scaled-font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c index 3d9e32a55..9bab7d367 100644 --- a/src/cairo-scaled-font.c +++ b/src/cairo-scaled-font.c @@ -1049,7 +1049,7 @@ cairo_scaled_font_glyph_extents (cairo_scaled_font_t *scaled_font, } /* "Ink" extents should skip "invisible" glyphs */ - if (scaled_glyph->metrics.width == 0 && scaled_glyph->metrics.height == 0) + if (scaled_glyph->metrics.width == 0 || scaled_glyph->metrics.height == 0) continue; left = scaled_glyph->metrics.x_bearing + glyphs[i].x; @@ -1089,7 +1089,7 @@ cairo_scaled_font_glyph_extents (cairo_scaled_font_t *scaled_font, x0 = glyphs[0].x; y0 = glyphs[0].y; - /* scaled_glyphs contains the glyph for num_glyphs - 1 already. */ + /* scaled_glyph contains the glyph for num_glyphs - 1 already. */ x1 = glyphs[num_glyphs - 1].x + scaled_glyph->metrics.x_advance; y1 = glyphs[num_glyphs - 1].y + scaled_glyph->metrics.y_advance;