[cairo-commit] 2 commits - src/cairo-scaled-font.c

[Chris Wilson]

 src/cairo-scaled-font.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b722d5b2b988d43931648d8377a9433d75f7d95f
Merge: 05fce5b... 710f7d3...
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Oct 31 02:24:25 2008 +0000

    Merge branch '1.8'

commit 710f7d30d348517602293f123525aef7677d69cf
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Oct 31 02:14:53 2008 +0000

    [scaled-font] Fix typo that prevented meta_surface lookup.
    
    test/text-glyph-range was crashing since we requested the meta_surface but
    the glyph wrongly believed it already had the meta_surface but was
    checking for a path instead.

diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
index 3ec07d5..3c5a959 100644
--- a/src/cairo-scaled-font.c
+++ b/src/cairo-scaled-font.c
@@ -2399,7 +2399,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) {