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

Upgrade resvg to 0.34 and tiny_skia to 0.10

Browse source
This commit is contained in:
Alec Deason 2023-06-10 13:18:42 -07:00 • committed by Héctor Ramón Jiménez
parent 9f2be29a28
commit af386fd0a3
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
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]
raw-window-handle = "0.5"
softbuffer = "0.2"
tiny-skia = "0.9"
tiny-skia = "0.10"
bytemuck = "1"
rustc-hash = "1.1"
kurbo = "0.9"
@ -34,5 +34,5 @@ version = "1.6.1"
features = ["std"]
[dependencies.resvg]
version = "0.32"
version = "0.34"
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 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()
};

6
tiny_skia/src/raster.rs
View file

@ -2,6 +2,7 @@ use crate::core::image as raster;
use crate::core::{Rectangle, Size};
use crate::graphics;
use bytemuck::cast;
use rustc_hash::{FxHashMap, FxHashSet};
use std::cell::RefCell;
use std::collections::hash_map;
@ -80,9 +81,8 @@ impl Cache {
for (i, pixel) in image.pixels().enumerate() {
let [r, g, b, a] = pixel.0;
buffer[i] = tiny_skia::ColorU8::from_rgba(b, g, r, a)
.premultiply()
.get();
buffer[i] = cast(tiny_skia::ColorU8::from_rgba(b, g, r, a)
.premultiply());
}
entry.insert(Some(Entry {

35
tiny_skia/src/text.rs
View file

@ -3,6 +3,7 @@ use crate::core::font::{self, Font};
use crate::core::text::{Hit, LineHeight, Shaping};
use crate::core::{Color, Pixels, Point, Rectangle, Size};
use bytemuck::cast;
use rustc_hash::{FxHashMap, FxHashSet};
use std::borrow::Cow;
use std::cell::RefCell;
@ -288,14 +289,15 @@ impl GlyphCache {
for _y in 0..image.placement.height {
for _x in 0..image.placement.width {
buffer[i] = tiny_skia::ColorU8::from_rgba(
b,
g,
r,
image.data[i],
)
.premultiply()
.get();
buffer[i] = cast(
tiny_skia::ColorU8::from_rgba(
b,
g,
r,
image.data[i],
)
.premultiply(),
);
i += 1;
}
@ -307,14 +309,15 @@ impl GlyphCache {
for _y in 0..image.placement.height {
for _x in 0..image.placement.width {
// TODO: Blend alpha
buffer[i >> 2] = tiny_skia::ColorU8::from_rgba(
image.data[i + 2],
image.data[i + 1],
image.data[i],
image.data[i + 3],
)
.premultiply()
.get();
buffer[i >> 2] = cast(
tiny_skia::ColorU8::from_rgba(
image.data[i + 2],
image.data[i + 1],
image.data[i],
image.data[i + 3],
)
.premultiply(),
);
i += 4;
}

48
tiny_skia/src/vector.rs
View file

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

2
wgpu/Cargo.toml
View file

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

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

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