487 Commits
Author SHA1 Message Date
David Mann a037e55a7f Merge pull request #9952 from ashokram-si/feat/jpeg-options-size-readout
JPEG Options: show how big the file will be (FILE-215-19, #7843)
2026-11-12 13:26:45 +01:00
Dylan M. Taylor 21bb9fda63 Use shared crates for raster codecs (#13416)
* Use craft-raster-codecs, craft-dpx, craft-tga, craft-gif and craft-exr for the format code in crates/codecs

* Regenerate lockfile for current shared format crates

* Pin shared format crates to current craft-libs main

* Fix codec module imports for clippy
2026-11-12 01:29:33 -05:00
David Mann 82adf56e11 Merge remote-tracking branch 'origin/main' into feat/jpeg-options-size-readout 2026-11-12 02:22:55 +01:00
FredApps 36bfc50fd3 Merge branch 'main' into feat/image-processor-open-documents
Resolve conflicts by keeping both the Image Processor source parameter
and main's pdfSpotPlates text, and by combining the Last updated
headers in docs/gaps.md and docs/target-app-parity.md.
2026-11-11 11:10:40 +01:00
ashokram-si 23104adb7e Merge remote-tracking branch 'origin/main' into feat/jpeg-options-size-readout
# Conflicts:
#	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/hi.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
#	docs/gaps.md
#	docs/target-app-parity.md
2026-11-11 10:26:12 +05:30
Tom InglingandClaude c77f589184 Merge storytold main (0d08cb7dd) into pdf-spot-plates
One conflict, the gaps.md header: main's line (2026-11-08, G9 Column
Size now leads it) with this branch's G10 spot-plate item in front.
Main's changes to control-protocol.md and pdf/text.rs merged cleanly;
the doc.save row keeps `pdfSpotPlates`.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-10 13:48:01 -05:00
FredApps 96581039a8 Merge main into feat/ui-217-4-columns-unit 2026-11-10 18:41:49 +01:00
ashokram-si 1d0cfbcf6a Merge remote-tracking branch 'origin/main' into feat/jpeg-options-size-readout
# Conflicts:
#	contributors/people.toml
#	crates/ui-egui/src/i18n/cs.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/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
#	docs/file-format-parity.md
#	docs/gaps.md
#	docs/target-app-parity.md
2026-11-10 22:29:29 +05:30
Tsieg e0cb757a64 Merge main into Image Processor source branch 2026-11-10 20:09:45 +07:00
Tom InglingandClaude 9b5568ec92 Merge storytold main (2a950d64d) into pdf-spot-plates
Conflicts were the two docs headers only: gaps.md and
file-format-parity.md each take main's line (Fujifilm compressed RAF
now leads it) with this branch's PDF spot-plate items in front. Main
did not touch the PDF writer or the save commands since 009b93c5e.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-10 07:42:12 -05:00
Tsieg 9f1e7a50cc feat: support current and open documents in Image Processor 2026-11-10 17:37:13 +07:00
Tom InglingandClaude Fable 5.1 d08a0bfaba Merge storytold main (009b93c5e) into pdf-spot-plates: plates on artboard pages
Main rewrote the PDF writer since e4e2607c8: a page per artboard with
page labels, writer cancellation (`ctl`), an export memory budget, and
PDF import. This branch adds spot plates, an optional page image and an
XMP packet. The merged writer keeps both:

- `print_pdf_pages` numbers its objects dynamically: per page its page,
  contents, image and one XObject per plate; then the shared font, ICC
  profile, overprint ExtGState and XMP metadata stream, each only when
  present, the selection font and last the page-label tree. The XMP
  packet is a parameter now, not a page field, since it is the
  catalog's.
- `export(doc, spot_plates, ctl)` / `export_with(doc, spot_plates, xmp,
  ctl)`. An artboard page carries its own region of every plate
  (`plates_of` takes the page rect), so a two-board document separates
  into two pages of named plates; a Multichannel artboard document is
  pages of plates alone. The export budget counts one byte a pixel per
  plate alongside the composite. New test:
  artboard_pages_carry_their_region_of_each_plate.
- lib.rs passes `ctl` through; the PDF arm keeps the XmpEmbed gate.
- file_cmds.rs: main's `maximizeCompatibility` and this branch's
  `pdfSpotPlates` both listed in the four spec strings and the import.
