Merge pull request #1696 from storytold/codex/psd-head-metadata

Share PSD EXIF and XMP resource selection
This commit is contained in:
FredApps authored and GitHub committed 2026-11-16 06:48:01 +01:00
commit a1540d3039
2 files changed
+30

No files matched your search

+16
View File
@@ -369,6 +369,22 @@ fn layer_selection_ids(data: &[u8]) -> Result<Vec<u32>> {
(0..count).map(|_| r.u32()).collect()
}
/// Read the unique EXIF and XMP image resources, rejecting duplicates and invalid XMP UTF-8.
/// EXIF bytes retain any optional container prefix; trailing XMP NULs are removed.
pub fn unique_exif_xmp(resources: &[ImageResource]) -> Option<(Option<&[u8]>, Option<&str>)> {
let (mut exif, mut xmp) = (None, None);
for resource in resources {
match resource.id {
ids::EXIF if exif.is_some() => return None,
ids::EXIF => exif = Some(resource.data.as_slice()),
ids::XMP if xmp.is_some() => return None,
ids::XMP => xmp = Some(std::str::from_utf8(&resource.data).ok()?.trim_end_matches('\0')),
_ => {}
}
}
Some((exif, xmp))
}
impl ImageResource {
/// A new `8BIM` resource with an empty name.
pub fn new(id: u16, data: Vec<u8>) -> Self {
+14
View File
@@ -0,0 +1,14 @@
use craft_psd::ImageResource;
use craft_psd::resources::{ids, unique_exif_xmp};
#[test]
fn metadata_resources_reject_duplicates_and_invalid_xmp() {
let exif = ImageResource::new(ids::EXIF, b"Exif\0\0II*\0".to_vec());
let xmp = ImageResource::new(ids::XMP, b"<x/>\0".to_vec());
let resources = [exif.clone(), xmp.clone()];
assert_eq!(unique_exif_xmp(&resources), Some((Some(b"Exif\0\0II*\0".as_slice()), Some("<x/>"))));
assert!(unique_exif_xmp(&[exif.clone(), exif]).is_none());
assert!(unique_exif_xmp(&[xmp.clone(), xmp]).is_none());
assert!(unique_exif_xmp(&[ImageResource::new(ids::XMP, vec![255])]).is_none());
assert_eq!(unique_exif_xmp(&[]), Some((None, None)));
}