fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 09:58:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[cairo-scaled-font] Store fatal errors on the cairo_scaled_font_t.

Browse source 
Ensure that all fatal errors raised whilst using the font are stored on
the font.
This commit is contained in:
Chris Wilson 2007-10-04 15:43:09 +01:00
parent 4c32e6bfde
commit d0b1308cd7
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/cairo-scaled-font.c
View file

@ -221,6 +221,9 @@ cairo_status_t
_cairo_scaled_font_set_error (cairo_scaled_font_t *scaled_font,
cairo_status_t status)
{
if (status == CAIRO_STATUS_SUCCESS)
return status;
/* Don't overwrite an existing error. This preserves the first
* error, which is the most significant. */
_cairo_status_set_error (&scaled_font->status, status);
@ -1011,9 +1014,13 @@ _cairo_scaled_font_text_to_glyphs (cairo_scaled_font_t *scaled_font,
{
int i;
uint32_t *ucs4 = NULL;
cairo_status_t status = CAIRO_STATUS_SUCCESS;
cairo_status_t status;
cairo_scaled_glyph_t *scaled_glyph;
status = scaled_font->status;
if (status)
return status;
if (utf8[0] == '\0') {
*num_glyphs = 0;
*glyphs = NULL;
@ -1165,7 +1172,7 @@ _cairo_scaled_font_show_glyphs (cairo_scaled_font_t *scaled_font,
width, height,
glyphs, num_glyphs);
if (status != CAIRO_INT_STATUS_UNSUPPORTED)
return status;
return _cairo_scaled_font_set_error (scaled_font, status);
}
/* Font display routine either does not exist or failed. */
@ -1255,7 +1262,7 @@ CLEANUP_MASK:
if (mask != NULL)
cairo_surface_destroy (mask);
return status;
return _cairo_scaled_font_set_error (scaled_font, status);
}
typedef struct _cairo_scaled_glyph_path_closure {
@ -1415,8 +1422,9 @@ _cairo_scaled_font_glyph_path (cairo_scaled_font_t *scaled_font,
cairo_scaled_glyph_path_closure_t closure;
cairo_path_fixed_t *glyph_path;
if (scaled_font->status)
return scaled_font->status;
status = scaled_font->status;
if (status)
return status;
closure.path = path;
for (i = 0; i < num_glyphs; i++) {
@ -1429,7 +1437,7 @@ _cairo_scaled_font_glyph_path (cairo_scaled_font_t *scaled_font,
if (status == CAIRO_STATUS_SUCCESS)
glyph_path = scaled_glyph->path;
else if (status != CAIRO_INT_STATUS_UNSUPPORTED)
return status;
goto BAIL;
/* If the font is incapable of providing a path, then we'll
* have to trace our own from a surface. */
@ -1439,16 +1447,18 @@ _cairo_scaled_font_glyph_path (cairo_scaled_font_t *scaled_font,
CAIRO_SCALED_GLYPH_INFO_SURFACE,
&scaled_glyph);
if (status)
return status;
goto BAIL;
glyph_path = _cairo_path_fixed_create ();
if (glyph_path == NULL)
return _cairo_error (CAIRO_STATUS_NO_MEMORY);
if (glyph_path == NULL) {
status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
goto BAIL;
}
status = _trace_mask_to_path (scaled_glyph->surface, glyph_path);
if (status) {
_cairo_path_fixed_destroy (glyph_path);
return status;
goto BAIL;
}
}
@ -1466,10 +1476,11 @@ _cairo_scaled_font_glyph_path (cairo_scaled_font_t *scaled_font,
_cairo_path_fixed_destroy (glyph_path);
if (status)
return status;
goto BAIL;
}
BAIL:
return CAIRO_STATUS_SUCCESS;
return _cairo_scaled_font_set_error (scaled_font, status);
}
/**