Resolutions: CLI usage, flag lists and flag parsing carry both --tiff-compression (t15) and
--jpeg-format (t16); file.saveACopy, batch, imageProcessor and layersToFiles param specs carry
both tiffCompression and jpegFormat; file_cmds keeps tiff_compression_param and
jpeg_format_param; atn_cmds keeps flag_set/applies_at_canvas_bounds (t15) and UNHOLDABLE (t16),
edit.transform uses the pixel_target guard (t15) with layer_ref(p)? (t16); ui-egui open paths
build ImportOptions (t16) and apply raw_defaults (t15); docs headers/rows unioned; atn tests keep
both sides; tr.tsv "Keep Using CPU" kept once.
crates/io/tests/corpus.rs: kept main's pass_floor 188 (the PR's 187 would lower it; not re-measured here)
docs/file-format-parity.md: kept main's header and PSD/PSB rows; added the PR's change-log row without its floor figure
docs/gaps.md: kept main's header and evidence line; added the PR's change-log row without its floor figure
docs/scorecard.md: ours
crates/io/tests/corpus.rs: kept main's pass_floor 188 (TAKE-FIX: drop the PR's 186 hunk)
docs/file-format-parity.md: kept main's header and PSD/PSB rows; added the PR's change-log row without its floor figure
docs/gaps.md: kept main's header and evidence line; added the PR's change-log row without its floor figure
docs/scorecard.md: ours
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.
- 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>
Main moved about 2100 commits since the branch's last merge. Resolved:
- smartselect_cmds.rs: main's empty-layer check for Object Selection
(check_sampled_pixels, #5246) now runs before the SAM branch, which
returned before it in a plain merge.
- cutout_cmds.rs: the classical path keeps main's cancellable stage;
the BiRefNet path is unchanged.
- prefs_ui.rs: main split section_fields into field_visible/field_rows;
the model labels, the filtered model choices and the options struct
move into that structure.
- apps: main's trusted_local() CLI session, Linux print spooler and frame
cap kept beside the local-model setup.
- channel_view.rs: main's version (#4915); the branch's change there was
unrelated to local models.
- i18n, people.toml, SOURCES.md, architecture.md, gaps.md: both sides.
Cargo.lock and docs/scorecard.md from main, then regenerated.
Co-authored-by: mighty-programmer <83077551+mighty-programmer@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>
Offer explicit external editing for embedded SVG, PDF-compatible AI, PDF and
EPS smart objects, with bounded conversion/rendering and transactional save-back
that retains placement, shared instances, masks, filters and undo history.
On Linux, export the checked writable working file through the desktop portal
so the regular VectorCraft instance handles it. Keep Flatpak working copies in
the app-private cache and release completed editor sessions after cancellation.
Do not execute another Flatpak's interactive payload inside PhotoCraft.
Adapt the credited SVG editor foundation from Skyfuller1303's 897f2007 without
its clipboard or unrelated Shape Tools changes. Add current-main compatibility,
embedded native-vector support, regression tests and authored screenshots.
Co-authored-by: Skyfuller1303 <skyfullerdesign@gmail.com>
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.
FILE-215-17's note: PSD spot planes in Photoshop's polarity, earlier
PhotoCraft PSDs keep their ink.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The 117,504 x 22,464 px banner from #8456 failed with "2639609856 pixels
exceed max 1073741824": the decoder built the whole image in one buffer
and the importer copied it into tiles, so the decode was capped at 2^30 px.
- codecs: decode_ifd split into prepare + decode; new TiffBands decodes
~64 MiB groups of bands in parallel and hands each group, upright, to
the caller. Limits::banded(): 300,000 px a side on 64-bit, max_alloc per
group; 32-bit targets keep the whole-image check.
- raster: Surface::try_write_interleaved (fallible, tiles on all cores).
- io: import_tiff_page decodes flat pages through TiffBands straight into
the layer, converting pieces of rows on all cores; layered TIFFs keep
the whole-image path.
Release, 20 threads: 36 MP 220 -> 52 ms; 30,000^2 6.8 s / 6.43 GB peak ->
1.1 s / 3.86 GB; 35,000^2 and the 2.64 GP banner now open (1.5 s, 3.3 s).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XNm5ZNBFtLZ2cZNaPnYsXV
Conflicts, both sides kept: main's .act swatches next to the batch's .asl
styles (Open filters, preset extensions), main's Render smart filters next
to the batch's Distort ones (53 mapped), parity doc status lines.
docs/scorecard.md regenerated.
Follow-ups the merge needed: the Distort smart filter readers pass their
enum type to main's stricter enum_name (the type their writers use), and
the CMYK effect tests set main's new StrokeFx overprint and Bevel
gloss_anti_alias.
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Resolve relative activation against stable document opening order while keeping absolute indices in visual tab order. Preserve lifecycle identity across close, reopen and imported-ID collisions.
Add command and ATN playback regressions and document the behavioral source evidence.
Resolve catalog and parity-document conflicts without dropping either side.
Preserve ACT swatch routing alongside CSH shapes and add an ACT extension regression.
paint.artHistoryBrush stamps oriented dabs sampled from a history
state. Styles cover Tight/Loose Short, Medium, Long, Dab, Tight Curl
and Loose Curl. Area sets spacing; Tolerance skips dabs whose
footprint already matches the source. Scatter is seeded so a stroke
replays bit-for-bit.
The Y flyout lists History Brush then Art History Brush. The options
bar exposes Style, Area and Tolerance. Includes a 24 MP release bench.
Photoshop 27.11 stores spot ink 0 = solid in every PSD it saves (its 7
spot PSDs store the 100/25/75/0 % columns as 0/191/64/255) and numbers
the extra channels 3, 4, 5 in resource 1053, after 0 for the merged
transparency. PhotoCraft's PSDs stored the ink straight and wrote no 1053.
- PSD save and open use Photoshop's polarity through
channel_map::photoshop_spot_plane; alpha channels stay straight and the
in-memory convention (1 = solid ink) is unchanged.
- A fresh 1053 is written with the extra channels; a kept one is never
written next to it.
- psd_import::earlier_photocraft_spot_planes: a PSD whose 1077 marks a
spot, with no 1053 and the exact 1057 PhotoCraft 0.1.0-0.7.0 (CS6, NUL)
or 0.8.2-0.11.1 (2026) wrote, is read straight, so it keeps its ink.
- Part 3's switch (PsdExportOptions::photoshop_spot_polarity,
PsdImportOptions) is gone: PSD and the layered TIFF share one path.
- PSD keeps main's empty LMsk and layer flags; Multichannel is unchanged.
- Docs: file-format parity, gaps G10, target-app parity, FILE-215-17 note.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Zer0C00L01 <12090083+Zer0C00L01@users.noreply.github.com>
Main's Color panel HSB/RGB slider switch (#7172, #7317) is replaced by this
branch's panel-menu modes, which include RGB Sliders and HSB Sliders; its
control test now sets colorPanel.mode. The panel takes main's shared
photocraft_color HSB conversions and ui.set's f32-range checks.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Reconcile progress documentation while retaining upstream performance caveats
and current UI parity status alongside the intermediate scale preset notes.
Validation: fmt, full locked engine/UI tests (5660 passed), Clippy, layers,
wasm, scorecard generation/check, and panic_hunt all passed.
Keep the brush Mode menu's early return in canvas_buttons ahead of main's
physical right-button handling, keep both sets of control tests, and keep
both notes in docs/brush-parity.md and docs/control-protocol.md.
The Hand tool's held Zoom goes through `zoom_tool::drag`, so with Scrubby
Zoom off a ⌘-drag draws a zoom rectangle rather than scrubbing. Say so in
the parity row, and test that case.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
crates/format/src/store.rs: the Windows tiles/blobs directory flush goes before main's manifest write (main publishes the manifest before removing stale previews), and that write takes the PR's fs argument; the PR's second manifest write is dropped.
crates/ui-egui/src/lib.rs: replay_save doc comment names both Export As and JPEG; replay_save uses the PR's FormatChoices::from_step, after main's export_dialog::replay branch.
docs/file-format-parity.md: header keeps main's text plus the JPEG Options item (last updated 2026-10-19); TIFF row is main's, JPEG row is the PR's; change-log rows once each, newest first.
docs/gaps.md: header keeps main's text plus the G10 item (last updated 2026-10-19).
Conflicts:
docs/gaps.md: header line is ours plus the PR's missing change item (later Last updated date); change-log rows kept both, newest first
docs/file-format-parity.md: same
crates/engine/src/float_cmds.rs: kept main's cut_piece (parallel, shares full tiles) and try_lift_coverage, and the PR's CutParts::outline; the outline is read from the piece's alpha, which holds min(alpha, selection) as the PR's own lift loop computed, instead of replacing cut_piece with that loop.
crates/engine/src/float_cmds/tests.rs: git interleaved the two sides' new tests; took main's file and appended the PR's added tests whole.
docs/ui-parity.md: header line keeps main's text plus the PR's #7538 item.
Conflicts:
docs/gaps.md: header line is ours plus the PR's missing change item (later Last updated date); change-log rows kept both, newest first
docs/file-format-parity.md: same
crates/ui-egui/src/i18n/*.tsv (20 catalogs): both sides appended rows at the same place; union, no duplicate keys.
crates/ui-egui/src/state.rs: both new ToolOptions fields (type_style_defaults, type_direction) and defaults.
crates/ui-egui/src/tool_reset.rs: Type tools reset both type_direction and type_style_defaults.
crates/ui-egui/src/type_tool.rs: new type is created from default_style_params (main); direction added to it, and apply_defaults stores a direction edit in type_direction.
docs/gaps.md: header and G8 evidence from main, G8 missing text reworded for direction buttons, change-log lines of both.
docs/scorecard.md: ours (regenerated at combine).
crates/ui-egui/src/lib.rs: union in the PhotocraftApp fields, the initialiser and set_wgpu (main's window_device/window_lost/window_recovery_retry and set_available, the PR's gpu_render_state/gpu_fault).
docs/control-protocol.md: ui.gpu.simulateLoss line takes the PR's text and keeps main's destroy: true sentences.
crates/ui-egui/src/i18n/ru.tsv: both sides added rows at two places; kept both (union).
docs/gaps.md: header from main, change-log lines of both.
docs/localization-parity.md: change-log lines of both.
crates/format/src/store.rs: kept both field sets in PcraftWriter::default (main's blob_hash_cache/compressed_budget and the PR's lock_wait) and both setters (set_compressed_cache_budget, set_lock_wait).