[cairo-commit] cairo/src cairo-xlib-surface.c,1.111,1.112

[Owen Taylor]

Committed by: otaylor

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

Modified Files:
	cairo-xlib-surface.c 
Log Message:
2005-08-18  Owen Taylor  <otaylor at redhat.com>

        * src/cairo-xlib-surface.c (_cairo_xlib_surface_composite): We need
        the call to fixup_unbounded when we optimize the RENDER operator
        to XCopyArea as well.


Index: cairo-xlib-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-xlib-surface.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- cairo-xlib-surface.c	19 Aug 2005 00:19:54 -0000	1.111
+++ cairo-xlib-surface.c	19 Aug 2005 19:55:00 -0000	1.112
@@ -1140,17 +1140,6 @@
 			      width, height);
 	}
 
-	if (!_cairo_operator_bounded (operator) ||
-	    operator == CAIRO_OPERATOR_SOURCE ||
-	    operator == CAIRO_OPERATOR_CLEAR)
-	    status = _cairo_surface_composite_fixup_unbounded (&dst->base,
-							       &src_attr, src->width, src->height,
-							       mask ? &mask_attr : NULL,
-							       mask ? mask->width : 0,
-							       mask ? mask->height : 0,
-							       src_x, src_y,
-							       mask_x, mask_y,
-							       dst_x, dst_y, width, height);
 	break;
 
     case DO_XCOPYAREA:
@@ -1190,6 +1179,18 @@
 	ASSERT_NOT_REACHED;
     }
 
+    if (!_cairo_operator_bounded (operator) ||
+	operator == CAIRO_OPERATOR_SOURCE ||
+	operator == CAIRO_OPERATOR_CLEAR)
+      status = _cairo_surface_composite_fixup_unbounded (&dst->base,
+							 &src_attr, src->width, src->height,
+							 mask ? &mask_attr : NULL,
+							 mask ? mask->width : 0,
+							 mask ? mask->height : 0,
+							 src_x, src_y,
+							 mask_x, mask_y,
+							 dst_x, dst_y, width, height);
+    
  FAIL:
 
     if (mask)