[vangel76]

What this is

A pre-resolved view of the six open PSD hardening PRs merged together on top of upstream/main. Do not merge this PR. Please merge the six single PRs. If you merge them in any order, the later ones can take the conflict resolution from here (the merge commits on this branch show it per PR).

PR	Branch	Content
#1129	fix-psd-nested-group-depth	MAX_GROUP_DEPTH, tree_report()
#1131	fix-psd-nonfinite-and-panic-paths	finite guards (samples(), f64_finite, Warp::apply), saturating Rect::new
#1135	fix-psd-lenient-layer-section	Psd::warnings, damaged layer section falls back to the merged image
#1134	psd-simplify-dedupe	shared open_planes / decode_plane
#1137	psd-optimise	borrowed planes, in-place unpredict, mask loop, quad solve
#1139	fix-psd-decode-memory-budget	decode memory Budget, channels written straight into the result

Merged in that order, one --no-ff merge each, rerere on, no rebase.

Conflicts and how they were resolved

• PSD import: bound group nesting at 64 (#1128) #1129 + PSD: drop non-finite values, no panic in Warp::apply / Rect::new (#1130) #1131: psd/src/tests.rs (both append tests): kept all tests.
• #1132: a damaged PSD layer section keeps the merged image #1135: engine/src/psd_import.rs: kept both: psd.warnings are added first, then the flatten warning from tree_report(); an empty layer list with warnings imports the flattened comp, otherwise build_comp uses the tree_report() tree. engine/src/tests_vector_import.rs and psd/src/tests.rs: kept all tests of both sides.
• PSD: share the duplicated decode, placed-transform and writer helpers (#1133) #1134: psd/src/tests.rs: kept all tests.
• PSD: avoid redundant plane copies, per-pixel mask tests and repeated quad solves (#1136) #1137 x (PSD: share the duplicated decode, placed-transform and writer helpers (#1133) #1134): psd/src/lib.rs. One decode path: PSD: share the duplicated decode, placed-transform and writer helpers (#1133) #1134's open_planes / decode_plane (with PlaneStream) stay the shared entry points; PSD: avoid redundant plane copies, per-pixel mask tests and repeated quad solves (#1136) #1137's optimisations are built into them: plane_bytes returns Cow (raw planes borrowed from the file), zip_plane un-predicts in place in the inflated buffer, RLE reading is unpack_plane (keeps PSD: share the duplicated decode, placed-transform and writer helpers (#1133) #1134's checked counts.get(), no indexing). decode_channel became plane_bytes + samples. The old per-plane to_vec copies of PSD: share the duplicated decode, placed-transform and writer helpers (#1133) #1134 are gone.
• PSD: a memory budget for one decode and a capped smart-object bake (#1138) #1139 x (PSD: drop non-finite values, no panic in Warp::apply / Rect::new (#1130) #1131, PSD: share the duplicated decode, placed-transform and writer helpers (#1133) #1134, PSD: avoid redundant plane copies, per-pixel mask tests and repeated quad solves (#1136) #1137): psd/src/lib.rs and placed.rs.
  • channel_bytes / plane_bytes / open_planes / decode_plane / unpack_plane now take the Budget: ZIP is charged before inflating (as a whole, in open_planes), RLE buffers via budget.vec, raw planes are borrowed and not charged. New helper release_bytes releases only owned buffers. composite_with_budget and layer_pixels_with_budget use these (no second copy of the ZIP/RLE/raw logic).
  • for_each_sample (from PSD: a memory budget for one decode and a capped smart-object bake (#1138) #1139, replaces samples) now applies PSD: drop non-finite values, no panic in Warp::apply / Rect::new (#1130) #1131's non-finite rule (finite_sample: NaN to 0, +inf to 1, -inf to 0), which the budget rewrite had dropped.
  • Mask loop: PSD: avoid redundant plane copies, per-pixel mask tests and repeated quad solves (#1136) #1137's row-wise scale version kept (with its test counter), PSD: a memory budget for one decode and a capped smart-object bake (#1138) #1139's per-pixel loop dropped.
  • placed.rs: kept both sides' tests (PSD: drop non-finite values, no panic in Warp::apply / Rect::new (#1130) #1131's custom-warp test and PSD: a memory budget for one decode and a capped smart-object bake (#1138) #1139's bake-cap tests).

Test adaptations (signatures changed by the merge)

• tests_opt.rs (PSD: avoid redundant plane copies, per-pixel mask tests and repeated quad solves (#1136) #1137 reference decoders): call ref_samples / ref_to_rgb (from PSD: a memory budget for one decode and a capped smart-object bake (#1138) #1139's memory_tests.rs, now pub(crate)) because samples / to_rgb no longer exist; plane_bytes test passes &mut Budget::new(u64::MAX).
• memory_tests.rs (PSD: a memory budget for one decode and a capped smart-object bake (#1138) #1139 reference): ref_samples got PSD: drop non-finite values, no panic in Warp::apply / Rect::new (#1130) #1131's non-finite rule so "bit for bit equal" still holds for 32-bit data; with_merged is pub(crate).
• tests.rs (PSD: drop non-finite values, no panic in Warp::apply / Rect::new (#1130) #1131 test non_finite_32_bit_samples_become_finite): uses for_each_sample / rgb_from instead of samples / to_rgb.
• No assertion was weakened; the old-vs-new equality tests of PSD: avoid redundant plane copies, per-pixel mask tests and repeated quad solves (#1136) #1137 and PSD: a memory budget for one decode and a capped smart-object bake (#1138) #1139 pass.

New integration test

crates/psd/src/tests_integration.rs, all on a 2 MiB thread:

1. groups nested to 164 + a NaN/inf text transform: parses, tree depth <= 64, text transform finite, composite and every layer decode to a finite result or an error.
2. damaged layer section: one warning, no layers, merged image decodes.
3. tiny file claiming 16384x16384 / 4096x4096 (ZIP, ZIP+prediction, RLE, raw) under a 1 MiB budget (and the default budget for the big ones): clean "memory budget" error for composite and layer.

Commands run (target dir target/slot5)

Command	Result
cargo test -p effectcraft-psd	44 passed (incl. 3 new integration tests)
cargo test -p effectcraft-engine	549 passed, 2 ignored (+ 2, 7, 15 in the other targets)
cargo test -p effectcraft-media	35 + 4 + 1 + 30 + 1 passed, 1 ignored
cargo test -p effectcraft-script	80 passed
cargo test -p effectcraft-host	16 + 1 + 1 + 6 + 1 + 3 + 2 + 10 passed
cargo clippy --workspace --all-targets -- -D warnings	clean (one ptr_arg lint on the first version of release_bytes, fixed in the last commit)
cargo fmt --all --check	clean
cargo xtask layers	ok
cargo xtask assets	ok (39 assets)
cargo xtask wasm	ok (32 crates; one pre-existing dead-code warning in ui-egui, untouched)

Not run

cargo xtask ci, the full workspace tests, ui-egui tests (no ui code touched), and the known unrelated ui-egui failure theme::tests::interface_symbols_have_a_glyph_in_every_family.

🤖 Generated with Claude Code

[vangel76]

Closing: the maintainers merged all six PSD PRs (#1129, #1131, #1134, #1135, #1137, #1139), so this pre-resolved integration view is no longer needed.

🤖 Generated with Claude Code