me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1907 from alec-deason/master

Browse source 
Update `resvg` to `0.35` and `tiny-skia` to `0.10`
This commit is contained in:
Héctor Ramón 2023-07-12 09:24:35 +02:00 • committed by GitHub
commit e96fe1443d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 85 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tiny_skia/Cargo.toml
View file

@ -11,7 +11,7 @@ geometry = ["iced_graphics/geometry"]
[dependencies] [dependencies]
raw-window-handle = "0.5" raw-window-handle = "0.5"
softbuffer = "0.2" softbuffer = "0.2"
tiny-skia = "0.9" tiny-skia = "0.10"
bytemuck = "1" bytemuck = "1"
rustc-hash = "1.1" rustc-hash = "1.1"
kurbo = "0.9" kurbo = "0.9"
@ -34,5 +34,5 @@ version = "1.6.1"
features = ["std"] features = ["std"]
[dependencies.resvg] [dependencies.resvg]
version = "0.32" version = "0.35"
optional = true optional = true

10
tiny_skia/src/backend.rs
View file

@ -753,7 +753,15 @@ fn adjust_clip_mask(clip_mask: &mut tiny_skia::Mask, bounds: Rectangle) {
let path = { let path = {
let mut builder = tiny_skia::PathBuilder::new(); let mut builder = tiny_skia::PathBuilder::new();
builder.push_rect(bounds.x, bounds.y, bounds.width, bounds.height); builder.push_rect(
tiny_skia::Rect::from_xywh(
bounds.x,
bounds.y,
bounds.width,
bounds.height,
)
.unwrap(),
);
builder.finish().unwrap() builder.finish().unwrap()
}; };

6
tiny_skia/src/raster.rs
View file

@ -80,9 +80,9 @@ impl Cache {
for (i, pixel) in image.pixels().enumerate() { for (i, pixel) in image.pixels().enumerate() {
let [r, g, b, a] = pixel.0; let [r, g, b, a] = pixel.0;
buffer[i] = tiny_skia::ColorU8::from_rgba(b, g, r, a) buffer[i] = bytemuck::cast(
.premultiply() tiny_skia::ColorU8::from_rgba(b, g, r, a).premultiply(),
.get(); );
} }
entry.insert(Some(Entry { entry.insert(Some(Entry {

34
tiny_skia/src/text.rs
View file

@ -288,14 +288,15 @@ impl GlyphCache {
for _y in 0..image.placement.height { for _y in 0..image.placement.height {
for _x in 0..image.placement.width { for _x in 0..image.placement.width {
buffer[i] = tiny_skia::ColorU8::from_rgba( buffer[i] = bytemuck::cast(
b, tiny_skia::ColorU8::from_rgba(
g, b,
r, g,
image.data[i], r,
) image.data[i],
.premultiply() )
.get(); .premultiply(),
);
i += 1; i += 1;
} }
@ -307,14 +308,15 @@ impl GlyphCache {
for _y in 0..image.placement.height { for _y in 0..image.placement.height {
for _x in 0..image.placement.width { for _x in 0..image.placement.width {
// TODO: Blend alpha // TODO: Blend alpha
buffer[i >> 2] = tiny_skia::ColorU8::from_rgba( buffer[i >> 2] = bytemuck::cast(
image.data[i + 2], tiny_skia::ColorU8::from_rgba(
image.data[i + 1], image.data[i + 2],
image.data[i], image.data[i + 1],
image.data[i + 3], image.data[i],
) image.data[i + 3],
.premultiply() )
.get(); .premultiply(),
);
i += 4; i += 4;
} }

48
tiny_skia/src/vector.rs
View file

@ -130,30 +130,42 @@ impl Cache {
let mut image = tiny_skia::Pixmap::new(size.width, size.height)?; let mut image = tiny_skia::Pixmap::new(size.width, size.height)?;
resvg::render( let tree_size = tree.size.to_int_size();
tree,
if size.width > size.height { let target_size = if size.width > size.height {
resvg::FitTo::Width(size.width) tree_size.scale_to_width(size.width)
} else { } else {
resvg::FitTo::Height(size.height) tree_size.scale_to_height(size.height)
}, };
tiny_skia::Transform::default(),
image.as_mut(), let transform = if let Some(target_size) = target_size {
)?; let tree_size = tree_size.to_size();
let target_size = target_size.to_size();
tiny_skia::Transform::from_scale(
target_size.width() / tree_size.width(),
target_size.height() / tree_size.height(),
)
} else {
tiny_skia::Transform::default()
};
resvg::Tree::from_usvg(tree).render(transform, &mut image.as_mut());
if let Some([r, g, b, _]) = key.color { if let Some([r, g, b, _]) = key.color {
// Apply color filter // Apply color filter
for pixel in for pixel in
bytemuck::cast_slice_mut::<u8, u32>(image.data_mut()) bytemuck::cast_slice_mut::<u8, u32>(image.data_mut())
{ {
*pixel = tiny_skia::ColorU8::from_rgba( *pixel = bytemuck::cast(
b, tiny_skia::ColorU8::from_rgba(
g, b,
r, g,
(*pixel >> 24) as u8, r,
) (*pixel >> 24) as u8,
.premultiply() )
.get(); .premultiply(),
);
} }
} else { } else {
// Swap R and B channels for `softbuffer` presentation // Swap R and B channels for `softbuffer` presentation

2
wgpu/Cargo.toml
View file

@ -55,7 +55,7 @@ version = "1.0"
optional = true optional = true
[dependencies.resvg] [dependencies.resvg]
version = "0.32" version = "0.35"
optional = true optional = true
[dependencies.tracing] [dependencies.tracing]

32
wgpu/src/image/vector.rs
View file

@ -114,16 +114,28 @@ impl Cache {
// It would be cool to be able to smooth resize the `svg` example. // It would be cool to be able to smooth resize the `svg` example.
let mut img = tiny_skia::Pixmap::new(width, height)?; let mut img = tiny_skia::Pixmap::new(width, height)?;
resvg::render( let tree_size = tree.size.to_int_size();
tree,
if width > height { let target_size = if width > height {
resvg::FitTo::Width(width) tree_size.scale_to_width(width)
} else { } else {
resvg::FitTo::Height(height) tree_size.scale_to_height(height)
}, };
tiny_skia::Transform::default(),
img.as_mut(), let transform = if let Some(target_size) = target_size {
)?; let tree_size = tree_size.to_size();
let target_size = target_size.to_size();
tiny_skia::Transform::from_scale(
target_size.width() / tree_size.width(),
target_size.height() / tree_size.height(),
)
} else {
tiny_skia::Transform::default()
};
resvg::Tree::from_usvg(tree)
.render(transform, &mut img.as_mut());
let mut rgba = img.take(); let mut rgba = img.take();