Skip to content

LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust

Merge main into fix-2284-heif-exif

tecari03ae66b2d2fe7
diff --cc Cargo.lock
index e836d6ba2,378669bb9..f287e2fa9
--- a/Cargo.lock
+++ b/Cargo.lock
@@@ -3376,13 -3594,13 +3594,14 @@@ dependencies =
[[package]]
name = "lightcraft-meta"
- version = "0.9.1"
+ version = "0.14.0"
dependencies = [
+ "chrono",
"lightcraft-geom",
+ "lightcraft-heif",
"lightcraft-tiff",
"proptest",
- "quick-xml 0.38.4",
+ "quick-xml 0.41.0",
"serde",
"serde_json",
]
diff --cc crates/meta/Cargo.toml
index 26dffbadb,22538aee8..4f2fad315
--- a/crates/meta/Cargo.toml
+++ b/crates/meta/Cargo.toml
@@@ -13,9 -13,8 +13,10 @@@ lightcraft-tiff = { workspace = true
lightcraft-geom = { workspace = true }
serde = { workspace = true }
quick-xml = { workspace = true }
+ chrono = { workspace = true }
[dev-dependencies]
+# Lossless synthetic HEIC files: the HEIF item reader is proved against a real container writer.
+lightcraft-heif = { workspace = true, features = ["testdata"] }
proptest = { workspace = true }
serde_json = { workspace = true }
diff --cc crates/meta/src/container.rs
index b15251cca,3cfb7e287..e73159d22
--- a/crates/meta/src/container.rs
+++ b/crates/meta/src/container.rs
@@@ -7,10 -7,10 +7,12 @@@
//! - WebP (RIFF container spec): `EXIF`, `XMP `, `ICCP` chunks.
//! - TIFF-based files (TIFF, DNG and most raws): the whole file is the Exif block; XMP (700), ICC (34675) and
//! IPTC (33723) from IFD0.
+ //! - Photoshop PSD/PSB: EXIF (image resource 1058) and XMP (image resource 1060) from the bounded image-resource section.
+ //! - Minolta MRW (see [`crate::mrw`]): the `TTW` block is the Exif block.
//! - Canon CR3 (ISO base media file, see [`crate::cr3`]): `CMT1`/`CMT2`/`CMT4` merged into one Exif block; the
//! XMP `uuid` box.
+//! - HEIF/HEIC/AVIF (ISO base media file, see [`crate::heif`]): the `Exif` item's TIFF stream and the XMP
+//! `mime` item.
use lightcraft_tiff::{Tiff, tags};
diff --cc crates/meta/src/lib.rs
index 04fe3b532,46c7a1043..7f3d088c5
--- a/crates/meta/src/lib.rs
+++ b/crates/meta/src/lib.rs
@@@ -7,9 -7,8 +7,10 @@@
//! - [`parse_xmp`] / [`write_xmp`] — XMP packets (interchange fields + the opaque `lc:settings` JSON).
//! - [`parse_iptc`] — IPTC-IIM record 2 datasets.
//! - [`parse_gpx`] — GPS track logs (GPX) for geotagging by capture time.
- //! - [`extract`] — all of the above for a whole file (JPEG, PNG, WebP, TIFF/DNG/raw, Canon CR3, HEIF/HEIC/AVIF).
-//! - [`extract`] — all of the above for a whole file (JPEG, PNG, WebP, TIFF/DNG/raw, PSD/PSB, Canon CR3).
++//! - [`extract`] — all of the above for a whole file (JPEG, PNG, WebP, TIFF/DNG/raw, PSD/PSB, Canon CR3,
++//! HEIF/HEIC/AVIF).
//! - [`cr3`] — the Canon CR3 container (metadata blocks, XMP, the JPEG and raw tracks).
+//! - [`heif`] — the HEIF/HEIC/AVIF container's Exif and XMP items (no HEVC decoder needed).
#![forbid(unsafe_code)]
mod container;
@@@ -19,8 -18,9 +20,10 @@@ mod exif
pub mod focus;
mod focus_read;
mod gpx;
+pub mod heif;
mod iptc;
+ pub mod mrw;
+ mod psd;
pub mod tags;
mod xmp;
mod xmp_merge;