alex/vello
1
0
Fork 0
mirror of https://github.com/italicsjenga/vello.git synced 2025-01-23 18:06:34 +11:00
Code Issues Projects Releases Packages Wiki Activity

resolve merge conflicts

Browse source
This commit is contained in:
Chad Brokaw 2023-05-03 14:53:36 -04:00
parent 4f9ae4c937
commit e9c2ce1623
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/encoding/src/encoding.rs
View file

@ -105,11 +105,13 @@ impl Encoding {
Patch::Ramp {
draw_data_offset: offset,
stops,
extend,
} => {
let stops = stops.start + stops_base..stops.end + stops_base;
Patch::Ramp {
draw_data_offset: offset + offsets.draw_data,
stops,
extend: *extend,
}
}
Patch::GlyphRun { index } => Patch::GlyphRun {
@ -347,7 +349,12 @@ impl Encoding {
}
#[cfg(feature = "full")]
fn add_ramp(&mut self, color_stops: impl Iterator<Item = ColorStop>, alpha: f32) {
fn add_ramp(
&mut self,
color_stops: impl Iterator<Item = ColorStop>,
alpha: f32,
extend: Extend,
) {
let offset = self.draw_data.len();
let stops_start = self.resources.color_stops.len();
if alpha != 1.0 {
@ -360,6 +367,7 @@ impl Encoding {
self.resources.patches.push(Patch::Ramp {
draw_data_offset: offset,
stops: stops_start..self.resources.color_stops.len(),
extend,
});
}
}

2
crates/encoding/src/resolve.rs
View file

@ -12,7 +12,7 @@ use {
image_cache::{ImageCache, Images},
ramp_cache::{RampCache, Ramps},
},
peniko::Image,
peniko::{Extend, Image},
std::ops::Range,
};