Commit Graph
3891 Commits
Author SHA1 Message Date
aiongg 41819a01e2 Merge PR #7087: Crop / Canvas Size: extending keeps the Background's hidden pixels (#7086) 2026-10-21 01:06:14 +00:00
aiongg c92fa0a1c7 Merge PR #7723: Crop: a W x H crop on an Indexed Color document resamples with Nearest Neighbor (#7722) 2026-10-21 01:06:14 +00:00
aiongg 3807454782 Merge PR #7013: Crop: Color Samplers scale with a W x H crop (#7012) 2026-10-21 01:06:14 +00:00
aiongg ea1c6fce1f Merge PR #6781: Apply Image: write into the targeted layer mask (#6780) 2026-10-21 01:06:14 +00:00
aiongg 81c030f217 Merge PR #7003: Channels: Multichannel conversion keeps the targeted channel (#7002) 2026-10-21 01:06:14 +00:00
aiongg ab88a0e4bb Merge PR #6777: Auto-Align: warp layer masks as masks, keeping what lies outside revealed (#6776) 2026-10-21 01:06:14 +00:00
aiongg 954a7560ef Merge PR #7030: Lens Correction: smart filters keep the exact focal length (#7029) 2026-10-21 01:06:14 +00:00
aiongg b9404a6eda Merge PR #3534: History: panel menu, Step Forward/Backward and Clear History (#2966) 2026-10-21 01:06:12 +00:00
jonathnwxh 87978566b7 Merge main preserving CSH limits and larger ABR imports 2026-10-21 09:00:18 +08:00
Higgs32584andClaude Opus 5.5 66c33840e0 Selections keep a document with a video layer clean
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>
2026-10-20 20:58:05 -04:00
Higgs32584andClaude Opus 5.5 3c2ef8b893 Auto-Blend: budget the work area past the canvas by its buffers' memory
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>
2026-10-20 20:55:10 -04:00
Higgs32584andClaude Opus 5.5 6dbc8956ad Document presets: check a rejected blank profile leaves preferences unchanged
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>
2026-10-20 20:53:16 -04:00
Higgs32584andClaude Opus 5.5 d0d5e31019 Test that Deselect with nothing selected is still rejected outside playback
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-20 20:50:59 -04:00
David MannandClaude Opus 5.5 168701779c CodeRabbit follow-ups for the #8095 batch (#5807, #4816, #7180)
- 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>
2026-10-21 02:48:24 +02:00
Higgs32584andClaude Opus 5.5 5eac93bf23 Merge upstream/main into revive/4330-jpeg-options
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>
2026-10-20 20:47:00 -04:00
aiongg b097800e78 Merge pull request #8095 from aiongg/integration-7
Integration batch: 9 PRs on main
2026-10-20 20:44:51 -04:00
Higgs32584andClaude Opus 5.5 92d1ff42f9 Merge upstream/main into revive/4330-jpeg-options
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>
2026-10-20 20:43:26 -04:00
Higgs32584andClaude Opus 5.5 249c4f94c2 Merge upstream/main into fix/5647-shift-tool-switch-migration
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>
2026-10-20 20:38:29 -04:00
404a17e711 Integration: write the .atn defaults Photoshop plays differently, keep resets and both colours (#4496)
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>
2026-10-21 02:28:58 +02:00
David MannandClaude Opus 5.5 c9b0bb0cbc Integration: merge main, resolve conflicts (#4496)
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>
2026-10-21 02:05:34 +02:00
Gabrieljr42 797c7852f9 fix(type): clear retained wght variation when resolving exact face 2026-10-20 21:01:11 -03:00
b484f45429 Integration: merge main, resolve conflicts (#5407)
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>
2026-10-21 01:49:54 +02:00
Gabrieljr42 99a234d2e2 fix(type): resolve exact PostScript names in type.create
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>
2026-10-20 20:34:08 -03:00
63958b07ab Integration: keep an untouched cylinder on Warp mode's Enter (#5769)
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>
2026-10-21 00:29:23 +02:00
David MannandClaude Opus 5.5 f13e215eb4 Integration: merge main, resolve conflicts (#5769)
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>
2026-10-21 00:22:49 +02:00
David MannandClaude Opus 5.5 627bb8f1bf Integration: merge main, resolve conflicts (#6002)
docs/file-format-parity.md: both sides added revision-history rows; keep both.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 00:11:01 +02:00
aiongg f679b4cf1f Integration: rustfmt the merged tree, for #6195 and #5857
cargo fmt --check failed on #6195's module order and canvas.rs guard, and on the IMPORT_ONLY line.
2026-10-20 22:07:10 +00:00
aiongg 6265d67de9 Integration: naming templates and more read-only formats use same_format, for #5857
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.
2026-10-20 22:07:10 +00:00
aiongg f5c2f2091e Merge PR #5857: Batch: Format "Same" saves camera raws as PSD instead of failing (#5799) 2026-10-20 22:07:10 +00:00
0073b395d4 Integration: merge main, resolve conflicts (#5990)
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>
2026-10-20 23:50:13 +02:00
f44e8e4be8 Integration: merge main, resolve conflicts (#6230)
docs/scorecard.md was the only conflict: regenerated with `cargo xtask scorecard`
on the merged tree.

Co-authored-by: Silly Silk <31193727+SillySilk@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-20 23:08:25 +02:00
8317acae04 Integration: Lefx class, linear style names, keep built-in groups, dialog opacity (#4049)
- 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>
2026-10-20 22:57:59 +02:00
Matthias Schlich d104f7015f fix(filters): Clouds and Fibers move with their smart object
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).
2026-10-20 22:49:04 +02:00
jlangeandClaude Opus 5.5 a67b6bca68 Print: keep the printable area to the driver's on a native print, off PDF output (#7782)
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>
2026-10-20 22:47:43 +02:00
David Mann 6db0473b43 Merge PR #7180: Brushes: accept .abr files up to 1 GiB 2026-10-20 22:39:24 +02:00
David Mann 2adfe0c4e2 Merge PR #5807: Type: keep superscript and subscript when a text layer is re-rendered (#5645) 2026-10-20 22:39:12 +02:00
53d780f566 Integration: merge main, resolve conflicts (#4049)
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>
2026-10-20 22:20:58 +02:00
Matthias Schlich 0a7325af6e Merge origin/main into feat/psd-render-smart-filters
# Conflicts:
#	docs/file-format-parity.md
2026-10-20 22:20:37 +02:00
durtyrobbin 70018d0388 Integrate live Mixer Brush with current main 2026-10-20 16:18:50 -04:00
Vikram Bhaskaran 1fd9ea8cfa Merge origin/main into pr/6498-comp-order.
Keep Move Up/Down catalog rows together with main's newer strings, and keep both the reorder tests and the apply-by-name test.
2026-10-21 06:59:45 +11:00
seotarek 121002e1b9 fix(atn): guard radial_blur_to with pixel_target and test mask target (#7234) 2026-10-20 22:49:15 +03:00
jlange 1f1cc11362 Merge remote-tracking branch 'origin/main' into print-fit-printable-7782 2026-10-20 21:23:52 +02:00
seotarek ee042fc49f feat(ui): nest light and dark themes into submenus (#3782) 2026-10-20 22:14:37 +03:00
jonathnwxh e014de4766 Merge DDS format documentation while retaining CSH import status 2026-10-21 03:02:51 +08:00
aiongg d94c277566 Merge PR #5499: perf(retouch): row-parallel Blur/Sharpen dabs, 2.6-3.3x faster strokes (#5426) 2026-10-20 18:41:28 +00:00
aiongg db56aeb10a Merge PR #7813: Choose the graphics adapter on multi-GPU Linux machines (#1885)
# Conflicts:
#	apps/photocraft/src/gpu_startup.rs
#	crates/ui-egui/src/i18n/cs.tsv
#	crates/ui-egui/src/i18n/de.tsv
#	crates/ui-egui/src/i18n/el.tsv
#	crates/ui-egui/src/i18n/es.tsv
#	crates/ui-egui/src/i18n/fr.tsv
#	crates/ui-egui/src/i18n/hu.tsv
#	crates/ui-egui/src/i18n/id.tsv
#	crates/ui-egui/src/i18n/it.tsv
#	crates/ui-egui/src/i18n/ja.tsv
#	crates/ui-egui/src/i18n/ko.tsv
#	crates/ui-egui/src/i18n/nl.tsv
#	crates/ui-egui/src/i18n/pl.tsv
#	crates/ui-egui/src/i18n/pt-br.tsv
#	crates/ui-egui/src/i18n/ru.tsv
#	crates/ui-egui/src/i18n/sr.tsv
#	crates/ui-egui/src/i18n/tr.tsv
#	crates/ui-egui/src/i18n/uk.tsv
#	crates/ui-egui/src/i18n/vi.tsv
#	crates/ui-egui/src/i18n/zh-hans.tsv
#	crates/ui-egui/src/i18n/zh-hant.tsv
#	crates/ui-egui/src/prefs_ui.rs
2026-10-20 18:41:25 +00:00
aiongg 1ca8a8aad0 Merge PR #7964: Preserve near-black ICC colors on the GPU canvas
# Conflicts:
#	contributors/people.toml
2026-10-20 18:39:43 +00:00
aiongg 1e2bea1060 Merge PR #6395: Windows: PhotoCraft starts without Windows.Data.Pdf.dll (#5884) 2026-10-20 18:39:29 +00:00
aiongg e2169d0dfd Merge PR #7847: Print: Portrait and Landscape in the Print dialog on Windows 2026-10-20 18:39:29 +00:00
aiongg c8cf9eaf0d Merge PR #7180: Brushes: accept .abr files up to 1 GiB 2026-10-20 18:39:28 +00:00