From 01df985ef8f67e6670734626d866826677f6a4fd Mon Sep 17 00:00:00 2001 From: Jonathan Behrens Date: Wed, 12 Jan 2022 20:13:23 -0500 Subject: [PATCH] Fix formatting --- src/decoder/ifd.rs | 28 +++++++++++++++++----------- src/decoder/mod.rs | 7 +++++-- src/decoder/stream.rs | 2 +- src/decoder/tag_reader.rs | 5 +---- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/decoder/ifd.rs b/src/decoder/ifd.rs index b326433..bea51a1 100644 --- a/src/decoder/ifd.rs +++ b/src/decoder/ifd.rs @@ -562,12 +562,16 @@ impl Entry { Type::DOUBLE => self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| { Ok(Double(reader.read_f64()?)) }), - Type::RATIONAL => self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| { - Ok(Rational(reader.read_u32()?, reader.read_u32()?)) - }), - Type::SRATIONAL => self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| { - Ok(SRational(reader.read_i32()?, reader.read_i32()?)) - }), + Type::RATIONAL => { + self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| { + Ok(Rational(reader.read_u32()?, reader.read_u32()?)) + }) + } + Type::SRATIONAL => { + self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| { + Ok(SRational(reader.read_i32()?, reader.read_i32()?)) + }) + } Type::LONG8 => self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| { Ok(UnsignedBig(reader.read_u64()?)) }), @@ -580,11 +584,13 @@ impl Entry { Type::IFD8 => self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| { Ok(IfdBig(reader.read_u64()?)) }), - Type::UNDEFINED => self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| { - let mut buf = [0; 1]; - reader.read_exact(&mut buf)?; - Ok(Byte(buf[0])) - }), + Type::UNDEFINED => { + self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| { + let mut buf = [0; 1]; + reader.read_exact(&mut buf)?; + Ok(Byte(buf[0])) + }) + } Type::ASCII => { let n = usize::try_from(self.count)?; if n > limits.decoding_buffer_size { diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs index 766336e..b3a5ae8 100644 --- a/src/decoder/mod.rs +++ b/src/decoder/mod.rs @@ -1229,7 +1229,9 @@ impl Decoder { } if self.image().chunk_offsets[0] as usize > self.limits.intermediate_buffer_size - || self.image().chunk_bytes + || self + .image() + .chunk_bytes .iter() .any(|&x| x as usize > self.limits.intermediate_buffer_size) { @@ -1252,7 +1254,8 @@ impl Decoder { // TODO: avoid this clone let jpeg_tables = self.image().jpeg_tables.clone(); - let jpeg_reader = JpegReader::new(&mut self.reader, u32::try_from(length)?, &jpeg_tables)?; + let jpeg_reader = + JpegReader::new(&mut self.reader, u32::try_from(length)?, &jpeg_tables)?; let mut decoder = jpeg::Decoder::new(jpeg_reader); match decoder.decode() { diff --git a/src/decoder/stream.rs b/src/decoder/stream.rs index a482826..bd247a4 100644 --- a/src/decoder/stream.rs +++ b/src/decoder/stream.rs @@ -340,7 +340,7 @@ where SmartReader { reader, byte_order } } pub fn into_inner(self) -> R { - self.reader + self.reader } } impl SmartReader { diff --git a/src/decoder/tag_reader.rs b/src/decoder/tag_reader.rs index 6691964..837da40 100644 --- a/src/decoder/tag_reader.rs +++ b/src/decoder/tag_reader.rs @@ -29,10 +29,7 @@ impl<'a, R: Read + Seek> TagReader<'a, R> { )), } } - pub fn find_tag_uint_vec>( - &mut self, - tag: Tag, - ) -> TiffResult>> { + pub fn find_tag_uint_vec>(&mut self, tag: Tag) -> TiffResult>> { self.find_tag(tag)? .map(|v| v.into_u64_vec()) .transpose()?