docs/gaps.md: header and change-log row once each (the PR's row on top).
docs/ui-parity.md: header and change-log row once each; the Selection row keeps main's #6549 sentence and adds the PR's #6548 sentence.
crates/engine/src/presets/tests.rs: tests appended by both sides, kept whole (the PR's before main's persistence sections).
crates/ui-egui/src/swatches_ui.rs: tests appended by both sides, kept whole.
crates/ui-egui/src/vector_ui.rs: kept both sides in paths_panel (main's trash-drag state, the PR's rename id) and both new tests; the PR's tests call path_context_actions with main's added layer argument (None).
crates/ui-egui/src/lib.rs: kept both cancel_stale calls (perspective crop from main, pen from the PR).
crates/ui-egui/src/vector_ui.rs pen_down: kept main's resume-at-endpoint block and the PR's pen_doc claim; the claim comes first so a resumed path is claimed by its document too.
crates/engine/src/layer_multi_cmds.rs: took the PR's call to shift_shape; main's added check that the moved path (plus stroke) stays inside the canvas moved into shift_shape (vector_cmds.rs) so both behaviours hold.
crates/algo/src/features.rs: comment-only conflict from a commit already on main; kept main's side.
crates/ui-egui/src/crop_ui.rs: fit_frame conflict; kept the PR's side (its 2-argument crop_size::target call does not compile on main; fixed in the next commit).
crates/ui-egui/src/puppet_ui.rs: tests added by both sides in the same place; kept both whole (#6754's pin-deletion tests, then #6786's drag-preview tests).
dc1ced70 makes a layer whose bounds hold pixels but which has no colour
or transparency channel mark the import damaged; no test covered it.
The first test fails with that line back on plain `warn`. The second
pins the ordinary case: a layer with empty bounds (an empty layer, or a
text or shape layer written without a pixel cache) returns before the
check, so it never marks the file damaged, even with no channels. None
of the 737 corpus PSD/PSB files reaches the new branch.
Co-authored-by: DavidBonnier <4418006+DavidBonnier@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- ui.set gained updatesOpen, but the MCP ui_set description didn't name it, so
automation's ui_set_description_names_every_accepted_field failed on main.
- The Flatpak grants no network on purpose and `flatpak update` owns updates there,
yet every launch started a check that could only fail and Help > Check for Updates
stayed enabled. Flatpak builds now get no update transport (the item is disabled,
as in the web build); flatpak_builds_have_no_update_transport pins it.
- The PR changed scorecard row DIST-220-1's target from "periodic" to "startup" and
marked it done. The target is back as written and the row is partial: one check
per launch, no periodic recheck while the app stays open. gaps.md G17 and the
parity Platforms row say the same; docs/scorecard.md regenerated.
- Merge leftovers: a doubled Services::inbox doc line, and the Serbian
release-check rows moved below main's newer rows to the end of sr.tsv.
Co-authored-by: ZhuanTou33212 <285931757+ZhuanTou33212@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The author's dc1ced70 (doc comments; a layer with bounds but no channel
data now marks the import damaged) on top of our earlier fix-up. Only
conflict: io/src/lib.rs, where main's import_psd (#5258) sits next to
the new doc comment on import_stages; both kept.
Co-authored-by: DavidBonnier <4418006+DavidBonnier@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Main moved about 1,860 commits since the PR's last merge. i18n catalogs keep both
sides' rows; control.rs keeps updatesOpen next to main's strokeTrace (39 fields);
Services keeps check_updates next to main's place_inbox; Cargo.lock is main's,
re-resolved for ureq and semver; docs/gaps.md, docs/target-app-parity.md and
docs/scorecard.md are main's (the PR's entries come back in the next commit).
Co-authored-by: ZhuanTou33212 <285931757+ZhuanTou33212@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
set_resident_budget now gives the borrowed bytes back to the effect-map
share before setting the exact budget, so memory_budget() stays the total,
and fit_layers lends nothing until the next set_memory_budget.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CD2ipSyvx1tYwnHJZyDs59
The line integral convolution takes 21 bilinear samples and 20 tangent lookups per
output pixel, and every one of those computed its coordinate with `f32::floor` or
`f32::round`. On the baseline x86-64 target both lower to library calls (`jmp floorf`
and `jmp roundf` in `rustc --emit asm`), so the filter spent most of its time in 82
call-and-return pairs per pixel.
`sample()` now truncates the coordinate it already clamped to the window, and the
tangent and bristle lookups use `round_i32`/`round_index`, which produce the same
integer for every position a tile can produce.
The output is bit-identical: six 600x400 fixtures (default, short, long, unlit, RGB
without alpha, CMYK) compare sample for sample with `cmp` and a per-channel maximum
delta of 0.0. 24 MP Oil Paint is 1.88x faster on the minimum of five alternating pairs,
measured on a contended 4-core machine; docs/oil-paint-performance.md has the numbers,
that caveat and the alternatives that were measured and rejected.
* fix(engine): Quick Export writes the format its path names (#8519)
Quick Export as PNG renamed to photo.jpeg in the save dialog wrote PNG
bytes under a JPEG name, which upload checks refuse and file managers
don't preview. The path's extension (.jpg/.jpeg/.png/.gif/.webp) now picks
the format; any other extension is refused with a pointer to Export As;
no extension keeps Export Preferences' format.
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* contributors: add benandez's real name
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
On an integrated GPU, 150 full-canvas 6 MP layers needed 3800 MB of
pages against a 3607 MB page share (the rest of the 4587 MB budget is
reserved for effect maps and lower-stack chunks), so every opacity or
visibility change went to the CPU compositor. Compositor::fit_layers lends
the pages the shortfall from the effect-map share when that covers it; an
evicted effect map is rebuilt by the next refresh that draws it. The
lower-stack share is never lent, and the loan holds across the budget set
before every refresh.
Arc B390: P60 p50 707-768 -> 66-70 ms, P61 704-766 -> 70 ms, peak RSS
7.0 -> 4.5 GB.
Part of #5973.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CD2ipSyvx1tYwnHJZyDs59
docs/scorecard.md conflicted with main (a generated file). Regenerated it
with cargo xtask scorecard on the merged tree: settings that do nothing
24 -> 23 of 171, plug_ins.generator_enabled leaves the Unread list.
Co-authored-by: reynold-hu <88558425+reynold-hu@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Use `warn_unreadable_data` instead of `warn` when a layer has no
recognized channel data.
This ensures the import is flagged as damaged and triggers the
interactive confirmation dialog, warning users that saving the
document may discard unrecognized channel data.
With --reps > 1 the console line printed the last sample and called it the
median. Sort the samples and print the median (mean of the two middle values
for an even count); the JSON report is unchanged.
The four new scenarios also made docs/scorecard.md stale, which failed
'test (ubuntu-latest)': cargo xtask scorecard now lists P64-P67.
- A floated Color panel, or one in a custom workspace, had no way to change its mode: the
shared docking renderer's panel menu had no Color entry, and the in-panel HSB/RGB button
this PR replaces is gone.
- Make Ramp Web Safe drew each cell from its centre but picked at the raw pointer, so a click
near a cell's edge set a different web colour (Grayscale Ramp, 5th cell: drawn FF, picked CC).
- A Web Color field took a sign ("+F" set 0F); a click beside the Color Wheel changed the hue
(Photoshop ignores it); Photoshop's panel menu has no separator before Grayscale Slider.
Each comes with a test that fails without it.
Co-authored-by: Khawar Zamman Wani <28915582+wanikhawar@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Conflict in crates/engine/src/file_cmds/tests.rs: both sides added tests at
the end of the file. Kept all three (sanitize device names, exposure text,
gzipped XCF listing). main's Save for Web slice rework still goes through
`slice_file` / `portable_generated_stem`, so the device-name fix applies.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>