diff options
| -rw-r--r-- | tiny_skia/src/vector.rs | 23 | ||||
| -rw-r--r-- | wgpu/src/image/vector.rs | 23 |
2 files changed, 24 insertions, 22 deletions
diff --git a/tiny_skia/src/vector.rs b/tiny_skia/src/vector.rs index 9836fb0a..433ca0f5 100644 --- a/tiny_skia/src/vector.rs +++ b/tiny_skia/src/vector.rs @@ -131,23 +131,24 @@ impl Cache { let mut image = tiny_skia::Pixmap::new(size.width, size.height)?; 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); + + let target_size = if size.width > size.height { + 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 { + 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( + + tiny_skia::Transform::from_scale( target_size.width() / tree_size.width(), target_size.height() / tree_size.height(), - ); + ) } else { - transform = tiny_skia::Transform::default(); - } + tiny_skia::Transform::default() + }; resvg::Tree::from_usvg(tree).render(transform, &mut image.as_mut()); diff --git a/wgpu/src/image/vector.rs b/wgpu/src/image/vector.rs index 5bfc1836..2c03d36b 100644 --- a/wgpu/src/image/vector.rs +++ b/wgpu/src/image/vector.rs @@ -115,23 +115,24 @@ impl Cache { let mut img = tiny_skia::Pixmap::new(width, height)?; let tree_size = tree.size.to_int_size(); - let target_size; - if width > height { - target_size = tree_size.scale_to_width(width); + + let target_size = if width > height { + tree_size.scale_to_width(width) } else { - target_size = tree_size.scale_to_height(height); - } - let transform; - if let Some(target_size) = 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( + + tiny_skia::Transform::from_scale( target_size.width() / tree_size.width(), target_size.height() / tree_size.height(), - ); + ) } else { - transform = tiny_skia::Transform::default(); - } + tiny_skia::Transform::default() + }; resvg::Tree::from_usvg(tree) .render(transform, &mut img.as_mut()); |