mirror of
https://gitlab.freedesktop.org/cairo/cairo.git
synced 2026-05-07 12:08:16 +02:00
[cairo-scaled-font] Pedantic check for zero-area glyphs
This commit is contained in:
parent
bf99e355d9
commit
523c7dbf6d
1 changed files with 2 additions and 2 deletions
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue