* codecs,raw,preview,meta,engine: cut over TIFF/JPEG/focus to craft-libs and fix CI
* docs: update parity-checklist paths after craft-raw/craft-metadata cutover
* Remove unused codec workspace deps and cut examples over to craft-image-codecs
* chore: update Cargo.lock after removing unused codec deps
* security: importers and preset application index instead of rescanning
* address review: keep first match when indexing names, skip used mask ids, move presets instead of cloning
* address review: a dry-run import keeps its rows, not the parsed presets
* merge main into fix/sec-importers-indexed
* address review: key duplicate presets by the settings value, so 0.0 and -0.0 are one preset
* preset import index: key numbers as f64 so 0 and 0.0 cannot collide
* security(pipeline): one dab budget per brush mask; linear-time defringe min/max
* address review: drop min_filter transpose buffers once consumed
* address review: an over-budget brush mask fails the render instead of dropping later strokes
* merge main into fix/sec-pipeline-render-work; the web worker rejects an over-budget brush mask
* address review: validate brush budgets on the mask's own frame; an exactly filled budget is not over it
* security(meta): bound namespace declarations in scope while parsing XMP
* address review: a readable sidecar that fails the merge read-back is kept and the save fails
* address review: a sidecar over the XMP complexity limit is kept and the save fails
* merge main into fix/sec-xmp-namespace-bound
* address review: text with no rdf:RDF element is backed up and replaced, not kept as readable
* xmp merge: open a self-closing rdf:RDF element instead of replacing the sidecar
Use craft-gainmap from craft-libs for gain map metadata and arithmetic
* Use craft-heif from craft-libs; remove crates/heif
lightcraft-heif moved to craft-libs unchanged as craft-heif
(storytold/craft-libs#784), so PhotoCraft can share it. The layer table,
the heif CI step and the change triggers drop the local crate; a workspace
file change (which a craft-heif rev bump is) still runs the heif step.
* Pin craft-heif to the merge of storytold/craft-libs#794
* docs: the HEIF rows point at craft-heif, not the removed crates/heif
* Use craft-gainmap from craft-libs for gain map metadata and arithmetic
crates/codecs/src/gainmap.rs keeps the JPEG layout (encode_jpeg, read_jpeg,
is_gain_map_jpeg) and re-exports GainMapMeta, GainImage, GainMapOptions,
ISO_URN, compute and apply from craft-gainmap, which is this file's metadata
and arithmetic moved to craft-libs (storytold/craft-libs#904). The tests of
the moved code went with it.
* craft-heif's Options has a chroma field at this rev: keep the libheif upsampling LightCraft had
* raw: count the chunks a TIFF declares from its offsets table
craft-tiff builds at most one chunk descriptor per byte of file
(craft-libs#827), so a grid of tiles sharing one payload lists fewer
chunks than the image declares. Compare the offsets table, which is the
source of truth, so such a file reaches the byte-accounting check and is
refused for the data it actually holds.
* Use craft-tiff from craft-libs; remove crates/tiff
lightcraft-tiff moved to craft-libs unchanged as craft-tiff
(storytold/craft-libs#783), the first step of sharing RAW support with
PhotoCraft (storytold/craft-libs#587). The layer table drops tiff and its
intra-layer ordering before raster.
* Pin craft-tiff to the merge of storytold/craft-libs#795
* mask.exportEffects refuses originals and sidecars and writes atomically
* check_write_target refuses unresolvable .. components in a missing destination folder
* test: accept either refusal for a missing/.. destination (Windows resolves .. lexically)
* security(engine): read user-named files through the opened regular file under a byte cap
* address review: compare the probe error with the std::fs::read error
* address review: open files for reading without waiting for a FIFO writer
* security(meta): linear entity decoding, indexed keyword de-duplication, bounded XMP path building
* address review: decode zero-padded numeric references in the three entity decoders
Part of the Lens Blur row (`LR-EDIT-LENSBLUR`, ⬜ → 🟡: no depth map yet). Related: #377 (SAM 3 subject selection, used here for the Lens Blur focus).
## Problem
Lens Blur settings existed but nothing rendered them: there was no way to add a shallow depth of field, keep the subject sharp while the rest falls out of focus, or blur only part of a photo through a mask.
## Change
**Edit → Lens Blur** (`section.lensBlur`, ⌘6)
- **Apply**, **Amount**, **Boost** (brighter bokeh highlights) and **Transition** (how gradually the blur grows away from what is in focus, so the subject doesn't look cut out).
- **In Focus**: *Subject* (a mask) or a fixed shape: **Auto / Round / Horizontal / Vertical**, buttons drawn in code that work on the light themes.
- **Move & Resize** (tool `lensBlurShape`) drags the ellipse on the photo and stretches it by its handles. Each drag is one undo step; a shape button puts the ellipse back in the middle.
- **Find Subject** (`lensBlur.findSubject`) runs only when clicked, never automatically on Apply.
- It starts from the focus point the camera recorded, when the file has one (Sony ILCE-1 and ILCE-7SM3, the models `lightcraft_meta` reads today). Otherwise it starts from the subject estimate.
- SAM 3 keeps the prominent people and animals: those at the focus point and those of a similar size. When the focus point falls on neither, it falls back to an object click at that point.
- The result is a normal Object mask ("Lens Blur Subject") that can be refined in Masking.
- It runs on the background segment worker, and on remote SAM 3 too (`Operation::Subject`). While the mask is pending, the UI shows a spinner and the render keeps the subject estimate in focus, so the photo is never blurred whole.
- Without the model, it returns the model-missing error, changes nothing, and the UI offers the SAM 3 download.
- **Brush Refinement**: Focus and Blur brushes painted on the photo (`lensBlur.brushStroke`, `lensBlur.brushReset`), with Size, Feather, Flow, Amount and Auto Mask.
- While Apply is off, In Focus, the shapes, Move & Resize and Find Subject are disabled.
**Masking: a Lens Blur block in every mask** (`section:maskLensBlur`, under Refine Edges)
- **Blur: Selection / Outside**. Outside blurs what the mask leaves out, without inverting the mask's other adjustments.
- **Amount**, **Boost** and **Transition**, per mask. The header's eye switches the block off and keeps its values; the header folds the block.
- Stored as `lens_blur`, `lens_blur_outside`, `lens_blur_boost`, `lens_blur_transition` and `lens_blur_off` on `LocalAdjustments`, set through `mask.adjust`.
**Rendering** (`crates/pipeline/src/lens_blur.rs`)
- Runs in the scene-linear stage after denoise; its settings are part of `pre_nr_key`.
- Disc (bokeh) kernel at four levels on coarse grids, with a normalized convolution weighted by the circle of confusion, so sharp areas don't bleed halos into the blur. Transition uses a chamfer distance to the in-focus area.
- The radius is relative to the long edge, so the blur doesn't depend on resolution. The work stays bounded on large exports: the disc kernel has a fixed size, and each level's coarse grid stays within a cell budget.
- Zoomed windows, both 8-bit and deep (16-bit/float), read around them and are cut back to the request. The grids follow the whole output's origin, and the automatic subject estimate is made once from the whole photo. A window therefore matches the whole render.
- GPU path: read back, apply on the CPU, upload (`crates/gpu/src/render.rs`).
- Hostile values (NaN or infinite sizes, out-of-range areas and focus points, oversized stroke lists) are sanitized or rejected, never a panic.
All new strings are in the 17 locales.
**Not in this PR:**
- Real depth. The falloff is the image distance from the focus, not scene depth; a depth model (e.g. Depth Anything V2 Small on candle) would be a separate PR.
- Rotating the ellipse.
- Aperture shapes.
- Focus points for more camera makes and models.
- Find Subject doesn't resume by itself after the SAM 3 download (the Masking tools do). Like the existing Object / Describe jobs, it shows no row in the activity stack.
## How it was checked
- [x] Full `cargo xtask ci` on Windows 11 x86_64 after the latest merge of `main` (465c8722):
- fmt, clippy, heif, parity, layers, assets and wasm pass;
- every Lens Blur test passes;
- the only failures are five tests outside this change that fail on Windows on `main` too: `export::tests::sixteen_bit_zip_tiff_is_never_larger_than_uncompressed`, the two GPU out-of-memory tests in `gpu::ctx`, `dialog_role::settings_is_a_dialog_too` (needs craft-fonts) and `folder_drop::dont_ask_again_moves_the_next_drop_at_once`.
- [x] Tests that fail without the change:
- **pipeline**:
- the `lens_blur` tests: shapes and moved or hostile areas, blur growth away from the focus, the fallback while an AI mask is pending, brushes, masks blurring their selection or outside with Transition, hostile input;
- `large_image_blur_work_is_bounded`: on a 60 MP export with the strongest global and per-mask settings, the disc kernel stays a fixed size and every level's coarse grid stays within its cell budget, including an offset render window;
- window/full-render parity at U8 and U16, including the automatic subject.
- **engine**: brushes with undo; Find Subject without the model changes nothing; deleting the focus mask clears the focus; a partial effect preset sets `lens_blur`; with the `sam` feature, Find Subject fills the waiting mask.
- **segment**: `prominent_subjects`, and remote `Subject` validation.
- **catalog**: `op_variants_are_versioned` with the new format version.
- **ui-egui**: the brushes painting on the photo, the shape buttons, the controls disabled while Apply is off, Move & Resize with undo and redo, the mask block (side, sliders, eye, folding).
- [x] User-visible change: ran the app and looked at the result (dark and light themes).
## Screenshots
**Before / after**
<img width="1402" height="952" alt="before" src="https://github.com/user-attachments/assets/8baceb99-7708-4c25-990c-8da29b6bc1b4" />
<img width="1320" height="937" alt="after" src="https://github.com/user-attachments/assets/a1476510-558a-4460-8766-b25bda0dfd3d" />
**Edit → Lens Blur** and **the mask's Lens Blur block**
<img width="457" height="626" alt="main painel" src="https://github.com/user-attachments/assets/47a19637-29a8-4446-a003-2eef416975b7" />
<img width="463" height="333" alt="mask painel" src="https://github.com/user-attachments/assets/345ffc14-66d2-4adc-af3c-b756727201de" />
## Merging
- **Overlap:** #1713 (Clearfall; a draft since 2026-10-14 that conflicts with main) implements the same row on the CPU. It has aperture shapes and XMP roundtrip, which this PR lacks. This PR adds the per-mask block, SAM 3 Find Subject from the camera's focus point, the GPU path and window parity. Only one should land; happy to port what #1713 has that this lacks.
- **Existing edits and libraries:** unchanged. Lens Blur is off by default and every new field is omitted from the JSON at its default, so existing settings keep their JSON and hashes.
- **Shared numbers taken:** catalog format `VERSION` 12 (`crates/catalog/src/journal.rs`). main already uses 10 (`Mask.on_photo`) and 11 (`EmbeddedLens.source`), so Lens Blur takes one past them. If another pull request lands with 12 first, I'll take the next one when I merge main. No render-cache, look or process version change.
- **Where it came from:** own implementation; nothing derived from GPL code or Adobe data. The camera focus point comes from the existing `lightcraft_meta` reader; subject selection uses SAM 3 through the existing segment crate.
- **New dependencies, `unsafe`, build scripts, network access, spawned processes, deleted files, CI or `xtask` gate changes:** none. The remote SAM 3 protocol gains one request (`Operation::Subject`). An older worker rejects it with an error, as `docs/ai-masks.md` notes.
## Checklist
- [x] No new panic path in non-test code
- [x] New text on screen goes through `tr()` with keys in all `locales/*.json`; ⌘6 opens the new section (KEY-SECTIONS)
- [x] `docs/parity-checklist.md` rows updated (LR-EDIT-LENSBLUR 🟡, LR-MASK-SLIDERS, KEY-SECTIONS); `docs/gaps.md` has no Lens Blur entry
- [x] New code has a caller
- [x] No new assets (the shape icons are drawn in code)
- [x] Ready to merge
<!-- This is an auto-generated comment: release notes by coderabbit.ai -->
<!-- coderabbit-ai-generated:v1 -->
## Summary by CodeRabbit
* **New Features**
* Added Lens Blur with adjustable strength, highlight boost, and transition controls, plus Round, Wide, and Tall focus shapes.
* Keep a subject or selected mask in focus, find people or animals automatically, and refine focus or blur with brushes. Move and resize the focus area directly on the photo.
* Apply Lens Blur to individual masks, including selections or areas outside them.
* **Bug Fixes**
* Improved Lens Blur rendering for cropped views and preserved focus-mask assignments correctly when masks are edited.
* **Documentation**
* Updated feature and control guides, with Lens Blur interface translations added across multiple languages.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
lightcraft-heif moved to craft-libs unchanged as craft-heif
(storytold/craft-libs#784), so PhotoCraft can share it. The layer table,
the heif CI step and the change triggers drop the local crate; a workspace
file change (which a craft-heif rev bump is) still runs the heif step.
lightcraft-tiff moved to craft-libs unchanged as craft-tiff
(storytold/craft-libs#783), the first step of sharing RAW support with
PhotoCraft (storytold/craft-libs#587). The layer table drops tiff and its
intra-layer ordering before raster.
* security(segment): Object selections take at most 64 clicks at the engine API and the model
* address review: refuse over-cap Object clicks before queueing in background mode
* security(engine): one unpack budget across a preset zip's packs; linear comment skipping; small zip errors
* address review: charge a failed pack's unpacked bytes to the shared zip budget
* address review: charge a corrupt deflate entry's partial output to the shared budget
* address review: an entry past its stated size spends only what it unpacked
somewhere else (a share mounted over the folder, the folder moved away
and another put in its place) made the session write into that other
folder: its catalog.snap and catalog.log were replaced, and dropping the
lock removed the owner note of the program that had the library open.
OpenedFolder records the folder's device and inode number (and when it
was made, where the file system keeps that) when a library opens, and
check() asks, with one stat, whether the path still leads to it. A drive
or share mounted again gets another device number, and some file systems
number their folders anew at every mount, so a folder also counts when
it holds exactly the owner note this session's lock wrote (the lock
vouches for it, and the note holds a value no other lock's note has), or
when it has the same inode number and both creation times are known and
equal; on the same device two different creation times are two folders,
since an inode number is given again to a folder made later. FsStore
(both stores of a library, the snapshot worker), the catalog log's
thread and the lock's owner note ask before they write; a refusal is an
ordinary write error that names the path, so the changes stay queued,
the app says why they are unsaved, and saving goes on once the folder is
back. The thumbnail cache gets a gate that the library closes the same
way, and its takeover, prune and clear passes look at it every 256
files.
The catalog log is opened by its path for each batch and appended to
only while it is as long as what the thread wrote. A copy of the folder
put at the path holds the note and counts as the library, but its log
lacks what was written after the copy was made: it is refused like a
failed write (reported, with later changes taken meanwhile), and the
snapshot the app takes for held records replaces it, instead of going on
writing into the folder that was moved away. A longer log is cut back
only after a write of the thread's own failed.
The lock removes the owner note only when it is the one it wrote, in the
folder it locked. Reopening a path whose folder was replaced takes that
folder's own lock instead of handing the old one over, so does the
check_library preflight, and a lock taken in another folder than the
stores recorded is refused. A Move import removes its originals only
after the catalog log is on disk, not when it was handed to the log's
thread.
Windows reports no folder identity through std (nightly only): there the
check only asks that a folder is still at the path.
* LR-IMP-FORMATS: withdraw compressed ORF decoding
Remove the decoder introduced in #3775 pending provenance review while preserving uncompressed ORF layouts and embedded previews. Add unsupported probe/decode regressions, remove the prior provenance narrative, and restore camera coverage records to preview-only.
* LR-IMP-FORMATS: refresh ORF support status and render caches
* LR-IMP-FORMATS: document ORF withdrawal regressions
Libraries created on another OS may have no recorded file size for some photos. After moving OS and renaming the file, Find Missing should still relink it by its content hash instead of leaving it missing.
Allow plan_find_missing to match renamed files by content hash when size is unknown by hashing unused candidate files, and add a regression test with a Windows-style path, unknown size, known hash and a renamed file in the searched folder.
Test: find_missing_matches_renamed_file_by_content_without_size failed before the change and passes after.
Co-authored-by: eliets2 <287273517+eliets2@users.noreply.github.com>
Users importing a Lightroom catalog see masks that darken or lighten the wrong part of the photo, even though the mask exposure value itself looks correct.
Carry the inverted flag through catalog mask orientation handling for develop and XMP masks, and add a regression test with an inverted radial mask.
Test: inverted_radial_mask_keeps_its_inversion_on_import failed before the change and passes after.
* Picture Package and Custom Package pages can print cut guides at each cell's corners
Picture Package and Custom Package pages can print cut guides at each cell's corners
Picture Package and Custom Package pages can print cut guides at each cell's corners
Test: picture_package_and_custom_package_pages_can_print_cut_guide failed before the change and passes after.
* Print: Cut Guides in the package preview, page panel in its own function, tests follow the guides
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Print: Cut Guides sit at each cell's corners, outside any border
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Print: shorten the scroll position comment to what the code does
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Print: back to one scroll position for the settings column
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---------
Co-authored-by: eliets2 <287273517+eliets2@users.noreply.github.com>
Co-authored-by: FredApps <153173854+FredApps@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
* Write camera make and lens make to EXIF on export
PTGui and similar stitching tools read EXIF Make/LensMake to identify camera and lens; without them, exported JPEGs from CR2 files are not recognized the same way as Adobe's export.
Add make and lens_make fields to catalog Meta, populate them from the raw's EXIF on import in meta_of, and write them as EXIF Make and LensMake tags in export_metadata.
Test: export_writes_camera_make_and_lens_make_to_exif failed before the change and passes after.
* Export: read Make and LensMake on import and write them, with Model on its own
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Export: strip the maker from Model only as a separate word
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---------
Co-authored-by: eliets2 <287273517+eliets2@users.noreply.github.com>
Co-authored-by: FredApps <153173854+FredApps@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
* Add flash, exposure bias and serial rules to smart albums
Smart albums cannot filter by flash fired, exposure bias or camera serial even though the file metadata is already parsed.
Add flash, exposure_bias and camera_serial to Meta, copy them in meta_of and on reload, and add flash, exposureBias and cameraSerial rule fields evaluated in Rule::matches.
Test: flash_exposure_bias_and_serial_rules failed before the change and passes after.
* Rules editor: Exposure Bias takes negative values
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---------
Co-authored-by: eliets2 <287273517+eliets2@users.noreply.github.com>
Co-authored-by: FredApps <153173854+FredApps@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>