Adjust field names based on review

This commit is contained in:
Andreas Molzer committed 2020-12-06 02:34:59 +01:00
1 parent 4d8c64bf1e
commit 6d7d92c605
2 files changed
+20 -14

No files matched your search

+5 -5
View File
@@ -813,8 +813,8 @@ impl<R: Read + Seek> Decoder<R> {
if bytes / buffer.byte_len() > strip_sample_count {
return Err(TiffError::FormatError(
TiffFormatError::UnexpectedCompressedData {
actual: bytes,
required: strip_sample_count * buffer.byte_len(),
actual_bytes: bytes,
required_bytes: strip_sample_count * buffer.byte_len(),
},
));
}
@@ -1048,9 +1048,9 @@ impl<R: Read + Seek> Decoder<R> {
if units_read < buffer_size {
return Err(TiffError::FormatError(
TiffFormatError::InconsistentStripElements {
actual: units_read,
required: buffer_size,
TiffFormatError::InconsistentStripSamples {
actual_samples: units_read,
required_samples: buffer_size,
},
));
}
+15 -9
View File
@@ -44,12 +44,12 @@ pub enum TiffFormatError {
ImageFileDirectoryNotFound,
InconsistentSizesEncountered,
UnexpectedCompressedData {
actual: usize,
required: usize,
actual_bytes: usize,
required_bytes: usize,
},
InconsistentStripElements {
actual: usize,
required: usize,
InconsistentStripSamples {
actual_samples: usize,
required_samples: usize,
},
InvalidTag,
InvalidTagValueType(Tag),
@@ -74,18 +74,24 @@ impl fmt::Display for TiffFormatError {
TiffSignatureInvalid => write!(fmt, "TIFF signature invalid."),
ImageFileDirectoryNotFound => write!(fmt, "Image file directory not found."),
InconsistentSizesEncountered => write!(fmt, "Inconsistent sizes encountered."),
UnexpectedCompressedData { actual, required } => {
UnexpectedCompressedData {
actual_bytes,
required_bytes,
} => {
write!(
fmt,
"Decompression returned different amount of bytes than expected: got {}, expected {}.",
actual, required
actual_bytes, required_bytes
)
}
InconsistentStripElements { actual, required } => {
InconsistentStripSamples {
actual_samples,
required_samples,
} => {
write!(
fmt,
"Inconsistent elements in strip: got {}, expected {}.",
actual, required
actual_samples, required_samples
)
}
InvalidTag => write!(fmt, "Image contains invalid tag."),