From 2d572c0370d7e007274c35ec020074cbe9b73151 Mon Sep 17 00:00:00 2001 From: Jonathan Behrens Date: Thu, 6 Jan 2022 22:22:21 -0500 Subject: [PATCH] Remove Decoder::byte_order --- src/decoder/mod.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs index 75b3cbe..a355327 100644 --- a/src/decoder/mod.rs +++ b/src/decoder/mod.rs @@ -361,7 +361,6 @@ where R: Read + Seek, { reader: SmartReader, - byte_order: ByteOrder, bigtiff: bool, limits: Limits, next_ifd: Option, @@ -575,7 +574,6 @@ impl Decoder { let mut decoder = Decoder { reader, - byte_order, bigtiff, limits: Default::default(), next_ifd, @@ -810,7 +808,7 @@ impl Decoder { /// Returns the byte_order pub fn byte_order(&self) -> ByteOrder { - self.byte_order + self.reader.byte_order } fn read_ifd_offset_nonrepeating(&mut self) -> TiffResult { @@ -1257,6 +1255,7 @@ impl Decoder { ) -> TiffResult<()> { let color_type = self.colortype()?; let byte_len = buffer.byte_len(); + let byte_order = self.reader.byte_order; let tile_attrs = self.tile_attributes.as_mut().unwrap(); let (padding_right, padding_down) = tile_attrs.get_padding(tile); @@ -1304,7 +1303,7 @@ impl Decoder { io::copy(&mut reader.by_ref().take(len), &mut io::sink())?; } - Self::fix_endianness(&mut buffer.subrange(row_start..row_end), self.byte_order); + Self::fix_endianness(&mut buffer.subrange(row_start..row_end), byte_order); if self.photometric_interpretation == PhotometricInterpretation::WhiteIsZero { Self::invert_colors(&mut buffer.subrange(row_start..row_end), color_type);