Rename radial gradient inner/outer to c1/c2

The inner/outer names were totally bogus. It is quite
legitimate to have the first circle's radius be larger than
that of the second.

2 files changed, 8 insertions, 8 deletions

diff --git a/pixman/src/icimage.c b/pixman/src/icimage.c
index 44c4c8b3..e97b4c8b 100644
--- a/pixman/src/icimage.c
+++ b/pixman/src/icimage.c
@@ -270,18 +270,18 @@ pixman_image_create_radial_gradient (const pixman_radial_gradient_t *gradient,
     memcpy (radial->stops, stops, sizeof (pixman_gradient_stop_t) * n_stops);
 
     radial->type = SourcePictTypeRadial;
-    x = (double) gradient->inner.radius / (double) gradient->outer.radius;
-    radial->dx = (gradient->outer.x - gradient->inner.x);
-    radial->dy = (gradient->outer.y - gradient->inner.y);
-    radial->fx = (gradient->inner.x) - x * radial->dx;
-    radial->fy = (gradient->inner.y) - x * radial->dy;
+    x = (double) gradient->c1.radius / (double) gradient->c2.radius;
+    radial->dx = (gradient->c2.x - gradient->c1.x);
+    radial->dy = (gradient->c2.y - gradient->c1.y);
+    radial->fx = (gradient->c1.x) - x * radial->dx;
+    radial->fy = (gradient->c1.y) - x * radial->dy;
     radial->m = 1. / (1 + x);
     radial->b = -x * radial->m;
     radial->dx /= 65536.;
     radial->dy /= 65536.;
     radial->fx /= 65536.;
     radial->fy /= 65536.;
-    x = gradient->outer.radius / 65536.;
+    x = gradient->c2.radius / 65536.;
     radial->a = x * x - radial->dx * radial->dx - radial->dy * radial->dy;
 
     image->pSourcePict = (pixman_source_image_t *) radial;
diff --git a/pixman/src/pixman.h b/pixman/src/pixman.h
index 309e5e65..7f0ef322 100644
--- a/pixman/src/pixman.h
+++ b/pixman/src/pixman.h
@@ -364,8 +364,8 @@ typedef struct pixman_linear_gradient {
 } pixman_linear_gradient_t;
 
 typedef struct pixman_radial_gradient {
-    pixman_circle_t inner;
-    pixman_circle_t outer;
+    pixman_circle_t c1;
+    pixman_circle_t c2;
 } pixman_radial_gradient_t;
 
 typedef enum {