summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@gnome.org>2021-02-02 15:18:26 -0600
committerSven Neumann <sven@svenfoo.org>2021-02-03 11:18:02 +0100
commit43028204be1a6e699d426ab044e1f3f4cff05aba (patch)
tree39d3808dc90b1f6fa2299d6cad85c346c21d4fb2
parent92c6575d0f8bd0cd5b0de571d7fd8dcdc520dd4f (diff)
downloadlibrsvg-43028204be1a6e699d426ab044e1f3f4cff05aba.tar.gz
Avoid a couple of temporary values
-rw-r--r--src/bin/rsvg-convert.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/bin/rsvg-convert.rs b/src/bin/rsvg-convert.rs
index a40df856..43cd4644 100644
--- a/src/bin/rsvg-convert.rs
+++ b/src/bin/rsvg-convert.rs
@@ -458,9 +458,9 @@ impl Converter {
}
fn natural_size(&self, renderer: &CairoRenderer, input: &Input) -> Result<Size, Error> {
- let (w, h) = renderer
+ renderer
.legacy_layer_geometry(self.export_id.as_deref())
- .map(|(ink_r, _)| (ink_r.width, ink_r.height))
+ .map(|(ink_r, _)| Size::new(ink_r.width, ink_r.height))
.map_err(|e| match e {
RenderingError::IdNotFound => error!(
"File {} does not have an object with id \"{}\")",
@@ -468,9 +468,7 @@ impl Converter {
self.export_id.as_deref().unwrap()
),
_ => error!("Error rendering SVG {}: {}", input, e),
- })?;
-
- Ok(Size::new(w, h))
+ })
}
fn final_size(