Skip to content

Read SignedShort as i16, add TiffFormatError::ShortExpected #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weiji14 merged 9 commits into from
May 7, 2025
Merged

Read SignedShort as i16, add TiffFormatError::ShortExpected #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1805fb6
Add TiffFormatError::ShortExpected enum variant
weiji14 May 5, 2025
1046499
Allow casting Short u16 values to Vec<u32>
weiji14 May 5, 2025
43251bb
Cast SignedShort to i16 instead of i32
weiji14 May 5, 2025
ed49eb5
Fixed unit tests that incorrectly decoded SShort as Short
weiji14 May 5, 2025
f90ca86
Align some lines
weiji14 May 5, 2025
380bdb6
Raise TiffFormatError:ShortExpected in into_u16_vec
weiji14 May 5, 2025
7d4aa19
Merge branch 'main' into sshort_i16
weiji14 May 7, 2025
098e756
Remove sshort comments
weiji14 May 7, 2025
23a6e5d
More Signed -> SignedShort conversions for reading tags (Case 4)
weiji14 May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions src/metadata/reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ async fn read_tag_value<F: MetadataFetch>(
Type::BYTE | Type::UNDEFINED => Value::Byte(data.read_u8()?),
Type::SBYTE => Value::Signed(data.read_i8()? as i32),
Type::SHORT => Value::Short(data.read_u16()?),
Type::SSHORT => Value::Signed(data.read_i16()? as i32),
Type::SSHORT => Value::SignedShort(data.read_i16()?),
Type::LONG => Value::Unsigned(data.read_u32()?),
Type::SLONG => Value::Signed(data.read_i32()?),
Type::FLOAT => Value::Float(data.read_f32()?),
Expand Down Expand Up @@ -446,7 +446,7 @@ async fn read_tag_value<F: MetadataFetch>(
Type::SSHORT => {
let mut v = Vec::new();
for _ in 0..count {
v.push(Value::Signed(i32::from(data.read_i16()?)));
v.push(Value::SignedShort(data.read_i16()?));
}
return Ok(Value::List(v));
}
Expand Down Expand Up @@ -525,7 +525,7 @@ async fn read_tag_value<F: MetadataFetch>(
Type::SSHORT => {
let mut v = Vec::with_capacity(count as _);
for _ in 0..count {
v.push(Value::Signed(cursor.read_i16().await? as i32))
v.push(Value::SignedShort(cursor.read_i16().await?))
}
Ok(Value::List(v))
}
Expand Down Expand Up @@ -657,10 +657,10 @@ mod test {
([1,1, 0, 7, 0,0,0,1, 42, 0, 0, 0], Endianness::BigEndian, Value::Byte (42 )), // undefined
([1,1, 2, 0, 1,0,0,0, 0, 0, 0, 0], Endianness::LittleEndian, Value::Ascii ("".into() )),
([1,1, 0, 2, 0,0,0,1, 0, 0, 0, 0], Endianness::BigEndian, Value::Ascii ("".into() )),
([1,1, 3, 0, 1,0,0,0, 42, 0, 0, 0], Endianness::LittleEndian, Value::Short (42 )),
([1,1, 0, 3, 0,0,0,1, 0,42, 0, 0], Endianness::BigEndian, Value::Short (42 )),
([1,1, 8, 0, 1,0,0,0, 42, 0, 0, 0], Endianness::LittleEndian, Value::Signed (42 )), // signedshort
([1,1, 0, 8, 0,0,0,1, 0,42, 0, 0], Endianness::BigEndian, Value::Signed (42 )), // signedshort
([1,1, 3, 0, 1,0,0,0, 42, 0, 0, 0], Endianness::LittleEndian, Value::Short (42 )),
([1,1, 0, 3, 0,0,0,1, 0,42, 0, 0], Endianness::BigEndian, Value::Short (42 )),
([1,1, 8, 0, 1,0,0,0, 42, 0, 0, 0], Endianness::LittleEndian, Value::SignedShort (42 )),
([1,1, 0, 8, 0,0,0,1, 0,42, 0, 0], Endianness::BigEndian, Value::SignedShort (42 )),
([1,1, 4, 0, 1,0,0,0, 42, 0, 0, 0], Endianness::LittleEndian, Value::Unsigned (42 )),
([1,1, 0, 4, 0,0,0,1, 0, 0, 0,42], Endianness::BigEndian, Value::Unsigned (42 )),
([1,1, 9, 0, 1,0,0,0, 42, 0, 0, 0], Endianness::LittleEndian, Value::Signed (42 )),
Expand Down Expand Up @@ -702,8 +702,8 @@ mod test {
([1,1, 0, 2, 0,0,0,0,0,0,0,1, 0, 0, 0, 0, 0, 0, 0, 0], Endianness::BigEndian, Value::Ascii ("".into()) ),
([1,1, 3, 0, 1,0,0,0,0,0,0,0, 42, 0, 0, 0, 0, 0, 0, 0], Endianness::LittleEndian, Value::Short (42) ),
([1,1, 0, 3, 0,0,0,0,0,0,0,1, 0,42, 0, 0, 0, 0, 0, 0], Endianness::BigEndian, Value::Short (42) ),
([1,1, 8, 0, 1,0,0,0,0,0,0,0, 42, 0, 0, 0, 0, 0, 0, 0], Endianness::LittleEndian, Value::Signed (42) ), //sshort
([1,1, 0, 8, 0,0,0,0,0,0,0,1, 0,42, 0, 0, 0, 0, 0, 0], Endianness::BigEndian, Value::Signed (42) ), //sshort
([1,1, 8, 0, 1,0,0,0,0,0,0,0, 42, 0, 0, 0, 0, 0, 0, 0], Endianness::LittleEndian, Value::SignedShort(42) ),
([1,1, 0, 8, 0,0,0,0,0,0,0,1, 0,42, 0, 0, 0, 0, 0, 0], Endianness::BigEndian, Value::SignedShort(42) ),
([1,1, 4, 0, 1,0,0,0,0,0,0,0, 42, 0, 0, 0, 0, 0, 0, 0], Endianness::LittleEndian, Value::Unsigned (42) ),
([1,1, 0, 4, 0,0,0,0,0,0,0,1, 0, 0, 0,42, 0, 0, 0, 0], Endianness::BigEndian, Value::Unsigned (42) ),
([1,1, 9, 0, 1,0,0,0,0,0,0,0, 42, 0, 0, 0, 0, 0, 0, 0], Endianness::LittleEndian, Value::Signed (42) ),
Expand Down Expand Up @@ -755,10 +755,10 @@ mod test {
([1,1, 0, 7, 0,0,0,4, 42,42,42,42], Endianness::BigEndian, Value::List(vec![Value::Byte (42); 4]) ), // undefined
([1,1, 2, 0, 4,0,0,0, 42,42,42, 0], Endianness::LittleEndian, Value::Ascii("***".into())),
([1,1, 0, 2, 0,0,0,4, 42,42,42, 0], Endianness::BigEndian, Value::Ascii("***".into())),
([1,1, 3, 0, 2,0,0,0, 42, 0,42, 0], Endianness::LittleEndian, Value::List(vec![Value::Short (42); 2]) ),
([1,1, 0, 3, 0,0,0,2, 0,42, 0,42], Endianness::BigEndian, Value::List(vec![Value::Short (42); 2]) ),
([1,1, 8, 0, 2,0,0,0, 42, 0,42, 0], Endianness::LittleEndian, Value::List(vec![Value::Signed (42); 2]) ), //sshort i16
([1,1, 0, 8, 0,0,0,2, 0,42, 0,42], Endianness::BigEndian, Value::List(vec![Value::Signed (42); 2]) ), //sshort i16
([1,1, 3, 0, 2,0,0,0, 42, 0,42, 0], Endianness::LittleEndian, Value::List(vec![Value::Short (42); 2]) ),
([1,1, 0, 3, 0,0,0,2, 0,42, 0,42], Endianness::BigEndian, Value::List(vec![Value::Short (42); 2]) ),
([1,1, 8, 0, 2,0,0,0, 42, 0,42, 0], Endianness::LittleEndian, Value::List(vec![Value::SignedShort (42); 2]) ),
([1,1, 0, 8, 0,0,0,2, 0,42, 0,42], Endianness::BigEndian, Value::List(vec![Value::SignedShort (42); 2]) ),
([1,1, 0, 2, 0,0,0,4, b'A',b'B',b'C',0], Endianness::BigEndian, Value::Ascii("ABC".into())),
// others don't fit, neither 8-types and we special-case IFD
];
Expand Down Expand Up @@ -792,10 +792,10 @@ mod test {
([1,1, 0, 7, 0,0,0,0,0,0,0,8, 42,42,42,42,42,42,42,42], Endianness::BigEndian, Value::List(vec![Value::Byte (42) ; 8])), //undefined u8
([1,1, 2, 0, 8,0,0,0,0,0,0,0, 42,42,42,42,42,42,42, 0], Endianness::LittleEndian, Value::Ascii ("*******".into() )),
([1,1, 0, 2, 0,0,0,0,0,0,0,8, 42,42,42,42,42,42,42, 0], Endianness::BigEndian, Value::Ascii ("*******".into() )),
([1,1, 3, 0, 4,0,0,0,0,0,0,0, 42, 0,42, 0,42, 0,42, 0], Endianness::LittleEndian, Value::List(vec![Value::Short (42) ; 4])),
([1,1, 0, 3, 0,0,0,0,0,0,0,4, 0,42, 0,42, 0,42, 0,42], Endianness::BigEndian, Value::List(vec![Value::Short (42) ; 4])),
([1,1, 8, 0, 4,0,0,0,0,0,0,0, 42, 0,42, 0,42, 0,42, 0], Endianness::LittleEndian, Value::List(vec![Value::Signed (42) ; 4])), //sshort i16
([1,1, 0, 8, 0,0,0,0,0,0,0,4, 0,42, 0,42, 0,42, 0,42], Endianness::BigEndian, Value::List(vec![Value::Signed (42) ; 4])), //sshort i16
([1,1, 3, 0, 4,0,0,0,0,0,0,0, 42, 0,42, 0,42, 0,42, 0], Endianness::LittleEndian, Value::List(vec![Value::Short (42) ; 4])),
([1,1, 0, 3, 0,0,0,0,0,0,0,4, 0,42, 0,42, 0,42, 0,42], Endianness::BigEndian, Value::List(vec![Value::Short (42) ; 4])),
([1,1, 8, 0, 4,0,0,0,0,0,0,0, 42, 0,42, 0,42, 0,42, 0], Endianness::LittleEndian, Value::List(vec![Value::SignedShort (42) ; 4])),
([1,1, 0, 8, 0,0,0,0,0,0,0,4, 0,42, 0,42, 0,42, 0,42], Endianness::BigEndian, Value::List(vec![Value::SignedShort (42) ; 4])),
([1,1, 4, 0, 2,0,0,0,0,0,0,0, 42, 0, 0, 0,42, 0, 0, 0], Endianness::LittleEndian, Value::List(vec![Value::Unsigned (42) ; 2])),
([1,1, 0, 4, 0,0,0,0,0,0,0,2, 0, 0, 0,42, 0, 0, 0,42], Endianness::BigEndian, Value::List(vec![Value::Unsigned (42) ; 2])),
([1,1, 9, 0, 2,0,0,0,0,0,0,0, 42, 0, 0, 0,42, 0, 0, 0], Endianness::LittleEndian, Value::List(vec![Value::Signed (42) ; 2])),
Expand Down Expand Up @@ -837,8 +837,8 @@ mod test {
(vec![1,1, 0, 2, 0,0,0,5, 0, 0, 0,12, 42,42,42,42, 0], Endianness::BigEndian , Value::Ascii ("****".into() ) ),
(vec![1,1, 3, 0, 3,0,0,0, 12, 0, 0, 0, 42, 0,42, 0,42, 0], Endianness::LittleEndian, Value::List(vec![Value::Short (42 );3])),
(vec![1,1, 0, 3, 0,0,0,3, 0, 0, 0,12, 0,42, 0,42, 0,42], Endianness::BigEndian , Value::List(vec![Value::Short (42 );3])),
(vec![1,1, 8, 0, 3,0,0,0, 12, 0, 0, 0, 42, 0,42, 0,42, 0], Endianness::LittleEndian, Value::List(vec![Value::Signed (42 );3])), // Type::SSHORT ),
(vec![1,1, 0, 8, 0,0,0,3, 0, 0, 0,12, 0,42, 0,42, 0,42], Endianness::BigEndian , Value::List(vec![Value::Signed (42 );3])), // Type::SSHORT ),
(vec![1,1, 8, 0, 3,0,0,0, 12, 0, 0, 0, 42, 0,42, 0,42, 0], Endianness::LittleEndian, Value::List(vec![Value::SignedShort(42 );3])),
(vec![1,1, 0, 8, 0,0,0,3, 0, 0, 0,12, 0,42, 0,42, 0,42], Endianness::BigEndian , Value::List(vec![Value::SignedShort(42 );3])),
(vec![1,1, 4, 0, 2,0,0,0, 12, 0, 0, 0, 42, 0, 0, 0,42, 0, 0, 0], Endianness::LittleEndian, Value::List(vec![Value::Unsigned (42 );2])),
(vec![1,1, 0, 4, 0,0,0,2, 0, 0, 0,12, 0, 0, 0,42, 0, 0, 0,42], Endianness::BigEndian , Value::List(vec![Value::Unsigned (42 );2])),
(vec![1,1, 9, 0, 2,0,0,0, 12, 0, 0, 0, 42, 0, 0, 0,42, 0, 0, 0], Endianness::LittleEndian, Value::List(vec![Value::Signed (42 );2])),
Expand Down Expand Up @@ -891,8 +891,8 @@ mod test {
(vec![1,1, 0, 2, 0,0,0,0,0,0,0,9, 0, 0, 0, 0, 0, 0, 0,20, 42,42,42,42,42,42,42,42, 0], Endianness::BigEndian , Value::Ascii ("********".into() ) ),
(vec![1,1, 3, 0, 5,0,0,0,0,0,0,0, 20, 0, 0, 0, 0, 0, 0, 0, 42, 0,42, 0,42, 0,42, 0,42, 0], Endianness::LittleEndian, Value::List(vec![Value::Short (42 );5])),
(vec![1,1, 0, 3, 0,0,0,0,0,0,0,5, 0, 0, 0, 0, 0, 0, 0,20, 0,42, 0,42, 0,42, 0,42, 0,42], Endianness::BigEndian , Value::List(vec![Value::Short (42 );5])),
(vec![1,1, 8, 0, 5,0,0,0,0,0,0,0, 20, 0, 0, 0, 0, 0, 0, 0, 42, 0,42, 0,42, 0,42, 0,42, 0], Endianness::LittleEndian, Value::List(vec![Value::Signed (42 );5])), //TagType::SSHORT ),
(vec![1,1, 0, 8, 0,0,0,0,0,0,0,5, 0, 0, 0, 0, 0, 0, 0,20, 0,42, 0,42, 0,42, 0,42, 0,42], Endianness::BigEndian , Value::List(vec![Value::Signed (42 );5])), //TagType::SSHORT ),
(vec![1,1, 8, 0, 5,0,0,0,0,0,0,0, 20, 0, 0, 0, 0, 0, 0, 0, 42, 0,42, 0,42, 0,42, 0,42, 0], Endianness::LittleEndian, Value::List(vec![Value::SignedShort(42 );5])),
(vec![1,1, 0, 8, 0,0,0,0,0,0,0,5, 0, 0, 0, 0, 0, 0, 0,20, 0,42, 0,42, 0,42, 0,42, 0,42], Endianness::BigEndian , Value::List(vec![Value::SignedShort(42 );5])),
(vec![1,1, 4, 0, 3,0,0,0,0,0,0,0, 20, 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, 0,42, 0, 0, 0,42, 0, 0, 0], Endianness::LittleEndian, Value::List(vec![Value::Unsigned (42 );3])),
(vec![1,1, 0, 4, 0,0,0,0,0,0,0,3, 0, 0, 0, 0, 0, 0, 0,20, 0, 0, 0,42, 0, 0, 0,42, 0, 0, 0,42], Endianness::BigEndian , Value::List(vec![Value::Unsigned (42 );3])),
(vec![1,1, 9, 0, 3,0,0,0,0,0,0,0, 20, 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, 0,42, 0, 0, 0,42, 0, 0, 0], Endianness::LittleEndian, Value::List(vec![Value::Signed (42 );3])),
Expand Down
2 changes: 2 additions & 0 deletions src/tiff/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ pub enum TiffFormatError {
UnknownPlanarConfiguration(u16),
ByteExpected(Value),
SignedByteExpected(Value),
ShortExpected(Value),
SignedShortExpected(Value),
UnsignedIntegerExpected(Value),
SignedIntegerExpected(Value),
Expand Down Expand Up @@ -117,6 +118,7 @@ impl fmt::Display for TiffFormatError {
}
ByteExpected(ref val) => write!(fmt, "Expected byte, {:?} found.", val),
SignedByteExpected(ref val) => write!(fmt, "Expected signed byte, {:?} found.", val),
ShortExpected(ref val) => write!(fmt, "Expected short, {:?} found.", val),
SignedShortExpected(ref val) => write!(fmt, "Expected signed short, {:?} found.", val),
UnsignedIntegerExpected(ref val) => {
write!(fmt, "Expected unsigned integer, {:?} found.", val)
Expand Down
9 changes: 3 additions & 6 deletions src/tiff/ifd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@ impl Value {
Short(val) => Ok(val),
Unsigned(val) => Ok(u16::try_from(val)?),
UnsignedBig(val) => Ok(u16::try_from(val)?),
val => Err(TiffError::FormatError(
TiffFormatError::UnsignedIntegerExpected(val),
)),
val => Err(TiffError::FormatError(TiffFormatError::ShortExpected(val))),
}
}

Expand Down Expand Up @@ -159,6 +157,7 @@ impl Value {
}
Ok(new_vec)
}
Short(val) => Ok(vec![val.into()]),
Unsigned(val) => Ok(vec![val]),
UnsignedBig(val) => Ok(vec![u32::try_from(val)?]),
Rational(numerator, denominator) => Ok(vec![numerator, denominator]),
Expand Down Expand Up @@ -201,9 +200,7 @@ impl Value {
Ok(new_vec)
}
Short(val) => Ok(vec![val]),
val => Err(TiffError::FormatError(
TiffFormatError::UnsignedIntegerExpected(val),
)),
val => Err(TiffError::FormatError(TiffFormatError::ShortExpected(val))),
}
}

Expand Down