Fix compiler and clippy warnings

This commit is contained in:
Birk Tjelmeland committed 2019-02-28 07:58:07 +01:00
1 parent 2ff0934354
commit 5c3f50f800
3 files changed
+20 -23

No files matched your search

+4 -4
View File
@@ -171,7 +171,7 @@ impl Entry {
},
(Type::SHORT, n) => {
// each value is ~8 bytes
if n as u64*8 > limits.decoding_buffer_size {
if u64::from(n)*8 > limits.decoding_buffer_size {
return Err(TiffError::LimitsExceeded)
}
let mut v = Vec::with_capacity(n as usize);
@@ -184,7 +184,7 @@ impl Entry {
(Type::LONG, 1) => Ok(Unsigned(try!(self.r(bo).read_u32()))),
(Type::LONG, n) => {
// each value is ~8 bytes
if n as u64*8 > limits.decoding_buffer_size {
if u64::from(n)*8 > limits.decoding_buffer_size {
return Err(TiffError::LimitsExceeded)
}
let mut v = Vec::with_capacity(n as usize);
@@ -202,7 +202,7 @@ impl Entry {
},
(Type::RATIONAL, n) => {
// each value is ~8 bytes
if n as u64*8 > limits.decoding_buffer_size {
if u64::from(n)*8 > limits.decoding_buffer_size {
return Err(TiffError::LimitsExceeded)
}
let mut v = Vec::with_capacity(n as usize);
@@ -215,7 +215,7 @@ impl Entry {
Ok(List(v))
},
(Type::ASCII, n) => {
if n as u64 > limits.decoding_buffer_size {
if u64::from(n) > limits.decoding_buffer_size {
return Err(TiffError::LimitsExceeded)
}
try!(decoder.goto_offset(try!(self.r(bo).read_u32())));