From b719592428907d2010645303fb65d38dcb8b30c0 Mon Sep 17 00:00:00 2001
From: Vladimir Vukicevic <vladimir@pobox.com>
Date: Wed, 4 Jul 2007 12:16:27 +0200
Subject: [PATCH] [fixpt] Fix up compilation post pixman merge

---
 src/cairo-pattern.c        | 1 -
 src/cairo-region-private.h | 2 +-
 src/cairo-region.c         | 9 +++++----
 src/cairo-svg-surface.c    | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index 7a81c3f93..c2f12d740 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -1170,7 +1170,6 @@ _cairo_pattern_acquire_surface_for_gradient (cairo_gradient_pattern_t *pattern,
     {
 	cairo_linear_pattern_t *linear = (cairo_linear_pattern_t *) pattern;
 	pixman_point_fixed_t p1, p2;
-	pixman_linear_gradient_t gradient;
 
 	p1.x = _cairo_fixed_to_16_16 (linear->p1.x);
 	p1.y = _cairo_fixed_to_16_16 (linear->p1.y);
diff --git a/src/cairo-region-private.h b/src/cairo-region-private.h
index a3ee75965..efb01cefb 100644
--- a/src/cairo-region-private.h
+++ b/src/cairo-region-private.h
@@ -37,7 +37,7 @@
 #ifndef CAIRO_REGION_PRIVATE_H
 #define CAIRO_REGION_PRIVATE_H
 
-#include <pixman.h>
+#include <pixman/pixman.h>
 
 /* cairo_region_t is defined in cairoint.h */
 
diff --git a/src/cairo-region.c b/src/cairo-region.c
index 287c1690d..fe2b405b5 100644
--- a/src/cairo-region.c
+++ b/src/cairo-region.c
@@ -77,7 +77,7 @@ _cairo_region_init_boxes (cairo_region_t *region,
 	pboxes[i].y2 = boxes[i].p2.y;
     }
 
-    if (!pixman_region_init_rects (region, pboxes, count))
+    if (!pixman_region_init_rects (&region->rgn, pboxes, count))
 	status = CAIRO_STATUS_NO_MEMORY;
 
     if (pboxes != stack_pboxes)
@@ -104,24 +104,25 @@ _cairo_region_copy (cairo_region_t *dst, cairo_region_t *src)
 int
 _cairo_region_num_boxes (cairo_region_t *region)
 {
-    return pixman_region_n_rects(&region->rgn);
+    return pixman_region_n_rects (&region->rgn);
 }
 
 cairo_int_status_t
 _cairo_region_get_boxes (cairo_region_t *region, int *num_boxes, cairo_box_int_t **boxes)
 {
-    int nboxes = pixman_region_n_rects (&region->rgn);
+    int nboxes;
     pixman_box16_t *pboxes;
     cairo_box_int_t *cboxes;
     int i;
 
+    pboxes = pixman_region_rectangles (&region->rgn, &nboxes);
+
     if (nboxes == 0) {
 	*num_boxes = 0;
 	*boxes = NULL;
 	return CAIRO_STATUS_SUCCESS;
     }
 
-    pboxes = pixman_region_rectangles (&region->rgn);
     cboxes = _cairo_malloc_ab (nboxes, sizeof(cairo_box_int_t));
     if (cboxes == NULL)
 	return CAIRO_STATUS_NO_MEMORY;
diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c
index 5237c147c..956dbb718 100644
--- a/src/cairo-svg-surface.c
+++ b/src/cairo-svg-surface.c
@@ -1429,12 +1429,12 @@ _cairo_svg_surface_emit_radial_pattern (cairo_svg_surface_t    *surface,
     double fx, fy;
     cairo_bool_t reverse_stops;
     cairo_status_t status;
-    cairo_point_t &c0, &c1;
+    cairo_point_t *c0, *c1;
     cairo_fixed_t radius0, radius1;
 
     extend = pattern->base.base.extend;
 
-    if (pattern->radius1 < pattern->radius2) {
+    if (pattern->r1 < pattern->r2) {
 	c0 = &pattern->c1;
 	c1 = &pattern->c2;
 	radius0 = pattern->r1;
@@ -1460,7 +1460,7 @@ _cairo_svg_surface_emit_radial_pattern (cairo_svg_surface_t    *surface,
     if (status)
 	return status;
 
-    if (radius0 == radius1) {
+    if (pattern->r1 == pattern->r2) {
 	_cairo_output_stream_printf (document->xml_node_defs,
 				     "<radialGradient id=\"radial%d\" "
 				     "gradientUnits=\"userSpaceOnUse\" "