GNOME.org
 

[librsvg] s/colour/color - sorry, but this was all inconsistent

commit 153bcc92746300f5676bc0f32a7dcc1de65b654f
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Apr 12 16:25:18 2016 -0500

    s/colour/color - sorry, but this was all inconsistent

 rsvg-base.c         |    2 +-
 rsvg-cairo-draw.c   |   14 +++---
 rsvg-filter.c       |  118 +++++++++++++++++++++++++-------------------------
 rsvg-filter.h       |    2 +-
 rsvg-paint-server.c |   16 +++---
 rsvg-paint-server.h |   10 ++--
 rsvg-private.h      |    2 +-
 tests/styles.c      |    4 +-
 8 files changed, 84 insertions(+), 84 deletions(-)
---
diff --git a/rsvg-base.c b/rsvg-base.c
index 3367b23..9738b5c 100644
--- a/rsvg-base.c
+++ b/rsvg-base.c
@@ -245,7 +245,7 @@ rsvg_standard_element_start (RsvgHandle * ctx, const char *name, RsvgPropertyBag
     else if (!strcmp (name, "feBlend"))
         newnode = rsvg_new_filter_primitive_blend ();
     else if (!strcmp (name, "feColorMatrix"))
-        newnode = rsvg_new_filter_primitive_colour_matrix ();
+        newnode = rsvg_new_filter_primitive_color_matrix ();
     else if (!strcmp (name, "feComponentTransfer"))
         newnode = rsvg_new_filter_primitive_component_transfer ();
     else if (!strcmp (name, "feComposite"))
diff --git a/rsvg-cairo-draw.c b/rsvg-cairo-draw.c
index 4152cb7..f100d9f 100644
--- a/rsvg-cairo-draw.c
+++ b/rsvg-cairo-draw.c
@@ -157,16 +157,16 @@ _set_source_rsvg_radial_gradient (RsvgDrawingCtx * ctx,
 }
 
 static void
-_set_source_rsvg_solid_colour (RsvgDrawingCtx * ctx,
-                               RsvgSolidColour * colour, guint8 opacity, guint32 current_colour)
+_set_source_rsvg_solid_color (RsvgDrawingCtx * ctx,
+                              RsvgSolidColor * color, guint8 opacity, guint32 current_color)
 {
     RsvgCairoRender *render = RSVG_CAIRO_RENDER (ctx->render);
     cairo_t *cr = render->cr;
-    guint32 argb = colour->argb;
+    guint32 argb = color->argb;
     double r, g, b, a;
 
-    if (colour->currentcolour)
-        argb = current_colour;
+    if (color->currentcolor)
+        argb = current_color;
 
     r = ((argb >> 16) & 0xff) / 255.0;
     g = ((argb >>  8) & 0xff) / 255.0;
@@ -328,7 +328,7 @@ static void
 _set_source_rsvg_paint_server (RsvgDrawingCtx * ctx,
                                guint32 current_color_rgb,
                                RsvgPaintServer * ps,
-                               guint8 opacity, RsvgBbox bbox, guint32 current_colour)
+                               guint8 opacity, RsvgBbox bbox, guint32 current_color)
 {
     RsvgNode *node;
 
@@ -346,7 +346,7 @@ _set_source_rsvg_paint_server (RsvgDrawingCtx * ctx,
         rsvg_release_node (ctx, node);
         break;
     case RSVG_PAINT_SERVER_SOLID:
-        _set_source_rsvg_solid_colour (ctx, ps->core.colour, opacity, current_colour);
+        _set_source_rsvg_solid_color (ctx, ps->core.color, opacity, current_color);
         break;
     }
 }
diff --git a/rsvg-filter.c b/rsvg-filter.c
index ec5f9c0..81cce75 100644
--- a/rsvg-filter.c
+++ b/rsvg-filter.c
@@ -2233,16 +2233,16 @@ rsvg_new_filter_primitive_merge_node (void)
 /*************************************************************/
 /*************************************************************/
 
-typedef struct _RsvgFilterPrimitiveColourMatrix
- RsvgFilterPrimitiveColourMatrix;
+typedef struct _RsvgFilterPrimitiveColorMatrix
+ RsvgFilterPrimitiveColorMatrix;
 
-struct _RsvgFilterPrimitiveColourMatrix {
+struct _RsvgFilterPrimitiveColorMatrix {
     RsvgFilterPrimitive super;
     gint *KernelMatrix;
 };
 
 static void
-rsvg_filter_primitive_colour_matrix_render (RsvgFilterPrimitive * self, RsvgFilterContext * ctx)
+rsvg_filter_primitive_color_matrix_render (RsvgFilterPrimitive * self, RsvgFilterContext * ctx)
 {
     guchar ch;
     gint x, y;
@@ -2253,13 +2253,13 @@ rsvg_filter_primitive_colour_matrix_render (RsvgFilterPrimitive * self, RsvgFilt
     guchar *in_pixels;
     guchar *output_pixels;
 
-    RsvgFilterPrimitiveColourMatrix *upself;
+    RsvgFilterPrimitiveColorMatrix *upself;
 
     cairo_surface_t *output, *in;
 
     int sum;
 
-    upself = (RsvgFilterPrimitiveColourMatrix *) self;
+    upself = (RsvgFilterPrimitiveColorMatrix *) self;
     boundarys = rsvg_filter_primitive_get_bounds (self, ctx);
 
     in = rsvg_filter_get_in (self->in, ctx);
@@ -2337,26 +2337,26 @@ rsvg_filter_primitive_colour_matrix_render (RsvgFilterPrimitive * self, RsvgFilt
 }
 
 static void
-rsvg_filter_primitive_colour_matrix_free (RsvgNode * self)
+rsvg_filter_primitive_color_matrix_free (RsvgNode * self)
 {
-    RsvgFilterPrimitiveColourMatrix *matrix;
+    RsvgFilterPrimitiveColorMatrix *matrix;
 
-    matrix = (RsvgFilterPrimitiveColourMatrix *) self;
+    matrix = (RsvgFilterPrimitiveColorMatrix *) self;
     g_free (matrix->KernelMatrix);
     
     rsvg_filter_primitive_free (self);
 }
 
 static void
-rsvg_filter_primitive_colour_matrix_set_atts (RsvgNode * self, RsvgHandle * ctx,
+rsvg_filter_primitive_color_matrix_set_atts (RsvgNode * self, RsvgHandle * ctx,
                                               RsvgPropertyBag * atts)
 {
     gint type;
     guint listlen = 0;
     const char *value;
-    RsvgFilterPrimitiveColourMatrix *filter;
+    RsvgFilterPrimitiveColorMatrix *filter;
 
-    filter = (RsvgFilterPrimitiveColourMatrix *) self;
+    filter = (RsvgFilterPrimitiveColorMatrix *) self;
 
     type = 0;
 
@@ -2461,20 +2461,20 @@ rsvg_filter_primitive_colour_matrix_set_atts (RsvgNode * self, RsvgHandle * ctx,
 }
 
 RsvgNode *
-rsvg_new_filter_primitive_colour_matrix (void)
+rsvg_new_filter_primitive_color_matrix (void)
 {
-    RsvgFilterPrimitiveColourMatrix *filter;
-    filter = g_new (RsvgFilterPrimitiveColourMatrix, 1);
-    _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_COLOUR_MATRIX);
+    RsvgFilterPrimitiveColorMatrix *filter;
+    filter = g_new (RsvgFilterPrimitiveColorMatrix, 1);
+    _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_COLOR_MATRIX);
     filter->super.in = g_string_new ("none");
     filter->super.result = g_string_new ("none");
     filter->super.x.factor = filter->super.y.factor = filter->super.width.factor =
         filter->super.height.factor = 'n';
     filter->KernelMatrix = NULL;
-    filter->super.render = rsvg_filter_primitive_colour_matrix_render;
-    filter->super.super.free = rsvg_filter_primitive_colour_matrix_free;
+    filter->super.render = rsvg_filter_primitive_color_matrix_render;
+    filter->super.super.free = rsvg_filter_primitive_color_matrix_free;
 
-    filter->super.super.set_atts = rsvg_filter_primitive_colour_matrix_set_atts;
+    filter->super.super.set_atts = rsvg_filter_primitive_color_matrix_set_atts;
     return (RsvgNode *) filter;
 }
 
@@ -3187,10 +3187,10 @@ rsvg_filter_primitive_flood_render (RsvgFilterPrimitive * self, RsvgFilterContex
     RsvgIRect boundarys;
     guchar *output_pixels;
     cairo_surface_t *output;
-    char pixcolour[4];
+    char pixcolor[4];
     RsvgFilterPrimitiveOutput out;
 
-    guint32 colour = self->super.state->flood_color;
+    guint32 color = self->super.state->flood_color;
     guint8 opacity = self->super.state->flood_opacity;
 
     boundarys = rsvg_filter_primitive_get_bounds (self, ctx);
@@ -3206,14 +3206,14 @@ rsvg_filter_primitive_flood_render (RsvgFilterPrimitive * self, RsvgFilterContex
     output_pixels = cairo_image_surface_get_data (output);
 
     for (i = 0; i < 3; i++)
-        pixcolour[i] = (int) (((unsigned char *)
-                               (&colour))[2 - i]) * opacity / 255;
-    pixcolour[3] = opacity;
+        pixcolor[i] = (int) (((unsigned char *)
+                               (&color))[2 - i]) * opacity / 255;
+    pixcolor[3] = opacity;
 
     for (y = boundarys.y0; y < boundarys.y1; y++)
         for (x = boundarys.x0; x < boundarys.x1; x++)
             for (i = 0; i < 4; i++)
-                output_pixels[4 * x + y * rowstride + ctx->channelmap[i]] = pixcolour[i];
+                output_pixels[4 * x + y * rowstride + ctx->channelmap[i]] = pixcolor[i];
 
     cairo_surface_mark_dirty (output);
 
@@ -4358,7 +4358,7 @@ get_light_direction (RsvgNodeLightSource * source, gdouble x1, gdouble y1, gdoub
 }
 
 static vector3
-get_light_colour (RsvgNodeLightSource * source, vector3 colour,
+get_light_color (RsvgNodeLightSource * source, vector3 color,
                   gdouble x1, gdouble y1, gdouble z, cairo_matrix_t *affine, RsvgDrawingCtx * ctx)
 {
     double base, angle, x, y;
@@ -4368,7 +4368,7 @@ get_light_colour (RsvgNodeLightSource * source, vector3 colour,
     double sx, sy, sz, spx, spy, spz;
 
     if (source->type != SPOTLIGHT)
-        return colour;
+        return color;
 
     sx = _rsvg_css_normalize_length (&source->x, ctx, 'h');
     sy = _rsvg_css_normalize_length (&source->y, ctx, 'v');
@@ -4401,9 +4401,9 @@ get_light_colour (RsvgNodeLightSource * source, vector3 colour,
         return output;
     }
 
-    output.x = colour.x * pow (base, source->specularExponent);
-    output.y = colour.y * pow (base, source->specularExponent);
-    output.z = colour.z * pow (base, source->specularExponent);
+    output.x = color.x * pow (base, source->specularExponent);
+    output.y = color.y * pow (base, source->specularExponent);
+    output.z = color.z * pow (base, source->specularExponent);
 
     return output;
 }
@@ -4471,7 +4471,7 @@ struct _RsvgFilterPrimitiveDiffuseLighting {
     gdouble dx, dy;
     double diffuseConstant;
     double surfaceScale;
-    guint32 lightingcolour;
+    guint32 lightingcolor;
 };
 
 static void
@@ -4482,8 +4482,8 @@ rsvg_filter_primitive_diffuse_lighting_render (RsvgFilterPrimitive * self, RsvgF
     gdouble z;
     gint rowstride, height, width;
     gdouble factor, surfaceScale;
-    vector3 lightcolour, L, N;
-    vector3 colour;
+    vector3 lightcolor, L, N;
+    vector3 color;
     cairo_matrix_t iaffine;
     RsvgNodeLightSource *source = NULL;
     RsvgIRect boundarys;
@@ -4536,9 +4536,9 @@ rsvg_filter_primitive_diffuse_lighting_render (RsvgFilterPrimitive * self, RsvgF
 
     output_pixels = cairo_image_surface_get_data (output);
 
-    colour.x = ((guchar *) (&upself->lightingcolour))[2] / 255.0;
-    colour.y = ((guchar *) (&upself->lightingcolour))[1] / 255.0;
-    colour.z = ((guchar *) (&upself->lightingcolour))[0] / 255.0;
+    color.x = ((guchar *) (&upself->lightingcolor))[2] / 255.0;
+    color.y = ((guchar *) (&upself->lightingcolor))[1] / 255.0;
+    color.z = ((guchar *) (&upself->lightingcolor))[0] / 255.0;
 
     surfaceScale = upself->surfaceScale / 255.0;
 
@@ -4561,15 +4561,15 @@ rsvg_filter_primitive_diffuse_lighting_render (RsvgFilterPrimitive * self, RsvgF
             N = get_surface_normal (in_pixels, boundarys, x, y,
                                     dx, dy, rawdx, rawdy, upself->surfaceScale,
                                     rowstride, ctx->channelmap[3]);
-            lightcolour = get_light_colour (source, colour, x, y, z, &iaffine, ctx->ctx);
+            lightcolor = get_light_color (source, color, x, y, z, &iaffine, ctx->ctx);
             factor = dotproduct (N, L);
 
             output_pixels[y * rowstride + x * 4 + ctx->channelmap[0]] =
-                MAX (0, MIN (255, upself->diffuseConstant * factor * lightcolour.x * 255.0));
+                MAX (0, MIN (255, upself->diffuseConstant * factor * lightcolor.x * 255.0));
             output_pixels[y * rowstride + x * 4 + ctx->channelmap[1]] =
-                MAX (0, MIN (255, upself->diffuseConstant * factor * lightcolour.y * 255.0));
+                MAX (0, MIN (255, upself->diffuseConstant * factor * lightcolor.y * 255.0));
             output_pixels[y * rowstride + x * 4 + ctx->channelmap[2]] =
-                MAX (0, MIN (255, upself->diffuseConstant * factor * lightcolour.z * 255.0));
+                MAX (0, MIN (255, upself->diffuseConstant * factor * lightcolor.z * 255.0));
             output_pixels[y * rowstride + x * 4 + ctx->channelmap[3]] = 255;
         }
 
@@ -4607,7 +4607,7 @@ rsvg_filter_primitive_diffuse_lighting_set_atts (RsvgNode * self, RsvgHandle * c
         if ((value = rsvg_property_bag_lookup (atts, "kernelUnitLength")))
             rsvg_css_parse_number_optional_number (value, &filter->dx, &filter->dy);
         if ((value = rsvg_property_bag_lookup (atts, "lighting-color")))
-            filter->lightingcolour = rsvg_css_parse_color (value, 0);
+            filter->lightingcolor = rsvg_css_parse_color (value, 0);
         if ((value = rsvg_property_bag_lookup (atts, "diffuseConstant")))
             filter->diffuseConstant = g_ascii_strtod (value, NULL);
         if ((value = rsvg_property_bag_lookup (atts, "surfaceScale")))
@@ -4631,7 +4631,7 @@ rsvg_new_filter_primitive_diffuse_lighting (void)
     filter->diffuseConstant = 1;
     filter->dx = 1;
     filter->dy = 1;
-    filter->lightingcolour = 0xFFFFFFFF;
+    filter->lightingcolor = 0xFFFFFFFF;
     filter->super.render = rsvg_filter_primitive_diffuse_lighting_render;
     filter->super.super.free = rsvg_filter_primitive_free;
     filter->super.super.set_atts = rsvg_filter_primitive_diffuse_lighting_set_atts;
@@ -4648,7 +4648,7 @@ struct _RsvgFilterPrimitiveSpecularLighting {
     double specularConstant;
     double specularExponent;
     double surfaceScale;
-    guint32 lightingcolour;
+    guint32 lightingcolor;
 };
 
 static void
@@ -4658,7 +4658,7 @@ rsvg_filter_primitive_specular_lighting_render (RsvgFilterPrimitive * self, Rsvg
     gdouble z, surfaceScale;
     gint rowstride, height, width;
     gdouble factor, max, base;
-    vector3 lightcolour, colour;
+    vector3 lightcolor, color;
     vector3 L;
     cairo_matrix_t iaffine;
     RsvgIRect boundarys;
@@ -4711,9 +4711,9 @@ rsvg_filter_primitive_specular_lighting_render (RsvgFilterPrimitive * self, Rsvg
 
     output_pixels = cairo_image_surface_get_data (output);
 
-    colour.x = ((guchar *) (&upself->lightingcolour))[2] / 255.0;
-    colour.y = ((guchar *) (&upself->lightingcolour))[1] / 255.0;
-    colour.z = ((guchar *) (&upself->lightingcolour))[0] / 255.0;
+    color.x = ((guchar *) (&upself->lightingcolor))[2] / 255.0;
+    color.y = ((guchar *) (&upself->lightingcolor))[1] / 255.0;
+    color.z = ((guchar *) (&upself->lightingcolor))[0] / 255.0;
 
     surfaceScale = upself->surfaceScale / 255.0;
 
@@ -4724,7 +4724,7 @@ rsvg_filter_primitive_specular_lighting_render (RsvgFilterPrimitive * self, Rsvg
             L.z += 1;
             L = normalise (L);
 
-            lightcolour = get_light_colour (source, colour, x, y, z, &iaffine, ctx->ctx);
+            lightcolor = get_light_color (source, color, x, y, z, &iaffine, ctx->ctx);
             base = dotproduct (get_surface_normal (in_pixels, boundarys, x, y,
                                                    1, 1, 1.0 / ctx->paffine.xx,
                                                    1.0 / ctx->paffine.yy, upself->surfaceScale,
@@ -4733,12 +4733,12 @@ rsvg_filter_primitive_specular_lighting_render (RsvgFilterPrimitive * self, Rsvg
             factor = upself->specularConstant * pow (base, upself->specularExponent) * 255;
 
             max = 0;
-            if (max < lightcolour.x)
-                max = lightcolour.x;
-            if (max < lightcolour.y)
-                max = lightcolour.y;
-            if (max < lightcolour.z)
-                max = lightcolour.z;
+            if (max < lightcolor.x)
+                max = lightcolor.x;
+            if (max < lightcolor.y)
+                max = lightcolor.y;
+            if (max < lightcolor.z)
+                max = lightcolor.z;
 
             max *= factor;
             if (max > 255)
@@ -4746,9 +4746,9 @@ rsvg_filter_primitive_specular_lighting_render (RsvgFilterPrimitive * self, Rsvg
             if (max < 0)
                 max = 0;
 
-            output_pixels[y * rowstride + x * 4 + ctx->channelmap[0]] = lightcolour.x * max;
-            output_pixels[y * rowstride + x * 4 + ctx->channelmap[1]] = lightcolour.y * max;
-            output_pixels[y * rowstride + x * 4 + ctx->channelmap[2]] = lightcolour.z * max;
+            output_pixels[y * rowstride + x * 4 + ctx->channelmap[0]] = lightcolor.x * max;
+            output_pixels[y * rowstride + x * 4 + ctx->channelmap[1]] = lightcolor.y * max;
+            output_pixels[y * rowstride + x * 4 + ctx->channelmap[2]] = lightcolor.z * max;
             output_pixels[y * rowstride + x * 4 + ctx->channelmap[3]] = max;
 
         }
@@ -4784,7 +4784,7 @@ rsvg_filter_primitive_specular_lighting_set_atts (RsvgNode * self, RsvgHandle *
         if ((value = rsvg_property_bag_lookup (atts, "height")))
             filter->super.height = _rsvg_css_parse_length (value);
         if ((value = rsvg_property_bag_lookup (atts, "lighting-color")))
-            filter->lightingcolour = rsvg_css_parse_color (value, 0);
+            filter->lightingcolor = rsvg_css_parse_color (value, 0);
         if ((value = rsvg_property_bag_lookup (atts, "specularConstant")))
             filter->specularConstant = g_ascii_strtod (value, NULL);
         if ((value = rsvg_property_bag_lookup (atts, "specularExponent")))
@@ -4810,7 +4810,7 @@ rsvg_new_filter_primitive_specular_lighting (void)
     filter->surfaceScale = 1;
     filter->specularConstant = 1;
     filter->specularExponent = 1;
-    filter->lightingcolour = 0xFFFFFFFF;
+    filter->lightingcolor = 0xFFFFFFFF;
     filter->super.render = rsvg_filter_primitive_specular_lighting_render;
     filter->super.super.free = rsvg_filter_primitive_free;
     filter->super.super.set_atts = rsvg_filter_primitive_specular_lighting_set_atts;
diff --git a/rsvg-filter.h b/rsvg-filter.h
index 12038fe..da7ffeb 100644
--- a/rsvg-filter.h
+++ b/rsvg-filter.h
@@ -66,7 +66,7 @@ RsvgNode    *rsvg_new_filter_primitive_merge                (void);
 G_GNUC_INTERNAL
 RsvgNode    *rsvg_new_filter_primitive_merge_node           (void);
 G_GNUC_INTERNAL
-RsvgNode    *rsvg_new_filter_primitive_colour_matrix        (void);
+RsvgNode    *rsvg_new_filter_primitive_color_matrix        (void);
 G_GNUC_INTERNAL
 RsvgNode    *rsvg_new_filter_primitive_component_transfer   (void);
 G_GNUC_INTERNAL
diff --git a/rsvg-paint-server.c b/rsvg-paint-server.c
index a9199a7..3519467 100644
--- a/rsvg-paint-server.c
+++ b/rsvg-paint-server.c
@@ -43,22 +43,22 @@ rsvg_paint_server_solid (guint32 argb)
 
     result->refcnt = 1;
     result->type = RSVG_PAINT_SERVER_SOLID;
-    result->core.colour = g_new (RsvgSolidColour, 1);
-    result->core.colour->argb = argb;
-    result->core.colour->currentcolour = FALSE;
+    result->core.color = g_new (RsvgSolidColor, 1);
+    result->core.color->argb = argb;
+    result->core.color->currentcolor = FALSE;
 
     return result;
 }
 
 static RsvgPaintServer *
-rsvg_paint_server_solid_current_colour (void)
+rsvg_paint_server_solid_current_color (void)
 {
     RsvgPaintServer *result = g_new (RsvgPaintServer, 1);
 
     result->refcnt = 1;
     result->type = RSVG_PAINT_SERVER_SOLID;
-    result->core.colour = g_new (RsvgSolidColour, 1);
-    result->core.colour->currentcolour = TRUE;
+    result->core.color = g_new (RsvgSolidColor, 1);
+    result->core.color->currentcolor = TRUE;
 
     return result;
 }
@@ -104,7 +104,7 @@ rsvg_paint_server_parse (gboolean * inherit, const char *str)
         return rsvg_paint_server_solid (0);
     } else if (!strcmp (str, "currentColor")) {
         RsvgPaintServer *ps;
-        ps = rsvg_paint_server_solid_current_colour ();
+        ps = rsvg_paint_server_solid_current_color ();
         return ps;
     } else {
         argb = rsvg_css_parse_color (str, inherit);
@@ -139,7 +139,7 @@ rsvg_paint_server_unref (RsvgPaintServer * ps)
         return;
     if (--ps->refcnt == 0) {
         if (ps->type == RSVG_PAINT_SERVER_SOLID)
-            g_free (ps->core.colour);
+            g_free (ps->core.color);
         else if (ps->type == RSVG_PAINT_SERVER_IRI)
             g_free (ps->core.iri);
         g_free (ps);
diff --git a/rsvg-paint-server.h b/rsvg-paint-server.h
index 0adc826..8f11af5 100644
--- a/rsvg-paint-server.h
+++ b/rsvg-paint-server.h
@@ -38,7 +38,7 @@ typedef struct _RsvgGradientStops RsvgGradientStops;
 typedef struct _RsvgLinearGradient RsvgLinearGradient;
 typedef struct _RsvgRadialGradient RsvgRadialGradient;
 typedef struct _RsvgPattern RsvgPattern;
-typedef struct _RsvgSolidColour RsvgSolidColour;
+typedef struct _RsvgSolidColor RsvgSolidColor;
 
 typedef struct _RsvgPaintServer RsvgPaintServer;
 
@@ -107,17 +107,17 @@ struct _RsvgPattern {
     char *fallback;
 };
 
-struct _RsvgSolidColour {
-    gboolean currentcolour;
+struct _RsvgSolidColor {
+    gboolean currentcolor;
     guint32 argb;
 };
 
-typedef struct _RsvgSolidColour RsvgPaintServerColour;
+typedef struct _RsvgSolidColor RsvgPaintServerColor;
 typedef enum _RsvgPaintServerType RsvgPaintServerType;
 typedef union _RsvgPaintServerCore RsvgPaintServerCore;
 
 union _RsvgPaintServerCore {
-    RsvgSolidColour *colour;
+    RsvgSolidColor *color;
     char *iri;
 };
 
diff --git a/rsvg-private.h b/rsvg-private.h
index 6921bc3..169d4bf 100644
--- a/rsvg-private.h
+++ b/rsvg-private.h
@@ -292,7 +292,7 @@ typedef enum {
     /* Filter primitives */
     RSVG_NODE_TYPE_FILTER_PRIMITIVE = 64,
     RSVG_NODE_TYPE_FILTER_PRIMITIVE_BLEND,
-    RSVG_NODE_TYPE_FILTER_PRIMITIVE_COLOUR_MATRIX,
+    RSVG_NODE_TYPE_FILTER_PRIMITIVE_COLOR_MATRIX,
     RSVG_NODE_TYPE_FILTER_PRIMITIVE_COMPONENT_TRANSFER,
     RSVG_NODE_TYPE_FILTER_PRIMITIVE_COMPOSITE,
     RSVG_NODE_TYPE_FILTER_PRIMITIVE_CONVOLVE_MATRIX,
diff --git a/tests/styles.c b/tests/styles.c
index 02b6cb2..ff7694d 100644
--- a/tests/styles.c
+++ b/tests/styles.c
@@ -41,9 +41,9 @@ static void
 assert_equal_value (FixtureData *fixture, RsvgNode *node)
 {
     if (g_str_equal (fixture->target_name, "stroke"))
-        assert_equal_color (fixture->expected.color, node->state->stroke->core.colour->argb);
+        assert_equal_color (fixture->expected.color, node->state->stroke->core.color->argb);
     else if (g_str_equal (fixture->target_name, "fill"))
-        assert_equal_color (fixture->expected.color, node->state->fill->core.colour->argb);
+        assert_equal_color (fixture->expected.color, node->state->fill->core.color->argb);
     else if (g_str_equal (fixture->target_name, "stroke-width"))
         assert_equal_length (&fixture->expected.length, &node->state->stroke_width);
     else
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]