Cast Short to u16 instead of u32

Adapted from 84ff679
image-rs · Jul 22, 2024 · 36f8ee0 · 36f8ee0
1 parent 5808cd0
commit 36f8ee0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/decoder/ifd.rs b/src/decoder/ifd.rs
@@ -161,6 +161,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]),
@@ -283,6 +284,7 @@ impl Value {
                 }
                 Ok(new_vec)
             }
+            Short(val) => Ok(vec![val.into()]),
             Unsigned(val) => Ok(vec![val.into()]),
             UnsignedBig(val) => Ok(vec![val]),
             Rational(numerator, denominator) => Ok(vec![numerator.into(), denominator.into()]),
@@ -431,7 +433,7 @@ impl Entry {
                 Type::BYTE => Unsigned(u32::from(self.offset[0])),
                 Type::SBYTE => Signed(i32::from(self.offset[0] as i8)),
                 Type::UNDEFINED => Byte(self.offset[0]),
-                Type::SHORT => Unsigned(u32::from(self.r(bo).read_u16()?)),
+                Type::SHORT => Short(self.r(bo).read_u16()?),
                 Type::SSHORT => Signed(i32::from(self.r(bo).read_i16()?)),
                 Type::LONG => Unsigned(self.r(bo).read_u32()?),
                 Type::SLONG => Signed(self.r(bo).read_i32()?),