From ff33343372ee38d544111049bf8aecb3cf144116 Mon Sep 17 00:00:00 2001 From: Jonathan Behrens Date: Fri, 15 Apr 2022 11:28:56 -0400 Subject: [PATCH] Fix formatting --- src/decoder/mod.rs | 13 +++---------- src/decoder/stream.rs | 9 ++------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs index 04f00a7..8884c87 100644 --- a/src/decoder/mod.rs +++ b/src/decoder/mod.rs @@ -1032,11 +1032,7 @@ impl Decoder { let byte_order = self.reader.byte_order; let compression_method = self.image().compression_method; - let reader = Self::create_reader( - &mut self.reader, - compression_method, - length, - )?; + let reader = Self::create_reader(&mut self.reader, compression_method, length)?; // Read into output buffer. { @@ -1096,11 +1092,8 @@ impl Decoder { let compression_method = self.image().compression_method; let photometric_interpretation = self.image().photometric_interpretation; - let mut reader = Self::create_reader( - &mut self.reader, - compression_method, - compressed_length, - )?; + let mut reader = + Self::create_reader(&mut self.reader, compression_method, compressed_length)?; for row in 0..(tile_length - padding_down) { let buf = match &mut buffer { diff --git a/src/decoder/stream.rs b/src/decoder/stream.rs index 37a1a1d..75d45fd 100644 --- a/src/decoder/stream.rs +++ b/src/decoder/stream.rs @@ -139,10 +139,7 @@ pub struct LZWReader { impl LZWReader { /// Wraps a reader - pub fn new( - reader: R, - compressed_length: usize, - ) -> LZWReader { + pub fn new(reader: R, compressed_length: usize) -> LZWReader { Self { reader: BufReader::with_capacity( (32 * 1024).min(compressed_length), @@ -156,9 +153,7 @@ impl LZWReader { impl Read for LZWReader { fn read(&mut self, buf: &mut [u8]) -> io::Result { loop { - let result = self - .decoder - .decode_bytes(self.reader.fill_buf()?, buf); + let result = self.decoder.decode_bytes(self.reader.fill_buf()?, buf); self.reader.consume(result.consumed_in); match result.status {