radialmonster
749636fb2e
LR-IMP-FORMATS: decode table-less Nikon 34713 NEFs stored as packed 12/14-bit data
2026-10-15 08:25:08 -04:00
Brandon Thomas
5e9f7f1a65
Merge PR #1027 (rebased)
...
# Conflicts:
# ROADMAP.md
# docs/gaps.md
# docs/parity-checklist.md
# docs/target-app-parity.md
2026-10-15 03:40:37 -04:00
Brandon Thomas
9ddb8d1824
Merge PR #1663 (rebased)
...
# Conflicts:
# crates/ui-egui/locales/de.json
# crates/ui-egui/locales/es.json
# crates/ui-egui/locales/fr.json
# crates/ui-egui/locales/ja.json
# crates/ui-egui/locales/pt-br.json
# crates/ui-egui/locales/ru.json
# crates/ui-egui/locales/uk.json
# crates/ui-egui/locales/zh-hans.json
# crates/ui-egui/locales/zh-hant.json
2026-10-15 03:40:17 -04:00
Brandon Thomas
8291f08ab7
Merge PR #1602 (rebased)
2026-10-15 03:40:15 -04:00
Brandon Thomas and Claude Opus 5.5
1d7699056e
Merge PR #1027
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 03:36:18 -04:00
Brandon Thomas and Claude Opus 5.5
2179473536
Merge PR #1663
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 03:24:51 -04:00
Brandon Thomas and Claude Opus 5.5
00dced3dae
Batch 39: #1829 's straight brush lines carry pen pressure as the author merged them with #1033 (the whole masks.rs from the PR head)
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 03:07:35 -04:00
Brandon Thomas and Claude Opus 5.5
4212907656
Merge PR #1602
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 03:02:56 -04:00
Brandon Thomas
fd80e4eb2f
Merge PR #1829 (updated head)
2026-10-15 03:01:12 -04:00
Brandon Thomas
809259a37d
Merge PR #1829 (rebased)
...
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-15 02:32:15 -04:00
Michael Anderson
fc6719d1db
Merge remote-tracking branch 'upstream/main' into feat/brush-shift-click
...
# Conflicts:
# docs/whats-new.md
2026-10-15 01:07:50 -05:00
Brandon Thomas and Claude Opus 5.5
a39e85da72
Merge PR #1829
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 02:00:02 -04:00
Brandon Thomas and Claude Opus 5.5
e44e7157fc
Batch 38: rustfmt and parity summary after the merges
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:58:56 -04:00
Michael Anderson
a77eafb32a
Merge remote-tracking branch 'upstream/main' into feat/brush-shift-click
...
# Conflicts:
# docs/whats-new.md
2026-10-15 00:54:23 -05:00
Brandon Thomas
11351ef141
Merge PR #1834 (rebased)
...
# Conflicts:
# crates/ui-egui/locales/cs-formats.json
# crates/ui-egui/locales/pl-formats.json
# crates/ui-egui/src/lib.rs
2026-10-15 01:48:46 -04:00
Brandon Thomas
d5b2cd1474
Merge PR #1595 (rebased)
...
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-15 01:48:05 -04:00
Brandon Thomas
97959610be
Merge PR #1592 (rebased)
...
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-15 01:47:46 -04:00
Brandon Thomas
99eba2e069
Merge PR #1586 (rebased)
...
# Conflicts:
# crates/engine/src/camera_preview.rs
# crates/engine/src/files.rs
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-15 01:45:53 -04:00
Brandon Thomas
e4519aa710
Merge PR #1487 (rebased)
...
# Conflicts:
# docs/parity-checklist.md
2026-10-15 01:43:02 -04:00
Brandon Thomas and Claude Opus 5.5
26e43cd691
Merge PR #1595
...
Stacked on rb/1592: LOOK_VERSION 8 -> 9; the PR's corpus-profile helper is the base's corpus_uses_the_bundled_profile.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:42:11 -04:00
Brandon Thomas and Claude Opus 5.5
480e96c030
Merge PR #1592
...
Stacked on rb/1586: LOOK_VERSION 7 -> 8; README lists the base's ILCA-99M2 profile too.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:42:11 -04:00
Brandon Thomas and Claude Opus 5.5
2756414f46
Merge PR #1586
...
Resolved against rb-base-36: LOOK_VERSION 6 -> 7; starting_colour_tags passes no lens (merge frames arrive without it).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:42:11 -04:00
Brandon Thomas and Claude Opus 5.5
b5733c7649
Merge PR #1487
...
Resolved against rb-base-36: Scanned keeps the base's rewrite flag next to magic and tag; Exif keeps the Panasonic lens fallback; locale catalogs merged (one duplicate key dropped).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:42:11 -04:00
Brandon Thomas and Claude Opus 5.5
dec7fd4eb2
Merge PR #1834
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:26:47 -04:00
Brandon Thomas
51a784cd95
Merge PR #1475 (rebased)
...
# Conflicts:
# crates/raw/examples/rawinfo.rs
# crates/raw/src/lib.rs
# crates/raw/src/vendor/arw.rs
# crates/raw/src/vendor/erf.rs
# crates/raw/src/vendor/mef.rs
# crates/raw/src/vendor/nef.rs
# crates/raw/tests/lossy_dng.rs
# crates/raw/tests/robust.rs
2026-10-15 01:13:36 -04:00
Brandon Thomas
cf0002b484
Merge PR #1471 (rebased)
...
# Conflicts:
# docs/parity-checklist.md
2026-10-15 01:10:17 -04:00
Brandon Thomas
66a0cd826c
Merge PR #1475
...
# Conflicts:
# crates/merge/src/output.rs
# crates/raw/src/vendor/nef.rs
2026-10-15 01:05:31 -04:00
Brandon Thomas
7f7401713a
Merge PR #1471
...
# Conflicts:
# crates/engine/src/camera_preview.rs
# crates/engine/src/merge.rs
# crates/merge/src/frame.rs
# crates/merge/src/hdr.rs
# docs/parity-checklist.md
2026-10-15 00:56:52 -04:00
Brandon Thomas and Claude Opus 5.5
3c489dc408
Batch 37: the print commands ( #1215 ) take the Result that Session::targets returns since #1773
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 00:56:44 -04:00
Brandon Thomas
9ca113defa
Merge PR #1135 (rebased)
...
# Conflicts:
# xtask/src/main.rs
2026-10-15 00:53:45 -04:00
Brandon Thomas
8591cdfa6b
Merge PR #1469 (rebased)
...
# Conflicts:
# crates/engine/src/lib.rs
# docs/parity-checklist.md
2026-10-15 00:52:33 -04:00
Brandon Thomas
0af2d36442
Merge PR #1320 (rebased)
2026-10-15 00:52:32 -04:00
Brandon Thomas
cab59313fd
Merge PR #1316 (rebased)
2026-10-15 00:52:32 -04:00
Brandon Thomas
b3012745d5
Merge PR #1215 (rebased)
...
# Conflicts:
# docs/gaps.md
# docs/parity-checklist.md
2026-10-15 00:52:31 -04:00
Brandon Thomas
f7204aa8dd
Merge PR #1176 (rebased)
2026-10-15 00:52:31 -04:00
Brandon Thomas
8b73a2ec2f
Merge PR #1138 (rebased)
...
# Conflicts:
# docs/gaps.md
2026-10-15 00:52:30 -04:00
Brandon Thomas
a690478e52
Merge PR #1773 (rebased)
...
# Conflicts:
# docs/whats-new.md
2026-10-15 00:52:29 -04:00
Brandon Thomas
7b49657a26
Merge PR #1705 (rebased)
2026-10-15 00:52:27 -04:00
Brandon Thomas
12eab11cf5
Merge PR #1469
...
# Conflicts:
# crates/engine/src/cmd/preset_files.rs
# crates/engine/src/tests_import.rs
# docs/parity-checklist.md
# docs/xmp-interop.md
2026-10-15 00:50:08 -04:00
Michael Anderson
dc562c654a
Merge remote-tracking branch 'upstream/main' into feat/brush-shift-click
...
# Conflicts:
# crates/engine/src/cmd/masks.rs
# crates/ui-egui/src/panels/detail.rs
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-14 23:45:14 -05:00
Brandon Thomas
372f39f8f7
Merge PR #1320
...
# Conflicts:
# crates/engine/src/files.rs
# crates/raw/src/demosaic/ahd.rs
2026-10-15 00:38:16 -04:00
Brandon Thomas
af8843bf01
Merge PR #1316
...
# Conflicts:
# crates/engine/src/camera_preview.rs
# crates/engine/src/media.rs
2026-10-15 00:33:33 -04:00
Brandon Thomas and Claude Opus 5.5
2475cf5e32
Merge PR #1773
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 00:31:26 -04:00
Brandon Thomas
b29a1a8cc2
Merge PR #1215
...
# Conflicts:
# crates/engine/src/lib.rs
# crates/engine/src/pdf.rs
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/menus.rs
# crates/ui-egui/src/panels/dialogs.rs
# crates/ui-egui/src/state.rs
# docs/gaps.md
# docs/parity-checklist.md
2026-10-15 00:22:08 -04:00
Brandon Thomas
77dc170ede
Merge PR #1053 (updated head)
...
# Conflicts:
# crates/engine/examples/raw_frame.rs
# crates/raw/src/vendor/nef.rs
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/whats-new.md
# xtask/src/main.rs
2026-10-15 00:10:37 -04:00
Brandon Thomas
f613aeba59
Merge PR #1176
...
# Conflicts:
# crates/raw/src/vendor/arw.rs
# docs/parity-checklist.md
# docs/sony-lens-corrections.md
2026-10-14 23:54:06 -04:00
Brandon Thomas
e6b2e6eefb
Merge PR #1138
...
# Conflicts:
# crates/catalog/src/lib.rs
# crates/catalog/src/query.rs
# crates/engine/src/cmd/library.rs
# crates/ui-egui/src/tests_keywording.rs
# docs/gaps.md
2026-10-14 23:46:16 -04:00
Brandon Thomas and Claude Opus 5.5
851aedc64d
Batch 36: tests and tracker after the merges
...
- Visualize HDR (#1555 ) has no default key: ⇧H cycles the Tool Overlay (#1473 , issue #224 )
- CR3 tests (#1461 , #1462 ) accept adaptive QP 131–175, as #1694 decodes; cr3.md says the R6 Mark II files decode
- English fallbacks in the Czech and Polish catalogs use → for the menu triangle; Polish in the keyword-label test
- canvas handle tests show pins (Tool Overlay Always); a focused handle keeps its pins shown in Auto
- the model-install test and demo deadlock guards wait on deadlines long enough for a busy machine
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 23:25:29 -04:00
Brandon Thomas
9ca3cd0926
Merge PR #1135
...
# Conflicts:
# Cargo.lock
# Cargo.toml
# README.md
# crates/raw/Cargo.toml
# crates/ui-egui/src/theme.rs
# xtask/src/main.rs
2026-10-14 23:23:18 -04:00
Brandon Thomas and Claude Opus 5.5
b8c5913afe
Merge PR #1705
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 23:11:45 -04:00
radialmonster