Switch to miniz_oxide crate for DEFLATE decompression

Cargo.toml

@@ -21,7 +21,7 @@ byteorder = "1.2"
 lzw = "0.10"
 num-derive = "0.3"
 num-traits = "0.2"
-libflate = "0.1" # TODO: Put behind a feature?
+miniz_oxide = "0.3" # TODO: Put behind a feature?
 
 [dev-dependencies]
 tempfile = "3.0"

src/decoder/mod.rs

@@ -580,9 +580,7 @@ impl<R: Read + Seek> Decoder<R> {
                 (bytes, Box::new(reader))
             }
             CompressionMethod::OldDeflate => {
-                let (bytes, reader) = DeflateReader::new(
+                let (bytes, reader) = DeflateReader::new(&mut self.reader)?;
-                    &mut self.reader,
-                    max_uncompressed_length)?;
                 (bytes, Box::new(reader))
             }
             method => {

src/decoder/stream.rs

@@ -3,7 +3,7 @@
 use byteorder::{BigEndian, LittleEndian, ReadBytesExt};
 use lzw;
 use std::io::{self, Read, Seek};
-use libflate::zlib;
+use miniz_oxide::inflate;
 
 /// Byte order of the TIFF file.
 #[derive(Clone, Copy, Debug)]
@@ -77,16 +77,20 @@ pub struct DeflateReader {
 impl DeflateReader {
     pub fn new<R: Read + Seek>(
         reader: &mut SmartReader<R>,
-        max_uncompressed_length: usize,
     ) -> io::Result<(usize, Self)> {
         let byte_order = reader.byte_order;
-        let mut decoder = zlib::Decoder::new(reader)?;
+        let mut compressed = Vec::new();
-        let mut uncompressed = Vec::with_capacity(max_uncompressed_length);
+        reader.read_to_end(&mut compressed)?;
-        let bytes_read = decoder.read_to_end(&mut uncompressed)?;
+        let uncompressed = inflate::decompress_to_vec_zlib(&compressed).map_err(|error| {
-        Ok((bytes_read, Self {
+            std::io::Error::new(std::io::ErrorKind::InvalidData, format!("DEFLATE error: {:?}", error))
+        })?;
+        Ok((
+            uncompressed.len(),
+            Self {
                 byte_order,
                 buffer: io::Cursor::new(uncompressed),
-        }))
+            },
+        ))
     }
 }
 

src/error.rs

@@ -138,7 +138,7 @@ impl Error for TiffError {
         }
     }
 
-    fn cause(&self) -> Option<&Error> {
+    fn cause(&self) -> Option<& dyn Error> {
         match *self {
             TiffError::IoError(ref e) => Some(e),
             _ => None,

src/lib.rs

@@ -8,7 +8,7 @@
 
 extern crate byteorder;
 extern crate lzw;
-extern crate libflate;
+extern crate miniz_oxide;
 #[macro_use]
 extern crate num_derive;
 extern crate num_traits;