diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs
index c22f6eb..03975fc 100644
--- a/src/decoder/mod.rs
+++ b/src/decoder/mod.rs
@@ -1209,6 +1209,9 @@ impl<R: Read + Seek> Decoder<R> {
         self.goto_offset_u64(offset)?;
 
         let line_samples = output_width * self.image().bits_per_sample.len();
+        let padding_right_samples = chunk_info.padding_right() * self.image().bits_per_sample.len();
+        let row_samples = chunk_info.data_width * self.image().bits_per_sample.len();
+
         let photometric_interpretation = self.image().photometric_interpretation;
         let compression_method = self.image().compression_method;
         let jpeg_tables = self.image().jpeg_tables.clone();
diff --git a/src/decoder/stream.rs b/src/decoder/stream.rs
index 5e8ffdd..159c179 100644
--- a/src/decoder/stream.rs
+++ b/src/decoder/stream.rs
@@ -4,8 +4,6 @@ use std::convert::TryFrom;
 use std::io::{self, BufRead, BufReader, Read, Seek, SeekFrom, Take};
 use std::sync::Arc;
 
-use crate::tags::PhotometricInterpretation;
-
 /// Byte order of the TIFF file.
 #[derive(Clone, Copy, Debug)]
 pub enum ByteOrder {