diff --git a/src/endian.rs b/src/endian.rs index 1ff4eeb..3ad4435 100644 --- a/src/endian.rs +++ b/src/endian.rs @@ -33,6 +33,7 @@ use std::mem; pub trait Endian { fn loadu16(buf: &[u8], from: usize) -> u16; fn loadu32(buf: &[u8], from: usize) -> u32; + fn loadu64(buf: &[u8], from: usize) -> u64; } pub struct BigEndian; @@ -55,11 +56,13 @@ macro_rules! generate_load { impl Endian for BigEndian { generate_load!(loadu16, u16, from_be); generate_load!(loadu32, u32, from_be); + generate_load!(loadu64, u64, from_be); } impl Endian for LittleEndian { generate_load!(loadu16, u16, from_le); generate_load!(loadu32, u32, from_le); + generate_load!(loadu64, u64, from_le); } #[cfg(test)] @@ -86,6 +89,22 @@ mod tests { 0x05040302); } + #[test] + fn loadu64() { + assert_eq!(BigEndian::loadu64(&[0x01, 0x02, 0x03, 0x04, + 0x05, 0x06, 0x07, 0x08], 0), + 0x0102030405060708); + assert_eq!(BigEndian::loadu64(&[0x01, 0x02, 0x03, 0x04, 0x05, + 0x06, 0x07, 0x08, 0x09], 1), + 0x0203040506070809); + assert_eq!(LittleEndian::loadu64(&[0x01, 0x02, 0x03, 0x04, + 0x05, 0x06, 0x07, 0x08], 0), + 0x0807060504030201); + assert_eq!(LittleEndian::loadu64(&[0x01, 0x02, 0x03, 0x04, 0x05, + 0x06, 0x07, 0x08, 0x09], 1), + 0x0908070605040302); + } + #[test] fn dispatch() { fn dispatch_sub(data: &[u8]) -> u16 where E: Endian { diff --git a/src/value.rs b/src/value.rs index e5e55a9..0379e87 100644 --- a/src/value.rs +++ b/src/value.rs @@ -59,6 +59,9 @@ pub enum Value<'a> { /// Vector of 32-bit (single precision) floating-point numbers. /// Unused in the Exif specification. Float(Vec), + /// Vector of 64-bit (double precision) floating-point numbers. + /// Unused in the Exif specification. + Double(Vec), /// The type is unknown to this implementation. /// The associated values are the type and the count, and the /// offset of the "Value Offset" element. @@ -100,6 +103,7 @@ pub fn get_type_info<'a, E>(typecode: u16) 9 => (4, parse_slong::), 10 => (8, parse_srational::), 11 => (4, parse_float::), + 12 => (8, parse_double::), _ => (0, parse_unknown), } } @@ -204,6 +208,16 @@ fn parse_float<'a, E>(data: &'a [u8], offset: usize, count: usize) Value::Float(val) } +// TIFF and Rust use IEEE 754 format, so no conversion is required. +fn parse_double<'a, E>(data: &'a [u8], offset: usize, count: usize) + -> Value<'a> where E: Endian { + let mut val = Vec::with_capacity(count); + for i in 0..count { + val.push(unsafe { mem::transmute(E::loadu64(data, offset + i * 8)) }); + } + Value::Double(val) +} + // This is a dummy function and will never be called. #[allow(unused_variables)] fn parse_unknown<'a>(data: &'a [u8], offset: usize, count: usize) @@ -415,4 +429,23 @@ mod tests { } } } + + #[test] + fn double() { + let sets: &[(&[u8], Vec)] = &[ + (b"x", vec![]), + (b"x\x7f\xef\xff\xff\xff\xff\xff\xff\ + \x80\x10\x00\x00\x00\x00\x00\x00\ + \x40\x00\x00\x00\x00\x00\x00\x00", + vec![::std::f64::MAX, -::std::f64::MIN_POSITIVE, 2.0]), + ]; + let (unitlen, parser) = get_type_info::(12); + for &(data, ref ans) in sets { + assert!((data.len() - 1) % unitlen == 0); + match parser(data, 1, (data.len() - 1) / unitlen) { + Value::Double(v) => assert_eq!(v, *ans), + v => panic!("wrong variant {:?}", v), + } + } + } }