diff --git a/crates/metadata/src/exif.rs b/crates/metadata/src/exif.rs index c691b7fb0..8f23b5c7b 100644 --- a/crates/metadata/src/exif.rs +++ b/crates/metadata/src/exif.rs @@ -51,8 +51,18 @@ fn pos(v: Option) -> Option { /// the Exif's tag 700 states; a viewer displays a photo by the Exif's alone, so that one can't tell how a photo /// is stored. pub(crate) fn ifd0_orientation(bytes: &[u8]) -> Option { + ifd0_orientation_value(bytes).filter(|v| (1..=8).contains(v)).map(Orientation::from_exif) +} + +fn ifd0_orientation_value(bytes: &[u8]) -> Option { let tiff = Tiff::parse_with(strip_exif_header(bytes), &ParseOptions::default()).ok()?; - tiff.ifds.first().and_then(|i| i.u16(t::ORIENTATION)).filter(|v| (1..=8).contains(v)).map(Orientation::from_exif) + tiff.ifds.first().and_then(|i| i.u16(t::ORIENTATION)) +} + +/// Read the first IFD's orientation, treating out-of-range values as normal. +/// Missing or malformed values return `None`. +pub fn ifd0_orientation_compat(bytes: &[u8]) -> Option { + ifd0_orientation_value(bytes).map(Orientation::from_exif) } /// The ISO an Exif IFD states beyond the 16-bit ISOSpeedRatings: RecommendedExposureIndex, else diff --git a/crates/metadata/src/lib.rs b/crates/metadata/src/lib.rs index 05f9b81b4..49e1516d4 100644 --- a/crates/metadata/src/lib.rs +++ b/crates/metadata/src/lib.rs @@ -40,7 +40,7 @@ mod xmp_merge; pub use container::{Embedded, embedded, jpeg_segments, jpeg_segments_with_all_xmp, png_chunks, webp_chunks}; pub use datetime::{DatePrecision, DateTime}; -pub use exif::{from_tiff, read_exif, strip_exif_header, try_read_exif, try_read_exif_with, write_exif}; +pub use exif::{from_tiff, ifd0_orientation_compat, read_exif, strip_exif_header, try_read_exif, try_read_exif_with, write_exif}; pub use focus::FocusPoint; pub use fuji::{FujiRecipe, FujiRow, might_hold_fuji_recipe, read_recipe_file, recipe_from_bytes, recipe_from_exif}; pub use geom::{Orientation, Point, Rect}; diff --git a/crates/metadata/tests/ifd0_orientation_compat.rs b/crates/metadata/tests/ifd0_orientation_compat.rs new file mode 100644 index 000000000..948b2a388 --- /dev/null +++ b/crates/metadata/tests/ifd0_orientation_compat.rs @@ -0,0 +1,8 @@ +#[test] +fn missing_and_invalid_values_remain_distinct() { + let mut data = b"II*\0\x08\0\0\0\x01\0\x12\x01\x03\0\x01\0\0\0\x06\0\0\0\0\0\0\0".to_vec(); + assert_eq!(craft_metadata::ifd0_orientation_compat(&data).map(|o| o.to_exif()), Some(6)); + data[18] = 0; + assert_eq!(craft_metadata::ifd0_orientation_compat(&data).map(|o| o.to_exif()), Some(1)); + assert_eq!(craft_metadata::ifd0_orientation_compat(b"invalid"), None); +}