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

[cairo-scaled-font] Return the error status from _cairo_scaled_font_set_error()

Browse source 
Similar to the other _cairo_*_set_error() return the error status.
This commit is contained in:
Chris Wilson 2007-10-04 15:31:25 +01:00
parent 06ae5f1ba3
commit 4c32e6bfde
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cairo-ft-font.c
View file

@ -2539,7 +2539,7 @@ cairo_ft_scaled_font_lock_face (cairo_scaled_font_t *abstract_font)
face = _cairo_ft_unscaled_font_lock_face (scaled_font->unscaled);
if (face == NULL) {
_cairo_scaled_font_set_error (&scaled_font->base, CAIRO_STATUS_NO_MEMORY);
status = _cairo_scaled_font_set_error (&scaled_font->base, CAIRO_STATUS_NO_MEMORY);
return NULL;
}
@ -2547,7 +2547,7 @@ cairo_ft_scaled_font_lock_face (cairo_scaled_font_t *abstract_font)
&scaled_font->base.scale);
if (status) {
_cairo_ft_unscaled_font_unlock_face (scaled_font->unscaled);
_cairo_scaled_font_set_error (&scaled_font->base, status);
status = _cairo_scaled_font_set_error (&scaled_font->base, status);
return NULL;
}

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

@ -214,8 +214,10 @@ const cairo_scaled_font_t _cairo_scaled_font_nil = {
* The purpose of this function is to allow the user to set a
* breakpoint in _cairo_error() to generate a stack trace for when the
* user causes cairo to detect an error.
*
* Return value: the error status.
**/
void
cairo_status_t
_cairo_scaled_font_set_error (cairo_scaled_font_t *scaled_font,
cairo_status_t status)
{
@ -223,7 +225,7 @@ _cairo_scaled_font_set_error (cairo_scaled_font_t *scaled_font,
* error, which is the most significant. */
_cairo_status_set_error (&scaled_font->status, status);
_cairo_error_throw (status);
return _cairo_error (status);
}
/**
@ -888,7 +890,7 @@ cairo_scaled_font_text_extents (cairo_scaled_font_t *scaled_font,
status = _cairo_scaled_font_text_to_glyphs (scaled_font, 0., 0., utf8, &glyphs, &num_glyphs);
if (status) {
_cairo_scaled_font_set_error (scaled_font, status);
status = _cairo_scaled_font_set_error (scaled_font, status);
return;
}
cairo_scaled_font_glyph_extents (scaled_font, glyphs, num_glyphs, extents);
@ -938,7 +940,7 @@ cairo_scaled_font_glyph_extents (cairo_scaled_font_t *scaled_font,
CAIRO_SCALED_GLYPH_INFO_METRICS,
&scaled_glyph);
if (status) {
_cairo_scaled_font_set_error (scaled_font, status);
status = _cairo_scaled_font_set_error (scaled_font, status);
goto UNLOCK;
}
@ -1096,10 +1098,8 @@ _cairo_scaled_font_glyph_device_extents (cairo_scaled_font_t *scaled_font,
glyphs[i].index,
CAIRO_SCALED_GLYPH_INFO_METRICS,
&scaled_glyph);
if (status) {
_cairo_scaled_font_set_error (scaled_font, status);
return status;
}
if (status)
return _cairo_scaled_font_set_error (scaled_font, status);
/* glyph images are snapped to pixel locations */
x = _cairo_lround (glyphs[i].x);
@ -1677,7 +1677,7 @@ _cairo_scaled_glyph_lookup (cairo_scaled_font_t *scaled_font,
if (status) {
/* It's not an error for the backend to not support the info we want. */
if (status != CAIRO_INT_STATUS_UNSUPPORTED)
_cairo_scaled_font_set_error (scaled_font, status);
status = _cairo_scaled_font_set_error (scaled_font, status);
*scaled_glyph_ret = NULL;
} else {
*scaled_glyph_ret = scaled_glyph;

2
src/cairoint.h
View file

@ -1360,7 +1360,7 @@ _cairo_scaled_font_thaw_cache (cairo_scaled_font_t *scaled_font);
cairo_private void
_cairo_scaled_font_reset_cache (cairo_scaled_font_t *scaled_font);
cairo_private void
cairo_private cairo_status_t
_cairo_scaled_font_set_error (cairo_scaled_font_t *scaled_font,
cairo_status_t status);