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);
+7 -6
View File
@@ -1,6 +1,7 @@
use num_traits::{FromPrimitive, Num};
use std::collections::HashMap;
use std::io::{self, Read, Seek};
use std::cmp;
use {ColorType, TiffError, TiffFormatError, TiffResult, TiffUnsupportedError};
@@ -38,7 +39,7 @@ impl DecodingResult {
}
pub fn as_buffer(&mut self, start: usize) -> DecodingBuffer {
match self {
match *self {
DecodingResult::U8(ref mut buf) => DecodingBuffer::U8(&mut buf[start..]),
DecodingResult::U16(ref mut buf) => DecodingBuffer::U16(&mut buf[start..]),
}
@@ -55,14 +56,14 @@ pub enum DecodingBuffer<'a> {
impl<'a> DecodingBuffer<'a> {
fn len(&self) -> usize {
match self {
match *self {
DecodingBuffer::U8(ref buf) => buf.len(),
DecodingBuffer::U16(ref buf) => buf.len(),
}
}
fn byte_len(&self) -> usize {
match self {
match *self {
DecodingBuffer::U8(_) => 1,
DecodingBuffer::U16(_) => 2,
}
@@ -72,7 +73,7 @@ impl<'a> DecodingBuffer<'a> {
where
'a: 'b,
{
match self {
match *self {
DecodingBuffer::U8(ref mut buf) => DecodingBuffer::U8(buf),
DecodingBuffer::U16(ref mut buf) => DecodingBuffer::U16(buf),
}
@@ -661,7 +662,7 @@ impl<R: Read + Seek> Decoder<R> {
.get_tag_u32(ifd::Tag::RowsPerStrip)
.unwrap_or(self.height) as usize;
let strip_height = std::cmp::min(
let strip_height = cmp::min(
rows_per_strip,
self.height as usize - index * rows_per_strip,
);
@@ -716,7 +717,7 @@ impl<R: Read + Seek> Decoder<R> {
.get_tag_u32(ifd::Tag::RowsPerStrip)
.unwrap_or(self.height) as usize;
let strip_height = std::cmp::min(
let strip_height = cmp::min(
rows_per_strip,
self.height as usize - index * rows_per_strip,
);