- docs: gaps.md and file-format-parity.md headers take main's line with
  this branch's items in front; the PDF parity row keeps main's new
  read column and notes and this branch's plate notes, plus that an
  artboard page carries its region of each plate; control-protocol.md's
  doc.save row lists both new params.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-09 14:46:47 -05:00
c2408b376f Merge origin/main into feat/jpeg-options-size-readout (#9952)
Main added toolbar rows next to the JPEG size-readout rows in 17
translation catalogs and new status-line entries in docs/gaps.md and
docs/target-app-parity.md; kept both sides.

Co-Authored-By: ashokram-si <ashokram-si@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-09 17:29:59 +01:00
David Mann 80b6f3d9b3 Merge remote-tracking branch 'origin/main' into pr-6215
# Conflicts:
#	docs/gaps.md
#	docs/ui-parity.md
2026-11-09 17:06:19 +01:00
David Mann 68547285b5 Merge main into #7377 (Fujifilm compressed RAF) 2026-11-09 17:06:04 +01:00
David Mann e06ba09af4 Merge remote-tracking branch 'origin/main' into pr-6215
# Conflicts:
#	docs/gaps.md
#	docs/ui-parity.md
2026-11-09 14:38:19 +01:00
719ce3cfda Merge main into #9798 (Cylinder warp editor)
Conflict only in docs/gaps.md's status line: both entries kept.

Co-Authored-By: TimothyBritt <TimothyBritt@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-09 14:36:07 +01:00
David Mann 3369f427ba Merge main into #7377 (Fujifilm compressed RAF)
Only the docs status lines conflicted: main's text, with the compressed RAF entry kept first.
2026-11-09 14:26:32 +01:00
Tim BrittandClaude Fable 5.1 5872941b12 Warp mode: the cylinder's grid and handles as the reference's, and a stored warp previews unwarped (#9798)
The cylinder is outlined and cut into a 3 × 2 grid (two horizontal curves and
the centre line) that hugs the warped picture. The handle in the middle of the
upper arc sets the bend of both arcs, the one in the middle of the lower arc the
lower edge's height, and the wrap handle sits at the grid's centre and slides to
the right (starting 15 % along), stretching the middle of the picture and
squeezing its sides round the back.

A smart object's stored warp used to enter Warp mode with the layer's already
warped render as the preview texels, which the mesh then warped again, so the
picture never sat on the grid: the session now previews the source placed
without the warp over the warp box. Edit › Transform › Warp carries a check
while the active layer is warped, as the reference's does.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-09 04:36:43 +00:00
Tim BrittandClaude Fable 5.1 5e7bccc4d8 Address review: match the reference's Cylinder editor (#9798)
As a maintainer compared it with the reference application: Bend, H and V stay
in the bar, greyed (no Top/Bottom/Wrap fields); the starting cylinder has its
four corners on the box and both curves 50 % deep; five handles (the top-right
and bottom-left corners, the front of each curve, a wrap handle near the middle
dragged sideways); a drag on the surface moves the whole cylinder; the overlay
is the two curves and the centre line, not a grid.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-09 04:36:28 +00:00
Tim BrittandClaude Fable 5.1 4243427390 Warp mode: edit Photoshop's Cylinder warp with handles and fields (#4112)
The Warp menu lists Cylinder after the presets (not on type). Picking it starts
a cylinder fitted to the box; handles set its seven values: the corners move a
silhouette and an edge, the middle of a silhouette moves it alone, the middle of
the top and bottom edge sets that ellipse's depth, and a drag across the surface
turns the contents round the cylinder. The options bar shows Top, Bottom and
Wrap in place of Bend, H and V, with Split, Grid and the orientation switch
greyed. The warp stays a cylinder through the commit, so a smart object keeps it
as `warpCylinder`.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-09 04:36:28 +00:00
David MannandClaude Opus 5.5 4ebd2da168 Regenerate scorecard after merging main; preference counts of 199
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 23:55:07 +01:00
David Mann 61dfc33a04 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	docs/gaps.md
#	docs/scorecard.md
#	docs/ui-parity.md
2026-11-08 23:28:28 +01:00
David Mann 0523777541 Merge origin/main into fix/average-smart-filters 2026-11-08 22:24:23 +01:00
David Mann 7fc72c7591 Merge origin/main into feat/jpeg-options-size-readout 2026-11-08 22:24:18 +01:00
6afd603e53 Merge main into #7377 (Fujifilm compressed RAF)
Only the doc status lines, histories and raw tables conflicted. The
status lines take main's with the #7377 entry kept first; histories keep
both sides. The RAF table row keeps this PR's compressed support next to
main's new Hasselblad 3FR row and its sidecar status, and points at the
moved test file tests/it/raf.rs. The Camera RAW row keeps main's 3FR and
Nikon text and no longer lists compressed RAF as open.

Co-Authored-By: Yorgos S. <smyrgeorge@gmail.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 20:35:13 +01:00
David Mann 55498d45ba Merge remote-tracking branch 'origin/main' into pr-9077
# Conflicts:
#	docs/gaps.md
2026-11-08 18:55:24 +01:00
David Mann 85971ce95f Merge remote-tracking branch 'origin/main' into pr-5224
# Conflicts:
#	crates/ui-egui/src/panels/brush_panel/tests.rs
#	crates/ui-egui/src/panels/brush_sections/tests.rs
#	docs/brush-parity.md
#	docs/gaps.md
2026-11-08 14:51:51 +01:00
David Mann d95faebaa3 Merge remote-tracking branch 'origin/main' into pr-9077
# Conflicts:
#	docs/gaps.md
#	docs/target-app-parity.md
2026-11-08 03:04:43 +01:00
David Mann ce7706f041 Merge remote-tracking branch 'origin/main' into pr-5224
# Conflicts:
#	crates/ui-egui/src/panels/brush_panel/tests.rs
#	crates/ui-egui/src/panels/brush_sections/tests.rs
#	docs/brush-parity.md
#	docs/gaps.md
2026-11-08 02:49:33 +01:00
c79fd49996 Merge origin/main into feat/jpeg-options-size-readout
Conflicts: the status lines of docs/file-format-parity.md and docs/gaps.md take main's entries
plus this PR's JPEG clause; the JPEG row takes main's text with this PR's size-readout sentence.

Co-Authored-By: Ashok Ram <ashokram-si@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 02:45:07 +01:00
960bd438e3 Merge origin/main into PR #5250 (Both Axes on the Scatter header)
Co-Authored-By: augrclk <augrclk@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 02:37:20 +01:00
David Mann 9849f778d8 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	docs/gaps.md
#	docs/scorecard.md
#	docs/ui-parity.md
2026-11-08 01:43:45 +01:00
c751712a53 Merge origin/main into PR #5250 (Both Axes on the Scatter header)
Main added Brush Tip Shape Angle/Roundness tests and doc rows at the same places as
this PR's Scatter header tests and rows; both sides are kept, and the doc status
lines name both changes.

Co-Authored-By: augrclk <augrclk@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 23:45:02 +01:00
David Mann 977f80dc42 Merge origin/main into PR #9058 (raw: Hasselblad 3FR/FFF)
# Conflicts:
#	docs/gaps.md
2026-11-07 23:30:32 +01:00
David Mann e5d6d552ae Merge origin/main into feat/jpeg-options-size-readout 2026-11-07 23:27:02 +01:00
David Mann b8b539c845 Merge origin/main into PR #9058 (raw: Hasselblad 3FR/FFF) 2026-11-07 19:37:23 +01:00
David MannandClaude Opus 5.5 97d5880b1f Merge origin/main into feat/jpeg-options-size-readout
Conflicts: the i18n catalogs keep both main's new rows and the JPEG size row; the parity docs
take main's status lines plus this PR's JPEG clause; the JPEG Options module doc keeps both the
size readout and main's remembered settings.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 19:13:41 +01:00
7f09b2013d Merge current main into #9077 (Average on Smart Objects)
Resolves the status-line conflicts in docs/gaps.md and
docs/target-app-parity.md (both sides kept) and the module list in
crates/engine/tests/it/main.rs.

Co-Authored-By: arjen <76012639+ArjenS-LA@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 18:48:12 +01:00
David Mann 7892e148b2 Merge origin/main into PR #5250 (Both Axes on the Scatter header)
Main moved brush_sections.rs to panels/, its tests to brush_sections/tests.rs and
split widgets.rs into modules. The PR's tests now live in brush_sections/tests.rs and
scrub_label_within is crate-visible from widgets/scrub.rs; both doc status lines and
history rows keep both sides.
2026-11-07 17:30:24 +01:00
a3712435c3 Merge main into #5269 (Brush Tip Shape Angle/Roundness layout)
main moved brush_sections.rs to panels/ with its tests in
panels/brush_sections/tests.rs, and gave the Angle and Roundness fields
accessible names. Keep the PR's left column and right-hand widget with
main's accessible names, move the PR's three layout tests and
section_harness_width into the new tests file, and find the captions with
main's caption_rect (get_by_label now also matches the named fields).
Docs: both sides' status entries kept.

Co-Authored-By: augrclk <217665348+augrclk@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 17:07:55 +01:00
David Mann fd4f9c9703 Merge remote-tracking branch 'origin/main' into pr-5224
# Conflicts:
#	crates/ui-egui/src/panels/brush_sections.rs
#	docs/brush-parity.md
#	docs/gaps.md
2026-11-07 15:09:34 +01:00
b9323e117e Merge main into #7377 (Fujifilm compressed RAF)
Main moved crates/raw/src/testgen.rs into testgen/ and the integration
tests into tests/it/, and its preview fallback now also opens a larger
JPEG XL preview. The compressed RAF test generator moves to
testgen/raf.rs; the JPEG fallback and the damaged-data fallback both go
through preview_image (Adobe RGB tag from the EXIF) under the caller's
decode limits. Doc status lines and histories keep both sides; G14 and
the Camera Raw row no longer list compressed RAF as missing.

Co-Authored-By: Yorgos S. <smyrgeorge@gmail.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 13:43:08 +01:00
RickiNano 1aa85bd796 Windows: the pen's eraser end selects the Eraser (#2285)
The pointer hooks read PEN_FLAG_INVERTED from GetPointerPenInfo and
report the pen end through Services::pen_end, so flipping the pen
switches to the Eraser and the tip restores the previous tool, as on
macOS. A WH_CALLWNDPROC hook beside WH_GETMESSAGE catches
WM_POINTERLEAVE, which Windows documents as sent, not posted.
PEN_FLAG_ERASER alone is an eraser button on the barrel and does not
switch tools.
2026-11-06 19:45:17 +01:00
David Mann e8bb14bb0f Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	docs/scorecard.md
#	docs/ui-parity.md
2026-11-06 14:05:34 +01:00
ashokram-si 3a06d48cd7 Merge remote-tracking branch 'origin/main' into feat/jpeg-options-size-readout
# Conflicts:
#	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/hi.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
#	docs/gaps.md
#	docs/target-app-parity.md
2026-11-06 10:00:08 +05:30
Gotya-OFFCIAL e7241d2e26 raw: decode Hasselblad 3FR/FFF (X2D II 100C, uncompressed)
The X2D II 100C's 3FR files develop at full sensor resolution instead of
falling back to the camera's embedded JPEG preview. A 3FR is a TIFF whose
IFD0 holds the camera's JPEG and whose CFA image sits in a SubIFD with
DNG-style tags but no DNGVersion and no CFA-pattern tag (neither the
TIFF/EP pair nor the EXIF one), which is why the generic TIFF/EP path
reported "CFA pattern not recorded". The new decoder reuses the shared
strip reader, takes BlackLevel, WhiteLevel, DefaultCropOrigin/Size and
AsShotNeutral from the file, and takes the Bayer phase from a measured
per-body table (the X2D II 100C: RGGB at the data origin, measured
against the camera's own embedded JPEG; unmeasured bodies warn).
Lossless-JPEG 3FR stays preview-only, like uncompressed-only ORF and RAF
before it.

Clean-room: the TIFF 6.0 and DNG specifications, the sample file's bytes
and its embedded JPEG; no code or tables from dcraw, LibRaw, rawspeed,
rawler or darktable.

Adds round-trip and hostile tests through a mirrored synthetic builder
(tests/it/hasselblad.rs, testgen::Hasselblad3frSpec) and updates the
support matrix (file-format-parity, gaps G14, target-app-parity).
2026-11-06 12:05:10 +08:00
David Mann 0fb63e2f58 Merge commit '9bef3b2dc8b84c1b6cefc8ce0dc2b01d089cd9e8' into HEAD
# Conflicts:
#	docs/gaps.md
#	docs/scorecard.md
#	docs/ui-parity.md
2026-11-06 02:07:26 +01:00
ArjenS-LA a38fc6ff5b Refresh Average Smart Filter stack and verify selection and channel values 2026-11-05 15:53:24 -08:00
ArjenS-LA 19b5ef0fb3 Merge current main and strengthen Average selection regression 2026-11-05 15:52:30 -08:00