diff --git a/src/decoder/ifd.rs b/src/decoder/ifd.rs index ce9c8e1..0b68d56 100644 --- a/src/decoder/ifd.rs +++ b/src/decoder/ifd.rs @@ -445,7 +445,7 @@ impl Entry { // 2b: the value is at most 4 bytes or doesn't fit in the offset field. return Ok(match self.type_ { Type::BYTE => Byte(self.offset[0]), - Type::SBYTE => SignedByte(i8::from(self.offset[0] as i8)), + Type::SBYTE => SignedByte(self.offset[0] as i8), Type::UNDEFINED => Byte(self.offset[0]), Type::SHORT => Short(self.r(bo).read_u16()?), Type::SSHORT => SignedShort(self.r(bo).read_i16()?), diff --git a/src/decoder/image.rs b/src/decoder/image.rs index 49510a3..e3dc31f 100644 --- a/src/decoder/image.rs +++ b/src/decoder/image.rs @@ -643,11 +643,11 @@ impl Image { self.jpeg_tables.as_deref().map(|a| &**a), )?; - if output_row_stride == chunk_row_bytes as usize { + if output_row_stride == chunk_row_bytes { let tile = &mut buf[..chunk_row_bytes * data_dims.1 as usize]; reader.read_exact(tile)?; - for row in tile.chunks_mut(chunk_row_bytes as usize) { + for row in tile.chunks_mut(chunk_row_bytes) { super::fix_endianness_and_predict( row, color_type.bit_depth(), @@ -678,11 +678,7 @@ impl Image { } } } else { - for (_i, row) in buf - .chunks_mut(output_row_stride) - .take(data_dims.1 as usize) - .enumerate() - { + for row in buf.chunks_mut(output_row_stride).take(data_dims.1 as usize) { let row = &mut row[..data_row_bytes]; reader.read_exact(row)?; diff --git a/src/encoder/mod.rs b/src/encoder/mod.rs index 1c95821..717f1f0 100644 --- a/src/encoder/mod.rs +++ b/src/encoder/mod.rs @@ -296,7 +296,7 @@ impl<'a, W: 'a + Write + Seek, K: TiffKind> DirectoryEncoder<'a, W, K> { } let entry = Self::write_value( - &mut self.writer, + self.writer, &DirectoryEntry { data_type: ::FIELD_TYPE, count: value.count().try_into()?, @@ -370,14 +370,14 @@ impl<'a, W: 'a + Write + Seek, K: TiffKind> DirectoryEncoder<'a, W, K> { if bytes.len() > in_entry_bytes { let offset = writer.offset(); - writer.write_bytes(&bytes)?; + writer.write_bytes(bytes)?; let offset = K::convert_offset(offset)?; offset_bytes[..offset.bytes()].copy_from_slice(&offset.data()); } else { // Note: we have indicated our native byte order in the header, hence this // corresponds to our byte order no matter the value type. - offset_bytes[..bytes.len()].copy_from_slice(&bytes); + offset_bytes[..bytes.len()].copy_from_slice(bytes); } // Undoing some hidden type. Offset is either u32 or u64. Due to the trait API being public diff --git a/tests/predict.rs b/tests/predict.rs index a61eb6c..59bb79c 100644 --- a/tests/predict.rs +++ b/tests/predict.rs @@ -1,7 +1,7 @@ extern crate tiff; use tiff::decoder::{Decoder, DecodingResult}; -use tiff::encoder::{colortype, Compression, Predictor, TiffEncoder}; +use tiff::encoder::{colortype, Predictor, TiffEncoder}; use tiff::ColorType; use std::fs::File;