ft: If glyph->format is not OUTLINE use _render_glyph_bitmap to coerce to a bitmap

This commit is contained in:
Carl Worth 2006-06-14 03:53:18 -07:00
parent 61a3260e44
commit c515b15cfc

View file

@ -1887,17 +1887,16 @@ _cairo_ft_scaled_glyph_init (void *abstract_font,
cairo_image_surface_t *surface;
cairo_status_t status;
if (glyph->format == FT_GLYPH_FORMAT_OUTLINE)
if (glyph->format == FT_GLYPH_FORMAT_OUTLINE) {
status = _render_glyph_outline (face, &scaled_font->base.options,
&surface);
else if (glyph->format == FT_GLYPH_FORMAT_BITMAP) {
} else {
status = _render_glyph_bitmap (face, &scaled_font->base.options,
&surface);
if (status == CAIRO_STATUS_SUCCESS && unscaled->have_shape)
status = _transform_glyph_bitmap (&unscaled->current_shape,
&surface);
} else
status = CAIRO_STATUS_NO_MEMORY;
}
if (status) {
cairo_ft_scaled_font_unlock_face (abstract_font);
return status;