From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 22 May 2021 21:27:54 +0000 (+0100)
Subject: bundles: Move BufReader back into image_usvg
X-Git-Tag: otter-0.6.0~57
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a1ebd253fc660e8479435eccd819769c308a8872;p=otter.git

bundles: Move BufReader back into image_usvg

It's base64_usvg that the actual-svg will want.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/bundles.rs b/src/bundles.rs
index 9c142899..52b2f5be 100644
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -724,8 +724,10 @@ struct Base64Meta {
 }
 
 #[throws(LE)]
-fn image_usvg(zfname: &str, mut input: BufReader<File>, output: File,
+fn image_usvg(zfname: &str, input: File, output: File,
               format: image::ImageFormat, ctype: &'static str) {
+  let mut input = BufReader::new(input);
+
   let image = image::io::Reader::with_format(&mut input, format);
   let (width, height) = image.into_dimensions().map_err(
     |e| LE::BadBundle(format!("{}: image examination failed: {}",
@@ -856,7 +858,6 @@ fn make_usvg(za: &mut IndexedZip, progress_count: &mut usize,
       dbgc!(size);
     },
     PF::Png => {
-      let input = BufReader::new(input);
       image_usvg(zf.name(),input,output, IF::Png, "image/png")?;
     },
   }