From 547b6503fbe07e0faaf39a970bbb22ac9954201c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 22 May 2021 22:18:25 +0100 Subject: [PATCH] bundles: Move BufReader out of image_usvg Signed-off-by: Ian Jackson --- src/bundles.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bundles.rs b/src/bundles.rs index ceb2929a..9b285562 100644 --- a/src/bundles.rs +++ b/src/bundles.rs @@ -717,7 +717,7 @@ enum PictureFormat { } #[throws(LE)] -fn image_usvg(zfname: &str, input: File, output: File, +fn image_usvg(zfname: &str, mut input: BufReader, output: File, format: image::ImageFormat, ctype: &'static str) { #[derive(Serialize,Copy,Clone,Debug)] struct Render { @@ -726,7 +726,6 @@ fn image_usvg(zfname: &str, input: File, output: File, ctype: &'static str, } - let mut input = BufReader::new(input); let mut output = BufWriter::new(output); let image = image::io::Reader::with_format(&mut input, format); @@ -850,7 +849,10 @@ fn make_usvg(za: &mut IndexedZip, progress_count: &mut usize, let size = usvg_size(&mut BufReader::new(t_f))?; dbgc!(size); }, - PF::Png => image_usvg(zf.name(),input,output, IF::Png, "image/png")?, + PF::Png => { + let input = BufReader::new(input); + image_usvg(zf.name(),input,output, IF::Png, "image/png")?; + }, } } -- 2.30.2