Fix formatting

src/decoder/mod.rs

@@ -1032,11 +1032,7 @@ impl<R: Read + Seek> Decoder<R> {
         let byte_order = self.reader.byte_order;
         let compression_method = self.image().compression_method;
 
-        let reader = Self::create_reader(
+        let reader = Self::create_reader(&mut self.reader, compression_method, length)?;
-            &mut self.reader,
-            compression_method,
-            length,
-        )?;
 
         // Read into output buffer.
         {
@@ -1096,11 +1092,8 @@ impl<R: Read + Seek> Decoder<R> {
         let compression_method = self.image().compression_method;
         let photometric_interpretation = self.image().photometric_interpretation;
 
-        let mut reader = Self::create_reader(
+        let mut reader =
-            &mut self.reader,
+            Self::create_reader(&mut self.reader, compression_method, compressed_length)?;
-            compression_method,
-            compressed_length,
-        )?;
 
         for row in 0..(tile_length - padding_down) {
             let buf = match &mut buffer {

src/decoder/stream.rs

@@ -139,10 +139,7 @@ pub struct LZWReader<R: Read> {
 
 impl<R: Read> LZWReader<R> {
     /// Wraps a reader
-    pub fn new(
+    pub fn new(reader: R, compressed_length: usize) -> LZWReader<R> {
-        reader: R,
-        compressed_length: usize,
-    ) -> LZWReader<R> {
         Self {
             reader: BufReader::with_capacity(
                 (32 * 1024).min(compressed_length),
@@ -156,9 +153,7 @@ impl<R: Read> LZWReader<R> {
 impl<R: Read> Read for LZWReader<R> {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         loop {
-            let result = self
+            let result = self.decoder.decode_bytes(self.reader.fill_buf()?, buf);
-                .decoder
-                .decode_bytes(self.reader.fill_buf()?, buf);
             self.reader.consume(result.consumed_in);
 
             match result.status {