mirror of
https://gitlab.freedesktop.org/cairo/cairo.git
synced 2026-04-03 11:30:46 +02:00
[scaled-font] Zero font extents for an error surface.
Do not attempt to read from the error object, but just return zero extents.
This commit is contained in:
parent
1ddf0b2a5c
commit
ca5f868a73
1 changed files with 12 additions and 1 deletions
|
|
@ -1127,6 +1127,15 @@ void
|
|||
cairo_scaled_font_extents (cairo_scaled_font_t *scaled_font,
|
||||
cairo_font_extents_t *extents)
|
||||
{
|
||||
if (scaled_font->status) {
|
||||
extents->ascent = 0.0;
|
||||
extents->descent = 0.0;
|
||||
extents->height = 0.0;
|
||||
extents->max_x_advance = 0.0;
|
||||
extents->max_y_advance = 0.0;
|
||||
return;
|
||||
}
|
||||
|
||||
*extents = scaled_font->extents;
|
||||
}
|
||||
slim_hidden_def (cairo_scaled_font_extents);
|
||||
|
|
@ -1174,8 +1183,10 @@ cairo_scaled_font_text_extents (cairo_scaled_font_t *scaled_font,
|
|||
&glyphs, &num_glyphs,
|
||||
NULL, NULL,
|
||||
NULL);
|
||||
if (status)
|
||||
if (status) {
|
||||
status = _cairo_scaled_font_set_error (scaled_font, status);
|
||||
goto ZERO_EXTENTS;
|
||||
}
|
||||
|
||||
cairo_scaled_font_glyph_extents (scaled_font, glyphs, num_glyphs, extents);
|
||||
free (glyphs);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue