[cairo-commit] cairo/src cairo-ft-font.c,1.103,1.104

[Owen Taylor]

Committed by: otaylor

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

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

        * src/cairo-ft-font.c (_cairo_ft_unscaled_font_create_glyph):
        Don't try to transform val->image when it is NULL.
        (#4163, Mathias Hasselmann)


Index: cairo-ft-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-ft-font.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- cairo-ft-font.c	18 Aug 2005 22:50:36 -0000	1.103
+++ cairo-ft-font.c	21 Aug 2005 15:06:06 -0000	1.104
@@ -1258,7 +1258,8 @@
     else
 	status = _render_glyph_bitmap (face, val);
     
-    if (unscaled->have_shape &&
+    if (val->image &&
+	unscaled->have_shape &&
 	(unscaled->face->face_flags & FT_FACE_FLAG_SCALABLE) == 0)
 	status = _transform_glyph_bitmap (val);