Fix to actually test scaled_font->status instead of just having a comment that claims to test it. Thanks to Behdad Esfahbod <behdad@cs.toronto.edu>.

This commit is contained in:
Carl Worth 2005-08-19 13:00:23 +00:00
parent 8eb912577b
commit 9d0211b263
2 changed files with 9 additions and 1 deletions

View file

@ -1,3 +1,10 @@
2005-08-19 Carl Worth <cworth@cworth.org>
* src/cairo-font.c: (_cairo_scaled_font_set_error): Fix to
actually test scaled_font->status instead of just having a comment
that claims to test it. Thanks to Behdad Esfahbod
<behdad@cs.toronto.edu>.
2005-08-18 Owen Taylor <otaylor@redhat.com>
* src/cairo-xlib-surface.c (_cairo_xlib_surface_composite): We need

View file

@ -447,7 +447,8 @@ _cairo_scaled_font_set_error (cairo_scaled_font_t *scaled_font,
/* Don't overwrite an existing error. This preserves the first
* error, which is the most significant. It also avoids attempting
* to write to read-only data (eg. from a nil scaled_font). */
scaled_font->status = status;
if (scaled_font->status == CAIRO_STATUS_SUCCESS)
scaled_font->status = status;
_cairo_error (status);
}