From 2c76423b32b3414a9e0392d0551dd0869ab14074 Mon Sep 17 00:00:00 2001 From: Hubert Figuière Date: Wed, 3 Jan 2024 21:52:17 -0500 Subject: tiff+iterator: Properly fetch bytes from metadata MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hubert Figuière --- src/tiff/iterator.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/tiff/iterator.rs b/src/tiff/iterator.rs index 29fa5e5..414e007 100644 --- a/src/tiff/iterator.rs +++ b/src/tiff/iterator.rs @@ -83,14 +83,16 @@ fn from_entry(entry: &Entry, endian: Endian) -> MetadataValue { } exif::TagType::Float => MetadataValue::Float(entry.value_array::(endian).unwrap()), exif::TagType::Double => MetadataValue::Double(entry.value_array::(endian).unwrap()), - exif::TagType::Byte | exif::TagType::Undefined => MetadataValue::Bytes(Vec::default()), //entry.data().to_vec()) - exif::TagType::SByte => MetadataValue::SBytes(Vec::default()), //entry.data().to_vec()) + exif::TagType::Byte | exif::TagType::Undefined => { + MetadataValue::Bytes(entry.data().to_vec()) + } + exif::TagType::SByte => MetadataValue::SBytes(entry.value_array::(endian).unwrap()), exif::TagType::Short | exif::TagType::Long => { MetadataValue::Int(entry.uint_value_array(endian).unwrap()) } exif::TagType::SShort | exif::TagType::SLong => { MetadataValue::SInt(entry.int_value_array(endian).unwrap()) } - exif::TagType::Invalid => MetadataValue::Invalid(Vec::default()), //entry.data().to_vec()) + exif::TagType::Invalid => MetadataValue::Invalid(entry.data().to_vec()), } } -- cgit v1.2.3