[cairo-commit] cairo/src cairo-xlib-surface.c,1.87,1.88

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairo-xlib-surface.c 
Log Message:

        * src/cairo-xlib-surface.c: (_cairo_xlib_surface_composite),
        (_cairo_xlib_surface_composite_trapezoids),
        (_cairo_xlib_surface_show_glyphs): Eek. Yet _more_ fixups for
        _cairo_pattern_release_surface missed earlier.


Index: cairo-xlib-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-xlib-surface.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- cairo-xlib-surface.c	14 Jul 2005 22:10:48 -0000	1.87
+++ cairo-xlib-surface.c	14 Jul 2005 23:56:08 -0000	1.88
@@ -1068,9 +1068,9 @@
  FAIL:
 
     if (mask)
-	_cairo_pattern_release_surface (&dst->base, &mask->base, &mask_attr);
+	_cairo_pattern_release_surface (mask_pattern, &mask->base, &mask_attr);
     
-    _cairo_pattern_release_surface (&dst->base, &src->base, &src_attr);
+    _cairo_pattern_release_surface (src_pattern, &src->base, &src_attr);
 
     return status;
 }
@@ -1168,7 +1168,7 @@
 				    (XTrapezoid *) traps, num_traps);
 
  FAIL:
-    _cairo_pattern_release_surface (&dst->base, &src->base, &attributes);
+    _cairo_pattern_release_surface (pattern, &src->base, &attributes);
 
     return status;
 }
@@ -2045,7 +2045,7 @@
 	free (entries); 
 
  FAIL:
-    _cairo_pattern_release_surface (&self->base, &src->base, &attributes);
+    _cairo_pattern_release_surface (pattern, &src->base, &attributes);
     
     return status;
 }