From 51bfc6b21fc283eed716e12d4f338ce5a91c0a5e Mon Sep 17 00:00:00 2001 From: KAMADA Ken'ichi Date: Wed, 26 Jul 2017 23:27:48 +0900 Subject: [PATCH] Align the offset handling of unknown types with the doc comment. --- src/tiff.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tiff.rs b/src/tiff.rs index ce32aac..3b32737 100644 --- a/src/tiff.rs +++ b/src/tiff.rs @@ -103,6 +103,7 @@ fn parse_ifd(data: &[u8], offset: usize, ctx: Context, thumbnail: bool) Error::InvalidFormat("Invalid entry count"))); let val; if unitlen == 0 { + let ofs = offset + 2 + i * 12 + 8; val = Value::Unknown(typ, cnt as u32, ofs as u32); } else if vallen <= 4 { val = parser(data, offset + 2 + i * 12 + 8, cnt); @@ -228,6 +229,6 @@ mod tests { \0\x01\x01\0\xff\xff\0\0\0\x01\0\x14\0\0\0\0\0\0"; let (v, _) = parse_exif(data).unwrap(); assert_eq!(v.len(), 1); - assert_pat!(v[0].value, Value::Unknown(0xffff, 1, 0x140000)); + assert_pat!(v[0].value, Value::Unknown(0xffff, 1, 0x12)); } }