Skip to content

Read SignedByte as i8, handle casting of Byte (u8) into unsigned types #95

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
merged 2 commits into from
May 8, 2025
Merged

Read SignedByte as i8, handle casting of Byte (u8) into unsigned types #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4199623
Handle casting of Byte (u8) into other unsigned types
weiji14 May 8, 2025
f6e35e7
Cast SignedByte to i8 instead of i32
weiji14 May 8, 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
34 changes: 17 additions & 17 deletions src/metadata/reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ async fn read_tag_value<F: MetadataFetch>(
// 2b: the value is at most 4 bytes or doesn't fit in the offset field.
return Ok(match tag_type {
Type::BYTE | Type::UNDEFINED => Value::Byte(data.read_u8()?),
Type::SBYTE => Value::Signed(data.read_i8()? as i32),
Type::SBYTE => Value::SignedByte(data.read_i8()?),
Type::SHORT => Value::Short(data.read_u16()?),
Type::SSHORT => Value::SignedShort(data.read_i16()?),
Type::LONG => Value::Unsigned(data.read_u32()?),
Expand Down Expand Up @@ -418,7 +418,7 @@ async fn read_tag_value<F: MetadataFetch>(
return {
Ok(Value::List(
(0..count)
.map(|_| Value::Signed(data.read_i8().unwrap() as i32))
.map(|_| Value::SignedByte(data.read_i8().unwrap()))
.collect(),
))
}
Expand Down Expand Up @@ -511,7 +511,7 @@ async fn read_tag_value<F: MetadataFetch>(
Type::SBYTE => {
let mut v = Vec::with_capacity(count as _);
for _ in 0..count {
v.push(Value::Signed(cursor.read_i8().await? as i32))
v.push(Value::SignedByte(cursor.read_i8().await?))
}
Ok(Value::List(v))
}
Expand Down Expand Up @@ -651,8 +651,8 @@ mod test {
// /\ / \ / \ / \
([1,1, 1, 0, 1,0,0,0, 42, 0, 0, 0], Endianness::LittleEndian, Value::Byte (42 )),
([1,1, 0, 1, 0,0,0,1, 42, 0, 0, 0], Endianness::BigEndian, Value::Byte (42 )),
([1,1, 6, 0, 1,0,0,0, 42, 0, 0, 0], Endianness::LittleEndian, Value::Signed (42 )), // sbyte
([1,1, 0, 6, 0,0,0,1, 42, 0, 0, 0], Endianness::BigEndian, Value::Signed (42 )), // sbyte
([1,1, 6, 0, 1,0,0,0, 42, 0, 0, 0], Endianness::LittleEndian, Value::SignedByte(42 )),
([1,1, 0, 6, 0,0,0,1, 42, 0, 0, 0], Endianness::BigEndian, Value::SignedByte(42 )),
([1,1, 7, 0, 1,0,0,0, 42, 0, 0, 0], Endianness::LittleEndian, Value::Byte (42 )), // undefined
([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() )),
Expand Down Expand Up @@ -694,8 +694,8 @@ mod test {
// / \ 1 2 3 4 5 6 7 8 1 2 3 4 5 6 7 8
([1,1, 1, 0, 1,0,0,0,0,0,0,0, 42, 0, 0, 0, 0, 0, 0, 0], Endianness::LittleEndian, Value::Byte (42) ),
([1,1, 0, 1, 0,0,0,0,0,0,0,1, 42, 0, 0, 0, 0, 0, 0, 0], Endianness::BigEndian, Value::Byte (42) ),
([1,1, 6, 0, 1,0,0,0,0,0,0,0, 42, 0, 0, 0, 0, 0, 0, 0], Endianness::LittleEndian, Value::Signed (42) ), // sbyte
([1,1, 0, 6, 0,0,0,0,0,0,0,1, 42, 0, 0, 0, 0, 0, 0, 0], Endianness::BigEndian, Value::Signed (42) ), // sbyte
([1,1, 6, 0, 1,0,0,0,0,0,0,0, 42, 0, 0, 0, 0, 0, 0, 0], Endianness::LittleEndian, Value::SignedByte (42) ),
([1,1, 0, 6, 0,0,0,0,0,0,0,1, 42, 0, 0, 0, 0, 0, 0, 0], Endianness::BigEndian, Value::SignedByte (42) ),
([1,1, 7, 0, 1,0,0,0,0,0,0,0, 42, 0, 0, 0, 0, 0, 0, 0], Endianness::LittleEndian, Value::Byte (42) ), // undefined
([1,1, 0, 7, 0,0,0,0,0,0,0,1, 42, 0, 0, 0, 0, 0, 0, 0], Endianness::BigEndian, Value::Byte (42) ), // undefined
([1,1, 2, 0, 1,0,0,0,0,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0], Endianness::LittleEndian, Value::Ascii ("".into()) ),
Expand Down Expand Up @@ -747,10 +747,10 @@ mod test {
let cases = [
// tag type count offset
// // / \ / \ / \
([1,1, 1, 0, 4,0,0,0, 42,42,42,42], Endianness::LittleEndian, Value::List(vec![Value::Byte (42); 4]) ),
([1,1, 0, 1, 0,0,0,4, 42,42,42,42], Endianness::BigEndian, Value::List(vec![Value::Byte (42); 4]) ),
([1,1, 6, 0, 4,0,0,0, 42,42,42,42], Endianness::LittleEndian, Value::List(vec![Value::Signed (42); 4]) ), //sbyte i8
([1,1, 0, 6, 0,0,0,4, 42,42,42,42], Endianness::BigEndian, Value::List(vec![Value::Signed (42); 4]) ), //sbyte i8
([1,1, 1, 0, 4,0,0,0, 42,42,42,42], Endianness::LittleEndian, Value::List(vec![Value::Byte (42); 4]) ),
([1,1, 0, 1, 0,0,0,4, 42,42,42,42], Endianness::BigEndian, Value::List(vec![Value::Byte (42); 4]) ),
([1,1, 6, 0, 4,0,0,0, 42,42,42,42], Endianness::LittleEndian, Value::List(vec![Value::SignedByte (42); 4]) ),
([1,1, 0, 6, 0,0,0,4, 42,42,42,42], Endianness::BigEndian, Value::List(vec![Value::SignedByte (42); 4]) ),
([1,1, 7, 0, 4,0,0,0, 42,42,42,42], Endianness::LittleEndian, Value::List(vec![Value::Byte (42); 4]) ), // undefined
([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())),
Expand Down Expand Up @@ -786,8 +786,8 @@ mod test {
// / \ 1 2 3 4 5 6 7 8 1 2 3 4 5 6 7 8
([1,1, 1, 0, 8,0,0,0,0,0,0,0, 42,42,42,42,42,42,42,42], Endianness::LittleEndian, Value::List(vec![Value::Byte (42) ; 8])),
([1,1, 0, 1, 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])),
([1,1, 6, 0, 8,0,0,0,0,0,0,0, 42,42,42,42,42,42,42,42], Endianness::LittleEndian, Value::List(vec![Value::Signed (42) ; 8])), //sbyte i8
([1,1, 0, 6, 0,0,0,0,0,0,0,8, 42,42,42,42,42,42,42,42], Endianness::BigEndian, Value::List(vec![Value::Signed (42) ; 8])), //sbyte i8
([1,1, 6, 0, 8,0,0,0,0,0,0,0, 42,42,42,42,42,42,42,42], Endianness::LittleEndian, Value::List(vec![Value::SignedByte(42) ; 8])),
([1,1, 0, 6, 0,0,0,0,0,0,0,8, 42,42,42,42,42,42,42,42], Endianness::BigEndian, Value::List(vec![Value::SignedByte(42) ; 8])),
([1,1, 7, 0, 8,0,0,0,0,0,0,0, 42,42,42,42,42,42,42,42], Endianness::LittleEndian, Value::List(vec![Value::Byte (42) ; 8])), //undefined u8
([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() )),
Expand Down Expand Up @@ -829,8 +829,8 @@ mod test {
// /\ / \ / \
(vec![1,1, 1, 0, 5,0,0,0, 12, 0, 0, 0, 42,42,42,42,42], Endianness::LittleEndian, Value::List(vec![Value::Byte (42 );5])),
(vec![1,1, 0, 1, 0,0,0,5, 0, 0, 0,12, 42,42,42,42,42], Endianness::BigEndian , Value::List(vec![Value::Byte (42 );5])),
(vec![1,1, 6, 0, 5,0,0,0, 12, 0, 0, 0, 42,42,42,42,42], Endianness::LittleEndian, Value::List(vec![Value::Signed (42 );5])), // Type::SBYTE ),
(vec![1,1, 0, 6, 0,0,0,5, 0, 0, 0,12, 42,42,42,42,42], Endianness::BigEndian , Value::List(vec![Value::Signed (42 );5])), // Type::SBYTE ),
(vec![1,1, 6, 0, 5,0,0,0, 12, 0, 0, 0, 42,42,42,42,42], Endianness::LittleEndian, Value::List(vec![Value::SignedByte (42 );5])),
(vec![1,1, 0, 6, 0,0,0,5, 0, 0, 0,12, 42,42,42,42,42], Endianness::BigEndian , Value::List(vec![Value::SignedByte (42 );5])),
(vec![1,1, 7, 0, 5,0,0,0, 12, 0, 0, 0, 42,42,42,42,42], Endianness::LittleEndian, Value::List(vec![Value::Byte (42 );5])), // Type::UNDEFINED ),
(vec![1,1, 0, 7, 0,0,0,5, 0, 0, 0,12, 42,42,42,42,42], Endianness::BigEndian , Value::List(vec![Value::Byte (42 );5])), // Type::UNDEFINED ),
(vec![1,1, 2, 0, 5,0,0,0, 12, 0, 0, 0, 42,42,42,42, 0], Endianness::LittleEndian, Value::Ascii ("****".into() ) ),
Expand Down Expand Up @@ -883,8 +883,8 @@ mod test {
// / \ 1 2 3 4 5 6 7 8 1 2 3 4 5 6 7 8
(vec![1,1, 1, 0, 9,0,0,0,0,0,0,0, 20, 0, 0, 0, 0, 0, 0, 0, 42,42,42,42,42,42,42,42,42], Endianness::LittleEndian, Value::List(vec![Value::Byte (42 );9])),
(vec![1,1, 0, 1, 0,0,0,0,0,0,0,9, 0, 0, 0, 0, 0, 0, 0,20, 42,42,42,42,42,42,42,42,42], Endianness::BigEndian , Value::List(vec![Value::Byte (42 );9])),
(vec![1,1, 6, 0, 9,0,0,0,0,0,0,0, 20, 0, 0, 0, 0, 0, 0, 0, 42,42,42,42,42,42,42,42,42], Endianness::LittleEndian, Value::List(vec![Value::Signed (42 );9])), //TagType::SBYTE ),
(vec![1,1, 0, 6, 0,0,0,0,0,0,0,9, 0, 0, 0, 0, 0, 0, 0,20, 42,42,42,42,42,42,42,42,42], Endianness::BigEndian , Value::List(vec![Value::Signed (42 );9])), //TagType::SBYTE ),
(vec![1,1, 6, 0, 9,0,0,0,0,0,0,0, 20, 0, 0, 0, 0, 0, 0, 0, 42,42,42,42,42,42,42,42,42], Endianness::LittleEndian, Value::List(vec![Value::SignedByte (42 );9])),
(vec![1,1, 0, 6, 0,0,0,0,0,0,0,9, 0, 0, 0, 0, 0, 0, 0,20, 42,42,42,42,42,42,42,42,42], Endianness::BigEndian , Value::List(vec![Value::SignedByte (42 );9])),
(vec![1,1, 7, 0, 9,0,0,0,0,0,0,0, 20, 0, 0, 0, 0, 0, 0, 0, 42,42,42,42,42,42,42,42,42], Endianness::LittleEndian, Value::List(vec![Value::Byte (42 );9])), //TagType::UNDEFINED ),
(vec![1,1, 0, 7, 0,0,0,0,0,0,0,9, 0, 0, 0, 0, 0, 0, 0,20, 42,42,42,42,42,42,42,42,42], Endianness::BigEndian , Value::List(vec![Value::Byte (42 );9])), //TagType::UNDEFINED ),
(vec![1,1, 2, 0, 9,0,0,0,0,0,0,0, 20, 0, 0, 0, 0, 0, 0, 0, 42,42,42,42,42,42,42,42, 0], Endianness::LittleEndian, Value::Ascii ("********".into() ) ),
Expand Down
10 changes: 6 additions & 4 deletions src/tiff/ifd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ impl Value {

pub fn into_u16(self) -> TiffResult<u16> {
match self {
Byte(val) => Ok(val.into()),
Short(val) => Ok(val),
Unsigned(val) => Ok(u16::try_from(val)?),
UnsignedBig(val) => Ok(u16::try_from(val)?),
Expand All @@ -73,6 +74,7 @@ impl Value {

pub fn into_u32(self) -> TiffResult<u32> {
match self {
Byte(val) => Ok(val.into()),
Short(val) => Ok(val.into()),
Unsigned(val) => Ok(val),
UnsignedBig(val) => Ok(u32::try_from(val)?),
Expand All @@ -98,6 +100,7 @@ impl Value {

pub fn into_u64(self) -> TiffResult<u64> {
match self {
Byte(val) => Ok(val.into()),
Short(val) => Ok(val.into()),
Unsigned(val) => Ok(val.into()),
UnsignedBig(val) => Ok(val),
Expand Down Expand Up @@ -157,6 +160,7 @@ impl Value {
}
Ok(new_vec)
}
Byte(val) => Ok(vec![val.into()]),
Short(val) => Ok(vec![val.into()]),
Unsigned(val) => Ok(vec![val]),
UnsignedBig(val) => Ok(vec![u32::try_from(val)?]),
Expand All @@ -183,10 +187,7 @@ impl Value {
Ok(new_vec)
}
Byte(val) => Ok(vec![val]),

val => Err(TiffError::FormatError(
TiffFormatError::UnsignedIntegerExpected(val),
)),
val => Err(TiffError::FormatError(TiffFormatError::ByteExpected(val))),
}
}

Expand All @@ -199,6 +200,7 @@ impl Value {
}
Ok(new_vec)
}
Byte(val) => Ok(vec![val.into()]),
Short(val) => Ok(vec![val]),
val => Err(TiffError::FormatError(TiffFormatError::ShortExpected(val))),
}
Expand Down