Parse RATIONAL fields.
This commit is contained in:
parent
e84675d5a7
commit
3788c45482
|
@ -32,6 +32,7 @@ pub use tag::Tag;
|
||||||
pub use tiff::Field;
|
pub use tiff::Field;
|
||||||
pub use tiff::parse_exif;
|
pub use tiff::parse_exif;
|
||||||
pub use value::Value;
|
pub use value::Value;
|
||||||
|
pub use value::Rational;
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
|
|
51
src/value.rs
51
src/value.rs
|
@ -24,6 +24,8 @@
|
||||||
// SUCH DAMAGE.
|
// SUCH DAMAGE.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
use std::fmt;
|
||||||
|
|
||||||
use endian::Endian;
|
use endian::Endian;
|
||||||
|
|
||||||
/// Types and values of TIFF fields (for Exif attributes).
|
/// Types and values of TIFF fields (for Exif attributes).
|
||||||
|
@ -39,12 +41,24 @@ pub enum Value<'a> {
|
||||||
Short(Vec<u16>),
|
Short(Vec<u16>),
|
||||||
/// Vector of 32-bit unsigned integers.
|
/// Vector of 32-bit unsigned integers.
|
||||||
Long(Vec<u32>),
|
Long(Vec<u32>),
|
||||||
|
/// Vector of unsigned rationals.
|
||||||
|
/// An unsigned rational number is a pair of 32-bit unsigned integers.
|
||||||
|
Rational(Vec<Rational>),
|
||||||
/// The type is unknown to this implementation.
|
/// The type is unknown to this implementation.
|
||||||
/// The associated values are the type and the count, and the
|
/// The associated values are the type and the count, and the
|
||||||
/// offset of the "Value Offset" element.
|
/// offset of the "Value Offset" element.
|
||||||
Unknown(u16, u32, u32),
|
Unknown(u16, u32, u32),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// An unsigned rational number, which is a pair of 32-bit unsigned integers.
|
||||||
|
pub struct Rational { pub num: u32, pub denom: u32 }
|
||||||
|
|
||||||
|
impl fmt::Debug for Rational {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||||
|
write!(f, "Rational({}/{})", self.num, self.denom)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
type Parser<'a> = fn(&'a [u8], usize, usize) -> Value<'a>;
|
type Parser<'a> = fn(&'a [u8], usize, usize) -> Value<'a>;
|
||||||
|
|
||||||
// Return the length of a single value and the parser of the type.
|
// Return the length of a single value and the parser of the type.
|
||||||
|
@ -55,6 +69,7 @@ pub fn get_type_info<'a, E>(typecode: u16)
|
||||||
2 => (1, parse_ascii),
|
2 => (1, parse_ascii),
|
||||||
3 => (2, parse_short::<E>),
|
3 => (2, parse_short::<E>),
|
||||||
4 => (4, parse_long::<E>),
|
4 => (4, parse_long::<E>),
|
||||||
|
5 => (8, parse_rational::<E>),
|
||||||
_ => (0, parse_unknown),
|
_ => (0, parse_unknown),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -94,6 +109,18 @@ fn parse_long<'a, E>(data: &'a [u8], offset: usize, count: usize)
|
||||||
Value::Long(val)
|
Value::Long(val)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn parse_rational<'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(Rational {
|
||||||
|
num: E::loadu32(data, offset + i * 8),
|
||||||
|
denom: E::loadu32(data, offset + i * 8 + 4),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Value::Rational(val)
|
||||||
|
}
|
||||||
|
|
||||||
// This is a dummy function and will never be called.
|
// This is a dummy function and will never be called.
|
||||||
#[allow(unused_variables)]
|
#[allow(unused_variables)]
|
||||||
fn parse_unknown<'a>(data: &'a [u8], offset: usize, count: usize)
|
fn parse_unknown<'a>(data: &'a [u8], offset: usize, count: usize)
|
||||||
|
@ -175,4 +202,28 @@ mod tests {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rational() {
|
||||||
|
let sets: &[(&[u8], Vec<Rational>)] = &[
|
||||||
|
(b"x", vec![]),
|
||||||
|
(b"x\xa1\x02\x03\x04\x05\x06\x07\x08\
|
||||||
|
\x09\x0a\x0b\x0c\xbd\x0e\x0f\x10",
|
||||||
|
vec![Rational { num: 0xa1020304, denom: 0x05060708 },
|
||||||
|
Rational { num: 0x090a0b0c, denom: 0xbd0e0f10 }]),
|
||||||
|
];
|
||||||
|
let (unitlen, parser) = get_type_info::<BigEndian>(5);
|
||||||
|
for &(data, ref ans) in sets {
|
||||||
|
assert!((data.len() - 1) % unitlen == 0);
|
||||||
|
match parser(data, 1, (data.len() - 1) / unitlen) {
|
||||||
|
Value::Rational(v) => {
|
||||||
|
assert_eq!(v.len(), ans.len());
|
||||||
|
for (x, y) in v.iter().zip(ans.iter()) {
|
||||||
|
assert!(x.num == y.num && x.denom == y.denom);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
v => panic!("wrong variant {:?}", v),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue