Fix formatting
This commit is contained in:
1 parent
593479e5e3
commit
01df985ef8
3 files changed
+18
-12
No files matched your search
+12
-6
@@ -562,12 +562,16 @@ impl Entry {
|
|||||||
Type::DOUBLE => self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| {
|
Type::DOUBLE => self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| {
|
||||||
Ok(Double(reader.read_f64()?))
|
Ok(Double(reader.read_f64()?))
|
||||||
}),
|
}),
|
||||||
Type::RATIONAL => self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| {
|
Type::RATIONAL => {
|
||||||
|
self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| {
|
||||||
Ok(Rational(reader.read_u32()?, reader.read_u32()?))
|
Ok(Rational(reader.read_u32()?, reader.read_u32()?))
|
||||||
}),
|
})
|
||||||
Type::SRATIONAL => self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| {
|
}
|
||||||
|
Type::SRATIONAL => {
|
||||||
|
self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| {
|
||||||
Ok(SRational(reader.read_i32()?, reader.read_i32()?))
|
Ok(SRational(reader.read_i32()?, reader.read_i32()?))
|
||||||
}),
|
})
|
||||||
|
}
|
||||||
Type::LONG8 => self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| {
|
Type::LONG8 => self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| {
|
||||||
Ok(UnsignedBig(reader.read_u64()?))
|
Ok(UnsignedBig(reader.read_u64()?))
|
||||||
}),
|
}),
|
||||||
@@ -580,11 +584,13 @@ impl Entry {
|
|||||||
Type::IFD8 => self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| {
|
Type::IFD8 => self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| {
|
||||||
Ok(IfdBig(reader.read_u64()?))
|
Ok(IfdBig(reader.read_u64()?))
|
||||||
}),
|
}),
|
||||||
Type::UNDEFINED => self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| {
|
Type::UNDEFINED => {
|
||||||
|
self.decode_offset(self.count, bo, bigtiff, limits, reader, |reader| {
|
||||||
let mut buf = [0; 1];
|
let mut buf = [0; 1];
|
||||||
reader.read_exact(&mut buf)?;
|
reader.read_exact(&mut buf)?;
|
||||||
Ok(Byte(buf[0]))
|
Ok(Byte(buf[0]))
|
||||||
}),
|
})
|
||||||
|
}
|
||||||
Type::ASCII => {
|
Type::ASCII => {
|
||||||
let n = usize::try_from(self.count)?;
|
let n = usize::try_from(self.count)?;
|
||||||
if n > limits.decoding_buffer_size {
|
if n > limits.decoding_buffer_size {
|
||||||
|
|||||||
+5
-2
@@ -1229,7 +1229,9 @@ impl<R: Read + Seek> Decoder<R> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if self.image().chunk_offsets[0] as usize > self.limits.intermediate_buffer_size
|
if self.image().chunk_offsets[0] as usize > self.limits.intermediate_buffer_size
|
||||||
|| self.image().chunk_bytes
|
|| self
|
||||||
|
.image()
|
||||||
|
.chunk_bytes
|
||||||
.iter()
|
.iter()
|
||||||
.any(|&x| x as usize > self.limits.intermediate_buffer_size)
|
.any(|&x| x as usize > self.limits.intermediate_buffer_size)
|
||||||
{
|
{
|
||||||
@@ -1252,7 +1254,8 @@ impl<R: Read + Seek> Decoder<R> {
|
|||||||
// TODO: avoid this clone
|
// TODO: avoid this clone
|
||||||
let jpeg_tables = self.image().jpeg_tables.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);
|
let mut decoder = jpeg::Decoder::new(jpeg_reader);
|
||||||
|
|
||||||
match decoder.decode() {
|
match decoder.decode() {
|
||||||
|
|||||||
@@ -29,10 +29,7 @@ impl<'a, R: Read + Seek> TagReader<'a, R> {
|
|||||||
)),
|
)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn find_tag_uint_vec<T: TryFrom<u64>>(
|
pub fn find_tag_uint_vec<T: TryFrom<u64>>(&mut self, tag: Tag) -> TiffResult<Option<Vec<T>>> {
|
||||||
&mut self,
|
|
||||||
tag: Tag,
|
|
||||||
) -> TiffResult<Option<Vec<T>>> {
|
|
||||||
self.find_tag(tag)?
|
self.find_tag(tag)?
|
||||||
.map(|v| v.into_u64_vec())
|
.map(|v| v.into_u64_vec())
|
||||||
.transpose()?
|
.transpose()?
|
||||||
|
|||||||
Reference in new issue
Block a user