diff --git a/examples/scenes/src/test_scenes.rs b/examples/scenes/src/test_scenes.rs index a2a02491..5cf19163 100644 --- a/examples/scenes/src/test_scenes.rs +++ b/examples/scenes/src/test_scenes.rs @@ -1095,14 +1095,14 @@ mod impls { (100., Color::WHITE), ]; let mut depth = 0; - for (width, colour) in &options[..params.complexity.min(options.len() - 1)] { + for (width, color) in &options[..params.complexity.min(options.len() - 1)] { scene.push_layer( Mix::Normal, 0.9, Affine::IDENTITY, &Rect::from_origin_size((10., 10.), (*width, *width)), ); - scene.fill(Fill::EvenOdd, Affine::IDENTITY, colour, None, &main_rect); + scene.fill(Fill::EvenOdd, Affine::IDENTITY, color, None, &main_rect); depth += 1; } for _ in 0..depth { diff --git a/vello/src/scene.rs b/vello/src/scene.rs index 51c32f09..81d4136e 100644 --- a/vello/src/scene.rs +++ b/vello/src/scene.rs @@ -438,7 +438,7 @@ impl<'a> DrawGlyphs<'a> { /// This supports emoji fonts in COLR and bitmap formats. /// `style` is ignored for these fonts. /// - /// For these glyphs, the given [brush](Self::brush) is used as the "foreground colour", and should + /// For these glyphs, the given [brush](Self::brush) is used as the "foreground color", and should /// be [`Solid`](Brush::Solid) for maximum compatibility. pub fn draw(mut self, style: impl Into>, glyphs: impl Iterator) { let font_index = self.run.font.index; @@ -495,7 +495,7 @@ impl<'a> DrawGlyphs<'a> { (-self.run.font_size / upem).into(), ); - let colour_collection = font.color_glyphs(); + let color_collection = font.color_glyphs(); let bitmaps = bitmap::BitmapStrikes::new(&font); let mut final_glyph = None; let mut outline_count = 0; @@ -508,7 +508,7 @@ impl<'a> DrawGlyphs<'a> { let ppem = self.run.font_size; let outline_glyphs = (&mut glyphs).take_while(|glyph| { let glyph_id = GlyphId::new(glyph.id); - match colour_collection.get(glyph_id) { + match color_collection.get(glyph_id) { Some(color) => { final_glyph = Some((EmojiLikeGlyph::Colr(color), *glyph)); false @@ -979,7 +979,7 @@ fn conv_brush( } fn color_index(cpal: &'_ Cpal<'_>, palette_index: u16) -> Option { - // The "application determined" foreground colour should be used + // The "application determined" foreground color should be used // This will be handled by the caller if palette_index == 0xFFFF { return None; @@ -1017,7 +1017,7 @@ impl ColorStopsSource for ColorStopsConverter<'_> { let color = color_index(self.1, item.palette_index); let color = match color { Some(color) => color, - // If we should use the "application defined fallback colour", + // If we should use the "application defined fallback color", // then *try* and determine that from the existing brush None => match self.2 { BrushRef::Solid(c) => c, diff --git a/vello_tests/src/lib.rs b/vello_tests/src/lib.rs index d0acc17e..76fb8e93 100644 --- a/vello_tests/src/lib.rs +++ b/vello_tests/src/lib.rs @@ -60,7 +60,7 @@ pub use snapshot::{ pub struct TestParams { pub width: u32, pub height: u32, - pub base_colour: Option, + pub base_color: Option, pub use_cpu: bool, pub name: String, pub anti_aliasing: AaConfig, @@ -71,7 +71,7 @@ impl TestParams { TestParams { width, height, - base_colour: None, + base_color: None, use_cpu: false, name: name.into(), anti_aliasing: AaConfig::Area, @@ -127,7 +127,7 @@ pub async fn get_scene_image(params: &TestParams, scene: &Scene) -> Result