diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs index a200f37..48ee92e 100644 --- a/src/decoder/mod.rs +++ b/src/decoder/mod.rs @@ -1032,17 +1032,11 @@ impl Decoder { self.goto_offset_u64(offset)?; let byte_order = self.reader.byte_order; - let photometric_interpretation = self.image().photometric_interpretation; let compression_method = self.image().compression_method; let jpeg_tables = self.image().jpeg_tables.clone(); - let reader = Self::create_reader( - &mut self.reader, - photometric_interpretation, - compression_method, - length, - jpeg_tables, - )?; + let reader = + Self::create_reader(&mut self.reader, compression_method, length, jpeg_tables)?; // Read into output buffer. { @@ -1105,7 +1099,6 @@ impl Decoder { let mut reader = Self::create_reader( &mut self.reader, - photometric_interpretation, compression_method, compressed_length, jpeg_tables, @@ -1149,7 +1142,6 @@ impl Decoder { fn create_reader<'r>( reader: &'r mut SmartReader, - photometric_interpretation: PhotometricInterpretation, compression_method: CompressionMethod, compressed_length: u64, jpeg_tables: Option>>, @@ -1170,12 +1162,7 @@ impl Decoder { )); } - let jpeg_reader = JpegReader::new( - reader, - compressed_length, - jpeg_tables, - &photometric_interpretation, - )?; + let jpeg_reader = JpegReader::new(reader, compressed_length, jpeg_tables)?; let mut decoder = jpeg::Decoder::new(jpeg_reader); let data = decoder.decode().unwrap(); diff --git a/src/decoder/stream.rs b/src/decoder/stream.rs index b125bff..5e8ffdd 100644 --- a/src/decoder/stream.rs +++ b/src/decoder/stream.rs @@ -192,8 +192,6 @@ impl Read for LZWReader { pub(crate) struct JpegReader { jpeg_tables: Option>>, - photometric_interpretation: Option, - buffer: io::Cursor>, offset: usize, @@ -216,7 +214,6 @@ impl JpegReader { reader: &mut SmartReader, length: u64, jpeg_tables: Option>>, - photometric_interpretation: &PhotometricInterpretation, ) -> io::Result where R: Read + Seek, @@ -247,14 +244,12 @@ impl JpegReader { Ok(JpegReader { buffer, jpeg_tables: Some(jpeg_tables), - photometric_interpretation: Some(*photometric_interpretation), offset: 0, }) } None => Ok(JpegReader { buffer: io::Cursor::new(segment), jpeg_tables: None, - photometric_interpretation: None, offset: 0, }), }