Change minimal rustc version to 1.24.1

This commit is contained in:
Birk Tjelmeland committed 2019-05-03 23:12:29 +02:00
1 parent fa900be945
commit 514b7cddaa
7 files changed
+48 -39

No files matched your search

+6 -5
View File
@@ -2,6 +2,7 @@
use std::collections::HashMap;
use std::io::{self, Read, Seek};
use std::mem;
use super::stream::{ByteOrder, EndianReader, SmartReader};
use {TiffError, TiffFormatError, TiffResult, TiffUnsupportedError};
@@ -27,9 +28,9 @@ macro_rules! tags {
}
}
pub fn to_u16(&self) -> u16 {
match self {
match *self {
$( Tag::$tag => $val, )*
Tag::Unknown(n) => *n,
Tag::Unknown(n) => n,
}
}
}
@@ -174,7 +175,7 @@ impl Entry {
]))
}
(Type::SHORT, n) => {
if n as usize > limits.decoding_buffer_size / std::mem::size_of::<Value>() {
if n as usize > limits.decoding_buffer_size / mem::size_of::<Value>() {
return Err(TiffError::LimitsExceeded);
}
let mut v = Vec::with_capacity(n as usize);
@@ -186,7 +187,7 @@ impl Entry {
}
(Type::LONG, 1) => Ok(Unsigned(try!(self.r(bo).read_u32()))),
(Type::LONG, n) => {
if n as usize > limits.decoding_buffer_size / std::mem::size_of::<Value>() {
if n as usize > limits.decoding_buffer_size / mem::size_of::<Value>() {
return Err(TiffError::LimitsExceeded);
}
let mut v = Vec::with_capacity(n as usize);
@@ -203,7 +204,7 @@ impl Entry {
Ok(Rational(numerator, denominator))
}
(Type::RATIONAL, n) => {
if n as usize > limits.decoding_buffer_size / std::mem::size_of::<Value>() {
if n as usize > limits.decoding_buffer_size / mem::size_of::<Value>() {
return Err(TiffError::LimitsExceeded);
}
let mut v = Vec::with_capacity(n as usize);