diff --git a/src/decoder/image.rs b/src/decoder/image.rs index 544ec7b..7adffc7 100644 --- a/src/decoder/image.rs +++ b/src/decoder/image.rs @@ -99,7 +99,7 @@ impl Image { let height = tag_reader.require_tag(Tag::ImageLength)?.into_u32()?; if width == 0 || height == 0 { return Err(TiffError::FormatError( - TiffFormatError::InconsistentSizesEncountered, + TiffFormatError::InvalidDimensions(width, height), )); } diff --git a/src/encoder/mod.rs b/src/encoder/mod.rs index 3547596..924ed8c 100644 --- a/src/encoder/mod.rs +++ b/src/encoder/mod.rs @@ -352,7 +352,7 @@ impl<'a, W: 'a + Write + Seek, T: ColorType, K: TiffKind, D: Compression> ) -> TiffResult { if width == 0 || height == 0 { return Err(TiffError::FormatError( - TiffFormatError::InconsistentSizesEncountered, + TiffFormatError::InvalidDimensions(width, height), )); } diff --git a/src/error.rs b/src/error.rs index 8c8ac8b..5653d00 100644 --- a/src/error.rs +++ b/src/error.rs @@ -56,6 +56,7 @@ pub enum TiffFormatError { actual_samples: usize, required_samples: usize, }, + InvalidDimensions(u32, u32), InvalidTag, InvalidTagValueType(Tag), RequiredTagNotFound(Tag), @@ -100,6 +101,7 @@ impl fmt::Display for TiffFormatError { actual_samples, required_samples ) } + InvalidDimensions(width, height) => write!(fmt, "Invalid dimensions: {}x{}.", width, height), InvalidTag => write!(fmt, "Image contains invalid tag."), InvalidTagValueType(ref tag) => { write!(fmt, "Tag `{:?}` did not have the expected value type.", tag)