Skip to content

Avoid unwraps on pixmap creation #990

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

Merged
LaurenzV merged 5 commits into from
Dec 16, 2025
Merged

Avoid unwraps on pixmap creation #990

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f2613f7
handle unwrap
Its-Just-Nans Dec 14, 2025
16bf4a8
fix comments
Its-Just-Nans Dec 16, 2025
b4c9a84
Apply suggestion from @LaurenzV
Its-Just-Nans Dec 16, 2025
d84a01d
Apply suggestion from @LaurenzV
Its-Just-Nans Dec 16, 2025
2088824
lowercase
Its-Just-Nans Dec 16, 2025
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
25 changes: 13 additions & 12 deletions crates/resvg/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,17 +675,16 @@ fn render_svg(args: &Args, tree: &usvg::Tree) -> Result<tiny_skia::Pixmap, Strin
None => return Err(format!("SVG doesn't have '{}' ID", id)),
};

let bbox = node
.abs_layer_bounding_box()
.ok_or_else(|| "node has zero size".to_string())?;
let bbox = node.abs_layer_bounding_box().ok_or("node has zero size")?;

let size = args
.fit_to
.fit_to_size(bbox.size().to_int_size())
.ok_or_else(|| "target size is zero".to_string())?;
.ok_or("target size is zero")?;

// Unwrap is safe, because `size` is already valid.
let mut pixmap = tiny_skia::Pixmap::new(size.width(), size.height()).unwrap();
// Pixmap's width is limited by i32::MAX/4, we handle the creation error.
let mut pixmap =
tiny_skia::Pixmap::new(size.width(), size.height()).ok_or("cannot create pixmap")?;

if !args.export_area_page {
if let Some(background) = args.background {
Expand All @@ -703,10 +702,11 @@ fn render_svg(args: &Args, tree: &usvg::Tree) -> Result<tiny_skia::Pixmap, Strin
let size = args
.fit_to
.fit_to_size(tree.size().to_int_size())
.ok_or_else(|| "target size is zero".to_string())?;
.ok_or("target size is zero")?;

// Unwrap is safe, because `size` is already valid.
let mut page_pixmap = tiny_skia::Pixmap::new(size.width(), size.height()).unwrap();
// Pixmap's width is limited by i32::MAX/4, we handle the creation error.
let mut page_pixmap = tiny_skia::Pixmap::new(size.width(), size.height())
.ok_or("cannot create pixmap")?;

if let Some(background) = args.background {
page_pixmap.fill(svg_to_skia_color(background));
Expand All @@ -728,10 +728,11 @@ fn render_svg(args: &Args, tree: &usvg::Tree) -> Result<tiny_skia::Pixmap, Strin
let size = args
.fit_to
.fit_to_size(tree.size().to_int_size())
.ok_or_else(|| "target size is zero".to_string())?;
.ok_or("target size is zero")?;

// Unwrap is safe, because `size` is already valid.
let mut pixmap = tiny_skia::Pixmap::new(size.width(), size.height()).unwrap();
// Pixmap's width is limited by i32::MAX/4, we handle the creation error.
let mut pixmap =
tiny_skia::Pixmap::new(size.width(), size.height()).ok_or("cannot create pixmap")?;

if let Some(background) = args.background {
pixmap.fill(svg_to_skia_color(background));
Expand Down