[cairo-commit] src/cairo-glitz-surface.c

[Chris Wilson]

 src/cairo-glitz-surface.c |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

New commits:
diff-tree 5b0e2e3e2b6823580bbc40dd1be415b7461bcbf0 (from c0a7d33ac6c81dd74ee2a9daaa3749a346ef4897)
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jul 23 13:05:13 2007 +0100

    [cairo-glitz-surface] Compile fix.
    
    Minor corrections to reflect updated structures.

diff --git a/src/cairo-glitz-surface.c b/src/cairo-glitz-surface.c
index 9fddaf8..00a3d68 100644
--- a/src/cairo-glitz-surface.c
+++ b/src/cairo-glitz-surface.c
@@ -157,7 +157,7 @@ _cairo_glitz_get_boxes_from_region (cair
     glitz_box_t *gboxes;
     int n, i;
 
-    if (_cairo_region_get_boxes (&surface->clip, &n, &cboxes) != CAIRO_STATUS_SUCCESS)
+    if (_cairo_region_get_boxes (region, &n, &cboxes) != CAIRO_STATUS_SUCCESS)
         return NULL;
 
     *nboxes = n;
@@ -176,7 +176,7 @@ _cairo_glitz_get_boxes_from_region (cair
     }
 
 done:
-    _cairo_region_boxes_fini (&sruface->clip, &cboxes);
+    _cairo_region_boxes_fini (region, cboxes);
     return gboxes;
 }
 
@@ -803,10 +803,10 @@ _cairo_glitz_pattern_acquire_surface (ca
 	for (i = 0; i < gradient->n_stops; i++)
 	{
 	    pixels[i] =
-		(((int) (gradient->stops[i].color.alpha >> 8)) << 24) |
-		(((int) (gradient->stops[i].color.red   >> 8)) << 16) |
-		(((int) (gradient->stops[i].color.green >> 8)) << 8)  |
-		(((int) (gradient->stops[i].color.blue  >> 8)));
+		(((int) (gradient->stops[i].color.alpha_short >> 8)) << 24) |
+		(((int) (gradient->stops[i].color.red_short   >> 8)) << 16) |
+		(((int) (gradient->stops[i].color.green_short >> 8)) << 8)  |
+		(((int) (gradient->stops[i].color.blue_short  >> 8)));
 
 	    params[n_base_params + 3 * i + 0] = gradient->stops[i].x;
 	    params[n_base_params + 3 * i + 1] = i << 16;
@@ -834,10 +834,10 @@ _cairo_glitz_pattern_acquire_surface (ca
 
 	    params[0] = grad->c1.x;
 	    params[1] = grad->c1.y;
-	    params[2] = grad->radius1;
+	    params[2] = grad->r1;
 	    params[3] = grad->c2.x;
 	    params[4] = grad->c2.y;
-	    params[5] = grad->radius2;
+	    params[5] = grad->r2;
 	    attr->filter = GLITZ_FILTER_RADIAL_GRADIENT;
 	}
 
@@ -1430,12 +1430,11 @@ _cairo_glitz_surface_composite_trapezoid
 
 static cairo_int_status_t
 _cairo_glitz_surface_set_clip_region (void		*abstract_surface,
-                                      cairo_region_t	*region);
+                                      cairo_region_t	*region)
 {
     cairo_glitz_surface_t *surface = abstract_surface;
 
     if (region)
-
     {
 	glitz_box_t *box;
 	int	    n;