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

[cairo-ft-font] Tidy usage of cairo_error().

Browse source 
Remove a redundant use of cairo_error(NO_MEMORY).
This commit is contained in:
Chris Wilson 2008-01-30 15:19:49 +00:00
parent a4c960a93c
commit a3f071aee7
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -932,7 +932,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap,
width, height, stride);
if ((*surface)->base.status) {
free (data);
return _cairo_error (CAIRO_STATUS_NO_MEMORY);
return (*surface)->base.status;
}
if (subpixel)
@ -1051,9 +1051,8 @@ _render_glyph_outline (FT_Face face,
bitmap.width = width * hmul;
bitmap.rows = height * vmul;
bitmap.buffer = calloc (stride, bitmap.rows);
if (bitmap.buffer == NULL) {
if (bitmap.buffer == NULL)
return _cairo_error (CAIRO_STATUS_NO_MEMORY);
}
FT_Outline_Translate (outline, -cbox.xMin*hmul, -cbox.yMin*vmul);
@ -2310,7 +2309,7 @@ _cairo_ft_font_face_create (cairo_ft_unscaled_font_t *unscaled,
font_face->ft_options.extra_flags == ft_options->extra_flags &&
cairo_font_options_equal (&font_face->ft_options.base, &ft_options->base))
{
if (! font_face->base.status)
if (font_face->base.status == CAIRO_STATUS_SUCCESS)
return cairo_font_face_reference (&font_face->base);
/* The font_face has been left in an error state, abandon it. */