Skip to content

Support floating point viewbox in resvg binary #875

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 2 commits into from
Oct 8, 2026
Merged

Support floating point viewbox in resvg binary #875

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e0de0b
Support floating point viewbox in resvg binary
jermy Dec 27, 2024
f9bc393
rename
LaurenzV Oct 8, 2026
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
48 changes: 25 additions & 23 deletions crates/resvg/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,35 +397,34 @@ enum FitTo {
/// Keep original size.
Original,
/// Scale to width.
Width(u32),
Width(f32),
/// Scale to height.
Height(u32),
Height(f32),
/// Scale to size.
Size(u32, u32),
Size(f32, f32),
/// Zoom by factor.
Zoom(f32),
}

impl FitTo {
fn fit_to_size(&self, size: tiny_skia::IntSize) -> Option<tiny_skia::IntSize> {
fn fit_to_size(&self, size: tiny_skia::Size) -> Option<tiny_skia::Size> {
match *self {
FitTo::Original => Some(size),
FitTo::Width(w) => size.scale_to_width(w),
FitTo::Height(h) => size.scale_to_height(h),
FitTo::Size(w, h) => tiny_skia::IntSize::from_wh(w, h).map(|s| size.scale_to(s)),
FitTo::Size(w, h) => tiny_skia::Size::from_wh(w, h).map(|s| size.scale_to(s)),
FitTo::Zoom(z) => size.scale_by(z),
}
}

fn fit_to_transform(&self, size: tiny_skia::IntSize) -> tiny_skia::Transform {
let size1 = size.to_size();
let size2 = match self.fit_to_size(size) {
Some(v) => v.to_size(),
fn fit_to_transform(&self, original_size: tiny_skia::Size) -> tiny_skia::Transform {
let target_size = match self.fit_to_size(original_size) {
Some(v) => v,
None => return tiny_skia::Transform::default(),
};
tiny_skia::Transform::from_scale(
size2.width() / size1.width(),
size2.height() / size1.height(),
target_size.width() / original_size.width(),
target_size.height() / original_size.height(),
)
}
}
Expand Down Expand Up @@ -538,13 +537,13 @@ fn parse_args() -> Result<Args, String> {
let mut default_size = usvg::Size::from_wh(100.0, 100.0).unwrap();
if let (Some(w), Some(h)) = (args.width, args.height) {
default_size = usvg::Size::from_wh(w as f32, h as f32).unwrap();
fit_to = FitTo::Size(w, h);
fit_to = FitTo::Size(w as f32, h as f32);

@DJMcNab DJMcNab Jan 6, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense for these arguments to themselves be floats? I think probably not, because they need to be positive and finite. But creating a massive image can still cause issues.

@LaurenzV LaurenzV Oct 8, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's ignore this for now, if you want to render such big images you are going to have other problems. 😄

} else if let Some(w) = args.width {
default_size = usvg::Size::from_wh(w as f32, 100.0).unwrap();
fit_to = FitTo::Width(w);
fit_to = FitTo::Width(w as f32);
} else if let Some(h) = args.height {
default_size = usvg::Size::from_wh(100.0, h as f32).unwrap();
fit_to = FitTo::Height(h);
fit_to = FitTo::Height(h as f32);
} else if let Some(z) = args.zoom {
fit_to = FitTo::Zoom(z);
}
Expand Down Expand Up @@ -702,20 +701,21 @@ fn render_svg(args: &Args, tree: &usvg::Tree) -> Result<tiny_skia::Pixmap, Strin

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

// 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")?;
tiny_skia::Pixmap::new(size.width().ceil() as u32, size.height().ceil() as u32)
.ok_or("cannot create pixmap")?;

if !args.export_area_page {
if let Some(background) = args.background {
pixmap.fill(svg_to_skia_color(background));
}
}

let ts = args.fit_to.fit_to_transform(tree.size().to_int_size());
let ts = args.fit_to.fit_to_transform(tree.size());

resvg::render_node(node, ts, &mut pixmap.as_mut());

Expand All @@ -724,12 +724,13 @@ 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())
.fit_to_size(tree.size())
.ok_or("target size is zero")?;

// 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")?;
let mut page_pixmap =
tiny_skia::Pixmap::new(size.width().ceil() as u32, size.height().ceil() as u32)
.ok_or("cannot create pixmap")?;

if let Some(background) = args.background {
page_pixmap.fill(svg_to_skia_color(background));
Expand All @@ -750,18 +751,19 @@ fn render_svg(args: &Args, tree: &usvg::Tree) -> Result<tiny_skia::Pixmap, Strin
} else {
let size = args
.fit_to
.fit_to_size(tree.size().to_int_size())
.fit_to_size(tree.size())
.ok_or("target size is zero")?;

// 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")?;
tiny_skia::Pixmap::new(size.width().ceil() as u32, size.height().ceil() as u32)
.ok_or("cannot create pixmap")?;

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

let ts = args.fit_to.fit_to_transform(tree.size().to_int_size());
let ts = args.fit_to.fit_to_transform(tree.size());

resvg::render(tree, ts, &mut pixmap.as_mut());

Expand Down
Loading