selection_only_change used same_pixels, which turns down every video layer,
so any selection step marked such a document modified. It now compares video
frames (painted and original) by tile pointer as well; same_pixels itself is
unchanged.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The pixel-only cap (2^27) still let two RGBA layers past the canvas with
about 11 GiB of working buffers. Count what Auto-Blend holds per pixel
(each layer's pixels, luminance, alpha and weight, plus the merged picture
and depth map) against a 4 GiB budget; over it, keep to the canvas as
before. The per-layer region reads and luminance/alpha buffers now use the
fallible allocation helpers, so running out of memory is an error.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Move the empty/whitespace/non-string Color Profile cases into the bad-input
table, which asserts the preferences (presets included) and their revision
are untouched.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- type.setStyle/edit/create: an unknown `baseline` is a BadParams error and no longer resets
superscript or subscript to Normal (#5807).
- Indexed/Bitmap PSD save warns whenever flattening loses something, also for a single hidden,
masked, non-Normal, effect, type, shape or smart object layer, not only for two or more layers
(#4816).
- brush.presets.importAbr: the apply step keeps only `replace` and `select`, not a second copy of
a base64 `data` string of up to ~1.3 GiB (#7180).
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Main moved on (integration batch #8095 and others). Two conflicts:
- docs/gaps.md revision history: both rows kept, newest first.
- docs/scorecard.md (generated): main's version taken. It needs
`cargo xtask scorecard` again: with FILE-215-19 done, File
compatibility reads 8 done / 5 missing rather than main's 7 / 6.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Main added DDS saving (#5993): DDS Options, and FormatChoices carrying the
Targa and DDS answers through every save path (this branch's SaveChoices
carried Targa and JPEG). Resolved by keeping main's name and making it
the one struct for all three answers.
- lib.rs: FormatChoices { tga_bits, dds, jpeg } with from_params (strict),
from_step (lenient JPEG read of a recorded step), apply and record;
main's separate block is folded in. Both prompts (dds_options and
jpeg_options) are kept everywhere: save_to asks Targa, then DDS, then
JPEG Options; save_options_open covers all four. save_in_place takes
main's (path, choices) signature and records the plain-Save step with
plain_save_step for JPEG plus the Targa/DDS answers (save_in_place_with
folded into it). journal_as_plain_save relabels a parked Targa, DDS or
JPEG prompt and keeps tgaBits/dds*/quality/jpegFormat when dropping the
path. replay_save reads choices with from_step.
- SAVE_OPTIONS_OPEN names all four prompts; DDS Options uses it too.
- targa_options_ui: main's plain-Save step (no path) through this
branch's write_answered_save. JPEG Options gets main's Enter-on-a-
focused-Cancel fix.
- view_cmds Save a Copy asks Targa, DDS, then JPEG Options; write_copy
takes FormatChoices.
- control.rs: both app.save tests (JPEG and DDS) kept.
- engine file_cmds: SaveOpts keeps jpeg_format and dds; param docs list
both jpegFormat and ddsCompression/ddsMipmaps. CLI: both --jpeg-format
and --dds-compression/--dds-mipmaps. codecs re-exports JpegFormat and
DdsCompression/DdsOptions.
- docs/book: both entries kept (control-protocol app.save lists both).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Resolve prefs.rs against #6641 (a wrongly typed preference resets only
that field): keep main's InvalidPref / read_lenient helpers next to
PREFS_VERSION, and in load_prefs_json keep main's "expected a JSON object"
check first, then the pre-version-2 Use Shift Key for Tool Switch
migration, before the lenient read.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The PR stopped writing PhotoCraft's defaults for params a step leaves
out. Checked against Photoshop, that is fine for Fill opacity and mode,
Crop delete, Selective Color method, Channel Mixer monochrome, Paint
Bucket contiguous and Gradient Map reverse/dither, but Photoshop plays
other missing keys differently: Canvas Size anchors top left (PhotoCraft:
centre), Apply Image blends Normal (Multiply), Color Balance turns
preserve luminosity off (on), and a Paint Bucket step without a
tolerance doesn't play at all. Those, and the unverified Hue/Saturation,
Color Balance tone and Save for Web keys, are written again as before.
- `tools.setColors` exported only the foreground of a step that sets
both colours; such a step now doesn't export (the strict save refuses
it, as before the PR).
- `kind` on an imported `layer.setAdjustment` made Photoshop's "reset to
default" (`set` with an empty `T`) a no-op merge; it now joins only
params that edit something.
- `cargo xtask corpus --atn` (and `--all`) failed on Windows: the Bjango
archive has a macOS `Icon\r` file tar can't create there; it's skipped.
- `test-corpus --changed` now runs for `atn_cmds` changes, and the
`ALL` doc comment is back on `ALL`.
Tests: defaults_photoshop_plays_differently_are_written,
set_colors_exports_only_a_single_colour and
adjustment_layer_reset_still_resets fail without this commit; the psd
and engine .atn corpus tests still pass (16 files byte-identical; 513
kept Photoshop steps).
Co-authored-by: Fabio Lissi <3223836+FabioLissi@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
fill_to (Paint Bucket export): keep main's `source` alias and explicit
colour (`Usng` = `Clr ` plus `Clr `, #7199) together with the PR's
optional `Tlrn`/`AntA`.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
apps/photocraft{,-web}: main added "cin" to OPEN_EXTS; kept it and the PR's
"act". apps/photocraft/src/services.rs: main gave File > Open one filter per
format (#6337) and checks with every_open_format_has_its_own_filter that the
filters cover OPEN_EXTS exactly, so "act" joins the Swatches filter.
i18n: both sides appended sections at the end of every catalog; kept both.
Co-authored-by: Abdul karim mia <97598943+abdul-karim-mia@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
type.create stored the font field as a family name, so an exact
PostScript face such as Arial-Black warned and fell back. Resolve
only an exact PostScript match and keep that face's family, weight,
slant, and name. Unknown families still warn.
Fixes#8063
Signed-off-by: Gabrieljr42 <gabrieljunior42566@gmail.com>
Warp mode shows a smart object's stored cylinder as its 13 x 4 mesh
(smart_warp_doc_space), and Enter commits that mesh as edit.transform.warp.
The cylinder was then stored as a custom warp, and the next PSD save wrote
no warp ("custom warp with more than one patch was written without its
warp"). On main the same steps kept Photoshop's warpCylinder (unread, so
the SoLd stayed verbatim). Committing exactly what Warp mode shows (the
same mesh over the same box) now changes nothing and adds no history
step; a moved point or another box still makes it a custom warp.
The transform box then treats a `changed: false` commit like an untouched
box: a ⌥⌘T copy stays its own step instead of being folded into the step
before it (that also held for an unchanged Warp Text on a type copy).
Also: the cylinder_warp test takes `as_chunks` (clippy's
chunks_exact_to_as_chunks on the current toolchain).
Co-authored-by: alvarohn <32224796+alvarohn@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
docs/file-format-parity.md and docs/gaps.md: main's status lines and rows, with #4112's entries added.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
With a naming template, Format Same still took the raw extension (IMG_0001_001.dng: unknown file format). HEIC, SVG, Cineon, PCX and XPM open but have no writer, so they save as PSD too; DDS has a writer and keeps its format.
docs/file-format-parity.md: main added three 2026-10-15 revision rows
(DDS save, PNG sTER, PSD guides) where the PR added its own; keep all four.
Co-authored-by: varanus-salvator <262257003+varanus-salvator@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- Export wrote each style's effects object with class `null` (a layer's `lfx2`
class). Style libraries use class `Lefx` (Krita's reader takes a `null`
descriptor as the start of the next style). Test: exported_effects_object_has_class_lefx.
- Repeated style names were numbered by rescanning every taken name for every
candidate: an .asl of 10 000 styles all named "A" (about 0.7 MB) froze the
import for minutes. Now a set plus a next number per name, as the .abr import
does. Test: many_identical_names_import_quickly.
- Importing "Basics.asl" (or any file named like a built-in group) replaced and
deleted that built-in group, with no undo. It now goes to "Basics 2".
- The Layer Style dialog's New Style… saved the layer's opacity instead of the
dialog's pending one, and picking a style swatch there ignored the style's
opacity.
- Serbian strings for the Styles panel menu (sr.tsv came with main), and a
rustfmt line in the merged workspace.rs.
Co-authored-by: Brandon Thomas <39263+echelon@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Their noise was sampled in document coordinates, so moving a smart object re-rendered a
different texture with the same params. The pattern is now anchored at the filter's bounds:
the object for a smart filter, the canvas on a layer. Fibers, like Clouds, takes the canvas
as its bounds even with a selection, which only masks it, so layer results stay as before
(CodeRabbit review on #6160).
A fitted native print drops a caller's printable area and fits only the one the
driver reports for this paper. The Print dialog drops it whenever output or a
preview is set, also when that change and the confirm land in one frame.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The branch was 1134 commits behind main. Every conflict was two sides adding to the same
list: File > Open extensions (web and desktop), the automation path checks and their tests,
the command registry, `psd` modules, the preset file opener (main added `.pat`), the i18n
tables (main's new strings kept, the Styles panel strings appended), and the parity/gaps
status lines (`.asl` now R/W, dated 2026-10-20).
Co-authored-by: Brandon Thomas <39263+echelon@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>