From bc49df322770b3bd1797c0e153b97f1f296fbd1e Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Wed, 28 Apr 2010 19:56:36 +0200
Subject: [PATCH] pixman_image_composite => pixman_image_composite32

Fix up the remaining callers
---
 src/cairo-gl-surface.c    | 12 ++++++------
 src/cairo-image-surface.c | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c
index 497a9c98a..db837aa51 100644
--- a/src/cairo-gl-surface.c
+++ b/src/cairo-gl-surface.c
@@ -1230,12 +1230,12 @@ _render_gradient (const cairo_gl_context_t *ctx,
 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
     }
 
-    pixman_image_composite (PIXMAN_OP_SRC,
-			    gradient, NULL, image,
-			    0, 0,
-			    0, 0,
-			    0, 0,
-			    width, 1);
+    pixman_image_composite32 (PIXMAN_OP_SRC,
+                              gradient, NULL, image,
+                              0, 0,
+                              0, 0,
+                              0, 0,
+                              width, 1);
 
     pixman_image_unref (gradient);
     pixman_image_unref (image);
diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
index 891e5bcd6..662e94ee6 100644
--- a/src/cairo-image-surface.c
+++ b/src/cairo-image-surface.c
@@ -1649,12 +1649,12 @@ _cairo_image_surface_fixup_unbounded (cairo_image_surface_t *dst,
 	int height = rects->unbounded.height;
 
 	if (mask != NULL) {
-	    pixman_image_composite (PIXMAN_OP_OUT_REVERSE,
-				    mask, NULL, dst->pixman_image,
-				    x + mask_x, y + mask_y,
-				    0, 0,
-				    x, y,
-				    width, height);
+	    pixman_image_composite32 (PIXMAN_OP_OUT_REVERSE,
+                                      mask, NULL, dst->pixman_image,
+                                      x + mask_x, y + mask_y,
+                                      0, 0,
+                                      x, y,
+                                      width, height);
 	} else {
             pixman_color_t color = { 0, };
             pixman_box32_t box = { x, y, width, height };