[cairo-commit] cairo/src cairo-glitz-surface.c,1.57,1.58

[Vladimir Vukicevic]

Committed by: vladimir

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

Modified Files:
	cairo-glitz-surface.c 
Log Message:
2005-08-10  Vladimir Vukicevic  <vladimir at pobox.com>

	* src/cairo-glitz-surface.c: Additional fix for 0-width/0-height
	glyphs.



Index: cairo-glitz-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-glitz-surface.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- cairo-glitz-surface.c	9 Aug 2005 20:42:54 -0000	1.57
+++ cairo-glitz-surface.c	10 Aug 2005 18:40:11 -0000	1.58
@@ -1266,9 +1266,6 @@
 _cairo_glitz_area_move_in (cairo_glitz_area_t *area,
 			   void		      *closure)
 {
-    if (area == &_empty_area)
-	return CAIRO_STATUS_SUCCESS;
-
     area->closure = closure;
     area->state   = CAIRO_GLITZ_AREA_OCCUPIED;
     
@@ -1785,7 +1782,8 @@
 	entry->size.height > GLYPH_CACHE_MAX_HEIGHT)
 	return CAIRO_STATUS_SUCCESS;
 
-    if (!image_entry->image)
+    if ((entry->size.width  == 0 && entry->size.height == 0) ||
+        !image_entry->image)
     {
 	entry->area = &_empty_area;
 	return CAIRO_STATUS_SUCCESS;