organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-04 21:15:06 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 9

[fontations] Use the proposed pop_layer_with_mode

Browse source 
Reduces the last Vec use.

https://github.com/googlefonts/fontations/pull/1419
This commit is contained in:
Behdad Esfahbod 2025-03-21 14:53:34 -06:00
parent 9fa31d1ed2
commit cfb962d73c
3 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/fontations/Cargo.lock generated
View file

@ -59,9 +59,9 @@ dependencies = [
[[package]] [[package]]
name = "read-fonts" name = "read-fonts"
version = "0.27.4" version = "0.27.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d1cb3d8f1eff7ebef84ca77c0ef99e84e40459132a71bd678e96c6b7f0e6c1e" checksum = "f14974c88fb4fd0a7203719f98020209248c9dbebaf9d10d860337797a905097"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"font-types", "font-types",
@ -69,9 +69,9 @@ dependencies = [
[[package]] [[package]]
name = "skrifa" name = "skrifa"
version = "0.29.1" version = "0.29.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d58313d717b05488e8c8bae9b4cb34191aa6168d07430e17a2c0a12695fe735" checksum = "7c0ca53de9bb9bee1720c727606275148463cd938eb6bde249dcedeec4967747"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"read-fonts", "read-fonts",

2
src/fontations/Cargo.toml
View file

@ -4,7 +4,7 @@ edition = "2021"
[dependencies] [dependencies]
read-fonts = "0.27" read-fonts = "0.27"
skrifa = "0.29.1" skrifa = "0.29.2"
[lib] [lib]
name = "harfbuzz_fontations" name = "harfbuzz_fontations"

13
src/fontations/lib.rs
View file

@ -415,7 +415,6 @@ struct HbColorPainter<'a> {
paint_data: *mut c_void, paint_data: *mut c_void,
color_records: &'a [ColorRecord], color_records: &'a [ColorRecord],
foreground: hb_color_t, foreground: hb_color_t,
composite_mode: Vec<CompositeMode>,
} }
impl HbColorPainter<'_> { impl HbColorPainter<'_> {
@ -706,18 +705,13 @@ impl ColorPainter for HbColorPainter<'_> {
} }
} }
} }
fn push_layer(&mut self, mode: CompositeMode) { fn push_layer(&mut self, _mode: CompositeMode) {
self.composite_mode.push(mode);
unsafe { unsafe {
hb_paint_push_group(self.paint_funcs, self.paint_data); hb_paint_push_group(self.paint_funcs, self.paint_data);
} }
} }
fn pop_layer(&mut self) { fn pop_layer_with_mode(&mut self, mode: CompositeMode) {
let mode = self.composite_mode.pop(); let mode = mode as hb_paint_composite_mode_t; // They are the same
if mode.is_none() {
return;
}
let mode = mode.unwrap() as hb_paint_composite_mode_t; // They are the same
unsafe { unsafe {
hb_paint_pop_group(self.paint_funcs, self.paint_data, mode); hb_paint_pop_group(self.paint_funcs, self.paint_data, mode);
} }
@ -777,7 +771,6 @@ extern "C" fn _hb_fontations_paint_glyph(
paint_data, paint_data,
color_records, color_records,
foreground, foreground,
composite_mode: Vec::new(),
}; };
unsafe { unsafe {
hb_paint_push_font_transform(paint_funcs, paint_data, font); hb_paint_push_font_transform(paint_funcs, paint_data, font);