Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update resvg to 0.35 and tiny-skia to 0.10 #1907

Merged
merged 4 commits into from
Jul 12, 2023
Merged

Update resvg to 0.35 and tiny-skia to 0.10 #1907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af386fd
Upgrade resvg to 0.34 and tiny_skia to 0.10
alec-deason Jun 10, 2023
9f73ee3
Fix import consistency for `bytemuck`
hecrj Jul 12, 2023
6502cf1
Improve code style in `vector` modules
hecrj Jul 12, 2023
5dd9234
Update `resvg` dependency to `0.35`
hecrj Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tiny_skia/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -34,5 +34,5 @@ version = "1.6.1"
features = ["std"]

[dependencies.resvg]
version = "0.32"
version = "0.35"
optional = true
10 changes: 9 additions & 1 deletion tiny_skia/src/backend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
};
Expand Down
6 changes: 3 additions & 3 deletions tiny_skia/src/raster.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ 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] = bytemuck::cast(
tiny_skia::ColorU8::from_rgba(b, g, r, a).premultiply(),
);
}

entry.insert(Some(Entry {
Expand Down
34 changes: 18 additions & 16 deletions tiny_skia/src/text.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,14 +288,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] = bytemuck::cast(
tiny_skia::ColorU8::from_rgba(
b,
g,
r,
image.data[i],
)
.premultiply(),
);

i += 1;
}
Expand All @@ -307,14 +308,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] = bytemuck::cast(
tiny_skia::ColorU8::from_rgba(
image.data[i + 2],
image.data[i + 1],
image.data[i],
image.data[i + 3],
)
.premultiply(),
);

i += 4;
}
Expand Down
48 changes: 30 additions & 18 deletions tiny_skia/src/vector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,30 +130,42 @@ 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 {
tree_size.scale_to_width(size.width)
} else {
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();

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 {
// 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 = bytemuck::cast(
tiny_skia::ColorU8::from_rgba(
b,
g,
r,
(*pixel >> 24) as u8,
)
.premultiply(),
);
}
} else {
// Swap R and B channels for `softbuffer` presentation
Expand Down
2 changes: 1 addition & 1 deletion wgpu/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ version = "1.0"
optional = true

[dependencies.resvg]
version = "0.32"
version = "0.35"
optional = true

[dependencies.tracing]
Expand Down
32 changes: 22 additions & 10 deletions wgpu/src/image/vector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,28 @@ 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 {
tree_size.scale_to_width(width)
} else {
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();

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();

Expand Down