Merge pull request #134 from RReverser/remove-inflate-error

Remove InflateError
This commit is contained in:
Jonathan Behrens authored and GitHub committed 2021-05-15 16:50:36 -04:00
commit 9fe9b2e0a0
2 files changed
-12

No files matched your search

-9
View File
@@ -61,8 +61,6 @@ pub enum TiffFormatError {
ByteExpected(Value), ByteExpected(Value),
UnsignedIntegerExpected(Value), UnsignedIntegerExpected(Value),
SignedIntegerExpected(Value), SignedIntegerExpected(Value),
#[allow(deprecated)]
InflateError(InflateError),
Format(String), Format(String),
RequiredTagEmpty(Tag), RequiredTagEmpty(Tag),
#[doc(hidden)] #[doc(hidden)]
@@ -113,7 +111,6 @@ impl fmt::Display for TiffFormatError {
SignedIntegerExpected(ref val) => { SignedIntegerExpected(ref val) => {
write!(fmt, "Expected signed integer, {:?} found.", val) write!(fmt, "Expected signed integer, {:?} found.", val)
} }
InflateError(_) => write!(fmt, "Failed to decode inflate data."),
Format(ref val) => write!(fmt, "Invalid format: {:?}.", val), Format(ref val) => write!(fmt, "Invalid format: {:?}.", val),
RequiredTagEmpty(ref val) => write!(fmt, "Required tag {:?} was empty.", val), RequiredTagEmpty(ref val) => write!(fmt, "Required tag {:?} was empty.", val),
__NonExhaustive => unreachable!(), __NonExhaustive => unreachable!(),
@@ -121,12 +118,6 @@ impl fmt::Display for TiffFormatError {
} }
} }
/// Decompression failed due to faulty compressed data.
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
#[allow(deprecated)]
#[deprecated = "This type is not used anymore: deflate errors are now propagated as regular `io::Error`s"]
pub struct InflateError(());
/// The Decoder does not support features required by the image. /// The Decoder does not support features required by the image.
/// ///
/// This only captures known failures for which the standard either does not require support or an /// This only captures known failures for which the standard either does not require support or an
-3
View File
@@ -17,9 +17,6 @@ pub mod tags;
pub use self::error::{TiffError, TiffFormatError, TiffResult, TiffUnsupportedError, UsageError}; pub use self::error::{TiffError, TiffFormatError, TiffResult, TiffUnsupportedError, UsageError};
#[allow(deprecated)]
pub use self::error::InflateError;
/// An enumeration over supported color types and their bit depths /// An enumeration over supported color types and their bit depths
#[derive(Copy, PartialEq, Eq, Debug, Clone, Hash)] #[derive(Copy, PartialEq, Eq, Debug, Clone, Hash)]
pub enum ColorType { pub enum ColorType {