Skip to content

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

Merge PR #1614 (rebased)

Brandon Thomas0fb809c671d5
diff --cc crates/merge/src/hdr.rs
index af1d6d25b,912766d2c..dd1a9ee53
--- a/crates/merge/src/hdr.rs
+++ b/crates/merge/src/hdr.rs
@@@ -275,21 -292,29 +295,35 @@@ pub fn merge_hdr(mut frames: Vec<Frame>
}
None => Plane::new(0, 0),
};
+ // per-frame results in the caller's order
+ let mut ev_in = vec![0.0; n];
+ let mut alignments_in = vec![Alignment::identity(); n];
+ for (p, &i) in input.iter().enumerate() {
+ ev_in[i] = ev[p];
+ alignments_in[i] = alignments[p].clone();
+ }
+ let ev_exif = ev_exif.map(|e: Vec<f64>| {
+ let mut v = vec![0.0; n];
+ for (p, &i) in input.iter().enumerate() {
+ v[i] = e[p];
+ }
+ v
+ });
let rf = &frames[reference];
+ // the merge's white balance is the median of its inputs', as a panorama's: a CR2's or NEF's colour tags have none
+ let wb_multipliers = consensus_multipliers(&frames);
+ let mut color = rf.color.clone();
+ if let Some(multipliers) = wb_multipliers {
+ color.set_as_shot_multipliers(multipliers);
+ }
Ok(HdrResult {
radiance: out,
ghost,
- reference,
- ev,
+ reference: input[reference],
+ ev: ev_in,
ev_exif,
- alignments,
+ alignments: alignments_in,
- color: rf.color.clone(),
+ color,
raw: rf.raw,
orientation: rf.orientation,
metadata: rf.metadata.clone(),
diff --cc docs/parity-checklist.md
index a077edf44,a5d5bdd56..86e8b5679
--- a/docs/parity-checklist.md
+++ b/docs/parity-checklist.md
@@@ -796,11 -797,7 +796,12 @@@ Latin stays upright. Advanced Japanese
| Date | Change | Summary |
|---|---|---|
+| 2026-10-12 | minor | LR-EDIT-OPTICS-PROFILE: Sony ARW shading, CA and distortion tables decoded with settings and provenance (raw IFD, `SR2SubIFD` fallback); applied corrections unchanged (ILCE-7RM4A and ILCE-7RM6 distortion); status unchanged (🟡) |
+| 2026-10-14 | minor | LR-IMP-CAMERA-COVERAGE: Camera-coverage sweep (#1327): 30 models verified on 40 CC0 files (coverage.py 515 → 545 verified); sensor verification does not establish colour parity (#1277); status unchanged (🟡) |
+| 2026-10-13 | minor | LR-MERGE-PANO: a panorama's DNG takes its `AsShotNeutral` from the median of its frames' vendor white-balance multipliers (CR2, NEF, ARW…) instead of the first frame's tags, and frames now carry the multipliers (issue #1144); status unchanged (✅) |
+| 2026-10-13 | minor | LR-MERGE-HDR: an HDR merge's DNG takes its `AsShotNeutral` from the median of its inputs' vendor white-balance multipliers instead of the reference frame's tags (issue #1144); status unchanged (🟡) |
+| 2026-10-13 | minor | LR-VIEW-FOCUSPOINT (new, 🟡): the camera's focus point from Sony α1 / A7S III maker notes, drawn in Detail, Compare and Survey, the Info panel's Focus row, and Z zooming to it; photos already in the library read in the background, header only (#1480) |
+ | 2026-10-14 | patch | LR-MERGE-HDR: the merge no longer depends on the order of its frames, and pixels next to clipped photosites lose their weight with them (no magenta fringes along clipped windows); status unchanged (🟡) |
| 2026-10-14 | minor | LR-IMP-CAMERA-COVERAGE: 17 uncompressed Olympus and Samsung Adobe models verified on one CC0 file each; status unchanged (🟡) |
| 2026-10-13 | minor | LR-EDIT-SECTION-SOLO: Solo Mode for Edit sections (Window ▸ Edit Sections, section-header menu, ⌥-click); KEYC-PANELS notes it |
| 2026-10-14 | minor | LR-MERGE-HDR ✅ → 🟡: tested on real 67 MP Sony brackets; moving clipped highlights (black-hole stars) and dark-sky ghosts fixed, merge memory cut ~25 %; AI Denoise on merged DNGs, JPEG response curves and per-frame memory remain (gap 29). LR-MERGE-HEADLESS, MENU-PHOTO-MERGE: HDR for Each Bracket Set (`merge.hdrBatch`) |
diff --cc docs/whats-new.md
index d51759908,1c167fed5..20bde58af
--- a/docs/whats-new.md
+++ b/docs/whats-new.md
@@@ -145,18 -121,13 +145,25 @@@
- A spot with Feather at 0 no longer draws black pixels exactly on its radius. This also fixes spots at 0% Opacity
changing pixels along their edge. The hard edge now leaves pixels on the radius unchanged.
+### Where the camera focused
+- **View ▸ Show Focus Point** (⌥F) draws the autofocus frame the camera recorded over the photo, in Detail, Compare
+ and Survey, following rotation and crops; the Info panel says how it focused (`AF-C · Wide · Animal Eye Tracking`).
+ Lightroom has no such view.
+- **Z zooms to it**: Toggle Zoom centres on the focus point, so checking that the subject is sharp is one key
+ (View ▸ Zoom to Focus Point turns this off). Photos without a point zoom as before.
+- Sony α1 (ILCE-1) and A7S III (ILCE-7SM3) raws for now; manual-focus shots and Wide shots that only report the frame
+ centre show nothing. More cameras will follow. Details: [focus-points.md](focus-points.md).
+- **Photos already in your library get theirs in the background**: LightCraft reads just the few kilobytes of each
+ file that hold the focus point (about 100 photos a second from a spinning disk), with a *Reading focus points* row
+ in the activity stack you can stop. Photo ▸ Read Focus Points runs it by hand.
+
+ ### Cleaner HDR merges
+ - Bright windows in an HDR made with Photo ▸ Photo Merge ▸ HDR no longer take a magenta tinge from the brighter
+ photos along the areas they clipped: right next to a clipped area, a photo's colour isn't used. It showed most when
+ the highlights were darkened or saturated.
+ - The same photos give the same HDR whatever order they are selected in; before, a different order could change a
+ few pixels.
+
### HDR merges keep the white balance
- An HDR merged from raws that LightCraft colours from the camera's JPEG (CR2, NEF, ARW…) now opens at the same
As Shot temperature and tint as its photos, and changing the white balance no longer turns it green. Sony ARW