Merge branch '1.8'

This commit is contained in:
Chris Wilson 2008-10-31 02:24:25 +00:00
commit b722d5b2b9

View file

@ -2398,7 +2398,7 @@ _cairo_scaled_glyph_lookup (cairo_scaled_font_t *scaled_font,
need_info |= CAIRO_SCALED_GLYPH_INFO_PATH;
if (((info & CAIRO_SCALED_GLYPH_INFO_META_SURFACE) != 0 &&
scaled_glyph->path == NULL))
scaled_glyph->meta_surface == NULL))
need_info |= CAIRO_SCALED_GLYPH_INFO_META_SURFACE;
if (need_info) {