[cairo-commit] cairo/src cairo-ft-font.c,1.59,1.60

[Owen Taylor]

Committed by: otaylor

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv14803/src

Modified Files:
	cairo-ft-font.c 
Log Message:
2005-05-09  Owen Taylor  <otaylor at redhat.com>

        * src/cairo-ft-font.c (_cairo_ft_unscaled_font_create_glyph):
        Get the glyphslot point *after* we get the FT_Face. (Robert O'Callahan)


Index: cairo-ft-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-ft-font.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- cairo-ft-font.c	9 May 2005 16:12:52 -0000	1.59
+++ cairo-ft-font.c	9 May 2005 23:34:00 -0000	1.60
@@ -525,13 +525,13 @@
     FT_Glyph_Metrics *metrics;
     cairo_status_t status = CAIRO_STATUS_SUCCESS;
 
-    glyphslot = unscaled->face->glyph;
-    metrics = &glyphslot->metrics;
-
     face = _ft_unscaled_font_lock_face (unscaled);
     if (!face)
 	return CAIRO_STATUS_NO_MEMORY;
 
+    glyphslot = face->glyph;
+    metrics = &glyphslot->metrics;
+
     _ft_unscaled_font_set_scale (unscaled, &val->key.scale);
 
     if (FT_Load_Glyph (face, val->key.index, val->key.flags) != 0) {