[Commit] cairo/src cairo_gstate.c,1.1,1.2 cairoint.h,1.4,1.5

[Carl Worth]

Committed by: cworth

Update of /local/src/CVS/cairo/src
In directory home.keithp.com:/tmp/cvs-serv18869/src

Modified Files:
	cairo_gstate.c cairoint.h 
Log Message:
Do nothing in cairo_show_text when using libic.

Index: cairo_gstate.c
===================================================================
RCS file: /local/src/CVS/cairo/src/cairo_gstate.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cairo_gstate.c	18 Jul 2003 18:34:19 -0000	1.1
+++ cairo_gstate.c	26 Jul 2003 06:16:31 -0000	1.2
@@ -1045,6 +1045,9 @@
     if (gstate->has_current_pt == 0)
 	return CAIRO_STATUS_NO_CURRENT_POINT;
 
+    if (gstate->surface->dpy == 0)
+	return CAIRO_STATUS_SUCCESS;
+
     _cairo_font_resolve_xft_font (&gstate->font, gstate, &xft_font);
 
     /* XXX: Need to abandon Xft and use Xc instead */

Index: cairoint.h
===================================================================
RCS file: /local/src/CVS/cairo/src/cairoint.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cairoint.h	24 Jul 2003 08:40:16 -0000	1.4
+++ cairoint.h	26 Jul 2003 06:16:31 -0000	1.5
@@ -226,7 +226,6 @@
     XftFont *xft_font;
 } cairo_font_t;
 
-
 #define CAIRO_GSTATE_OPERATOR_DEFAULT	CAIRO_OPERATOR_OVER
 #define CAIRO_GSTATE_TOLERANCE_DEFAULT	0.1
 #define CAIRO_GSTATE_FILL_RULE_DEFAULT	CAIRO_FILL_RULE_WINDING