From f86517a029d96f887cd82ff8062a5e7759372c5e Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 12 Oct 2026 05:50:36 -0400 Subject: [PATCH 01/92] fix(psd): write descriptor ids warp, list and time as length-4 strings (#4039) A descriptor class or key id is a u32 length and bytes, where length 0 means a 4-byte code follows. Photoshop stores `warp`, `list` and `time` as length-4 strings and treats the code form as a different key, so the warps of new smart objects and type layers and regenerated layer comp lists were not recognised. In the corpus, `warp` appears 741 times as a string and never as a code, `list` 5/0, `time` 7/0. `Id::new` now makes these three names string ids, as keys and class ids. Reading is byte-based and accepts both forms; a code read from a file is written back as a code. Tests: exact bytes for each name as class and key, both forms read, fresh placed-layer warp (SoLd/PlLd) and layer comp list bytes. Co-authored-by: Claude Opus 5.5 --- crates/io/src/comps_map.rs | 3 +++ crates/io/src/smart_map.rs | 22 +++++++++++++++++++ crates/psd/src/descriptor.rs | 41 ++++++++++++++++++++++++++++++++++-- 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/crates/io/src/comps_map.rs b/crates/io/src/comps_map.rs index 5b0759da..8d0c78f3 100644 --- a/crates/io/src/comps_map.rs +++ b/crates/io/src/comps_map.rs @@ -376,6 +376,9 @@ mod tests { }); d.last_applied_comp = Some(7); let res = write_comps_resource(&d).unwrap(); + // `list` is a length-4 string id, as Photoshop writes it, never a code. + assert!(res.windows(8).any(|w| w == b"\0\0\0\x04list")); + assert!(!res.windows(8).any(|w| w == b"\0\0\0\0list")); let cm = write_cmls(&d.layer_comps, None, d.layer(lid).unwrap(), 3).unwrap(); // Attach as Photoshop would: shmd with cmls plus another item. let mut raw = vec![(*b"shmd", write_shmd(&[MetadataItem::new(*b"cust", vec![1, 2])]))]; diff --git a/crates/io/src/smart_map.rs b/crates/io/src/smart_map.rs index f1fb78e9..d4c02894 100644 --- a/crates/io/src/smart_map.rs +++ b/crates/io/src/smart_map.rs @@ -817,6 +817,28 @@ pub fn uuid_from(seed: &[u8]) -> String { mod tests { use super::*; + fn count(hay: &[u8], needle: &[u8]) -> usize { + hay.windows(needle.len()).filter(|w| *w == needle).count() + } + + /// A freshly built placed layer writes `warp` (key and class) as a length-4 string, as + /// Photoshop does; the code form is a different key to Photoshop. + #[test] + fn fresh_placed_warp_is_a_string_id() { + let spec = + PlacedSpec { idnt: "id", placed: "id", transform: Affine::IDENTITY, perspective: None, size: (10.0, 10.0), dpi: 72.0, warp: None, filter_fx: None }; + let mut warnings = Vec::new(); + let sold = sold_bytes(None, &spec, &mut warnings); + let plld = plld_bytes(&spec, &mut warnings); + // `SoLd`: the `warp` key and the warp descriptor's class; `PlLd`: the descriptor's class. + for (bytes, n) in [(&sold, 2), (&plld, 1)] { + assert_eq!(count(bytes, b"\0\0\0\x04warp"), n); + assert_eq!(count(bytes, b"\0\0\0\0warp"), 0); + } + let d = sold_descriptor(&sold).unwrap(); + assert!(matches!(d.get("warp"), Some(Value::Descriptor(w)) if w.class_id == Id::Str(b"warp".to_vec()))); + } + fn sf(command: &str, params: J) -> SmartFilter { SmartFilter { command: command.into(), params, blend: BlendMode::Normal, opacity: 1.0, visible: true } } diff --git a/crates/psd/src/descriptor.rs b/crates/psd/src/descriptor.rs index a2eab7ae..3e0cc251 100644 --- a/crates/psd/src/descriptor.rs +++ b/crates/psd/src/descriptor.rs @@ -44,6 +44,10 @@ impl UnicodeString { } } +/// Four-character class and key ids Photoshop writes as length-4 strings, never as codes +/// (`00000004 'warp'`, not `00000000 'warp'`). +pub const STRING_IDS: [&str; 3] = ["warp", "list", "time"]; + /// A class / key / type identifier: a length-prefixed string, where a stored /// length of 0 means a 4-character code follows. #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -57,10 +61,15 @@ pub enum Id { impl Id { /// Convenience constructor: 4-byte strings become [`Id::Code`], others - /// [`Id::Str`]. + /// [`Id::Str`]. The four-character names Photoshop stores as length-4 strings + /// ([`STRING_IDS`]: `warp`, `list`, `time`) are [`Id::Str`] too: Photoshop treats the + /// string and the code as different keys and doesn't recognise the code form. pub fn new(s: &str) -> Self { let b = s.as_bytes(); - if b.len() == 4 { Id::Code([b[0], b[1], b[2], b[3]]) } else { Id::Str(b.to_vec()) } + match b { + [a, b, c, d] if !STRING_IDS.contains(&s) => Id::Code([*a, *b, *c, *d]), + _ => Id::Str(b.to_vec()), + } } /// The identifier's bytes. pub fn as_bytes(&self) -> &[u8] { @@ -609,6 +618,34 @@ mod tests { assert_eq!(p.to_bytes(), b); } + /// `warp`, `list` and `time` are written as length-4 strings, as Photoshop writes them, both + /// as keys and as class ids; other four-character names stay codes. Reading accepts both + /// forms, and a code read from a file is written back as a code. + #[test] + fn photoshop_string_ids_are_written_as_strings() { + let str_id = |s: &str| [&[0, 0, 0, 4][..], s.as_bytes()].concat(); + let code_id = |s: &str| [&[0, 0, 0, 0][..], s.as_bytes()].concat(); + for name in STRING_IDS { + assert_eq!(Id::new(name), Id::Str(name.as_bytes().to_vec())); + let d = Descriptor::new(name).with(name, Value::Integer(1)); + let b = d.to_bytes(); + // Name (empty unicode string), then the class id; then the item count and the key. + assert_eq!(&b[4..12], &str_id(name)[..], "class {name}"); + assert_eq!(&b[16..24], &str_id(name)[..], "key {name}"); + let back = Descriptor::from_bytes(&b).unwrap(); + assert_eq!(back, d); + assert!(back.class_id.is(name) && back.get(name).is_some()); + // A file that wrote the code form keeps it, and lookups still find the key. + let mut coded = b.clone(); + coded.splice(16..24, code_id(name)); + let back = Descriptor::from_bytes(&coded).unwrap(); + assert_eq!(back.get(name), Some(&Value::Integer(1))); + assert_eq!(back.to_bytes(), coded); + } + assert_eq!(Id::new("view"), Id::Code(*b"view")); + assert_eq!(Id::new("Txt "), Id::Code(*b"Txt ")); + } + #[test] fn versioned_roundtrip() { let v = VersionedDescriptor::new(sample()); From 32552a61a1bce252f203aa49aeb8ce8fb9379180 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 12 Oct 2026 05:56:09 -0400 Subject: [PATCH 02/92] fix(liquify): dab spacing runs on along the whole stroke, so pointer speed no longer changes the warp (#2606) (#4047) Liquify dabs were spaced a fifth of the brush radius apart and restarted at every pointer event, so a fast mouse (few far-apart events) and a slow one (many close ones) warped the same path differently, and a slow drag piled up one dab per event. Dabs now fall every twentieth of the radius by distance travelled along the whole stroke, carried from one segment to the next, as in Photoshop: any sampling of a path gives the same field. The stationary tools' per-dab strength is scaled to the new spacing so their effect per distance travelled is unchanged. Co-authored-by: Claude Opus 5.5 --- crates/algo/examples/bench_liquify.rs | 16 ++ crates/algo/src/liquify.rs | 252 ++++++++++++++++++++------ 2 files changed, 212 insertions(+), 56 deletions(-) diff --git a/crates/algo/examples/bench_liquify.rs b/crates/algo/examples/bench_liquify.rs index a953463f..2eea3b95 100644 --- a/crates/algo/examples/bench_liquify.rs +++ b/crates/algo/examples/bench_liquify.rs @@ -59,6 +59,22 @@ fn main() { prev = p; } println!("forward-warp segment (600 px brush, 25 px moves) + proxy update: mean {:.2} ms, worst {:.2} ms", total / n as f64, worst); + // One 3000 px drag with a 200 px brush (a straight leg, then a diagonal one), as a slow + // (every 2 px) and a fast (every 60 px) pointer reports it: the field cost of the whole + // stroke, and how far the two results differ. + let mut drag = LiquifyStroke::new(LiquifyTool::ForwardWarp, 200.0); + let mut fields = Vec::new(); + let along = |d: f64| if d <= 1500.0 { vec![1500.0 + d, 2000.0] } else { vec![3000.0 + (d - 1500.0) * 0.6, 2000.0 + (d - 1500.0) * 0.8] }; + for step in [2.0, 60.0] { + drag.points = (0..=(3000.0 / step) as usize).map(|k| along(k as f64 * step)).collect(); + let t = Instant::now(); + let mut f = LiquifyField::new(b, cell); + f.apply_stroke(&drag); + println!("forward-warp 3000 px drag (200 px brush), an event every {step} px: {:.1} ms", t.elapsed().as_secs_f64() * 1e3); + fields.push(f); + } + let diff = fields[0].d.iter().zip(&fields[1].d).map(|(p, q)| (p[0] - q[0]).abs().max((p[1] - q[1]).abs())).fold(0.0f32, f32::max); + println!(" slow vs fast pointer: fields differ by at most {diff:.3} px (max displacement {:.1} px)", fields[0].max_displacement()); st.tool = LiquifyTool::Bloat; let t = Instant::now(); let mut d = Rect::EMPTY; diff --git a/crates/algo/src/liquify.rs b/crates/algo/src/liquify.rs index 7e3bb606..adbca868 100644 --- a/crates/algo/src/liquify.rs +++ b/crates/algo/src/liquify.rs @@ -154,7 +154,7 @@ impl LiquifyStroke { } /// The displacement field plus the freeze mask, over `bounds` (document pixels). -#[derive(Clone, Debug, PartialEq)] +#[derive(Clone, Debug)] pub struct LiquifyField { pub bounds: Rect, /// Document pixels per field node. @@ -165,6 +165,38 @@ pub struct LiquifyField { pub d: Vec<[f32; 2]>, /// Freeze mask per node (0 = free, 1 = frozen). pub freeze: Vec, + /// Where the brush stroke in progress stands, so dab spacing runs on across its segments. + cursor: Option, +} + +/// Two fields are equal when their displacement and freeze mask are: the stroke cursor is +/// transient brush state, not part of the result. +impl PartialEq for LiquifyField { + fn eq(&self, o: &Self) -> bool { + self.bounds == o.bounds && self.cell == o.cell && self.w == o.w && self.h == o.h && self.d == o.d && self.freeze == o.freeze + } +} + +/// The brush stroke in progress: the point its last segment ended at, its last dab and how far +/// the brush has travelled along the path since that dab. +#[derive(Clone, Copy, Debug, PartialEq)] +struct StrokeCursor { + end: [f64; 2], + last_dab: [f64; 2], + carry: f64, +} + +/// Distance between dabs along a stroke for brush radius `r`: a twentieth of the radius, so a +/// drag is many small pushes and its edge stays smooth. +fn dab_spacing(r: f64) -> f64 { + (r * 0.05).max(0.5) +} + +/// Per-dab strength of a stationary tool (Twirl, Pucker, Bloat, Reconstruct, Smooth, Freeze, +/// Thaw) while it moves: scaled to the spacing so its effect per distance travelled stays what it +/// was with dabs a fifth of the radius apart. +fn moving_weight(r: f64) -> f64 { + dab_spacing(r) / (r * 0.2).max(0.5) } /// The default field resolution for `bounds`: 2 px per node up to 4 MP, 4 px beyond. @@ -177,7 +209,7 @@ impl LiquifyField { let cell = cell.clamp(1.0, 64.0); let w = (f64::from(bounds.width()) / cell).ceil() as usize + 2; let h = (f64::from(bounds.height()) / cell).ceil() as usize + 2; - LiquifyField { bounds, cell, w, h, d: vec![[0.0; 2]; w * h], freeze: vec![0.0; w * h] } + LiquifyField { bounds, cell, w, h, d: vec![[0.0; 2]; w * h], freeze: vec![0.0; w * h], cursor: None } } /// Document position of node (i, j) (node 0 sits on the first pixel centre). @@ -220,6 +252,7 @@ impl LiquifyField { /// Applies one stroke. Returns the document rectangle whose output changed. pub fn apply_stroke(&mut self, s: &LiquifyStroke) -> Rect { + self.cursor = None; match s.tool { LiquifyTool::LassoMask => return self.apply_lasso(s), LiquifyTool::ReconstructAll => { @@ -306,77 +339,120 @@ impl LiquifyField { /// callers use this plus [`Self::stroke_segment`] per new point, which is exactly what /// [`Self::apply_stroke`] does with the whole point list. pub fn stroke_begin(&mut self, s: &LiquifyStroke, p: [f64; 3]) -> Rect { - if s.tool.is_stationary() && !s.tool.is_global() { self.dab(s, [p[0], p[1]], [0.0, 0.0], p[2].clamp(0.0, 1.0)) } else { Rect::EMPTY } + self.cursor = Some(StrokeCursor { end: [p[0], p[1]], last_dab: [p[0], p[1]], carry: 0.0 }); + if s.tool.is_stationary() && !s.tool.is_global() { self.dab(s, [p[0], p[1]], [0.0, 0.0], p[2].clamp(0.0, 1.0), 1.0) } else { Rect::EMPTY } } - /// Continues a stroke from `a` to `b`: dabs every fifth of the brush radius (a stationary - /// tool held still dabs once at `b`). + /// Continues a stroke from `a` to `b`. Dabs fall every [`dab_spacing`] of distance travelled + /// along the whole stroke, carried from one segment to the next, so the result is the same + /// however finely the pointer path was sampled (a fast and a slow mouse give one warp). A + /// stationary tool held still dabs once at `b`. When `a` is not where the previous segment + /// ended, the stroke starts afresh at `a`. pub fn stroke_segment(&mut self, s: &LiquifyStroke, a: [f64; 3], b: [f64; 3]) -> Rect { + self.walk_segment(s, a, b, true) + } + + /// [`Self::stroke_segment`]; `skip` leaves out the dabs that cannot reach a field node (they + /// would change nothing), which tests compare with the full walk. + fn walk_segment(&mut self, s: &LiquifyStroke, a: [f64; 3], b: [f64; 3], skip: bool) -> Rect { let mut dirty = Rect::EMPTY; let (pa, pb) = (a[2].clamp(0.0, 1.0), b[2].clamp(0.0, 1.0)); - let len = (b[0] - a[0]).hypot(b[1] - a[1]); + let stationary = s.tool.is_stationary(); + let cur = match self.cursor { + Some(c) if c.end == [a[0], a[1]] => c, + _ => StrokeCursor { end: [a[0], a[1]], last_dab: [a[0], a[1]], carry: 0.0 }, + }; + let (dx, dy) = (b[0] - a[0], b[1] - a[1]); + let len = dx.hypot(dy); if len == 0.0 { - return if s.tool.is_stationary() { self.dab(s, [b[0], b[1]], [0.0, 0.0], pb) } else { dirty }; + self.cursor = Some(cur); + return if stationary { self.dab(s, [b[0], b[1]], [0.0, 0.0], pb, 1.0) } else { dirty }; + } + // NaN or a length that overflowed: nothing sensible to walk; the next segment restarts. + if !len.is_finite() { + self.cursor = None; + return dirty; } let r = (s.size / 2.0).max(0.5); - let spacing = (r * 0.2).max(0.5); - let steps = (len / spacing).ceil().max(1.0) as usize; - // Walk only the steps whose dab can reach a field node: the rest return from `dab` before - // touching anything, and a segment to a far-off point has trillions of them (#937). - let Some((k0, k1)) = self.reachable_steps(a, b, steps, r, s.tool.is_stationary()) else { return dirty }; - for k in k0..=k1 { - let t0 = (k - 1) as f64 / steps as f64; - let t1 = k as f64 / steps as f64; - let c = [a[0] + (b[0] - a[0]) * t1, a[1] + (b[1] - a[1]) * t1]; - let delta = [(b[0] - a[0]) * (t1 - t0), (b[1] - a[1]) * (t1 - t0)]; - let pr = pa + (pb - pa) * t1; - // Forward Warp centres the dab where the brush was (it drags what is under it). - let centre = if s.tool.is_stationary() { c } else { [c[0] - delta[0], c[1] - delta[1]] }; - dirty = dirty.union(&self.dab(s, centre, delta, pr)); + let spacing = dab_spacing(r); + let weight = if stationary { moving_weight(r) } else { 1.0 }; + // Distance along this segment of its first dab, then one every `spacing`. + let first = (spacing - cur.carry).clamp(0.0, spacing); + // Distances are compared with a little slack: a dab that rounding puts a hair past the + // segment's end still falls on it, so cutting one segment in two never adds or drops a dab. + let slack = spacing * 1e-6; + if first > len + slack { + self.cursor = Some(StrokeCursor { end: [b[0], b[1]], last_dab: cur.last_dab, carry: cur.carry + len }); + return dirty; } + let last_k = ((len - first + slack) / spacing).floor().max(0.0); + let at = |dist: f64| [a[0] + dx * dist / len, a[1] + dy * dist / len]; + let (mut k0, mut k1) = (0.0f64, last_k); + if skip { + match self.reachable_span(a, [dx, dy], len, r) { + // A dragging dab is centred one spacing behind its position: pad by that and a step. + Some((d0, d1)) => { + k0 = k0.max(((d0 - spacing - first) / spacing).floor() - 1.0); + k1 = k1.min(((d1 + spacing - first) / spacing).ceil() + 1.0); + } + None => k1 = -1.0, + } + } + if k0 <= k1 { + let mut prev = if k0 > 0.0 { at(first + (k0 - 1.0) * spacing) } else { cur.last_dab }; + for k in (k0 as u64)..=(k1 as u64) { + let dist = (first + k as f64 * spacing).min(len); + let c = at(dist); + let delta = [c[0] - prev[0], c[1] - prev[1]]; + // Forward Warp centres the dab where the brush was (it drags what is under it). + let centre = if stationary { c } else { prev }; + dirty = dirty.union(&self.dab(s, centre, delta, pa + (pb - pa) * dist / len, weight)); + prev = c; + } + } + let last = (first + last_k * spacing).min(len); + self.cursor = Some(StrokeCursor { end: [b[0], b[1]], last_dab: at(last), carry: (len - last).clamp(0.0, spacing) }); dirty } - /// The steps `k0..=k1` of a segment walked in `steps` whose dab can touch a field node, or - /// `None` when none can. Step `k` centres its dab at `a + (b - a)·(k - o)/steps`, with `o` = 1 - /// for the dragging tools and 0 for the stationary ones (see `stroke_segment`). A dab reaches a - /// node only when its centre is within `r` plus a node of the node grid, so the window below - /// pads that by another node and a step: the dabs it leaves out would each change nothing. - fn reachable_steps(&self, a: [f64; 3], b: [f64; 3], steps: usize, r: f64, stationary: bool) -> Option<(usize, usize)> { + /// The distances along a segment from `a` (direction `dir`, length `len`) whose points lie + /// within a dab radius `r` plus two nodes of the node grid, or `None` when none do. Only dabs + /// near that span can touch a node; a segment to a far-off point has trillions of others + /// (#937). + fn reachable_span(&self, a: [f64; 3], dir: [f64; 2], len: f64, r: f64) -> Option<(f64, f64)> { if self.w == 0 || self.h == 0 { return None; } let pad = r + 2.0 * self.cell; let lo = [f64::from(self.bounds.x0) + 0.5 - pad, f64::from(self.bounds.y0) + 0.5 - pad]; let hi = [lo[0] + (self.w - 1) as f64 * self.cell + 2.0 * pad, lo[1] + (self.h - 1) as f64 * self.cell + 2.0 * pad]; - let (n, o) = (steps as f64, if stationary { 0.0 } else { 1.0 }); - let (mut k0, mut k1) = (1.0f64, n); + let (mut u0, mut u1) = (0.0f64, 1.0f64); for ax in 0..2 { - let d = b[ax] - a[ax]; + let d = dir[ax]; if d == 0.0 { if a[ax].is_nan() || a[ax] < lo[ax] || a[ax] > hi[ax] { return None; } continue; } - let (u0, u1) = ((lo[ax] - a[ax]) / d, (hi[ax] - a[ax]) / d); - k0 = k0.max((u0.min(u1) * n + o).floor() - 1.0); - k1 = k1.min((u0.max(u1) * n + o).ceil() + 1.0); + let (v0, v1) = ((lo[ax] - a[ax]) / d, (hi[ax] - a[ax]) / d); + u0 = u0.max(v0.min(v1)); + u1 = u1.min(v0.max(v1)); } - // NaN: a segment whose length overflowed. - if k0.is_nan() || k1.is_nan() || k0 > k1 { + if u0.is_nan() || u1.is_nan() || u0 > u1 { return None; } - Some((k0 as usize, k1 as usize)) + Some((u0 * len, u1 * len)) } - /// One dab at `c` with brush motion `delta`. Returns the document rect it affected. - fn dab(&mut self, s: &LiquifyStroke, c: [f64; 2], delta: [f64; 2], point_pressure: f64) -> Rect { + /// One dab at `c` with brush motion `delta`, its strength scaled by `weight`. Returns the + /// document rect it affected. + fn dab(&mut self, s: &LiquifyStroke, c: [f64; 2], delta: [f64; 2], point_pressure: f64, weight: f64) -> Rect { if s.tool == LiquifyTool::LassoMask { return Rect::EMPTY; // the lasso is polygon-only; never a brush dab } let r = (s.size / 2.0).max(0.5); - let strength = (s.pressure / 100.0).clamp(0.0, 1.0) * point_pressure; + let strength = (s.pressure / 100.0).clamp(0.0, 1.0) * point_pressure * weight; let rate = (s.rate / 100.0).clamp(0.0, 1.0); let density = (s.density / 100.0).clamp(0.0, 1.0); if strength <= 0.0 { @@ -921,21 +997,9 @@ mod tests { use super::*; use photocraft_color::{ColorMode, PixelFormat, SampleType}; - /// The segment walk before #937: every step, whether or not its dab can reach the field. + /// The segment walk before #937: every dab, whether or not it can reach the field. fn full_walk(f: &mut LiquifyField, s: &LiquifyStroke, a: [f64; 3], b: [f64; 3]) -> Rect { - let mut dirty = Rect::EMPTY; - let (pa, pb) = (a[2].clamp(0.0, 1.0), b[2].clamp(0.0, 1.0)); - let len = (b[0] - a[0]).hypot(b[1] - a[1]); - let r = (s.size / 2.0).max(0.5); - let steps = (len / (r * 0.2).max(0.5)).ceil().max(1.0) as usize; - for k in 1..=steps { - let (t0, t1) = ((k - 1) as f64 / steps as f64, k as f64 / steps as f64); - let c = [a[0] + (b[0] - a[0]) * t1, a[1] + (b[1] - a[1]) * t1]; - let delta = [(b[0] - a[0]) * (t1 - t0), (b[1] - a[1]) * (t1 - t0)]; - let centre = if s.tool.is_stationary() { c } else { [c[0] - delta[0], c[1] - delta[1]] }; - dirty = dirty.union(&f.dab(s, centre, delta, pa + (pb - pa) * t1)); - } - dirty + f.walk_segment(s, a, b, false) } #[test] @@ -945,7 +1009,7 @@ mod tests { // every result bit-identical to the full walk. use LiquifyTool::*; let bounds = Rect::new(-7, 3, 89, 67); - let segments: [([f64; 3], [f64; 3]); 9] = [ + let segments: [([f64; 3], [f64; 3]); 10] = [ ([10.0, 20.0, 1.0], [70.0, 50.0, 0.5]), // inside ([-900.0, 30.0, 1.0], [40.0, 31.0, 1.0]), // in from far left ([40.0, 30.0, 1.0], [40.0, 4000.0, 0.2]), // out downwards @@ -955,6 +1019,7 @@ mod tests { ([88.5, -50.0, 1.0], [88.5, 120.0, 1.0]), // vertical, along the right edge ([200.0, 200.0, 1.0], [201.0, 900.0, 1.0]), // entirely outside ([0.0, 0.0, 1.0], [0.25, 0.1, 1.0]), // shorter than one step + ([60.0, 40.0, 1.0], [-2000.0, 45.0, 1.0]), // continues the stroke before it, out left ]; for tool in [ForwardWarp, PushLeft, Reconstruct, Smooth, TwirlCw, TwirlCcw, Pucker, Bloat, Freeze, Thaw] { for size in [6.0, 40.0] { @@ -973,6 +1038,81 @@ mod tests { } } + /// The same path sampled by `parts` pointer events per corner-to-corner leg, unevenly. + fn sampled(path: &[[f64; 3]], parts: usize) -> Vec> { + let mut out = vec![path[0].to_vec()]; + for w in path.windows(2) { + let (a, b) = (w[0], w[1]); + // Uneven steps, as a real pointer gives: t grows quadratically. + for k in 1..=parts { + let t = (k * k) as f64 / (parts * parts) as f64; + out.push((0..3).map(|i| a[i] + (b[i] - a[i]) * t).collect()); + } + } + out + } + + /// #2606: dabs restarted at every pointer event, so a fast mouse (few far-apart events) and a + /// slow one (many close ones) warped the same path differently. Spacing now runs on along the + /// whole stroke: any sampling of a path gives the same field. + #[test] + fn the_result_does_not_depend_on_how_finely_the_path_was_sampled() { + use LiquifyTool::*; + let path = [[20.0, 20.0, 1.0], [62.0, 26.0, 0.6], [70.0, 50.0, 0.9], [28.0, 55.0, 1.0], [30.0, 30.0, 1.0]]; + for tool in [ForwardWarp, PushLeft, TwirlCw, Bloat, Reconstruct, Smooth, Freeze] { + for size in [12.0, 40.0] { + let field = |parts: usize| { + let mut warp = LiquifyStroke::new(ForwardWarp, 30.0); + warp.points = vec![vec![30.0, 30.0], vec![50.0, 40.0]]; + let mut s = LiquifyStroke::new(tool, size); + s.points = sampled(&path, parts); + // Some displacement first, so Reconstruct and Smooth have something to change. + LiquifyField::from_strokes(bounds(), 2.0, &[warp, s]) + }; + let coarse = field(1); + for parts in [3, 17, 60] { + let fine = field(parts); + let dd = coarse.d.iter().zip(&fine.d).map(|(p, q)| (p[0] - q[0]).abs().max((p[1] - q[1]).abs())).fold(0.0f32, f32::max); + let df = coarse.freeze.iter().zip(&fine.freeze).map(|(p, q)| (p - q).abs()).fold(0.0f32, f32::max); + assert!(dd < 1e-3 && df < 1e-4, "{tool:?} {size}px, {parts} events per leg: field differs by {dd} px, mask by {df}"); + } + } + } + } + + /// A long drag whose events land exactly on dab positions, along a diagonal: rounding must not + /// add or drop the dab at a segment's end, or the deep displacement a long Forward Warp builds + /// up differs by a whole dab between a slow and a fast pointer. + #[test] + fn a_long_diagonal_drag_gives_one_field_at_any_event_spacing() { + let field = |step: f64| { + let mut s = LiquifyStroke::new(LiquifyTool::ForwardWarp, 40.0); + s.points = (0..=(300.0 / step) as usize).map(|k| vec![40.0 + k as f64 * step * 0.6, 20.0 + k as f64 * step * 0.8]).collect(); + LiquifyField::from_strokes(Rect::new(0, 0, 320, 300), 2.0, &[s]) + }; + let (slow, fast) = (field(2.0), field(60.0)); + let dd = slow.d.iter().zip(&fast.d).map(|(p, q)| (p[0] - q[0]).abs().max((p[1] - q[1]).abs())).fold(0.0f32, f32::max); + assert!(slow.max_displacement() > 50.0, "the drag builds up a deep displacement"); + assert!(dd < 1e-3, "slow and fast pointer fields differ by {dd} px"); + } + + #[test] + fn a_stroke_interrupted_by_a_jump_restarts_its_spacing() { + // A segment that does not start where the last one ended begins a new run of dabs there. + let s = LiquifyStroke::new(LiquifyTool::ForwardWarp, 20.0); + let mut f = LiquifyField::new(bounds(), 2.0); + f.stroke_begin(&s, [10.0, 10.0, 1.0]); + f.stroke_segment(&s, [10.0, 10.0, 1.0], [10.3, 10.0, 1.0]); + let mut g = LiquifyField::new(bounds(), 2.0); + f.stroke_segment(&s, [40.0, 30.0, 1.0], [50.0, 30.0, 1.0]); + g.stroke_begin(&s, [40.0, 30.0, 1.0]); + g.stroke_segment(&s, [40.0, 30.0, 1.0], [50.0, 30.0, 1.0]); + assert_eq!(f, g); + // Hostile points: nothing panics and the next segment starts afresh. + f.stroke_segment(&s, [f64::NAN, 3.0, 1.0], [4.0, f64::INFINITY, 1.0]); + f.stroke_segment(&s, [4.0, 3.0, f64::NAN], [9.0, 3.0, 1.0]); + } + #[test] fn a_segment_to_a_far_off_point_returns() { // The issue's request: about 3.3e14 steps before the fix. Also a segment whose length @@ -1110,8 +1250,8 @@ mod tests { /// dab's circle (a hard-edged block at Density 0, half strength at the default 50). #[test] fn forward_warp_leaves_the_brush_rim_in_place() { - // A drag of one dab spacing (a fifth of the radius): one dab, centred where it started. - let (r, drag) = (20.0, 4.0); + // A drag of one dab spacing (a twentieth of the radius): one dab, centred where it started. + let (r, drag) = (20.0, 1.0); for density in [0.0, 50.0, 100.0] { let mut s = LiquifyStroke::new(LiquifyTool::ForwardWarp, 2.0 * r); s.density = density; From c0fa2269d2ec22935e69a01e216b0c95380a0ab6 Mon Sep 17 00:00:00 2001 From: coolvitto <160416811+coolvitto@users.noreply.github.com> Date: Mon, 12 Oct 2026 18:57:45 +0900 Subject: [PATCH 03/92] Update Japanese translations (#3892) Improved readability and several translation corrections. --- crates/ui-egui/src/i18n/ja.tsv | 240 ++++++++++++++++----------------- 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index ffca724d..4cc90fa0 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -65,7 +65,7 @@ Close 閉じる Minimize 最小化 Maximize 最大化 - Restore 元に戻す（縮小） + Restore 元に戻す (縮小) Close All すべて閉じる Close Others ほかを閉じる Save 保存 @@ -76,7 +76,7 @@ Quick Export as PNG PNG としてクイック書き出し Export As… 書き出し形式を指定… Export Preferences… 書き出しの環境設定… - Save for Web (Legacy)… Web 用に保存(従来方式)… + Save for Web (Legacy)… Web 用に保存 (従来方式)… Artboards to Files… アートボードをファイルへ… Artboards to PDF… アートボードを PDF へ… Layers to Files… レイヤーをファイルへ… @@ -218,7 +218,7 @@ 16 Bits/Channel 16 ビット/チャンネル 16 bit 16 ビット 32 Bits/Channel 32 ビット/チャンネル - 32 bit (float) 32 ビット（float） + 32 bit (float) 32 ビット (float) Floating point 浮動小数点 Color Table… カラーテーブル… Bitmap… ビットマップ… @@ -304,13 +304,13 @@ Blending Options… レイヤー効果の描画オプション… Bevel & Emboss… ベベルとエンボス… Use Global Light グローバルライトを使用 - Inner Shadow… シャドウ(内側)… - Inner Glow… 光彩(内側)… + Inner Shadow… シャドウ (内側)… + Inner Glow… 光彩 (内側)… Satin… サテン… Color Overlay… カラーオーバーレイ… Gradient Overlay… グラデーションオーバーレイ… Pattern Overlay… パターンオーバーレイ… - Outer Glow… 光彩(外側)… + Outer Glow… 光彩 (外側)… Drop Shadow… ドロップシャドウ… Copy Layer Style レイヤースタイルをコピー Paste Layer Style レイヤースタイルを貼り付け @@ -531,18 +531,18 @@ Tilt-Shift… チルトシフト… Path Blur… パスぼかし… Spin Blur… 回転ぼかし… - Blur More ぼかし(強) - Box Blur… ぼかし(ボックス)… - Gaussian Blur… ぼかし(ガウス)… - Lens Blur… ぼかし(レンズ)… - Motion Blur… ぼかし(移動)… - Radial Blur… ぼかし(円形)… - Shape Blur… ぼかし(シェイプ)… - Smart Blur… ぼかし(詳細)… - Surface Blur… ぼかし(表面)… + Blur More ぼかし (強) + Box Blur… ぼかし (ボックス)… + Gaussian Blur… ぼかし (ガウス)… + Lens Blur… ぼかし (レンズ)… + Motion Blur… ぼかし (移動)… + Radial Blur… ぼかし (円形)… + Shape Blur… ぼかし (シェイプ)… + Smart Blur… ぼかし (詳細)… + Surface Blur… ぼかし (表面)… Average 平均 Displace… 置き換え… - Pinch… つまみ… + Pinch… つまむ… Polar Coordinates… 極座標… Ripple… 波紋… Shear… シアー… @@ -554,7 +554,7 @@ Add Noise… ノイズを加える… Despeckle ダスト除去 Dust & Scratches… ダスト&スクラッチ… - Median… メディアン… + Median… 明るさの中間値… Reduce Noise… ノイズを軽減… Pixelate ピクセレート Color Halftone… カラーハーフトーン… @@ -563,10 +563,10 @@ Fragment フラグメント Mezzotint… メゾティント… Mosaic… モザイク… - Pointillize… ポインティリスト… + Pointillize… 点描… Render 描画 Clouds 雲模様 - Difference Clouds 雲模様(差の絶対値) + Difference Clouds 雲模様 (差の絶対値) Fibers… 繊維… Flame… 炎… Lens Flare… レンズフレア… @@ -576,7 +576,7 @@ Tree… 木… Sharpen シャープ Sharpen Edges 輪郭のみシャープ - Sharpen More シャープ(強) + Sharpen More シャープ (強) Smart Sharpen… スマートシャープ… Unsharp Mask… アンシャープマスク… High Pass… ハイパス… @@ -686,11 +686,11 @@ Tile 並べて表示 Tile All Horizontally すべてを横に並べる Tile All Vertically すべてを縦に並べる - 2-up Horizontal 2 アップ(横) - 2-up Vertical 2 アップ(縦) - 3-up Horizontal 3 アップ(横) - 3-up Stacked 3 アップ(積み重ね) - 3-up Vertical 3 アップ(縦) + 2-up Horizontal 2 アップ (横) + 2-up Vertical 2 アップ (縦) + 3-up Horizontal 3 アップ (横) + 3-up Stacked 3 アップ (積み重ね) + 3-up Vertical 3 アップ (縦) 4-up 4 アップ 6-up 6 アップ Consolidate All to Tabs すべてをタブに統合 @@ -711,13 +711,13 @@ Lock Workspace ワークスペースをロック Theme テーマ Pro Theme プロテーマ - Pro Medium Gray Theme プロ(中間グレー)テーマ - Pro Light Gray Theme プロ(ライトグレー)テーマ - Pro Light Theme プロ(ライト)テーマ + Pro Medium Gray Theme プロ (中間グレー) テーマ + Pro Light Gray Theme プロ (ライトグレー) テーマ + Pro Light Theme プロ (ライト) テーマ Studio Theme スタジオテーマ - Studio Light Theme スタジオ(ライト)テーマ - Adwaita Light Theme Adwaita(ライト)テーマ - Adwaita Dark Theme Adwaita(ダーク)テーマ + Studio Light Theme スタジオ (ライト) テーマ + Adwaita Light Theme Adwaita (ライト) テーマ + Adwaita Dark Theme Adwaita (ダーク) テーマ Classic Theme クラシックテーマ Solarized dark Solarized ダーク Solarized Dark Theme Solarized ダークテーマ @@ -824,7 +824,7 @@ Answer the unsaved-changes prompt first 先に未保存の変更の確認に答えてください Anti-alias アンチエイリアス Appearance 外観 - Appearance (Layer Style) 外観(レイヤースタイル) + Appearance (Layer Style) 外観 (レイヤースタイル) Apply Layer Mask レイヤーマスクを適用 Apply Per Tip 先端ごとに適用 Apply next selected layer comp 次のレイヤーカンプを適用 @@ -849,10 +849,10 @@ Begin recording 記録を開始 Bend: 曲げ: Bicubic バイキュービック - Bicubic (smooth gradients) バイキュービック(滑らかな階調) + Bicubic (smooth gradients) バイキュービック (滑らかな階調) Automatic 自動 - Bicubic Smoother (enlargement) バイキュービック法 - 滑らか(拡大) - Bicubic Sharper (reduction) バイキュービック法 - シャープ(縮小) + Bicubic Smoother (enlargement) バイキュービック法 - 滑らか (拡大) + Bicubic Sharper (reduction) バイキュービック法 - シャープ (縮小) Bilinear バイリニア Black 黒 Black & White 白黒 @@ -982,7 +982,7 @@ Custom Shapes カスタムシェイプ Cyan シアン Cyan · Red シアン · 赤 - Darken 比較(暗) + Darken 比較 (暗) Darks 暗部 Data Sets データセット Default 既定 @@ -1030,7 +1030,7 @@ Diamond Gradient ダイヤモンド形グラデーション Difference 差の絶対値 Diffusion 拡散 - Discard the embedded profile (don't color manage) 埋め込みプロファイルを破棄(カラーマネジメントしない) + Discard the embedded profile (don't color manage) 埋め込みプロファイルを破棄 (カラーマネジメントしない) Discontiguous 不連続 Discord Discord Dismiss 閉じる @@ -1070,7 +1070,7 @@ Exact 正確 Expansion: 拡張: Export Presets プリセットを書き出し - Export selected measurements (CSV) 選択した測定値を書き出し(CSV) + Export selected measurements (CSV) 選択した測定値を書き出し (CSV) Exposure 露光量 Exposure and Gamma 露光量とガンマ Exposure: 露光量: @@ -1147,7 +1147,7 @@ Ignore All すべて無視 Image Size 画像サイズ Import Brushes… ブラシを読み込み… - Import brushes (.abr) ブラシ(.abr)を読み込み + Import brushes (.abr) ブラシ (.abr) を読み込み Import Presets プリセットを読み込み Imported 読み込み済み Indent First 先頭行の字下げ @@ -1160,12 +1160,12 @@ Inside 内側 Interlaced インターレース Interpolation: 補間方法: - Intersect with selection ({key}) 選択範囲との共通部分({key}) + Intersect with selection ({key}) 選択範囲との共通部分 ({key}) Invert All すべて反転 Invert has no settings. 階調の反転には設定がありません。 Italic イタリック Join us on Discord Discord に参加 - Justify all 均等配置(最終行も) + Justify all 均等配置 (最終行も) Justify last centered 最終行中央揃えの両端揃え Justify last left 最終行左揃えの両端揃え Justify last right 最終行右揃えの両端揃え @@ -1175,18 +1175,18 @@ Kind 種類 Label Size ラベルのサイズ Labels ラベル - Lanczos (sharp) ランチョス(シャープ) + Lanczos (sharp) ランチョス (シャープ) Landscape 横向き Last Document State ドキュメントの最後の状態 Layout レイアウト Leading 行送り - Leading (set to the font size × auto-leading when Auto) 行送り(自動のときはフォントサイズ × 自動行送り) - Leave as is (don't color manage) そのまま(カラーマネジメントしない) + Leading (set to the font size × auto-leading when Auto) 行送り (自動のときはフォントサイズ × 自動行送り) + Leave as is (don't color manage) そのまま (カラーマネジメントしない) Left align text 左揃え Length: 長さ: Level レベル Levels レベル補正 - Lighten 比較(明) + Lighten 比較 (明) Lightness 明度 Lights ライト Limits: 制限: @@ -1240,7 +1240,7 @@ Name 名前 Name: 名前: Nearest Neighbor ニアレストネイバー - Nearest Neighbor (hard edges) ニアレストネイバー(ハードエッジ) + Nearest Neighbor (hard edges) ニアレストネイバー (ハードエッジ) New Size 新しいサイズ New document… 新規ドキュメント… New effect layer 新規効果レイヤー @@ -1390,7 +1390,7 @@ Resolution: 解像度: Restore All すべて復元 Restore Defaults 既定に戻す - Restrictive (Web) 制限(Web) + Restrictive (Web) 制限 (Web) Right align text 右揃え Rigid 剛体 Rotate: 回転: @@ -1456,7 +1456,7 @@ Size: サイズ: Slice Options… スライスオプション… Slices From Guides ガイドからスライス - Slices are locked (View › Lock Slices) スライスはロックされています(表示 › スライスをロック) + Slices are locked (View › Lock Slices) スライスはロックされています (表示 › スライスをロック) Small Caps スモールキャップ Smoothing スムージング Space After 後ろのスペース @@ -1479,7 +1479,7 @@ Style Options… スタイルオプション… Style: Normal スタイル: 通常 Subtract from Sample サンプルから削除 - Subtract from selection ({key}) 選択範囲から削除({key}) + Subtract from selection ({key}) 選択範囲から削除 ({key}) Suggestions: 候補: Swap colours (X) 描画色と背景色を入れ替え(X) Swaps height and width 高さと幅を入れ替えます @@ -1492,7 +1492,7 @@ Texture Each Tip 先端ごとにテクスチャ Threshold しきい値 Threshold Level しきい値レベル - Thumbnail size (smallest: list) サムネールのサイズ(最小: リスト) + Thumbnail size (smallest: list) サムネールのサイズ (最小: リスト) Tilt X 傾き X Tilt Y 傾き Y Tint 色かぶり補正 @@ -1505,7 +1505,7 @@ Top 上 Total: 合計: Tracking トラッキング - Tracking (1/1000 em) トラッキング(1/1000 em) + Tracking (1/1000 em) トラッキング (1/1000 em) Transparency 透明 Transparent 透明 Trilinear トライリニア @@ -1514,11 +1514,11 @@ Underline 下線 Untitled 名称未設定 Untitled-1 名称未設定-1 - Update layer comp (visibility, position and appearance) レイヤーカンプを更新(表示状態・位置・外観) + Update layer comp (visibility, position and appearance) レイヤーカンプを更新 (表示状態・位置・外観) Use Default 既定を使用 Use Legacy 従来方式を使用 Use Measurement Scale 測定スケールを使用 - Use the embedded profile (instead of the working space) 埋め込みプロファイルを使用(作業用スペースの代わり) + Use the embedded profile (instead of the working space) 埋め込みプロファイルを使用 (作業用スペースの代わり) Variables bind a layer's visibility, text or pixels to a named data slot. 変数は、レイヤーの表示状態・テキスト・ピクセルを、名前付きのデータ枠に結び付けます。 Vertical scale 垂直比率 Vibrance 自然な彩度 @@ -1553,8 +1553,8 @@ ↑↓ navigate {key} run esc close ↑↓ 移動 {key} 実行 esc 閉じる Version {version} バージョン {version} New Document 新規ドキュメント - New Document With Mask 新規ドキュメント（マスク付き） - New Layer With Mask 新規レイヤー（マスク付き） + New Document With Mask 新規ドキュメント (マスク付き) + New Layer With Mask 新規レイヤー (マスク付き) Saved 保存済み Save Preset… プリセットを保存… Preset Name プリセット名 @@ -1658,8 +1658,8 @@ Indexed インデックス Initial Direction 初期の方向 Inner Bevel 内側ベベル - Inner Glow 光彩(内側) - Inner Shadow シャドウ(内側) + Inner Glow 光彩 (内側) + Inner Shadow シャドウ (内側) Lab Lab Landscape, 10 x 8 横向き、10 x 8 Landscape, 6 x 4 横向き、6 x 4 @@ -1673,12 +1673,12 @@ Light ライト Line Tool 直線ツール Linear 線形 - Linear Burn 焼き込み(リニア) + Linear Burn 焼き込み (リニア) Linear Height 線形の高さ Link with Layer レイヤーとリンク Lorem Ipsum ダミーテキスト Magentas マゼンタ系 - Magic Eraser Tool 背景消しゴム(自動)ツール + Magic Eraser Tool 背景消しゴム (自動) ツール Magic Wand Tool 自動選択ツール Marquee 選択 Mean: 平均: @@ -1730,10 +1730,10 @@ PostScript (72 points/inch) PostScript (72 ポイント/インチ) Postcard はがき Poster ポスター - Pro (Dark) プロ(ダーク) - Pro (Light) プロ(ライト) - Pro (Light Gray) プロ(ライトグレー) - Pro (Medium Gray) プロ(中間グレー) + Pro (Dark) プロ (ダーク) + Pro (Light) プロ (ライト) + Pro (Light Gray) プロ (ライトグレー) + Pro (Medium Gray) プロ (中間グレー) Protect Texture テクスチャを保護 Purple 紫 Quick Mask クイックマスク @@ -1774,8 +1774,8 @@ Square, 12 x 12 正方形、12 x 12 Square, 5 x 5 正方形、5 x 5 Std Dev: 標準偏差: - Studio (Dark) スタジオ(ダーク) - Studio (Light) スタジオ(ライト) + Studio (Dark) スタジオ (ダーク) + Studio (Light) スタジオ (ライト) Stylus Wheel スタイラスホイール Subtract 減算 Tabloid タブロイド @@ -1836,9 +1836,9 @@ Autosave 自動保存 Autosave minutes 自動保存の間隔(分) Beep when done 完了時にビープ音を鳴らす - Bicubic automatic バイキュービック(自動) - Bicubic sharper バイキュービック(シャープ) - Bicubic smoother バイキュービック(滑らか) + Bicubic automatic バイキュービック (自動) + Bicubic sharper バイキュービック (シャープ) + Bicubic smoother バイキュービック (滑らか) Bit depth ビット深度 Brush preview color ブラシプレビューの色 Cache levels キャッシュレベル @@ -1855,8 +1855,8 @@ Control port 制御ポート Convert to srgb sRGB に変換 Cursors カーソル - Custom dark カスタム(ダーク) - Custom light カスタム(ライト) + Custom dark カスタム (ダーク) + Custom light カスタム (ライト) Dark ダーク Dark gray ダークグレー Dashed lines 破線 @@ -1933,9 +1933,9 @@ Preserve details ディテールを保持 Print resolution 印刷解像度 Pro プロ - Pro light プロ(ライト) - Pro light gray プロ(ライトグレー) - Pro medium プロ(中間) + Pro light プロ (ライト) + Pro light gray プロ (ライトグレー) + Pro medium プロ (中間) Pro photo ProPhoto Quick export format クイック書き出しの形式 Quick export location クイック書き出しの保存先 @@ -1974,9 +1974,9 @@ Srgb sRGB Standard 標準 Studio スタジオ - Studio light スタジオ(ライト) + Studio light スタジオ (ライト) Adwaita Adwaita - Adwaita dark Adwaita(ダーク) + Adwaita dark Adwaita (ダーク) Subdivisions 分割数 System システム Text engine テキストエンジン @@ -2003,8 +2003,8 @@ Pass Through 通過 Dissolve ディザ合成 Darker Color カラー比較(暗) - Linear Dodge (Add) 覆い焼き(リニア)- 加算 - Lighter Color カラー比較(明) + Linear Dodge (Add) 覆い焼き (リニア)- 加算 + Lighter Color カラー比較 (明) Soft Light ソフトライト Hard Light ハードライト Vivid Light ビビッドライト @@ -2025,7 +2025,7 @@ Collapse 折りたたむ Collapse All Groups すべてのグループを折りたたむ Collapse Panel Group パネルグループを折りたたむ - Collapse group ({key}-click: all groups) グループを折りたたむ({key}+クリック: すべてのグループ) + Collapse group ({key}-click: all groups) グループを折りたたむ ({key}+クリック: すべてのグループ) Create new brush from the current settings 現在の設定から新規ブラシを作成 Create new brush from these settings この設定から新規ブラシを作成 Delete brush ブラシを削除 @@ -2033,9 +2033,9 @@ Drag the arrow to set the angle, the dots to set the roundness 矢印をドラッグして角度、点をドラッグして真円率を設定 Expand 展開 Expand Panel Group パネルグループを展開 - Expand group ({key}-click: all groups) グループを展開({key}+クリック: すべてのグループ) + Expand group ({key}-click: all groups) グループを展開 ({key}+クリック: すべてのグループ) Fade steps フェードのステップ数 - Hide the layer's effects ({key}-click: all layers) レイヤーの効果を隠す({key}+クリック: すべてのレイヤー) + Hide the layer's effects ({key}-click: all layers) レイヤーの効果を隠す ({key}+クリック: すべてのレイヤー) Import Brushes… (.abr) ブラシを読み込み…(.abr) Move Group Down グループを下へ移動 Move Group Up グループを上へ移動 @@ -2043,7 +2043,7 @@ Restore original size 元のサイズに戻す Roundness: 真円率: Search Brushes ブラシを検索 - Show the layer's effects ({key}-click: all layers) レイヤーの効果を表示({key}+クリック: すべてのレイヤー) + Show the layer's effects ({key}-click: all layers) レイヤーの効果を表示 ({key}+クリック: すべてのレイヤー) Brush picker ブラシピッカー Erase 消去 Right click with painting tools 描画ツールで右クリック @@ -2060,8 +2060,8 @@ Click to sample the foreground colour · {key}-click for background クリックで描画色を取得 · {key}+クリックで背景色を取得 {key}-click to set the source {key}+クリックでソースを設定 {key} to subtract {key} で削除 - Clone source {n} ({key}-click with Clone Stamp to set) コピーソース {n}({key}+クリックでコピースタンプのソースを設定) - Source: not set ({key}-click with Clone Stamp) ソース: 未設定({key}+クリックでコピースタンプ) + Clone source {n} ({key}-click with Clone Stamp to set) コピーソース {n} ({key}+クリックでコピースタンプのソースを設定) + Source: not set ({key}-click with Clone Stamp) ソース: 未設定 ({key}+クリックでコピースタンプ) Pixel Layer ピクセルレイヤー Type Layer 文字レイヤー Shape Layer シェイプレイヤー @@ -2128,7 +2128,7 @@ Create new path 新規パスを作成 Delete path パスを削除 Delete vector mask ベクトルマスクを削除 - CPU (no GPU acceleration) CPU(GPU アクセラレーションなし) + CPU (no GPU acceleration) CPU (GPU アクセラレーションなし) DirectX 12 DirectX 12 GPU backend GPU バックエンド Linux display server Linux ディスプレイサーバー @@ -2163,17 +2163,17 @@ Automatic (recommended) 自動（推奨） CPU / Compatibility CPU / 互換性 Automatic uses GPU acceleration when available and falls back to CPU rendering on errors. 自動モードは利用可能な場合にGPUを使用し、エラー時はCPU描画に切り替えます。 - Switched to CPU rendering CPU描画に切り替えました - GPU acceleration could not continue. Your documents are unchanged. GPUアクセラレーションを継続できませんでした。ドキュメントは変更されていません。 - PhotoCraft is using the CPU image compositor. The window may still use your graphics adapter. PhotoCraftはCPUで画像を合成しています。ウィンドウは引き続きグラフィックスアダプターを使用する場合があります。 - Retry GPU requires a restart. Save your work first. GPUの再試行には再起動が必要です。先に作業を保存してください。 - Keep Using CPU CPUを使い続ける - Retry GPU GPUを再試行 + Switched to CPU rendering CPU 描画に切り替えました + GPU acceleration could not continue. Your documents are unchanged. GPU アクセラレーションを継続できませんでした。ドキュメントは変更されていません。 + PhotoCraft is using the CPU image compositor. The window may still use your graphics adapter. PhotoCraft は CPU で画像を合成しています。ウィンドウは引き続きグラフィックスアダプターを使用する場合があります。 + Retry GPU requires a restart. Save your work first. GPU の再試行には再起動が必要です。先に作業を保存してください。 + Keep Using CPU CPU を使い続ける + Retry GPU GPU を再試行 Advanced 詳細設定 - GPU Backend GPUバックエンド + GPU Backend GPU バックエンド Details 詳細 Rendering mode レンダリングモード - Freeze Lasso: drag to freeze an area, Alt-drag to thaw it (L) フリーズなげなわ：ドラッグで範囲をフリーズ、Alt+ドラッグで解凍 (L) + Freeze Lasso: drag to freeze an area, Alt-drag to thaw it (L) 投げ縄でマスク操作: ドラッグで範囲をマスク、Alt+ドラッグで消去 (L) Shadow Clipping Warning (U) シャドウのクリッピング警告 (U) Highlight Clipping Warning (O) ハイライトのクリッピング警告 (O) Show Lab Color Readouts Lab カラー値を表示 @@ -2282,11 +2282,11 @@ cameraRaw Color カラー Apply At Canvas Bounds カンバスの境界に効果を適用 # Shared screen eyedropper and text Color Picker (#1128). - Color Picker (Text Color) カラーピッカー（文字色） + Color Picker (Text Color) カラーピッカー (文字色) Color Picker ({name}) カラーピッカー（{name}） - Color Picker (Fill Color) カラーピッカー（塗りつぶしカラー） + Color Picker (Fill Color) カラーピッカー (塗りつぶしカラー) Fill color 塗りつぶしカラー - Color Picker (Stroke Color) カラーピッカー（線のカラー） + Color Picker (Stroke Color) カラーピッカー (線のカラー) Stroke color 線のカラー Pick screen color 画面の色を選択 Sample a pixel anywhere on the screen 画面上の任意のピクセルから色を取得 @@ -2305,7 +2305,7 @@ cameraRaw Color カラー Color… カラー… 50% Gray 50% グレー Color Adaptation カラー適応 - {size} (was {old}) {size}(変更前 {old}) + {size} (was {old}) {size} (変更前 {old}) Cone 円錐 Cone (Inverted) 円錐 (反転) Domed ドーム @@ -2348,11 +2348,11 @@ cameraRaw Color カラー Fuchsia フクシア Violet 紫 Reset 初期化 - Large document: redrawing on the CPU 大きなドキュメント：CPUで再描画しています - This redraw took {seconds} s on the CPU. この再描画はCPUで{seconds}秒かかりました。 + Large document: redrawing on the CPU 大きなドキュメント: CPU で再描画しています + This redraw took {seconds} s on the CPU. この再描画は CPU で {seconds} 秒かかりました。 Edits that change the whole document, such as a layer's blend mode, opacity or visibility, redraw all of it. レイヤーの描画モード、不透明度、表示/非表示など、ドキュメント全体に関わる編集では全体が再描画されます。 - Its layers don't fit the GPU memory budget. Raising Memory usage in Preferences › Performance raises the budget, up to a quarter of this computer's memory. レイヤーがGPUメモリの予算に収まりません。環境設定 › パフォーマンスのメモリ使用量を増やすと、このコンピューターのメモリの4分の1まで予算が増えます。 - The GPU compositor wasn't used: {reason} GPUコンポジターは使用されませんでした：{reason} + Its layers don't fit the GPU memory budget. Raising Memory usage in Preferences › Performance raises the budget, up to a quarter of this computer's memory. レイヤーが GPU メモリの予算に収まりません。環境設定 › パフォーマンスのメモリ使用量を増やすと、このコンピューターのメモリの4分の1まで予算が増えます。 + The GPU compositor wasn't used: {reason} GPU コンポジターは使用されませんでした: {reason} fontWeight Thin 極細 fontWeight ExtraLight 特細 fontWeight Light 細字 @@ -2387,13 +2387,13 @@ fontWeight Italic 斜体 51 by 51 Average 51 × 51 平均 101 by 101 Average 101 × 101 平均 Sample Size: サンプルサイズ: - All Layers No Adjustments すべてのレイヤー（色調補正なし） - Current & Below No Adjustments 現在のレイヤーとその下（色調補正なし） + All Layers No Adjustments すべてのレイヤー (色調補正なし) + Current & Below No Adjustments 現在のレイヤーとその下 (色調補正なし) Show Sampling Ring サンプリングリングを表示 # Color Picker warnings - Out of gamut for printing: click for the nearest printable colour 印刷の色域外：クリックすると最も近い印刷可能な色になります - Not a web colour: click for the nearest web colour Web カラーではありません：クリックすると最も近い Web カラーになります + Out of gamut for printing: click for the nearest printable colour 印刷の色域外: クリックすると最も近い印刷可能な色になります + Not a web colour: click for the nearest web colour Web カラーではありません: クリックすると最も近い Web カラーになります # Generated labels: filter/gallery parameter names, option choices and gallery names (camelCase keys shown as words) (added 2026-10, checked against the code) Accented Edges 輪郭の強調 @@ -2777,7 +2777,7 @@ fontWeight Italic 斜体 Auto-Align Layers レイヤーを自動整列 Auto-Blend Layers レイヤーを自動合成 Bold Italic 太字斜体 - Box Blur ぼかし(ボックス) + Box Blur ぼかし (ボックス) Bulge 膨らみ Burn 焼き込み Camera Raw Filter Camera Raw フィルター @@ -2824,7 +2824,7 @@ fontWeight Italic 斜体 Fish 魚形 Flag 旗 Focus Area 焦点領域 - Gaussian Blur ぼかし(ガウス) + Gaussian Blur ぼかし (ガウス) Global Light グローバル光源 Gray Value (Maximum) グレー値 (最大) Gray Value (Mean) グレー値 (平均) @@ -2844,7 +2844,7 @@ fontWeight Italic 斜体 Label ラベル Layer Comp レイヤーカンプ Layer From Background 背景からレイヤーへ - Lens Blur ぼかし(レンズ) + Lens Blur ぼかし (レンズ) Lens Correction レンズ補正 Lens Flare レンズフレア Lighting Effects 照明効果 @@ -2872,11 +2872,11 @@ fontWeight Italic 斜体 Pencil Tool 鉛筆ツール Perimeter 周囲長 Photomerge 写真を貼り合わせ - Pinch つまみ + Pinch つまむ Place Embedded 埋め込みで配置 Place Linked リンクで配置 Place Scale Marker スケールマーカーを配置 - Pointillize ポインティリスト + Pointillize 点描 Polar Coordinates 極座標 Preserve Transparency 透明部分を保持 Preset Manager プリセットマネージャー @@ -2884,7 +2884,7 @@ fontWeight Italic 斜体 Punctuation 句読点 Quick Selection クイック選択 RGB RGB - Radial Blur ぼかし(円形) + Radial Blur ぼかし (円形) Reading 読み取り Recovery リカバリー Rectangle 長方形 @@ -2897,7 +2897,7 @@ fontWeight Italic 斜体 Ripple 波紋 Rise 上昇 Ruler 定規 - Save for Web (Legacy) Web 用に保存(従来方式) + Save for Web (Legacy) Web 用に保存 (従来方式) Scale Effects 効果を拡大・縮小 Scale Factor 拡大・縮小の倍率 Scale Units スケール単位 @@ -2906,19 +2906,19 @@ fontWeight Italic 斜体 Sepia セピア Set Measurement Scale 測定スケールを設定 Shadows/Highlights シャドウ・ハイライト - Shape Blur ぼかし(シェイプ) + Shape Blur ぼかし (シェイプ) Shear シアー Shell Lower シェル (下) Shell Upper シェル (上) Slice Options スライスオプション - Smart Blur ぼかし(詳細) + Smart Blur ぼかし (詳細) Smart Sharpen スマートシャープ Software ソフトウェア Spherize 球面 Spin Blur 回転ぼかし Squeeze 絞り込み Stroke Path パスのストローク - Surface Blur ぼかし(表面) + Surface Blur ぼかし (表面) Symbols 記号 Tiles タイル Tilt-Shift チルトシフト @@ -3458,9 +3458,9 @@ fontWeight Italic 斜体 Alt-click went to the desktop, which moves windows with Alt-drag. Set its window-move key to Super, or latch Alt in Window › Modifier Keys. Alt+クリックはデスクトップに取られました（Alt+ドラッグでウィンドウを移動する設定です）。デスクトップのウィンドウ移動キーを Super に変更するか、ウィンドウ › 修飾キーで Alt を固定してください。 # Shared Layer Style color picker - Color Picker (Layer Style Color) カラーピッカー（レイヤースタイルの色） + Color Picker (Layer Style Color) カラーピッカー (レイヤースタイルの色) Auto Hide Notifications 通知を自動的に隠す - Notification Duration (seconds) 通知の表示時間（秒） + Notification Duration (seconds) 通知の表示時間 (秒) Appearance Mode 外観モード Dark Theme ダークテーマ Light Theme ライトテーマ @@ -3469,7 +3469,7 @@ fontWeight Italic 斜体 Next Appearance Mode 次の外観モード Sync with system システムと同期 Active 適用中 - Color Picker (Solid Color) カラーピッカー（べた塗り） + Color Picker (Solid Color) カラーピッカー (べた塗り) Straighten the image by drawing a line on it 画像上に線を描いて角度を補正 Set additional Crop options 切り抜きの追加オプションを設定 Show Cropped Area 切り抜かれた領域を表示 @@ -3477,7 +3477,7 @@ fontWeight Italic 斜体 Match Canvas カンバスに合わせる Auto Adjust Opacity 不透明度を自動調整 Crop Shield color 切り抜きシールドのカラー - Color Picker (Crop Shield Color) カラーピッカー（切り抜きシールドのカラー） + Color Picker (Crop Shield Color) カラーピッカー (切り抜きシールドのカラー) From Center 中心から Link radii 半径をリンク Star Ratio: 星の比率: @@ -3489,7 +3489,7 @@ fontWeight Italic 斜体 Click to add a point, right-click to remove クリックでポイントを追加、右クリックで削除 Some brush presets could not be loaded 一部のブラシプリセットを読み込めませんでした Retry saving presets プリセットの保存を再試行 - Brush preset changes are not saved: {error} ブラシプリセットの変更は保存されていません：{error} + Brush preset changes are not saved: {error} ブラシプリセットの変更は保存されていません: {error} Keep this tab open to retain your brushes. ブラシを保持するには、このタブを開いたままにしてください。 Browser storage is unavailable; brushes are session-only. Keep this tab open to retain them. ブラウザーのストレージを利用できないため、ブラシはこのセッション中のみ有効です。保持するには、このタブを開いたままにしてください。 Saving brush presets… Keep this tab open until saving finishes. ブラシプリセットを保存中… 保存が完了するまでこのタブを開いたままにしてください。 @@ -3524,7 +3524,7 @@ fontWeight Italic 斜体 No subject found — try a rectangle around the object 被写体が見つかりません — オブジェクトを囲む長方形を試してください Click the first point or press {key} to close · {del} removes a point · Esc cancels 最初の点をクリックするか {key} を押して閉じる · {del} で点を削除 · Esc でキャンセル Click, then move along an edge · click to fasten a point · {alt}-click for a straight segment · double-click to close クリックしてエッジに沿って動かす · クリックで固定ポイント · {alt}-クリックで直線セグメント · ダブルクリックで閉じる - Follows only edges this close to the pointer ([ and ] change it) ポインターからこの距離内のエッジだけをたどる（[ と ] で変更） + Follows only edges this close to the pointer ([ and ] change it) ポインターからこの距離内のエッジだけをたどる ([ と ] で変更) Higher values follow only edges that contrast sharply with their surroundings 値を大きくすると、周囲とのコントラストが強いエッジだけをたどる How often fastening points are placed by themselves 固定ポイントが自動で置かれる頻度 Appearance Settings… 外観設定… From 19e51cf0adeb6bf88bdf56ca6922ad61fe0f3ca6 Mon Sep 17 00:00:00 2001 From: Scott C Hughes <1591011+dottedt@users.noreply.github.com> Date: Mon, 12 Oct 2026 05:04:23 -0500 Subject: [PATCH 04/92] refactor(ui): unify plain text inputs on one text_field widget (#3789) (#3896) Plain text fields (Preferences search and hex, the Color Picker hex, and the brush search fields) each drew egui's default TextEdit frame, so they differed in padding and border and showed egui's white focus ring (its selection.stroke). Add widgets::text_field, which draws the same box as a value_field (field fill, field_border, radius_sm) with frame NONE, a consistent inner padding, no focus outline, and a scoped, non-blue text-selection colour (grey in the monochrome Pro themes, the theme accent elsewhere). Migrate those fields to it; numeric fields already use value_field. Tests: cargo fmt --all -- --check; cargo test -p photocraft-ui-egui --lib; cargo clippy -p photocraft-ui-egui --all-targets -- -A clippy::nonminimal_bool -A clippy::collapsible_match -D warnings; cargo xtask wasm --- crates/ui-egui/src/brush_picker.rs | 7 +-- crates/ui-egui/src/brushes_tab.rs | 2 +- crates/ui-egui/src/color_picker_ui.rs | 2 +- crates/ui-egui/src/prefs_ui.rs | 4 +- crates/ui-egui/src/theme.rs | 19 ++++++++ crates/ui-egui/src/widgets.rs | 64 +++++++++++++++++++++++++++ 6 files changed, 88 insertions(+), 10 deletions(-) diff --git a/crates/ui-egui/src/brush_picker.rs b/crates/ui-egui/src/brush_picker.rs index 8a7ec9d4..3cade498 100644 --- a/crates/ui-egui/src/brush_picker.rs +++ b/crates/ui-egui/src/brush_picker.rs @@ -262,12 +262,7 @@ pub fn body( ui.horizontal(|ui| { icons::paint(ui, egui::Rect::from_min_size(ui.cursor().min + vec2(0.0, 3.0), vec2(16.0, 16.0)), "search", 14.0, t.text_faint); ui.add_space(20.0); - ui.add( - egui::TextEdit::singleline(&mut st.filter) - .hint_text(tl!("Search Brushes")) - .desired_width((size.x - 118.0).max(60.0)) - .id_salt("brush-picker-search"), - ); + widgets::text_field(ui, ui.id().with("brush-picker-search"), &mut st.filter, tl!("Search Brushes"), (size.x - 118.0).max(60.0), false); ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { gear_menu(ui, current, presets, st, &mut picks); let new_tip = "Create new brush preset from the current settings"; diff --git a/crates/ui-egui/src/brushes_tab.rs b/crates/ui-egui/src/brushes_tab.rs index 59b3ba6d..b6d96f6b 100644 --- a/crates/ui-egui/src/brushes_tab.rs +++ b/crates/ui-egui/src/brushes_tab.rs @@ -892,7 +892,7 @@ pub fn show(app: &mut PhotocraftApp, ui: &mut egui::Ui) { ui.horizontal(|ui| { icons::paint(ui, egui::Rect::from_min_size(ui.cursor().min + vec2(0.0, 3.0), vec2(16.0, 16.0)), "search", 14.0, t.text_faint); ui.add_space(20.0); - ui.add(egui::TextEdit::singleline(&mut app.ui.brushes_panel.filter).hint_text(tl!("Search Brushes")).desired_width(WIDTH - 120.0)); + widgets::text_field(ui, ui.id().with("brush-search"), &mut app.ui.brushes_panel.filter, tl!("Search Brushes"), WIDTH - 120.0, false); ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { let view = &mut app.ui.brushes_panel.view; let grid_tip = "Grid view"; diff --git a/crates/ui-egui/src/color_picker_ui.rs b/crates/ui-egui/src/color_picker_ui.rs index dc57de68..cfa7183a 100644 --- a/crates/ui-egui/src/color_picker_ui.rs +++ b/crates/ui-egui/src/color_picker_ui.rs @@ -638,7 +638,7 @@ fn fields(ui: &mut egui::Ui, f: &mut Map, mode: &str, now: &Compo } let typing = if ui.memory(|m| m.has_focus(id)) { ui.data(|d| d.get_temp::(id)) } else { None }; let mut h = typing.unwrap_or_else(|| hex(rgb).trim_start_matches('#').to_string()); - let r = ui.add(egui::TextEdit::singleline(&mut h).id(id).char_limit(6).desired_width(64.0).font(crate::theme::mono(12.0))); + let r = crate::widgets::text_field_ex(ui, id, &mut h, "", 64.0, true, Some(6)); if r.gained_focus() { crate::field_tab::select_all(ui.ctx(), id, &h); } diff --git a/crates/ui-egui/src/prefs_ui.rs b/crates/ui-egui/src/prefs_ui.rs index 5fc1065a..5b15e7bc 100644 --- a/crates/ui-egui/src/prefs_ui.rs +++ b/crates/ui-egui/src/prefs_ui.rs @@ -1082,7 +1082,7 @@ fn hex_field(ui: &mut egui::Ui, key: &str, rgb: &mut [u8; 3]) { let id = egui::Id::new(("pref-hex", key)); let shown = format!("#{:02x}{:02x}{:02x}", rgb[0], rgb[1], rgb[2]); let mut text = ui.data(|d| d.get_temp::(id)).unwrap_or_else(|| shown.clone()); - let r = ui.add(egui::TextEdit::singleline(&mut text).font(crate::theme::mono(11.5)).desired_width(72.0).char_limit(7)); + let r = crate::widgets::text_field_ex(ui, id, &mut text, "", 72.0, true, Some(7)); if r.changed() && let Some(c) = prefs::parse_hex(&text) { @@ -1130,7 +1130,7 @@ fn prefs_body(ui: &mut egui::Ui, f: &mut Map, system: Option Color32 { + if self.pro { Color32::from_gray(if self.dark() { 96 } else { 201 }) } else { self.accent_soft } + } + pub fn dark(&self) -> bool { matches!( self.kind, @@ -1066,6 +1075,16 @@ mod tests { assert_eq!(ThemeKind::from_name("lightest"), Some(ThemeKind::ProLight)); } + #[test] + fn field_selection_is_grey_only_for_the_monochrome_pro_themes() { + // #3789: a text field's selection is a subtle grey in the monochrome Pro themes, not a + // second blue accent; coloured themes keep their accent. + assert_eq!(Tokens::for_kind(ThemeKind::Pro).field_selection(), Color32::from_gray(96)); + assert_eq!(Tokens::for_kind(ThemeKind::ProLight).field_selection(), Color32::from_gray(201)); + assert_eq!(Tokens::for_kind(ThemeKind::Studio).field_selection(), Tokens::for_kind(ThemeKind::Studio).accent_soft); + assert_eq!(Tokens::for_kind(ThemeKind::Classic).field_selection(), Tokens::for_kind(ThemeKind::Classic).accent_soft); + } + #[test] fn theme_names_parse() { assert_eq!(ThemeKind::from_name("Classic"), Some(ThemeKind::Classic)); diff --git a/crates/ui-egui/src/widgets.rs b/crates/ui-egui/src/widgets.rs index 876ed82e..8ec6f94a 100644 --- a/crates/ui-egui/src/widgets.rs +++ b/crates/ui-egui/src/widgets.rs @@ -661,6 +661,45 @@ pub fn popup_value_field(ui: &mut Ui, name: &str, value: &mut f32, range: std::o out } +/// Height of a [`text_field`]'s box, matching a [`value_field`]. +pub const TEXT_FIELD_H: f32 = 24.0; + +/// Inner padding of a [`text_field`]'s box: 6 pt either side, 2 pt above and below. +const TEXT_FIELD_PAD: Vec2 = vec2(6.0, 2.0); + +/// A single-line text field in PhotoCraft's shared field style (#3789): the same box as a +/// [`value_field`] -- the theme's field fill and `field_border`, rounded by `radius_sm` -- with a +/// consistent inner padding and no focus outline. egui's default white focus ring (its +/// `selection.stroke`) is what made the Preferences search field look different from the Color +/// Picker's hex field, so every plain, non-numeric input (search, hex, name, filter) is drawn +/// through here to look and behave the same. `id` carries the field's text and focus across +/// frames; `hint` shows while it is empty; `mono` picks the monospaced face for hex and other +/// code-like values. +pub fn text_field(ui: &mut Ui, id: egui::Id, text: &mut String, hint: &str, width: f32, mono: bool) -> Response { + text_field_ex(ui, id, text, hint, width, mono, None) +} + +/// [`text_field`] limited to `char_limit` characters (a hex field's six digits, say). +pub fn text_field_ex(ui: &mut Ui, id: egui::Id, text: &mut String, hint: &str, width: f32, mono: bool, char_limit: Option) -> Response { + let t = Tokens::get(ui.ctx()); + let (rect, _) = ui.allocate_exact_size(vec2(width.max(16.0), TEXT_FIELD_H), Sense::hover()); + surface(ui, rect, t.field, false); + if !t.bevel { + ui.painter().rect_stroke(rect, t.radius_sm, Stroke::new(1.0, t.field_border), StrokeKind::Inside); + } + let font = if mono { theme::mono(12.0) } else { egui::FontId::proportional(12.5) }; + let mut edit = egui::TextEdit::singleline(text).id(id).hint_text(hint).frame(egui::Frame::NONE).font(font); + if let Some(limit) = char_limit { + edit = edit.char_limit(limit); + } + // A child Ui keeps the field's selection colour local: `Visuals::selection` also fills selected + // list rows and slider trails, which must keep the theme's. + let layout = egui::Layout::centered_and_justified(egui::Direction::TopDown); + let mut child = ui.new_child(egui::UiBuilder::new().max_rect(rect.shrink2(TEXT_FIELD_PAD)).layout(layout)); + child.style_mut().visuals.selection.bg_fill = t.field_selection(); + child.add(edit) +} + fn first_field_id() -> egui::Id { egui::Id::new("pc-focus-first-field") } @@ -1653,6 +1692,31 @@ mod tests { } use egui_kittest::{Harness, kittest::Queryable}; + /// #3789: a plain text field is one boxed, outline-free input whose text-selection colour stays + /// local, so it isn't recoloured for the rest of the frame (selected rows, slider trails). + #[test] + fn text_field_is_a_boxed_input_whose_selection_colour_stays_local() { + use egui::accesskit::Role; + let mut h = Harness::new_ui_state( + |ui, s: &mut (String, egui::Color32, egui::Color32)| { + s.1 = ui.visuals().selection.bg_fill; + super::text_field(ui, egui::Id::new("tf"), &mut s.0, "hint", 140.0, false); + s.2 = ui.visuals().selection.bg_fill; + }, + (String::new(), egui::Color32::WHITE, egui::Color32::BLACK), + ); + crate::PhotocraftApp::setup_context(&h.ctx, crate::theme::ThemeKind::Studio); + h.run(); + assert_eq!(h.state().1, h.state().2, "the field's selection colour does not leak into its parent"); + h.get_by_role(Role::TextInput).click(); + h.run_steps(1); + for ch in "abc".chars() { + h.event(egui::Event::Text(ch.to_string())); + h.run_steps(1); + } + assert_eq!(h.state().0, "abc", "typing reaches the bound string"); + } + /// Sets up a test with one value field. Its state is its value and how many times it changed. fn field(value: f32, range: std::ops::RangeInclusive) -> Harness<'static, (f32, u32)> { let mut h = Harness::new_ui_state( From 83f4452bf2dc1a9efc9381b58e95f012241c6b72 Mon Sep 17 00:00:00 2001 From: Fabian Ghenof <154279715+fabianghe@users.noreply.github.com> Date: Mon, 12 Oct 2026 13:04:35 +0300 Subject: [PATCH 05/92] =?UTF-8?q?Layer=20=E2=80=BA=20Export=20As=20exports?= =?UTF-8?q?=20every=20selected=20layer=20or=20artboard=20(#3629)=20(#3909)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With several layers selected, Export As was greyed: its dialog exported only the active layer. Someone with 20+ artboards (ads, Steam store capsules) had to export them one at a time. Export As now opens the same dialog for the selection ("Export As: N layers", the preview showing the first) and, on Export, asks for one destination and writes one file per layer with the dialog's format, quality, transparency and scale, each at its own size. Files are named as Quick Export as PNG names a selection's: the chosen path, then numbered siblings named after each layer, now in the chosen format. The layers are captured when Export is pressed. Co-authored-by: Claude Opus 5.5 --- crates/ui-egui/src/export_dialog.rs | 61 ++++++++++++++++++++++++- crates/ui-egui/src/file_dialog/tests.rs | 39 ++++++++++++++++ crates/ui-egui/src/layer_menu_ui.rs | 16 +++---- crates/ui-egui/src/menus.rs | 5 ++ 4 files changed, 111 insertions(+), 10 deletions(-) diff --git a/crates/ui-egui/src/export_dialog.rs b/crates/ui-egui/src/export_dialog.rs index b16fbc31..cd520d5c 100644 --- a/crates/ui-egui/src/export_dialog.rs +++ b/crates/ui-egui/src/export_dialog.rs @@ -44,6 +44,23 @@ pub fn open_layer(app: &mut PhotocraftApp, layer: photocraft_doc::LayerId) -> Re Ok(id) } +/// Layer › Export As… with several layers (artboards, say) selected: the same dialog, then one +/// file per layer with its settings (#3629). The preview shows the first layer. +pub fn open_layers(app: &mut PhotocraftApp, layers: &[photocraft_doc::LayerId]) -> Result { + let (first, n) = match layers { + [] => return Err("no selected layers".into()), + [one] => return open_layer(app, *one), + [first, ..] => (*first, layers.len()), + }; + let id = open_layer(app, first)?; + if let Some(d) = app.ui.dialogs.iter_mut().find(|d| d.id == id) { + d.fields.insert("__layers".into(), json!(layers.iter().map(|l| l.0).collect::>())); + let template = "Export As: {n} layers"; + d.fields.insert("__label".into(), json!(crate::i18n::fmt(tl!(template), &[("n", &n.to_string())]))); + } + Ok(id) +} + /// Layer › Quick Export as PNG. pub fn quick_export_layer_png(app: &mut PhotocraftApp, layer: photocraft_doc::LayerId) -> Result { let mut f = Map::new(); @@ -96,10 +113,13 @@ fn export_name(name: &str) -> String { if name.is_empty() { "layer".into() } else { name.into() } } +/// The files a multi-layer export writes: the chosen path, then numbered siblings named after +/// each layer, in the chosen path's format. fn batch_paths(path: &str, docs: &[Document]) -> Vec { let first = std::path::Path::new(path); let parent = first.parent().unwrap_or_else(|| std::path::Path::new("")); let stem = first.file_stem().and_then(|s| s.to_str()).unwrap_or("layers"); + let ext = first.extension().and_then(|e| e.to_str()).unwrap_or("png"); docs.iter() .enumerate() .map(|(i, doc)| { @@ -107,7 +127,7 @@ fn batch_paths(path: &str, docs: &[Document]) -> Vec { return path.to_string(); } let name = export_name(&doc.name); - let candidate = parent.join(format!("{stem}-{}-{name}.png", i + 1)); + let candidate = parent.join(format!("{stem}-{}-{name}.{ext}", i + 1)); // The first file's overwrite is handled by the Save dialog; never overwrite sibling // files silently on desktop. Downloads on the web are named by the browser. #[cfg(not(target_arch = "wasm32"))] @@ -115,7 +135,7 @@ fn batch_paths(path: &str, docs: &[Document]) -> Vec { let mut candidate = candidate; let mut suffix = 1u64; while candidate.exists() { - candidate = parent.join(format!("{stem}-{}-{name}-{suffix}.png", i + 1)); + candidate = parent.join(format!("{stem}-{}-{name}-{suffix}.{ext}", i + 1)); suffix = suffix.saturating_add(1); } candidate @@ -335,6 +355,10 @@ pub fn body(app: &mut PhotocraftApp, ui: &mut egui::Ui, f: &mut Map) -> Result { + if let Some(layers) = f.get("__layers").and_then(Value::as_array) { + let ids: Vec<_> = layers.iter().filter_map(Value::as_u64).map(photocraft_doc::LayerId).collect(); + return confirm_layers(app, f, &ids); + } let doc = source_document(app, f)?; let stem = doc.name.rsplit_once('.').map_or(doc.name.as_str(), |(a, _)| a).to_string(); let ext = s_fmt(f); @@ -356,6 +380,39 @@ pub fn confirm(app: &mut PhotocraftApp, f: &Map) -> Result, ids: &[photocraft_doc::LayerId]) -> Result { + let st = app.session.active().ok_or("no document")?; + let docs: Vec = + ids.iter().map(|id| photocraft_engine::layer_menu_cmds::layer_document(&st.doc, *id).map_err(|e| e.to_string())).collect::>()?; + if docs.is_empty() { + return Err("no selected layers".into()); + } + let stem = st.doc.name.rsplit_once('.').map_or(st.doc.name.as_str(), |(a, _)| a); + let suggested = format!("{}.{}", export_name(stem), s_fmt(f)); + let (f, settings) = (f.clone(), settings(f)); + app.pick_save(&suggested, move |app, path| { + let mut exported = Vec::new(); + for (doc, path) in docs.iter().zip(batch_paths(&path, &docs)) { + let out = export_document(doc, &f, None)?; + let export = app.services.export.as_ref().ok_or("no exporter configured")?; + let (bytes, warnings) = export(&out, &path, &settings)?; + let write = app.services.write.as_mut().ok_or("no writer configured")?; + write(&path, &bytes)?; + let template = "Exported {path}"; + let what = crate::i18n::fmt(tl!(template), &[("path", &crate::file_open::display_name(&path))]); + crate::notices::io_warnings(app, &what, &warnings); + exported.push(json!({"path": path, "bytes": bytes.len(), "warnings": warnings})); + } + let template = "Exported {n} files"; + app.ui.status = crate::i18n::fmt(tl!(template), &[("n", &exported.len().to_string())]); + app.ui.status_error = false; + Ok(json!({"files": exported})) + }) +} + /// File › Export › Quick Export as PNG: the format, quality, metadata, colour space and location /// from File › Export › Export Preferences (engine `file.export.quickExport`). On the web (no /// file system) it falls back to a PNG download through the export service. diff --git a/crates/ui-egui/src/file_dialog/tests.rs b/crates/ui-egui/src/file_dialog/tests.rs index e985a486..3081de03 100644 --- a/crates/ui-egui/src/file_dialog/tests.rs +++ b/crates/ui-egui/src/file_dialog/tests.rs @@ -685,3 +685,42 @@ fn an_unavailable_dialog_is_reported_and_a_cancelled_one_is_not() { assert_eq!(app.ui.status, "No file dialog can open"); assert!(!app.file_dialog_open(), "the pending dialog is over"); } + +/// #3629: Layer › Export As with several artboards selected exports one file per board, at each +/// board's size and with the dialog's settings, after one destination prompt. +#[test] +fn export_as_with_several_artboards_selected_writes_one_file_each() { + let (mut app, open, written) = app(); + let a = app.run("layer.new.artboard", json!({"rect": [0, 0, 40, 30], "name": "Header"})).unwrap()["layer"].as_u64().unwrap(); + let b = app.run("layer.new.artboard", json!({"rect": [60, 0, 20, 50], "name": "Capsule"})).unwrap()["layer"].as_u64().unwrap(); + app.run("layer.select", json!({"layer": a})).unwrap(); + app.run("layer.select", json!({"layer": b, "mode": "add"})).unwrap(); + assert_eq!(app.session.active().unwrap().selected_layers().len(), 2); + let sizes = Rc::new(RefCell::new(Vec::new())); + let capture = sizes.clone(); + app.services.export = Some(Box::new(move |doc: &photocraft_doc::Document, _: &str, _: &crate::ExportSettings| { + capture.borrow_mut().push((doc.name.clone(), doc.size.width, doc.size.height)); + Ok((b"out".to_vec(), Vec::new())) + })); + assert!(!crate::layer_menu_ui::single_layer_only("layer.exportAs"), "the menu offers it for a selection"); + let ctx = egui::Context::default(); + let r = menus::invoke(&mut app, &ctx, "layer.exportAs", Value::Null).unwrap(); + let id = r["dialog"].as_u64().unwrap(); + let mut fields = app.ui.dialogs.iter().find(|d| d.id == id).unwrap().fields.clone(); + assert_eq!(fields["__label"], "Export As: 2 layers"); + // The dialog's settings apply to every file: JPG at 50 %. + fields.insert("format".into(), json!("jpg")); + fields.insert("scale".into(), json!(50)); + crate::export_dialog::confirm(&mut app, &fields).unwrap(); + app.poll_file_dialog(&ctx, None); + assert_eq!(open.borrow().len(), 1, "one destination for every board"); + answer(&open, Some(FileDialogAnswer::SaveTo("/out/boards.jpg".into()))); + app.poll_file_dialog(&ctx, None); + assert!(!app.ui.status_error, "{}", app.ui.status); + assert_eq!(written.borrow().len(), 2); + assert_eq!(written.borrow()[0], "/out/boards.jpg"); + assert!(written.borrow()[1].starts_with("/out/boards-2-") && written.borrow()[1].ends_with(".jpg"), "{:?}", written.borrow()); + let mut got = sizes.borrow().iter().map(|(_, w, h)| (*w, *h)).collect::>(); + got.sort_unstable(); + assert_eq!(got, [(10, 25), (20, 15)], "each board at its own size, scaled to 50 %"); +} diff --git a/crates/ui-egui/src/layer_menu_ui.rs b/crates/ui-egui/src/layer_menu_ui.rs index 10629f25..fa70e436 100644 --- a/crates/ui-egui/src/layer_menu_ui.rs +++ b/crates/ui-egui/src/layer_menu_ui.rs @@ -40,14 +40,13 @@ pub fn mask_button_command(layer: Option<&Layer>, has_selection: bool, alt: bool } /// Commands that act on the active layer only and have no sensible meaning for a selection: Blending -/// Options (one dialog), Copy Layer Style (copy from which layer?), Export As, and the per-layer -/// mask items. With several layers selected they would hit whichever layer is active, not the one -/// that was right-clicked, so the menu greys them. Adding a mask, Paste/Clear Layer Style and -/// Rasterize run on every selected layer instead. +/// Options (one dialog), Copy Layer Style (copy from which layer?) and the per-layer mask items. +/// With several layers selected they would hit whichever layer is active, not the one that was +/// right-clicked, so the menu greys them. Adding a mask, Paste/Clear Layer Style, Rasterize and +/// Export As (one file per layer, #3629) run on every selected layer instead. pub fn single_layer_only(id: &str) -> bool { let adds_mask = matches!(id, "layer.layerMask.revealAll" | "layer.layerMask.hideAll" | "layer.layerMask.revealSelection" | "layer.layerMask.hideSelection"); - matches!(id, "layer.layerStyle.blendingOptions" | "layer.layerStyle.copyLayerStyle" | "layer.exportAs") - || (id.starts_with("layer.layerMask.") && !adds_mask) + matches!(id, "layer.layerStyle.blendingOptions" | "layer.layerStyle.copyLayerStyle") || (id.starts_with("layer.layerMask.") && !adds_mask) } /// The context menu entries for a layer (Photoshop 2026 order, trimmed to the layer kind). @@ -567,11 +566,12 @@ mod tests { fn multi_selection_menu_greys_what_acts_on_one_layer() { use egui_kittest::kittest::{NodeT, Queryable}; let (h, _) = open_multi_selection_menu(); - for label in ["Blending Options…", "Copy Layer Style", "Export As…"] { + for label in ["Blending Options…", "Copy Layer Style"] { assert!(h.get_by_label(label).accesskit_node().is_disabled(), "{label} works on one layer only"); } for label in [ "Quick Export As PNG", + "Export As…", "Add Layer Mask", "Duplicate Layers…", "Delete Layers", @@ -602,12 +602,12 @@ mod tests { "layer.layerMask.enabled", "layer.layerMask.apply", "layer.layerMask.delete", - "layer.exportAs", ] { assert!(single_layer_only(id), "{id}"); } for id in [ "layer.quickExportAsPng", + "layer.exportAs", "layer.duplicate", "layer.delete", "layer.rasterize.layer", diff --git a/crates/ui-egui/src/menus.rs b/crates/ui-egui/src/menus.rs index b5b72e93..4e6c9ba1 100644 --- a/crates/ui-egui/src/menus.rs +++ b/crates/ui-egui/src/menus.rs @@ -396,6 +396,11 @@ pub(crate) fn invoke_unguarded(app: &mut PhotocraftApp, ctx: &egui::Context, id: l if matches!(l, "layer.exportAs" | "layer.quickExportAsPng") && params.as_object().is_none_or(|o| o.is_empty()) => { let layer = app.session.active().and_then(|d| d.active_layer).ok_or("no active layer")?; if l == "layer.exportAs" { + // Several layers (artboards, say) selected: one file each (#3629). + let layers = app.session.active().map(|d| d.selected_layers()).unwrap_or_default(); + if layers.len() > 1 { + return Ok(json!({"dialog": crate::export_dialog::open_layers(app, &layers)?})); + } Ok(json!({"dialog": crate::export_dialog::open_layer(app, layer)?})) } else { crate::export_dialog::quick_export_selected_layers_png(app) From 24bd7533fc787f3a18aab89c7b294204d740863b Mon Sep 17 00:00:00 2001 From: Scott C Hughes <1591011+dottedt@users.noreply.github.com> Date: Mon, 12 Oct 2026 05:05:02 -0500 Subject: [PATCH 06/92] feat(ui): the generic filter dialogs get a Photoshop-style preview window (#3769) (#3877) Photoshop shows a preview of the filtered result inside its filter dialogs; ours only had the parameter widgets, with the live result on the canvas behind the dialog. The generic schema dialog now draws a preview window from the same downsampled proxy the canvas already computes, with - / + zoom steps and a percentage readout, drag to pan, a click to centre on a document point, and press-and-hold to compare with the unfiltered image. It sits under the parameters (reserving its height so a small window still fits OK/Cancel); the Preview checkbox still toggles the on-canvas result, unchanged. Tests: cargo fmt --all -- --check; cargo test -p photocraft-ui-egui --lib (only the pre-existing Czech cs.tsv duplicate-key test fails); cargo clippy -p photocraft-ui-egui --all-targets -- -A clippy::nonminimal_bool -A clippy::collapsible_match -D warnings; cargo xtask wasm; a snapshot of the Emboss dialog shows the window and its zoom controls. --- crates/ui-egui/src/canvas.rs | 8 +- crates/ui-egui/src/dialogs.rs | 8 +- crates/ui-egui/src/filter_dialog.rs | 3 +- crates/ui-egui/src/filter_preview_ui.rs | 320 ++++++++++++++++++++++++ crates/ui-egui/src/lib.rs | 1 + 5 files changed, 335 insertions(+), 5 deletions(-) create mode 100644 crates/ui-egui/src/filter_preview_ui.rs diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index c982dd9a..7a2a710c 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -937,7 +937,7 @@ fn buffer_to_image(buf: &photocraft_compose::Buffer) -> egui::ColorImage { /// A composite as monitor pixels: document profile → monitor profile (nothing to do in the /// common sRGB-on-sRGB case). -fn display_image(display: Option<&photocraft_engine::display_color::CanvasDisplay>, buf: &photocraft_compose::Buffer) -> egui::ColorImage { +pub(crate) fn display_image(display: Option<&photocraft_engine::display_color::CanvasDisplay>, buf: &photocraft_compose::Buffer) -> egui::ColorImage { match display { Some(d) if !d.is_identity() => { let img = d.to_rgba8(buf); @@ -950,7 +950,11 @@ fn display_image(display: Option<&photocraft_engine::display_color::CanvasDispla /// The canvas display of `doc` on `display` (`None`: the main window's) and a key that changes /// with it (folded into the canvas caches' preview keys, so a monitor or profile change /// re-renders). -fn canvas_display(app: &PhotocraftApp, doc: &Document, display: Option) -> (Option>, u64) { +pub(crate) fn canvas_display( + app: &PhotocraftApp, + doc: &Document, + display: Option, +) -> (Option>, u64) { match app.session.color.canvas_display_for(doc, display.or(app.session.color.main_display)) { Ok(d) => { let k = d.key; diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs index 1d45c03c..2765d0e2 100644 --- a/crates/ui-egui/src/dialogs.rs +++ b/crates/ui-egui/src/dialogs.rs @@ -255,10 +255,14 @@ pub fn show(app: &mut PhotocraftApp, ctx: &egui::Context) { fields.insert("__note".into(), Value::String(crate::monitor_status::note(app))); } // Long parameter lists (Flame, Lighting Effects) scroll, so the title and the - // OK / Cancel buttons stay inside a small window. - let room = (ctx.content_rect().height() - DIALOG_CHROME).max(120.0); + // OK / Cancel buttons stay inside a small window. The preview window below the + // parameters reserves its own space (#3769). + let room = (ctx.content_rect().height() - DIALOG_CHROME - crate::filter_preview_ui::reserved_height(&fields)).max(120.0); let body = |ui: &mut egui::Ui, fields: &mut serde_json::Map| { egui::ScrollArea::vertical().id_salt(id.with("body")).max_height(room).show(ui, |ui| crate::filter_dialog::body(ui, fields)); + // The in-dialog preview window sits under the scrolling parameters (#3769), + // so it never shifts them. + crate::filter_preview_ui::window(app, d.id, ui, fields); }; // Select and Mask leaves the keyboard to its view keys (F, X, O, V…). if crate::select_mask_view::owns(&fields) { diff --git a/crates/ui-egui/src/filter_dialog.rs b/crates/ui-egui/src/filter_dialog.rs index 997bd568..5f2f853f 100644 --- a/crates/ui-egui/src/filter_dialog.rs +++ b/crates/ui-egui/src/filter_dialog.rs @@ -1,4 +1,5 @@ -//! Filter dialogs generated from engine command parameter specs, with live on-canvas preview. +//! Filter dialogs generated from engine command parameter specs, with live on-canvas preview and an +//! in-dialog preview window (#3769). //! //! The preview runs the *same engine command* on the downsampled proxy document (pixel-sized //! parameters scaled by the proxy factor), so what you preview is what you get. diff --git a/crates/ui-egui/src/filter_preview_ui.rs b/crates/ui-egui/src/filter_preview_ui.rs new file mode 100644 index 00000000..5f4ac139 --- /dev/null +++ b/crates/ui-egui/src/filter_preview_ui.rs @@ -0,0 +1,320 @@ +//! In-dialog preview window for the generic schema filter dialogs (#3769). +//! +//! Photoshop shows a preview of the filtered result *inside* its filter dialogs. This draws one +//! from the same proxy preview the canvas already shows (`filter_dialog::preview_document`): a +//! cropped region of the filtered proxy with − / + zoom and a percentage readout, drag to pan, a +//! click to centre the view on a document point, and press-and-hold to compare with the unfiltered +//! image. The proxy is drawn scaled by its reduction factor, so 100% is one *document* pixel per +//! point whatever the proxy factor. The Preview checkbox keeps toggling the on-canvas live result +//! (`canvas::ensure_filter_preview`), unchanged. + +use egui::{Color32, Rect, Sense, Stroke, Vec2, pos2, vec2}; +use photocraft_doc::Document; +use serde_json::{Map, Value, json}; + +use crate::PhotocraftApp; +use crate::filter_dialog::FilterPreviewKey; +use crate::theme::Tokens; + +/// Zoom bounds, as a fraction of document scale: 100% shows one document pixel per point. +const MIN_ZOOM: f32 = 0.125; +const MAX_ZOOM: f32 = 8.0; +const DEFAULT_ZOOM: f32 = 1.0; +/// The preview region's height in points; its width follows the dialog. +const PREVIEW_H: f32 = 150.0; +/// Private dialog fields holding the preview's view (stripped from the command's params). +const ZOOM_FIELD: &str = "__pvZoom"; +const CENTER_X_FIELD: &str = "__pvCx"; +const CENTER_Y_FIELD: &str = "__pvCy"; + +/// Draw the filter dialog's in-dialog preview window below its parameters (its `fields` `f`). A +/// no-op for dialogs without a preview and for Select and Mask, which has its own view. +pub(crate) fn window(app: &PhotocraftApp, dialog: u64, ui: &mut egui::Ui, f: &mut Map) { + if !f.contains_key("__preview") || crate::select_mask_view::owns(f) { + return; + } + let Some(cmd) = f.get("__command").and_then(Value::as_str).map(str::to_owned) else { return }; + let Some(idx) = app.session.active_index() else { return }; + let Some(st) = app.session.documents().get(idx) else { return }; + let (doc_id, revision) = (st.doc.id, st.revision); + + // The filtered proxy the canvas already computed for this dialog, when there is one. Matching + // the dialog keeps a stacked dialog from showing another's preview; the Preview checkbox still + // decides whether the filtered result (rather than the original) is shown. + let preview_on = f.get("__preview").and_then(Value::as_bool) == Some(true); + let filtered: Option<(FilterPreviewKey, std::sync::Arc)> = app.filter_preview.as_ref().and_then(|p| { + (preview_on && p.key.dialog == dialog && p.key.doc == doc_id && p.key.command == cmd).then(|| p.result.clone().map(|r| (p.key.clone(), r))).flatten() + }); + // The proxy factor the preview runs at (the filtered key's when it exists, else the request's). + let base_k = filtered.as_ref().map(|(k, _)| k.k).unwrap_or_else(|| { + let params = app.with_mask_target(&cmd, crate::filter_dialog::params_of(f)); + crate::filter_dialog::preview_factor(&cmd, ¶ms, crate::proxy::preview_factor(&st.doc, crate::proxy::reduced_previews(app))) + }); + + let t = Tokens::get(ui.ctx()); + let cache_id = egui::Id::new(("filter-preview-ui", dialog)); + let mut cache: Cache = ui.ctx().data_mut(|d| std::mem::take(d.get_temp_mut_or_default::(cache_id))); + + // Unfiltered proxy: built once per document revision and factor (cheap at the proxy factor). + let orig_key = TexKey::Original(doc_id, revision, base_k); + if cache.original.as_ref().map(|c| &c.key) != Some(&orig_key) { + let proxy = crate::proxy::proxy_document(&st.doc, base_k); + let tex = upload(ui.ctx(), app, "filter-preview-original", &proxy); + cache.original = Some(CachedTex { key: orig_key, tex, size: [proxy.size.width, proxy.size.height] }); + } + // Filtered proxy: rebuilt whenever the worker publishes a new result. + match &filtered { + Some((key, filtered_doc)) => { + let fkey = TexKey::Filtered(key.clone()); + if cache.filtered.as_ref().map(|c| &c.key) != Some(&fkey) { + let tex = upload(ui.ctx(), app, "filter-preview-filtered", filtered_doc); + cache.filtered = Some(CachedTex { key: fkey, tex, size: [filtered_doc.size.width, filtered_doc.size.height] }); + } + } + None => cache.filtered = None, + } + let orig = cache.original.as_ref().map(|c| (c.tex.clone(), c.size)); + let filt = cache.filtered.as_ref().map(|c| (c.tex.clone(), c.size)); + ui.ctx().data_mut(|d| d.insert_temp(cache_id, cache)); + + let Some([img_w, img_h]) = filt.as_ref().map(|(_, s)| *s).or_else(|| orig.as_ref().map(|(_, s)| *s)) else { return }; + if img_w == 0 || img_h == 0 { + return; + } + // The proxy is the document reduced by `base_k`, so the view works in *document* pixels: at + // 100% one document pixel covers one point, whatever the proxy factor (#3769). + let doc = document_size([img_w, img_h], base_k); + + // View state, sanitised: a corrupt field must not divide by zero or draw off the texture. + let mut zoom = f.get(ZOOM_FIELD).and_then(Value::as_f64).map(|v| v as f32).filter(|z| z.is_finite() && *z > 0.0).unwrap_or(DEFAULT_ZOOM); + zoom = zoom.clamp(MIN_ZOOM, MAX_ZOOM); + let mut cx = f.get(CENTER_X_FIELD).and_then(Value::as_f64).map(|v| v as f32).filter(|v| v.is_finite()).unwrap_or(doc.x / 2.0); + let mut cy = f.get(CENTER_Y_FIELD).and_then(Value::as_f64).map(|v| v as f32).filter(|v| v.is_finite()).unwrap_or(doc.y / 2.0); + (cx, cy) = clamp_center(cx, cy, doc.x, doc.y); + + let width = ui.available_width().max(140.0); + let (rect, response) = ui.allocate_exact_size(vec2(width, PREVIEW_H), Sense::click_and_drag()); + let (x0, y0, sw, sh) = source_rect(cx, cy, zoom, rect.size(), doc); + let uv = Rect::from_min_max( + pos2((x0 / doc.x).clamp(0.0, 1.0), (y0 / doc.y).clamp(0.0, 1.0)), + pos2(((x0 + sw) / doc.x).clamp(0.0, 1.0), ((y0 + sh) / doc.y).clamp(0.0, 1.0)), + ); + + // Press-and-hold shows the unfiltered image, as Photoshop's preview does. + let holding = response.is_pointer_button_down_on(); + let shown = if holding { orig.as_ref() } else { filt.as_ref().or(orig.as_ref()) }; + let painter = ui.painter_at(rect); + painter.rect_filled(rect, t.radius_sm, t.canvas); + if let Some((tex, _)) = shown { + crate::widgets::checker(&painter, rect, 8.0); + painter.image(tex.id(), rect, uv, Color32::WHITE); + } + painter.rect_stroke(rect, t.radius_sm, Stroke::new(1.0, t.field_border), egui::StrokeKind::Inside); + + // Drag to pan (the image follows the pointer); a plain click centres on the clicked point. + if response.dragged() { + let d = response.drag_delta(); + cx -= d.x / zoom; + cy -= d.y / zoom; + } + if response.clicked() + && let Some(p) = response.interact_pointer_pos() + { + (cx, cy) = point_to_source(p - rect.min, x0, y0, zoom, doc); + } + (cx, cy) = clamp_center(cx, cy, doc.x, doc.y); + + ui.horizontal(|ui| { + if crate::icons::button(ui, "minus", 22.0, false, tl!("Zoom out")).clicked() { + zoom = step_zoom(zoom, false); + } + ui.label(egui::RichText::new(format!("{}%", crate::widgets::fmt_num(zoom as f64 * 100.0))).color(t.text_dim)); + if crate::icons::button(ui, "plus", 22.0, false, tl!("Zoom in")).clicked() { + zoom = step_zoom(zoom, true); + } + }); + + f.insert(ZOOM_FIELD.into(), json!(zoom.clamp(MIN_ZOOM, MAX_ZOOM))); + f.insert(CENTER_X_FIELD.into(), json!(cx)); + f.insert(CENTER_Y_FIELD.into(), json!(cy)); +} + +/// The zoom levels the − / + buttons step through, like the Filter Gallery's. +const ZOOM_STEPS: [f32; 7] = [0.125, 0.25, 0.5, 1.0, 2.0, 4.0, 8.0]; + +/// The vertical space the preview window takes below the parameters: the image, the zoom row and +/// their spacing. `0` when the dialog has no preview (so the caller reserves nothing). +pub(crate) fn reserved_height(f: &Map) -> f32 { + if f.contains_key("__preview") && !crate::select_mask_view::owns(f) { PREVIEW_H + 32.0 } else { 0.0 } +} + +/// The next zoom level up or down from `zoom`, clamped to [`ZOOM_STEPS`]' ends. +fn step_zoom(zoom: f32, up: bool) -> f32 { + if up { + ZOOM_STEPS.iter().copied().find(|s| *s > zoom + 1e-3).unwrap_or(MAX_ZOOM) + } else { + ZOOM_STEPS.iter().rev().copied().find(|s| *s < zoom - 1e-3).unwrap_or(MIN_ZOOM) + } +} + +/// Keep the view centre on the image (so panning never runs off it entirely). A non-finite centre +/// (corrupt dialog state) falls back to the image's origin. +fn clamp_center(cx: f32, cy: f32, w: f32, h: f32) -> (f32, f32) { + let axis = |v: f32, max: f32| if v.is_finite() { v.clamp(0.0, max.max(0.0)) } else { 0.0 }; + (axis(cx, w), axis(cy, h)) +} + +/// The image rectangle shown in a `region` of points at `zoom`, centred on `(cx, cy)`: +/// `(x0, y0, width, height)` in document pixels. A region wider than the image is centred on it. +fn source_rect(cx: f32, cy: f32, zoom: f32, region: Vec2, doc: Vec2) -> (f32, f32, f32, f32) { + let zoom = if zoom.is_finite() && zoom > 0.0 { zoom } else { DEFAULT_ZOOM }; + let sw = (region.x / zoom).max(0.0); + let sh = (region.y / zoom).max(0.0); + (origin(cx, sw, doc.x), origin(cy, sh, doc.y), sw, sh) +} + +fn origin(centre: f32, size: f32, total: f32) -> f32 { + if size >= total { (total - size) / 2.0 } else { (centre - size / 2.0).clamp(0.0, total - size) } +} + +/// The document pixel under a pointer at `local` (relative to the region's top-left) in a view whose +/// source rectangle starts at `(x0, y0)` and is shown at `zoom`. +fn point_to_source(local: Vec2, x0: f32, y0: f32, zoom: f32, doc: Vec2) -> (f32, f32) { + let zoom = if zoom.is_finite() && zoom > 0.0 { zoom } else { DEFAULT_ZOOM }; + ((x0 + local.x / zoom).clamp(0.0, doc.x), (y0 + local.y / zoom).clamp(0.0, doc.y)) +} + +/// The document-pixel size of a proxy with `k`-reduced dimensions. A hostile/overflowing size falls +/// back to the proxy's own dimensions (factor 1), which stays finite and positive. +fn document_size(proxy: [u32; 2], k: u32) -> Vec2 { + let scale = k.max(1) as f32; + let doc = vec2(proxy[0] as f32 * scale, proxy[1] as f32 * scale); + if doc.x.is_finite() && doc.y.is_finite() && doc.x > 0.0 && doc.y > 0.0 { doc } else { vec2(proxy[0] as f32, proxy[1] as f32) } +} + +/// A composite as monitor pixels, matching the canvas (`canvas::display_image`). +fn upload(ctx: &egui::Context, app: &PhotocraftApp, name: &str, doc: &Document) -> egui::TextureHandle { + let buf = photocraft_compose::flatten(doc); + let (display, _) = crate::canvas::canvas_display(app, doc, None); + let img = crate::canvas::display_image(display.as_deref(), &buf); + ctx.load_texture(name, img, egui::TextureOptions::LINEAR) +} + +/// What a cached texture was built from, so it is rebuilt only when its source changes. +#[derive(Clone, PartialEq)] +enum TexKey { + Filtered(FilterPreviewKey), + Original(photocraft_doc::DocId, u64, u32), +} + +#[derive(Clone)] +struct CachedTex { + key: TexKey, + tex: egui::TextureHandle, + /// The image's size in pixels. + size: [u32; 2], +} + +/// The dialog's live textures: the filtered proxy and the unfiltered proxy. +#[derive(Clone, Default)] +struct Cache { + filtered: Option, + original: Option, +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn zoom_steps_walk_the_levels_and_stay_in_bounds() { + assert_eq!(step_zoom(1.0, true), 2.0); + assert_eq!(step_zoom(1.0, false), 0.5); + assert_eq!(step_zoom(0.9, true), 1.0); + assert_eq!(step_zoom(1.1, false), 1.0); + assert_eq!(step_zoom(MAX_ZOOM, true), MAX_ZOOM, "clamped at the top"); + assert_eq!(step_zoom(MIN_ZOOM, false), MIN_ZOOM, "clamped at the bottom"); + assert_eq!(step_zoom(0.0, true), MIN_ZOOM, "a corrupt zoom recovers upward"); + assert_eq!(step_zoom(f32::NAN, false), MIN_ZOOM); + } + + #[test] + fn the_centre_is_clamped_to_the_document() { + assert_eq!(clamp_center(-5.0, 99.0, 100.0, 50.0), (0.0, 50.0)); + assert_eq!(clamp_center(40.0, 25.0, 100.0, 50.0), (40.0, 25.0)); + // A corrupt (non-finite) centre falls back to the origin, not a panic or a NaN. + assert_eq!(clamp_center(f32::NAN, f32::INFINITY, 100.0, 50.0), (0.0, 0.0)); + } + + #[test] + fn the_source_rect_follows_the_centre_and_zoom() { + let doc = vec2(1000.0, 500.0); + let region = vec2(200.0, 100.0); + // 100%: a 200×100 document-pixel crop centred at (500, 250) sits in the middle. + assert_eq!(source_rect(500.0, 250.0, 1.0, region, doc), (400.0, 200.0, 200.0, 100.0)); + // 200%: the crop is half as large, still centred. + assert_eq!(source_rect(500.0, 250.0, 2.0, region, doc), (450.0, 225.0, 100.0, 50.0)); + // Near an edge the crop stops at it instead of running off. + let (x0, _, sw, _) = source_rect(0.0, 250.0, 1.0, region, doc); + assert_eq!((x0, sw), (0.0, 200.0)); + let (x0, _, sw, _) = source_rect(1000.0, 250.0, 1.0, region, doc); + assert_eq!((x0, sw), (800.0, 200.0)); + } + + #[test] + fn a_zoomed_out_region_centres_the_whole_image() { + let doc = vec2(100.0, 50.0); + let region = vec2(200.0, 100.0); + let (x0, y0, sw, sh) = source_rect(50.0, 25.0, 0.5, region, doc); + // The region is wider than the image: it is centred (a negative origin) and covers all of + // it, so the UV clamps to 0..1 rather than reading outside the texture. + assert_eq!((x0, y0, sw, sh), (-150.0, -75.0, 400.0, 200.0)); + assert!(x0 / doc.x < 0.0 && (x0 + sw) / doc.x > 1.0); + } + + #[test] + fn a_click_maps_to_the_document_point_under_it() { + let doc = vec2(1000.0, 500.0); + // The top-left of a crop starting at (400, 200) shown at 100% is that point. + assert_eq!(point_to_source(vec2(0.0, 0.0), 400.0, 200.0, 1.0, doc), (400.0, 200.0)); + // At 200%, 50 points in is 25 document pixels in. + assert_eq!(point_to_source(vec2(50.0, 50.0), 400.0, 200.0, 2.0, doc), (425.0, 225.0)); + // Clicking outside the image clamps to it. + assert_eq!(point_to_source(vec2(-10_000.0, 0.0), 400.0, 200.0, 1.0, doc), (0.0, 200.0)); + } + + #[test] + fn a_hundred_percent_is_one_document_pixel_per_point() { + // A 4×-reduced proxy of a 4000×3000 document: 100% must span 200 document pixels across a + // 200-point region, not 200 proxy pixels (which would be a quarter of the document scale). + let doc = document_size([1000, 750], 4); + assert_eq!(doc, vec2(4000.0, 3000.0)); + let (_, _, sw, sh) = source_rect(2000.0, 1500.0, 1.0, vec2(200.0, 100.0), doc); + assert_eq!((sw, sh), (200.0, 100.0), "one document pixel per point at 100%"); + // The same region covers 50 proxy pixels: the stored UV is a 200/4000 fraction. + let (x0, _, _, _) = source_rect(2000.0, 1500.0, 1.0, vec2(200.0, 100.0), doc); + assert_eq!(x0 / doc.x, 0.475); + assert!(document_size([0, 0], 4) == vec2(0.0, 0.0), "degenerate size stays finite"); + assert_eq!(document_size([10, 20], 0), vec2(10.0, 20.0), "a zero factor means 1×"); + } + + #[test] + fn the_window_defaults_its_view_and_never_panics() { + let mut app = PhotocraftApp::new(photocraft_engine::Session::new(), crate::Services::default()); + app.run("file.new", json!({"width": 64, "height": 48})).unwrap(); + let id = crate::filter_dialog::open(&mut app, "filter.stylize.emboss").expect("Emboss opens a dialog"); + let mut f = app.ui.dialogs.iter().find(|d| d.id == id).expect("the dialog is open").fields.clone(); + assert!(f.contains_key("__preview"), "Emboss previews"); + egui::Context::default().run_ui(Default::default(), |ui| window(&app, id, ui, &mut f)).textures_delta.clear(); + assert_eq!(f.get(ZOOM_FIELD), Some(&json!(1.0)), "100% by default"); + assert_eq!(f.get(CENTER_X_FIELD), Some(&json!(32.0)), "centred on the document"); + assert_eq!(f.get(CENTER_Y_FIELD), Some(&json!(24.0))); + // Corrupt state is recovered, not panicked on. + f.insert(ZOOM_FIELD.into(), json!(0.0)); + f.insert(CENTER_X_FIELD.into(), json!(f64::NAN)); + f.insert(CENTER_Y_FIELD.into(), json!(-999.0)); + egui::Context::default().run_ui(Default::default(), |ui| window(&app, id, ui, &mut f)).textures_delta.clear(); + assert_eq!(f.get(ZOOM_FIELD), Some(&json!(1.0))); + assert_eq!(f.get(CENTER_Y_FIELD), Some(&json!(0.0))); + } +} diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs index 50a8998f..a16dca00 100644 --- a/crates/ui-egui/src/lib.rs +++ b/crates/ui-egui/src/lib.rs @@ -80,6 +80,7 @@ pub mod file_open; pub mod file_ui; pub mod fill_ui; pub mod filter_dialog; +mod filter_preview_ui; #[cfg(not(target_arch = "wasm32"))] mod filter_preview_worker; pub mod flick_pan; From 5bc66094f8541911f46ae732d39d945290fc0b49 Mon Sep 17 00:00:00 2001 From: Tarek Mohamed <30214297+seotarek@users.noreply.github.com> Date: Mon, 12 Oct 2026 13:05:15 +0300 Subject: [PATCH 07/92] fix(ui): allow selecting shapes and editing color with path selection (#3915) (#3932) * fix(ui): allow selecting shapes and editing color with path selection (#3915) - In vector_ui.rs, implement pick_shape_at to hit-test visible shape layers by path, surface pixels, or live shape geometry. - In path_selection_finish and canvas ToolEvent::Down, select the clicked shape layer under the pointer when using Path Selection. - In direct_select.rs, include visible shape layers in candidate hit tests and sync layer.select on press. - In options_bar, display Fill swatch/checkbox, Stroke swatch/width/style, and corner radius when a shape is selected with Path Selection or Direct Selection, and dispatch shape.edit. - Add tests in path_selection_tests.rs and vector_ui.rs verifying shape selection on click and options bar editing. Fixes storytold/photocraft#3915 * Collapse nested ifs for clippy (collapsible_if) Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Brandon Thomas Co-authored-by: Claude Opus 5.5 --- crates/ui-egui/src/canvas.rs | 8 + crates/ui-egui/src/direct_select.rs | 24 ++- crates/ui-egui/src/path_selection_tests.rs | 20 +++ crates/ui-egui/src/vector_ui.rs | 177 ++++++++++++++++++++- 4 files changed, 221 insertions(+), 8 deletions(-) diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index 7a2a710c..304f3b2f 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -4688,6 +4688,14 @@ pub fn tool_event(app: &mut PhotocraftApp, ev: ToolEvent, mods: egui::Modifiers) return; } match tool { + Tool::PathSelection => { + let tol = 6.0 / f64::from(app.point_zoom().max(0.01)); + if let Some(st) = app.session.active() + && let Some(id) = crate::vector_ui::pick_shape_at(&st.doc, [x, y], tol) + { + let _ = app.run("layer.select", json!({"layer": id.0})); + } + } Tool::Pen => { if !(mods.alt && crate::vector_ui::pen_grab_handle(app, x, y)) { crate::vector_ui::pen_down(app, x, y); diff --git a/crates/ui-egui/src/direct_select.rs b/crates/ui-egui/src/direct_select.rs index 49550539..01deb0a0 100644 --- a/crates/ui-egui/src/direct_select.rs +++ b/crates/ui-egui/src/direct_select.rs @@ -139,7 +139,20 @@ pub fn shows(app: &PhotocraftApp, mods: Modifiers) -> bool { pub(crate) fn candidates(app: &PhotocraftApp) -> Vec<(PathRef, Path)> { let layer = crate::vector_ui::targeted_vector_mask(app).or_else(|| crate::vector_ui::active_shape_path(app)); let work = app.session.active().and_then(|st| st.doc.work_path.clone()); - layer.map(|(id, p)| (PathRef::Layer(id), p)).into_iter().chain(work.map(|p| (PathRef::Work, p))).collect() + let mut out: Vec<_> = layer.map(|(id, p)| (PathRef::Layer(id), p)).into_iter().chain(work.map(|p| (PathRef::Work, p))).collect(); + if let Some(st) = app.session.active() { + for (path, _, l) in st.doc.walk().iter().rev() { + if !l.visible || !(1..=path.len()).all(|n| st.doc.layer_at(&path[..n]).is_some_and(|a| a.visible)) { + continue; + } + if let photocraft_doc::LayerContent::Shape(sh) = &l.content + && !out.iter().any(|(r, _)| *r == PathRef::Layer(l.id.0)) + { + out.push((PathRef::Layer(l.id.0), sh.path.clone())); + } + } + } + out } fn retracted(k: &photocraft_doc::Knot, h: Handle) -> bool { @@ -222,14 +235,19 @@ fn press(app: &mut PhotocraftApp, p: [f64; 2], mods: Modifiers, convert: bool) - let handles = if ds.target == Some(r) { shown_handles(ds, &path) } else { Vec::new() }; edit::hit(&path, Point::new(p[0], p[1]), tol, &handles).map(|h| (r, path, h)) }); - let ds = &mut app.ui.direct_selection; let Some((target, base, hit)) = found else { if convert { return own_tool; } - ds.drag = Some(Drag::Marquee { start: p, end: p, add: mods.shift }); + app.ui.direct_selection.drag = Some(Drag::Marquee { start: p, end: p, add: mods.shift }); return true; }; + if let PathRef::Layer(id) = target + && app.session.active().and_then(|st| st.active_layer).map(|l| l.0) != Some(id) + { + let _ = app.run("layer.select", json!({"layer": id})); + } + let ds = &mut app.ui.direct_selection; if ds.target != Some(target) { *ds = DirectSelection { target: Some(target), ..Default::default() }; } diff --git a/crates/ui-egui/src/path_selection_tests.rs b/crates/ui-egui/src/path_selection_tests.rs index 89dcd49c..8f82e2ad 100644 --- a/crates/ui-egui/src/path_selection_tests.rs +++ b/crates/ui-egui/src/path_selection_tests.rs @@ -227,3 +227,23 @@ fn thumbnail_selection_ctrl_click_layer_path_preserves_panel_target() { h.render().unwrap().save(path).unwrap(); } } + +/// #3915: Clicking a shape with the Path Selection tool selects its layer. +#[test] +fn clicking_shape_with_path_selection_selects_its_layer() { + let mut h = harness(); + let rect_layer = + h.state_mut().run("shape.create", json!({"kind": "rect", "rect": [20, 20, 80, 60], "fill": "#ff0000"})).unwrap()["layer"].as_u64().unwrap(); + // Add a new empty layer above so rect is not the active layer. + let empty_layer = h.state_mut().run("layer.new.layer", json!({})).unwrap()["layer"].as_u64().unwrap(); + assert_eq!(h.state().session.active().unwrap().active_layer.unwrap().0, empty_layer); + + // Clicking inside the rectangle with Path Selection selects the rect layer. + h.state_mut().ui.tool = Tool::PathSelection; + crate::vector_ui::path_selection_finish(h.state_mut(), [50.0, 50.0], [50.0, 50.0]); + assert_eq!(h.state().session.active().unwrap().active_layer.unwrap().0, rect_layer); + + // Clicking outside does not change active layer. + crate::vector_ui::path_selection_finish(h.state_mut(), [150.0, 90.0], [150.0, 90.0]); + assert_eq!(h.state().session.active().unwrap().active_layer.unwrap().0, rect_layer); +} diff --git a/crates/ui-egui/src/vector_ui.rs b/crates/ui-egui/src/vector_ui.rs index c9b3873c..3a5dade0 100644 --- a/crates/ui-egui/src/vector_ui.rs +++ b/crates/ui-egui/src/vector_ui.rs @@ -642,11 +642,98 @@ pub(crate) fn free_transform_path(app: &PhotocraftApp) -> Option<(Value, Path)> Some((params, path)) } +fn point_in_subpath(sp: &photocraft_doc::vector::Subpath, pt: [f64; 2]) -> bool { + if !sp.closed || sp.knots.len() < 3 { + return false; + } + let mut inside = false; + let n = sp.knots.len(); + for i in 0..n { + let j = (i + 1) % n; + let xi = sp.knots[i].anchor.x; + let yi = sp.knots[i].anchor.y; + let xj = sp.knots[j].anchor.x; + let yj = sp.knots[j].anchor.y; + let intersect = ((yi > pt[1]) != (yj > pt[1])) && (pt[0] < (xj - xi) * (pt[1] - yi) / (yj - yi) + xi); + if intersect { + inside = !inside; + } + } + inside +} + +/// The topmost visible shape layer under `at` (document coordinates): +/// hits the shape path or anchor within `tol`, or any non-transparent pixel of the shape's raster surface, +/// or point inside the shape's filled geometry. +pub fn pick_shape_at(doc: &Document, at: [f64; 2], tol: f64) -> Option { + let (x, y) = (at[0].floor() as i32, at[1].floor() as i32); + for (path, _, l) in doc.walk().iter().rev() { + if !l.visible || !(1..=path.len()).all(|n| doc.layer_at(&path[..n]).is_some_and(|a| a.visible)) { + continue; + } + let board = path.first().and_then(|i| doc.layers.get(*i)).and_then(|t| t.artboard()); + if board.is_some_and(|a| !a.rect.contains(x, y)) { + continue; + } + if let LayerContent::Shape(sh) = &l.content { + if photocraft_vector::edit::hit(&sh.path, photocraft_geom::Point::new(at[0], at[1]), tol, &[]).is_some() { + return Some(l.id); + } + if sh.fill.is_some() { + if let Some(surf) = l.surface() { + let mut px = [[0.0f32; 4]; 1]; + surf.read_rgba_into(photocraft_doc::Rect::from_xywh(x, y, 1, 1), &mut px); + if px[0][3] > 0.0 { + return Some(l.id); + } + } + if let Some(photocraft_doc::LiveShape::Rect { rect, .. }) = &sh.live { + let x0 = rect[0].min(rect[0] + rect[2]); + let x1 = rect[0].max(rect[0] + rect[2]); + let y0 = rect[1].min(rect[1] + rect[3]); + let y1 = rect[1].max(rect[1] + rect[3]); + if at[0] >= x0 && at[0] <= x1 && at[1] >= y0 && at[1] <= y1 { + return Some(l.id); + } + } + if let Some(photocraft_doc::LiveShape::Ellipse { rect }) = &sh.live { + let rx = rect[2].abs() / 2.0; + let ry = rect[3].abs() / 2.0; + if rx > 1e-6 && ry > 1e-6 { + let cx = rect[0] + rect[2] / 2.0; + let cy = rect[1] + rect[3] / 2.0; + let dx = (at[0] - cx) / rx; + let dy = (at[1] - cy) / ry; + if dx * dx + dy * dy <= 1.0 { + return Some(l.id); + } + } + } + if sh.path.subpaths.iter().any(|sp| point_in_subpath(sp, at)) { + return Some(l.id); + } + } + } + } + None +} + pub fn path_selection_finish(app: &mut PhotocraftApp, start: [f64; 2], end: [f64; 2]) { let (dx, dy) = (end[0] - start[0], end[1] - start[1]); + let tol = 6.0 / f64::from(app.point_zoom().max(0.01)); if dx.abs() + dy.abs() < 0.5 { + let Some(st) = app.session.active() else { return }; + if let Some(id) = pick_shape_at(&st.doc, start, tol) { + let _ = app.run("layer.select", json!({"layer": id.0})); + } return; } + if target_path(app).is_none() { + let Some(st) = app.session.active() else { return }; + if let Some(id) = pick_shape_at(&st.doc, start, tol) { + let _ = app.run("layer.select", json!({"layer": id.0})); + } + } let Some((target, path)) = target_path(app) else { return }; let _ = match target { PathTarget::Shape(id) => app.run("shape.edit", json!({"layer": id, "move": [dx.round(), dy.round()]})), @@ -826,11 +913,12 @@ pub fn options_bar(app: &mut PhotocraftApp, ui: &mut egui::Ui, tool: Tool) -> bo ui.label(egui::RichText::new(s).color(t.text_dim).size(12.0)); }; let o = &mut app.ui.tool_options; - if tool == Tool::PathSelection { + let target = selected_shape(&app.session); + if tool == Tool::PathSelection && target.is_none() { lbl(ui, if app.ui.vector_mask_target { "Drag to move the targeted vector mask" } else { tl!("Drag to move the active shape's path or the Work Path") }); return true; } - if tool == Tool::DirectSelection { + if tool == Tool::DirectSelection && target.is_none() { let (shift, alt) = (crate::shortcuts::pretty("Shift"), crate::shortcuts::pretty("Alt")); lbl( ui, @@ -893,7 +981,6 @@ pub fn options_bar(app: &mut PhotocraftApp, ui: &mut egui::Ui, tool: Tool) -> bo crate::widgets::dropdown(ui, "shape-mode", &mut mode, &[("shape".to_string(), tl!("Shape"))], 80.0); crate::widgets::vline(ui, 22.0); // Fill and Stroke edit the selected shape layer too (#3347), and still set the next shape's. - let target = selected_shape(&app.session); let (fg, bg) = (app.session.tools.foreground, app.session.tools.background); let (mut has_fill, fill, stroke) = match &target { Some(s) => (s.fill.is_some(), s.fill.clone(), s.stroke.clone()), @@ -936,7 +1023,15 @@ pub fn options_bar(app: &mut PhotocraftApp, ui: &mut egui::Ui, tool: Tool) -> bo Tool::Rectangle => { crate::widgets::vline(ui, 22.0); lbl(ui, tl!("Radius:")); - crate::widgets::value_field(ui, &mut o.corner_radius, 0.0..=10000.0, "px", 62.0); + let mut r = match target.as_ref().and_then(|s| s.live.as_ref()) { + Some(photocraft_doc::LiveShape::Rect { radii, .. }) => radii[0] as f32, + _ => o.corner_radius, + }; + if crate::widgets::value_field(ui, &mut r, 0.0..=10000.0, "px", 62.0).changed() { + o.corner_radius = r; + let rf = r as f64; + edit = Some(json!({"radii": [rf, rf, rf, rf], "coalesce": key("radius")})); + } } Tool::Polygon => { crate::widgets::vline(ui, 22.0); @@ -955,6 +1050,18 @@ pub fn options_bar(app: &mut PhotocraftApp, ui: &mut egui::Ui, tool: Tool) -> bo crate::widgets::vline(ui, 22.0); crate::preset_panels::shape_picker(app, ui); } + _ if matches!(tool, Tool::PathSelection | Tool::DirectSelection) => { + if let Some(photocraft_doc::LiveShape::Rect { radii, .. }) = target.as_ref().and_then(|s| s.live.as_ref()) { + crate::widgets::vline(ui, 22.0); + lbl(ui, tl!("Radius:")); + let mut r = radii[0] as f32; + if crate::widgets::value_field(ui, &mut r, 0.0..=10000.0, "px", 62.0).changed() { + o.corner_radius = r; + let rf = r as f64; + edit = Some(json!({"radii": [rf, rf, rf, rf], "coalesce": key("radius")})); + } + } + } _ => {} } for (is_stroke, change) in [(false, fill_color), (true, stroke_color)] { @@ -986,13 +1093,14 @@ struct SelectedShape { layer: photocraft_doc::LayerId, fill: Option, stroke: Option, + live: Option, } fn selected_shape(session: &photocraft_engine::Session) -> Option { let st = session.active()?; let layer = st.active_layer?; match &st.doc.layer(layer)?.content { - LayerContent::Shape(sh) => Some(SelectedShape { doc: st.doc.id, layer, fill: sh.fill.clone(), stroke: sh.stroke.clone() }), + LayerContent::Shape(sh) => Some(SelectedShape { doc: st.doc.id, layer, fill: sh.fill.clone(), stroke: sh.stroke.clone(), live: sh.live.clone() }), _ => None, } } @@ -2136,6 +2244,65 @@ mod tests { click_fill(&mut h); assert_eq!(h.state().session.active().unwrap().history.past_len(), history); } + + /// #3915: Path Selection and Direct Selection options bars show Fill, Stroke, and Radius + /// controls when a shape is selected, and editing them edits the selected shape. + #[test] + fn path_selection_options_bar_edits_the_selected_shape() { + use egui::accesskit::Role; + use egui_kittest::kittest::Queryable; + let mut app = app(); + app.run("tools.setColors", json!({"foreground": "#ff0000", "background": "#0000ff"})).unwrap(); + finish_shape(&mut app, Tool::Rectangle, [20.0, 20.0], [120.0, 100.0], Default::default()); + let shape = |app: &PhotocraftApp| { + let st = app.session.active().unwrap(); + match &st.doc.layer(st.active_layer.unwrap()).unwrap().content { + LayerContent::Shape(sh) => (sh.fill.clone(), sh.stroke.clone()), + _ => panic!("not a shape layer"), + } + }; + assert!(shape(&app).0.is_some() && shape(&app).1.is_none()); + let mut h = egui_kittest::Harness::builder().with_size(vec2(1100.0, 48.0)).build_ui_state( + |ui, app: &mut PhotocraftApp| { + if ui.ctx().fonts(|f| f.families().contains(&egui::FontFamily::Name("medium".into()))) { + ui.horizontal_centered(|ui| options_bar(app, ui, Tool::PathSelection)); + } + }, + app, + ); + PhotocraftApp::setup_context(&h.ctx, crate::theme::ThemeKind::Studio); + h.run_steps(4); + let click_fill = |h: &mut egui_kittest::Harness<'_, PhotocraftApp>| { + let label = h.query_all(egui_kittest::kittest::by().label("Fill:").include_labels()).next().expect("the Fill label").rect(); + let at = egui::pos2(label.right() + h.ctx.global_style().spacing.item_spacing.x + 7.0, label.center().y); + h.hover_at(at); + h.step(); + for pressed in [true, false] { + h.event(egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE }); + h.step(); + } + h.run_steps(2); + }; + // Stroke width field is available on Path Selection bar too. + h.get_all_by_role(Role::SpinButton).next().expect("the stroke width").click(); + h.run(); + for c in "6".chars() { + h.event(egui::Event::Text(c.to_string())); + h.run(); + } + h.key_press(egui::Key::Enter); + h.run_steps(2); + let stroke = shape(h.state()).1.expect("the width field stroked the shape"); + assert_eq!(stroke.width, 6.0); + assert_eq!(stroke.paint, photocraft_doc::Fill::Solid(photocraft_doc::Color::rgba(0.0, 0.0, 1.0, 1.0))); + // Fill toggle. + click_fill(&mut h); + assert_eq!(shape(h.state()).0, None, "unchecking Fill removed the shape's fill"); + // No shape selected: renders hint text instead. + h.state_mut().run("layer.new.layer", json!({})).unwrap(); + h.run_steps(2); + assert!(h.query_all(egui_kittest::kittest::by().label("Fill:").include_labels()).next().is_none()); + } } #[cfg(test)] From 6f1c4481bfe158eccd5ed9b0bae344145f74e165 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 12 Oct 2026 06:06:46 -0400 Subject: [PATCH 08/92] fix(psd): type layer bytes match Photoshop (TySh bounds, AntiAlias, version info) (#4041) - TySh: the four values after the warp descriptor are big-endian f32, not i32. Written as Photoshop writes them: zeros for unwarped type, the text-space bounds for warped type (corpus: warp-arc-50.psd, unwarped text oracles). - EngineData AntiAlias numbers as Photoshop writes them, on write and on read (when there is no AntA descriptor): 0 None, 1 Crisp, 2 Strong, 3 Smooth, 4 Sharp (corpus text/antialias-*.psd). Platform modes, which no corpus file confirms, write Smooth and keep their exact mode in AntA. - Resource 1057: writer "Adobe Photoshop", reader "Adobe Photoshop 2026", no NUL terminator, byte for byte what all 258 Photoshop 2026 oracles write. Co-authored-by: Claude Opus 5.5 --- crates/io/tests/psd_type_bounds.rs | 4 +- crates/io/tests/psd_type_photoshop_bytes.rs | 74 +++++++++++++++++++++ crates/psd/src/resources.rs | 20 +++++- crates/text/src/psd.rs | 46 +++++++++---- crates/text/src/tests.rs | 40 +++++++++++ 5 files changed, 167 insertions(+), 17 deletions(-) create mode 100644 crates/io/tests/psd_type_photoshop_bytes.rs diff --git a/crates/io/tests/psd_type_bounds.rs b/crates/io/tests/psd_type_bounds.rs index 4ae925ec..95e7ddfa 100644 --- a/crates/io/tests/psd_type_bounds.rs +++ b/crates/io/tests/psd_type_bounds.rs @@ -112,8 +112,8 @@ fn tysh_with_font(text: &str, runs: &[Run], box_bounds: Option<[f64; 4]>, transf .with("boundingBox", rect("boundingBox")) .with("TextIndex", D::Integer(0)) .with("EngineData", D::RawData(photocraft_text::engine_data::write(&engine_data(text, runs, box_bounds, font)))); - let bounds = [ink[0].floor() as i32, ink[1].floor() as i32, ink[2].ceil() as i32, ink[3].ceil() as i32]; - write_tysh(&TySh { transform, text: desc, warp: None, bounds }) + // Unwarped type: Photoshop writes four zero f32s after the warp descriptor. + write_tysh(&TySh { transform, text: desc, warp: None, bounds: [0.0; 4] }) } struct Case { diff --git a/crates/io/tests/psd_type_photoshop_bytes.rs b/crates/io/tests/psd_type_photoshop_bytes.rs new file mode 100644 index 00000000..98524892 --- /dev/null +++ b/crates/io/tests/psd_type_photoshop_bytes.rs @@ -0,0 +1,74 @@ +//! Type-layer bytes we write match what Photoshop 2026 writes for the same settings, checked +//! against Photoshop-authored files in `corpus/photoshop` (feature `corpus`; fetched by +//! `cargo xtask corpus --all`, a missing corpus fails): +//! - EngineData `AntiAlias` numbers for every anti-aliasing mode; +//! - the four f32 values that end a `TySh` block (zeros unwarped, text-space bounds warped); +//! - the version info resource (1057). + +#![cfg(feature = "corpus")] + +use std::path::{Path, PathBuf}; + +use photocraft_psd::PsdFile; +use photocraft_psd::descriptor::Value as D; +use photocraft_text::engine_data::Value as E; + +fn corpus(rel: &str) -> PsdFile { + let path: PathBuf = Path::new(env!("CARGO_MANIFEST_DIR")).join("../../corpus/photoshop").join(rel); + let bytes = std::fs::read(&path).unwrap_or_else(|e| panic!("{}: {e} (run `cargo xtask corpus --all`)", path.display())); + PsdFile::from_bytes(&bytes).unwrap() +} + +fn first_tysh(f: &PsdFile) -> Vec { + f.layers().iter().find_map(|l| l.block(b"TySh")).map(|b| b.data.clone()).unwrap() +} + +fn engine_antialias(tysh: &[u8]) -> Option { + let t = photocraft_text::psd::parse_tysh(tysh)?; + photocraft_text::psd::engine_data(&t.text)?.path(&["EngineDict", "AntiAlias"]).and_then(E::as_f64) +} + +fn rect(t: &photocraft_text::psd::TySh, key: &str) -> [f32; 4] { + let Some(D::Descriptor(d)) = t.text.get(key) else { panic!("no {key}") }; + ["Left", "Top ", "Rght", "Btom"].map(|k| match d.get(k) { + Some(D::UnitFloat { value, .. }) => *value as f32, + other => panic!("{k}: {other:?}"), + }) +} + +#[test] +fn engine_data_antialias_matches_photoshop() { + for name in ["none", "crisp", "strong", "smooth", "sharp"] { + let raw = first_tysh(&corpus(&format!("text/antialias-{name}.psd"))); + let mut layer = photocraft_text::psd::text_layer_from_tysh(&raw, 72.0).unwrap(); + layer.psd_raw = None; + let ours = photocraft_text::psd::build_tysh(&layer, 72.0, None); + assert_eq!(engine_antialias(&ours), engine_antialias(&raw), "{name}"); + } +} + +#[test] +fn tysh_trailing_bounds_match_photoshop() { + for (file, warped) in [("text/warp-arc-50.psd", true), ("text/antialias-smooth.psd", false)] { + let raw = first_tysh(&corpus(file)); + let theirs = photocraft_text::psd::parse_tysh(&raw).unwrap(); + let mut layer = photocraft_text::psd::text_layer_from_tysh(&raw, 72.0).unwrap(); + assert_eq!(layer.warp.is_some(), warped, "{file}"); + layer.psd_raw = None; + let ours = photocraft_text::psd::parse_tysh(&photocraft_text::psd::build_tysh(&layer, 72.0, Some(rect(&theirs, "bounds")))).unwrap(); + assert_eq!(ours.bounds, theirs.bounds, "{file}"); + if warped { + assert_eq!(theirs.bounds, rect(&theirs, "bounds"), "{file}"); + } else { + assert_eq!(theirs.bounds, [0.0; 4], "{file}"); + } + } +} + +#[test] +fn version_info_matches_photoshop() { + for file in ["text/antialias-smooth.psd", "text/warp-arc-50.psd"] { + let theirs = corpus(file); + assert_eq!(photocraft_psd::resources::version_info_resource(true).data, theirs.resource(1057).unwrap().data, "{file}"); + } +} diff --git a/crates/psd/src/resources.rs b/crates/psd/src/resources.rs index ba2674ba..c20efbfc 100644 --- a/crates/psd/src/resources.rs +++ b/crates/psd/src/resources.rs @@ -250,15 +250,16 @@ pub(crate) fn write_section(out: &mut Vec, res: &[ImageResource]) -> Result< out.end_len(at, false) } -/// Builds the data for a 1057 version info resource. +/// Builds the data for a 1057 version info resource, with the writer and reader names Photoshop +/// 2026 writes ("Adobe Photoshop", "Adobe Photoshop 2026"), without a NUL terminator. pub fn version_info_resource(has_real_merged_data: bool) -> ImageResource { ImageResource::new( ids::VERSION_INFO, VersionInfo { version: 1, has_real_merged_data, - writer: UnicodeString::new_nul("Adobe Photoshop"), - reader: UnicodeString::new_nul("Adobe Photoshop CS6"), + writer: UnicodeString::new("Adobe Photoshop"), + reader: UnicodeString::new("Adobe Photoshop 2026"), file_version: 1, } .to_bytes(), @@ -365,4 +366,17 @@ mod tests { other => panic!("{other:?}"), } } + + /// Byte for byte what Photoshop 2026 writes (every Photoshop-authored oracle in the corpus): + /// u32 count + UTF-16BE, no NUL terminator. + #[test] + fn version_info_matches_photoshop_bytes() { + let mut want = vec![0, 0, 0, 1, 1]; + for s in ["Adobe Photoshop", "Adobe Photoshop 2026"] { + want.extend_from_slice(&(s.len() as u32).to_be_bytes()); + want.extend(s.encode_utf16().flat_map(u16::to_be_bytes)); + } + want.extend_from_slice(&[0, 0, 0, 1]); + assert_eq!(version_info_resource(true).data, want); + } } diff --git a/crates/text/src/psd.rs b/crates/text/src/psd.rs index c6724bf2..2c0ca38a 100644 --- a/crates/text/src/psd.rs +++ b/crates/text/src/psd.rs @@ -24,8 +24,10 @@ pub struct TySh { pub transform: Affine, pub text: Descriptor, pub warp: Option, - /// The four trailing i32 values (left, top, right, bottom). - pub bounds: [i32; 4], + /// The four trailing big-endian f32 values (left, top, right, bottom) after the warp + /// descriptor. Photoshop writes zeros for unwarped type and the text-space bounds (the + /// `bounds` descriptor's rectangle) for warped type. + pub bounds: [f32; 4], } /// Parses a `TySh` block. @@ -42,10 +44,10 @@ pub fn parse_tysh(data: &[u8]) -> Option { None => (None, 0), }; let tail = rest.get(wused..).unwrap_or(&[]); - let mut bounds = [0i32; 4]; + let mut bounds = [0f32; 4]; for (i, b) in bounds.iter_mut().enumerate() { if let Some(x) = tail.get(i * 4..i * 4 + 4) { - *b = i32::from_be_bytes(x.try_into().unwrap_or([0; 4])); + *b = f32::from_be_bytes(x.try_into().unwrap_or([0; 4])); } } Some(TySh { transform: Affine { m }, text: text.descriptor, warp, bounds }) @@ -221,7 +223,11 @@ pub fn text_layer_from_tysh(data: &[u8], dpi: f32) -> Option { Some("AnSt" | "antiAliasStrong") => AntiAlias::Strong, Some("antiAliasPlatformGray") => AntiAlias::Windows, Some("antiAliasPlatformLCD") => AntiAlias::WindowsLcd, - _ => AntiAlias::Smooth, + Some(_) => AntiAlias::Smooth, + // No `AntA`: the engine data's mode says it. + None => { + engine_data(&t.text).and_then(|e| e.path(&["EngineDict", "AntiAlias"]).and_then(E::as_f64)).and_then(engine_antialias).unwrap_or(AntiAlias::Smooth) + } }; if let Some(w) = &t.warp { let style = enum_value(w, "warpStyle").unwrap_or_else(|| "warpNone".into()); @@ -979,12 +985,13 @@ pub fn build_engine_data(layer: &TextLayer, template: Option, dpi: f32) -> E "AntiAlias", E::Int(match layer.antialias { AntiAlias::None => 0, - AntiAlias::Sharp => 1, - AntiAlias::Crisp => 2, - AntiAlias::Strong => 3, - AntiAlias::Smooth => 4, - // EngineData has no platform modes; the `AntA` descriptor carries the exact value. - AntiAlias::Windows | AntiAlias::WindowsLcd => 1, + AntiAlias::Crisp => 1, + AntiAlias::Strong => 2, + AntiAlias::Smooth => 3, + AntiAlias::Sharp => 4, + // No Photoshop file confirms the platform modes' numbers here; the `AntA` descriptor + // carries the exact mode, and Smooth is the closest. + AntiAlias::Windows | AntiAlias::WindowsLcd => 3, }), ); if dict.get("UseFractionalGlyphWidths").is_none() { @@ -1059,6 +1066,19 @@ pub fn build_engine_data(layer: &TextLayer, template: Option, dpi: f32) -> E e } +/// The anti-aliasing mode for EngineData's `AntiAlias` number, as Photoshop writes it: 0 None, +/// 1 Crisp, 2 Strong, 3 Smooth, 4 Sharp. Other numbers (platform modes) are left to `AntA`. +fn engine_antialias(n: f64) -> Option { + Some(match n as i64 { + 0 => AntiAlias::None, + 1 => AntiAlias::Crisp, + 2 => AntiAlias::Strong, + 3 => AntiAlias::Smooth, + 4 => AntiAlias::Sharp, + _ => return None, + }) +} + /// Builds the `TySh` block for `layer`, patching its current `psd_raw` when present. /// `ink` is the layer's rendered bounds in text space (for `bounds`/`boundingBox`). pub fn build_tysh(layer: &TextLayer, dpi: f32, ink: Option<[f32; 4]>) -> Vec { @@ -1123,6 +1143,8 @@ pub fn build_tysh(layer: &TextLayer, dpi: f32, ink: Option<[f32; 4]>) -> Vec (None, Some(old)) if enum_value(&old, "warpStyle").as_deref() == Some("warpNone") => Some(old), _ => None, }; - let bounds = [l.floor() as i32, t.floor() as i32, r.ceil() as i32, b.ceil() as i32]; + // Photoshop's trailing bounds: zeros for unwarped type, the text-space bounds when warped. + let warped = warp.as_ref().is_some_and(|w| enum_value(w, "warpStyle").is_some_and(|s| s != "warpNone")); + let bounds = if warped { [l, t, r, b] } else { [0.0; 4] }; write_tysh(&TySh { transform: layer.transform, text, warp, bounds }) } diff --git a/crates/text/src/tests.rs b/crates/text/src/tests.rs index fa0a626f..8df4d81b 100644 --- a/crates/text/src/tests.rs +++ b/crates/text/src/tests.rs @@ -1505,3 +1505,43 @@ fn translate_tysh_moves_only_the_translation() { assert_eq!(crate::psd::parse_tysh(&tysh).unwrap().bounds, back.bounds, "bounds are in text space"); assert!(crate::psd::translate_tysh(&tysh[..40], 1.0, 1.0).is_none(), "a truncated block is refused"); } + +/// The four values after the `TySh` warp descriptor are big-endian f32, as Photoshop writes them: +/// zeros for unwarped type, the text-space bounds for warped type. +#[test] +fn tysh_trailing_bounds_are_f32() { + use photocraft_doc::text::TextWarp; + let tail = |b: &[u8]| -> [f32; 4] { + let t = b.get(b.len() - 16..).unwrap(); + std::array::from_fn(|i| f32::from_be_bytes(t[i * 4..i * 4 + 4].try_into().unwrap())) + }; + let ink = [0.0, -34.316406, 288.90625, 15.058594]; + let plain = crate::psd::build_tysh(&point("Type", 20.0), 72.0, Some(ink)); + assert_eq!(tail(&plain), [0.0; 4]); + let warped = TextLayer { + warp: Some(TextWarp { style: "warpArc".into(), value: 50.0, horizontal_distortion: 0.0, vertical_distortion: 0.0, horizontal: true }), + ..point("Type", 20.0) + }; + let bytes = crate::psd::build_tysh(&warped, 72.0, Some(ink)); + assert_eq!(tail(&bytes), ink); + let parsed = crate::psd::parse_tysh(&bytes).unwrap(); + assert_eq!(parsed.bounds, ink); + assert_eq!(crate::psd::write_tysh(&parsed), bytes); +} + +/// EngineData's `AntiAlias` numbers as Photoshop writes them, beside the `AntA` descriptor: +/// 0 None, 1 Crisp, 2 Strong, 3 Smooth, 4 Sharp. Read back from EngineData alone (no `AntA`), +/// every mode survives. +#[test] +fn engine_data_antialias_numbers_match_photoshop() { + use photocraft_doc::text::AntiAlias; + for (mode, n) in [(AntiAlias::None, 0), (AntiAlias::Crisp, 1), (AntiAlias::Strong, 2), (AntiAlias::Smooth, 3), (AntiAlias::Sharp, 4)] { + let t = TextLayer { antialias: mode, ..point("Type", 20.0) }; + let mut tysh = crate::psd::parse_tysh(&crate::psd::build_tysh(&t, 72.0, None)).unwrap(); + let e = crate::psd::engine_data(&tysh.text).unwrap(); + assert_eq!(e.path(&["EngineDict", "AntiAlias"]).and_then(crate::engine_data::Value::as_f64), Some(f64::from(n)), "{mode:?}"); + tysh.text.items.retain(|(k, _)| !k.is("AntA")); + let back = crate::psd::text_layer_from_tysh(&crate::psd::write_tysh(&tysh), 72.0).unwrap(); + assert_eq!(back.antialias, mode, "{n}"); + } +} From 0d6e658e73d8d93014ed345ab7e00e8b9de8bd7e Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 12 Oct 2026 06:11:33 -0400 Subject: [PATCH 09/92] PSD: rasterized fill and smart layers stay rasterized after save and reopen (#4034) * fix(psd): rasterized fill and smart layers stay rasterized after save and reopen Layer > Rasterize > Fill Content / Smart Object swapped the layer's content to pixels but kept the fill (SoCo/GdFl/PtFl) or placed-layer (SoLd/PlLd/SoLE) blocks read from the PSD. Written back, they made the reopened file a fill layer or smart object again and discarded the pixels. Photoshop writes none of them for a pixel layer. - Rasterize drops those blocks from the layer. - The PSD exporter never writes fill, placed, type (TySh), shape-content (vscg/vstk), adjustment or CgEd blocks for a raster layer, whichever command made it one; a vector mask (vmsk/vsms with its vogk) stays. Tests: synthetic fill + smart object rasterize/save/reopen, the exporter backstop with stale blocks, and Photoshop-authored corpus files. Co-Authored-By: Claude Opus 5.5 * fix(psd): keep a pixel layer's vstk when it has no vector mask, as Photoshop does Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 --- README.md | 2 - crates/engine/src/extra_cmds.rs | 3 + crates/engine/tests/rasterize_psd_reopen.rs | 115 ++++++++++++++++++++ crates/io/src/psd_export.rs | 16 ++- packaging/windows/photocraft.en-us.wxl | 1 - packaging/windows/photocraft.wxs | 12 -- 6 files changed, 133 insertions(+), 16 deletions(-) create mode 100644 crates/engine/tests/rasterize_psd_reopen.rs diff --git a/README.md b/README.md index 0455744b..b6e8c5a6 100644 --- a/README.md +++ b/README.md @@ -331,8 +331,6 @@ sha256-verified. Fetch them with `cargo xtask corpus --all` and run the tests wi | arm64 (Snapdragon and other ARM PCs) | `photocraft--windows-arm64.msi` | `photocraft--windows-arm64-portable.zip` | | x86 (32-bit) | `photocraft--windows-x86.msi` | `photocraft--windows-x86-portable.zip` | -Windows 10 or later is required. On Windows 7 and 8 the app can't start (the installer says so). - Installers and executables are code-signed. ### macOS diff --git a/crates/engine/src/extra_cmds.rs b/crates/engine/src/extra_cmds.rs index f25ea9a2..84c0e24d 100644 --- a/crates/engine/src/extra_cmds.rs +++ b/crates/engine/src/extra_cmds.rs @@ -673,6 +673,9 @@ fn rasterize_content(s: &mut Session, id: LayerId, only: Option<&str>, key: &str let l = doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?; l.content = LayerContent::Raster(px); l.fill_cache = None; + // The PSD fill or placed-layer blocks no longer describe the layer: kept, they + // would reopen it as a fill layer or smart object and drop these pixels. + l.psd_blocks.retain(|(k, _)| !matches!(k, b"SoCo" | b"GdFl" | b"PtFl" | b"SoLd" | b"PlLd" | b"SoLE")); Ok(()) }); s.coalesce_request = None; diff --git a/crates/engine/tests/rasterize_psd_reopen.rs b/crates/engine/tests/rasterize_psd_reopen.rs new file mode 100644 index 00000000..a39005ac --- /dev/null +++ b/crates/engine/tests/rasterize_psd_reopen.rs @@ -0,0 +1,115 @@ +//! Layer › Rasterize › Fill Content / Smart Object stays rasterized after a PSD save and reopen. +//! A fill or smart layer opened from a PSD keeps its file blocks (`SoCo`/`GdFl`/`PtFl`, +//! `SoLd`/`PlLd`); left on the rasterized layer, they made the reopened file a fill layer or +//! smart object again and threw the pixels away. Photoshop writes none of them for a pixel layer. + +use photocraft_doc::{Document, LayerContent, LayerId}; +use photocraft_engine::Session; +use serde_json::{Value, json}; + +fn id_of(r: Value) -> LayerId { + LayerId(r["layer"].as_u64().unwrap()) +} + +fn kind(l: &photocraft_doc::Layer) -> &'static str { + match &l.content { + LayerContent::Fill(_) => "fill", + LayerContent::Smart(_) => "smart", + LayerContent::Raster(_) => "raster", + _ => "other", + } +} + +fn kind_named(doc: &Document, name: &str) -> &'static str { + let l = doc.walk().into_iter().map(|(_, _, l)| l).find(|l| l.name == name).unwrap_or_else(|| panic!("no layer {name}")); + kind(l) +} + +fn reopen(doc: &Document) -> Document { + let out = photocraft_io::export(doc, "psd", &Default::default()).unwrap(); + photocraft_io::import("x.psd", &out.bytes).unwrap().document +} + +/// Whether the PSD written for `doc` gives the layer `name` any of `keys`. +fn has_block(doc: &Document, name: &str, keys: &[&[u8; 4]]) -> bool { + let out = photocraft_io::export(doc, "psd", &Default::default()).unwrap(); + let f = photocraft_psd::PsdFile::from_bytes(&out.bytes).unwrap(); + let rec = f.layers().iter().find(|r| r.name() == name).unwrap(); + keys.iter().any(|k| rec.block(k).is_some()) +} + +/// Rasterizes every layer named in `names` of a session opened on `doc`, then saves and reopens. +fn rasterize_and_reopen(doc: Document, names: &[&str]) -> Document { + let mut s = Session::new(); + s.add_document(doc, None); + for name in names { + let id = s.active().unwrap().doc.walk().into_iter().map(|(_, _, l)| l).find(|l| l.name == *name).unwrap().id; + s.execute("layer.rasterize.layer", json!({"layer": id.0})).unwrap(); + assert_eq!(kind_named(&s.active().unwrap().doc, name), "raster"); + } + reopen(&s.active().unwrap().doc) +} + +#[test] +fn rasterized_fill_and_smart_object_reopen_as_pixels() { + let mut s = Session::new(); + s.execute("file.new", json!({"width": 48, "height": 32})).unwrap(); + s.execute("layer.new.layer", json!({"name": "Source"})).unwrap(); + s.execute("paint.stroke", json!({"points": [[20, 16]], "size": 12})).unwrap(); + let smart = id_of(s.execute("layer.smartObjects.convertToSmartObject", json!({})).unwrap()); + let fill = id_of(s.execute("layer.newFillLayer.solidColor", json!({"color": "#00ff00"})).unwrap()); + let doc = s.active().unwrap().doc.clone(); + let smart_name = doc.layer(smart).unwrap().name.clone(); + let fill_name = doc.layer(fill).unwrap().name.clone(); + assert_ne!(smart_name, fill_name); + + // Opened from a PSD, both layers carry their file blocks. + let opened = reopen(&doc); + assert_eq!(kind_named(&opened, &fill_name), "fill"); + assert_eq!(kind_named(&opened, &smart_name), "smart"); + + let back = rasterize_and_reopen(opened, &[&fill_name, &smart_name]); + assert_eq!(kind_named(&back, &fill_name), "raster"); + assert_eq!(kind_named(&back, &smart_name), "raster"); + assert!(!has_block(&back, &fill_name, &[b"SoCo", b"GdFl", b"PtFl"])); + assert!(!has_block(&back, &smart_name, &[b"SoLd", b"PlLd", b"SoLE"])); +} + +/// The exporter never writes content-defining blocks for a pixel layer, whichever command made it +/// one (a backstop for paths that swap the content without pruning `psd_blocks`). +#[test] +fn raster_layer_with_stale_blocks_writes_none() { + let mut s = Session::new(); + s.execute("file.new", json!({"width": 16, "height": 16})).unwrap(); + s.execute("layer.newFillLayer.solidColor", json!({"color": "#ff0000"})).unwrap(); + let mut doc = reopen(&s.active().unwrap().doc); + let (id, name) = doc.walk().into_iter().map(|(_, _, l)| l).find(|l| kind(l) == "fill").map(|l| (l.id, l.name.clone())).unwrap(); + let fmt = doc.pixel_format(); + let l = doc.layer_mut(id).unwrap(); + assert!(l.psd_blocks.iter().any(|(k, _)| k == b"SoCo")); + l.content = LayerContent::Raster(photocraft_raster::Surface::new(fmt)); + l.psd_blocks.push((*b"TySh", std::sync::Arc::new(vec![0; 8]))); + l.psd_blocks.push((*b"vscg", std::sync::Arc::new(vec![0; 8]))); + l.psd_blocks.push((*b"levl", std::sync::Arc::new(vec![0; 8]))); + assert!(!has_block(&doc, &name, &[b"SoCo", b"TySh", b"vstk", b"vscg", b"SoLd", b"PlLd", b"levl"])); + assert_eq!(kind_named(&reopen(&doc), &name), "raster"); +} + +/// The same through files Photoshop wrote: a gradient fill layer and a placed smart object. +#[cfg(feature = "corpus")] +#[test] +fn photoshop_fill_and_smart_layers_stay_rasterized() { + let root = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../corpus"); + for (file, want) in [("psd-tools/gradient-fill.psd", "fill"), ("photoshop/smart-filters/sf-none-plain.psd", "smart")] { + let path = root.join(file); + let bytes = std::fs::read(&path).unwrap_or_else(|e| panic!("{}: {e} (run `cargo xtask corpus --all`)", path.display())); + let doc = photocraft_io::import(file, &bytes).unwrap().document; + let names: Vec = doc.walk().into_iter().map(|(_, _, l)| l).filter(|l| kind(l) == want).map(|l| l.name.clone()).collect(); + assert!(!names.is_empty(), "{file}: no {want} layer"); + let refs: Vec<&str> = names.iter().map(String::as_str).collect(); + let back = rasterize_and_reopen(doc, &refs); + for n in &names { + assert_eq!(kind_named(&back, n), "raster", "{file}: {n}"); + } + } +} diff --git a/crates/io/src/psd_export.rs b/crates/io/src/psd_export.rs index e8784e11..1c43a364 100644 --- a/crates/io/src/psd_export.rs +++ b/crates/io/src/psd_export.rs @@ -15,6 +15,11 @@ use crate::blocks; use crate::pixels::{deinterleave, encode_be, psd_depth}; use crate::psd_import::REGENERATED; +/// Blocks that define a layer's content as something other than pixels: fill (`SoCo`, `GdFl`, +/// `PtFl`), placed / smart object (`SoLd`, `PlLd`, `SoLE`), type (`TySh`) and shape fill (`vscg`). +/// A raster layer never writes them, nor adjustment blocks. +const RASTER_STALE_KEYS: [&[u8; 4]; 8] = [b"SoCo", b"GdFl", b"PtFl", b"SoLd", b"PlLd", b"SoLE", b"TySh", b"vscg"]; + const PSD_MAX_FILE_SIZE: u64 = 2 * 1024 * 1024 * 1024; const PSD_ESTIMATE_FIXED_OVERHEAD: u64 = 1024 * 1024; const PSD_ESTIMATE_LAYER_OVERHEAD: u64 = 64 * 1024; @@ -590,7 +595,16 @@ impl Ex { self.smart_blocks(l, sm, parsed, &mut raw); } } - LayerContent::Raster(_) | LayerContent::Group(_) => {} + // A pixel layer carries no content-defining blocks: a fill, placed (smart), type or + // shape-fill block left over from before Rasterize would make a reader (ours or + // Photoshop's) reopen the layer as that kind and discard the pixels. A shape stroke + // (`vstk`) beside a vector mask makes a shape too; without one, Photoshop keeps it on + // pixel layers, so it stays. A vector mask (`vmsk`/`vsms`, `vogk`) stays. + LayerContent::Raster(_) => { + let masked = l.vector_mask.is_some(); + raw.retain(|(k, _)| !RASTER_STALE_KEYS.contains(&k) && !adjust_map::ADJUSTMENT_KEYS.contains(&k) && k != b"CgEd" && !(k == b"vstk" && masked)); + } + LayerContent::Group(_) => {} } // Effects reference point: written from the field (in place, keeping block order). match l.effects.reference { diff --git a/packaging/windows/photocraft.en-us.wxl b/packaging/windows/photocraft.en-us.wxl index 8c14594d..faa2835a 100644 --- a/packaging/windows/photocraft.en-us.wxl +++ b/packaging/windows/photocraft.en-us.wxl @@ -7,6 +7,5 @@ - diff --git a/packaging/windows/photocraft.wxs b/packaging/windows/photocraft.wxs index d0b49095..98dc1fdf 100644 --- a/packaging/windows/photocraft.wxs +++ b/packaging/windows/photocraft.wxs @@ -31,18 +31,6 @@ DowngradeErrorMessage="A newer version of PhotoCraft is already installed." /> - - - - - - From ad3417dc053995f317c27023001e9dcfd593df3e Mon Sep 17 00:00:00 2001 From: Vikram Bhaskaran Date: Mon, 12 Oct 2026 21:18:58 +1100 Subject: [PATCH 10/92] Dismiss Home when the document count changes. (#3984) Chrome stored the document count when Home opened so File New could leave the overlay. Closing a tab that restored that count re-opened Home and hid remaining tabs (#3981). Clear the stored count as soon as it no longer matches, then keep Home dismissed until the user opens it again. --- crates/ui-egui/src/chrome_ui.rs | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/crates/ui-egui/src/chrome_ui.rs b/crates/ui-egui/src/chrome_ui.rs index 81cf0fce..e5aefd7b 100644 --- a/crates/ui-egui/src/chrome_ui.rs +++ b/crates/ui-egui/src/chrome_ui.rs @@ -22,7 +22,14 @@ pub struct ChromeState { impl ChromeState { /// Is the Home screen up, given the current number of open documents? With no documents it /// shows by itself when `auto_show` (Preferences › General › Auto show the Home Screen). - pub fn shows_home(&self, documents: usize, auto_show: bool) -> bool { + /// + /// `home` stores the document count when Home was opened so File › New / Open can leave it. + /// Closing a tab that returns to that count must not bring Home back (#3981): once the + /// document set has changed, the overlay is gone until the user opens Home again. + pub fn shows_home(&mut self, documents: usize, auto_show: bool) -> bool { + if self.home.is_some_and(|n| n != documents) { + self.home = None; + } (documents == 0 && auto_show) || self.home == Some(documents) } } @@ -377,6 +384,30 @@ mod tests { c.home = Some(2); assert!(c.shows_home(2, true)); assert!(!c.shows_home(3, true)); + assert!(c.home.is_none(), "leaving Home by opening a document dismisses it"); + c.home = Some(1); + assert!(!c.shows_home(2, true)); + assert!(!c.shows_home(1, true), "closing back to the stored count must not re-open Home"); + assert!(c.home.is_none()); + } + + #[test] + fn closing_a_tab_does_not_return_to_home() { + use crate::PhotocraftApp; + use photocraft_engine::Session; + use serde_json::json; + + let mut app = PhotocraftApp::new(Session::new(), crate::Services::default()); + app.run("file.new", json!({"width": 8, "height": 8, "name": "Keep"})).unwrap(); + let n = app.session.documents().len(); + app.ui.chrome.home = Some(n); + assert!(app.ui.chrome.shows_home(n, true)); + app.run("file.new", json!({"width": 8, "height": 8, "name": "Other"})).unwrap(); + assert!(!app.ui.chrome.shows_home(app.session.documents().len(), true)); + app.run("file.close", json!({"document": 1, "discard": true})).unwrap(); + assert_eq!(app.session.documents().len(), 1); + assert!(!app.ui.chrome.shows_home(1, true), "Home must stay dismissed after closing the extra tab"); + assert_eq!(app.session.documents()[0].doc.name, "Keep"); } #[test] From db509dc4d984e3843bccc8edf17f52ecf66ec4e5 Mon Sep 17 00:00:00 2001 From: MarekSpodBiedry <73122968+MarekSpodBiedry@users.noreply.github.com> Date: Mon, 12 Oct 2026 12:19:13 +0200 Subject: [PATCH 11/92] fix(ui): show a paint-bucket cursor for the Paint Bucket tool (#3968) (#3989) --- crates/ui-egui/src/canvas.rs | 16 ++++++++++++++++ crates/ui-egui/src/input_tests.rs | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index 304f3b2f..19f1cbf4 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -3527,6 +3527,14 @@ pub fn canvas_view(app: &mut PhotocraftApp, ui: &mut egui::Ui, idx: usize, rect: pipette_cursor(ui.ctx(), p) } } + // The Paint Bucket: a bucket, or the crosshair for Precise Other Cursors (#3968). + Tool::PaintBucket => { + if app.session.prefs().cursors.other == photocraft_engine::prefs::OtherCursor::Precise { + egui::CursorIcon::Crosshair + } else { + paint_bucket_cursor(ui.ctx(), p) + } + } // Preferences › Cursors › Other Cursors: Precise shows a crosshair for every tool. Tool::Move | Tool::Type | Tool::VerticalType | Tool::HorizontalTypeMask | Tool::VerticalTypeMask if app.session.prefs().cursors.other == photocraft_engine::prefs::OtherCursor::Precise => @@ -4346,6 +4354,14 @@ pub(crate) fn pipette_cursor(ctx: &egui::Context, p: Pos2) -> egui::CursorIcon { egui::CursorIcon::None } +/// The Paint Bucket's cursor: a bucket whose pouring corner is the filled pixel. Draws it at `p` +/// and returns the OS cursor to set (hidden). +pub(crate) fn paint_bucket_cursor(ctx: &egui::Context, p: Pos2) -> egui::CursorIcon { + // The left corner of the icon's bucket is at (2, 12) of its 24-unit box. + crate::icons::cursor(ctx, "paint-bucket", p, vec2(2.0, 12.0) / 24.0, 22.0); + egui::CursorIcon::None +} + /// Decided when the press starts, so ⌥ pressed or released mid-stroke never switches between /// painting and sampling. fn alt_eyedropper(app: &mut PhotocraftApp, ev: ToolEvent, mods: egui::Modifiers) -> bool { diff --git a/crates/ui-egui/src/input_tests.rs b/crates/ui-egui/src/input_tests.rs index bb87d477..956a9de9 100644 --- a/crates/ui-egui/src/input_tests.rs +++ b/crates/ui-egui/src/input_tests.rs @@ -564,6 +564,22 @@ fn eyedropper_and_alt_sampling_show_a_pipette() { assert_eq!(precise(&mut h), (egui::CursorIcon::Crosshair, desktop)); } +/// The Paint Bucket shows a bucket instead of the crosshair (#3968); Precise Other Cursors keeps +/// the crosshair. +#[test] +fn paint_bucket_shows_a_bucket_cursor() { + let mut h = harness(); + let p = h.state().last_canvas_rect.center(); + h.state_mut().ui.tool = crate::state::Tool::PaintBucket; + h.hover_at(p); + h.run_steps(2); + assert_eq!(h.output().platform_output.cursor_icon, egui::CursorIcon::None, "the bucket replaces the pointer"); + h.state_mut().run("prefs.set", json!({"values": {"cursors.other": "precise"}})).unwrap(); + h.hover_at(p); + h.run_steps(2); + assert_eq!(h.output().platform_output.cursor_icon, egui::CursorIcon::Crosshair, "Precise keeps the crosshair"); +} + /// The Hand tool, and Space held over another tool, show an open hand while hovering and a fist /// while they pan (#2196). The OS draws those everywhere but Windows, where winit maps `Grab` to /// the four-arrow move cursor, so the app hands it a bitmap there (`Crosshair` is the fallback). From 73520f868103c65585ce517f067a550bb2dea8c5 Mon Sep 17 00:00:00 2001 From: Nigel Ihza Firdausy <106657905+Ni-zav@users.noreply.github.com> Date: Mon, 12 Oct 2026 17:19:28 +0700 Subject: [PATCH 12/92] fix(ui): Open layer color choices from the visibility icon (#4001) * fix(ui): offer label colors from the layer eye icon * fix(ui): offer label colors from the layer eye icon * test(ui): cover layer eye color context menu * style(ui): keep extracted color menu indentation consistent --- crates/ui-egui/src/layer_menu_ui.rs | 41 +++++++++++-------- .../ui-egui/src/layer_menu_ui/color_tests.rs | 15 +++++++ crates/ui-egui/src/panels.rs | 28 ++++++++----- 3 files changed, 55 insertions(+), 29 deletions(-) diff --git a/crates/ui-egui/src/layer_menu_ui.rs b/crates/ui-egui/src/layer_menu_ui.rs index fa70e436..6c4c0ec9 100644 --- a/crates/ui-egui/src/layer_menu_ui.rs +++ b/crates/ui-egui/src/layer_menu_ui.rs @@ -212,26 +212,31 @@ fn common_color(app: &crate::PhotocraftApp, l: &Layer, on_set: bool) -> Option) { - let current = common_color(app, l, on_set); ui.menu_button(tl!("Color"), |ui| { - crate::widgets::menu_scroll(ui, |ui| { - ui.set_min_width(170.0); - for color in LabelColor::ALL { - if color == LabelColor::Red { - ui.separator(); - } - if color_button(ui, color, current == Some(color)).clicked() { - let params = if on_set { - json!({"color": color.id()}) - } else { - actions.push(("layer.select".into(), json!({"layer": l.id.0}))); - json!({"layer": l.id.0, "color": color.id()}) - }; - actions.push(("layer.setLabelColor".into(), params)); - ui.close(); - } + color_choices(app, ui, l, on_set, actions); + }); +} + +/// The eye column opens the same color choices directly, without the row's full context menu. +pub(crate) fn color_choices(app: &crate::PhotocraftApp, ui: &mut egui::Ui, l: &Layer, on_set: bool, actions: &mut Vec<(String, Value)>) { + let current = common_color(app, l, on_set); + crate::widgets::menu_scroll(ui, |ui| { + ui.set_min_width(170.0); + for color in LabelColor::ALL { + if color == LabelColor::Red { + ui.separator(); } - }); + if color_button(ui, color, current == Some(color)).clicked() { + let params = if on_set { + json!({"color": color.id()}) + } else { + actions.push(("layer.select".into(), json!({"layer": l.id.0}))); + json!({"layer": l.id.0, "color": color.id()}) + }; + actions.push(("layer.setLabelColor".into(), params)); + ui.close(); + } + } }); } diff --git a/crates/ui-egui/src/layer_menu_ui/color_tests.rs b/crates/ui-egui/src/layer_menu_ui/color_tests.rs index a2a113a3..88c11dfd 100644 --- a/crates/ui-egui/src/layer_menu_ui/color_tests.rs +++ b/crates/ui-egui/src/layer_menu_ui/color_tests.rs @@ -113,6 +113,21 @@ fn layer_color_background_is_confined_to_the_eye_column_in_every_theme() { } } +#[test] +fn right_clicking_eye_opens_color_choices_without_toggling_visibility() { + let (mut h, red, other) = harness(crate::theme::ThemeKind::Pro, 1.0); + let r = row(&h, red); + let eye = pos2(r.left() + 17.0, r.center().y); + click(&mut h, eye, PointerButton::Secondary, Modifiers::NONE); + let blue = h.get_by_label("Blue").rect().center(); + click(&mut h, blue, PointerButton::Primary, Modifiers::NONE); + + let st = h.state().session.active().unwrap(); + assert!(st.doc.layer(red).unwrap().visible); + assert_eq!(st.doc.layer(red).unwrap().label, LabelColor::Blue); + assert_eq!(st.doc.layer(other).unwrap().label, LabelColor::None); +} + #[test] fn layer_color_menu_marks_only_the_common_color() { let mut h = Harness::new_ui(|ui| { diff --git a/crates/ui-egui/src/panels.rs b/crates/ui-egui/src/panels.rs index 696e5b38..25f3653b 100644 --- a/crates/ui-egui/src/panels.rs +++ b/crates/ui-egui/src/panels.rs @@ -2636,6 +2636,10 @@ fn layer_row( actions.push(("layer.setProps".into(), json!({"layer": l.id.0, "visible": !l.visible}))); } } + eye_resp.context_menu(|ui| { + crate::widgets::style_spectrum_popup_menu(ui); + crate::layer_menu_ui::color_choices(app, ui, l, row.multi && selected, actions); + }); // Everything but the thumbnails, the indentation and the name, so a narrow panel squeezes // the indentation first, then the thumbnails (a layer with two masks has three). let others = 6.0 @@ -2796,17 +2800,19 @@ fn layer_row( if let Some(done) = crate::layer_row_ui::rename_field(ui, l.id.0, edit_rect) { actions.push(done); } - // Right-click context menu. - resp.context_menu(|ui| { - crate::widgets::style_spectrum_popup_menu(ui); - // Right-clicking inside a multi-selection keeps it and acts on every selected layer. - let on_set = row.multi && selected; - if crate::layer_menu_ui::show(app, ui, l, on_set, actions) - && let Some(done) = crate::layer_row_ui::start_rename(ui.ctx(), l.id.0, &l.name) - { - actions.push(done); - } - }); + // The visibility icon has its own color menu; elsewhere use the full layer menu. + if !eye_resp.secondary_clicked() && !eye_resp.context_menu_opened() { + resp.context_menu(|ui| { + crate::widgets::style_spectrum_popup_menu(ui); + // Right-clicking inside a multi-selection keeps it and acts on every selected layer. + let on_set = row.multi && selected; + if crate::layer_menu_ui::show(app, ui, l, on_set, actions) + && let Some(done) = crate::layer_row_ui::start_rename(ui.ctx(), l.id.0, &l.name) + { + actions.push(done); + } + }); + } rect } From 6ca7e60cb02833fc2afb657c5946034783da10bf Mon Sep 17 00:00:00 2001 From: Nigel Ihza Firdausy <106657905+Ni-zav@users.noreply.github.com> Date: Mon, 12 Oct 2026 17:19:44 +0700 Subject: [PATCH 13/92] fix(ui): make checkbox labels nonselectable with pointer cursors (#4002) --- crates/ui-egui/src/widgets.rs | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/crates/ui-egui/src/widgets.rs b/crates/ui-egui/src/widgets.rs index 8ec6f94a..5a3def4f 100644 --- a/crates/ui-egui/src/widgets.rs +++ b/crates/ui-egui/src/widgets.rs @@ -1548,6 +1548,7 @@ pub fn checkbox(ui: &mut Ui, on: &mut bool, label: &str) -> Response { .horizontal(|ui| { ui.spacing_mut().item_spacing.x = 6.0; let (rect, resp) = ui.allocate_exact_size(vec2(14.0, 14.0), Sense::click()); + let resp = resp.on_hover_cursor(egui::CursorIcon::PointingHand); let p = ui.painter(); if *on { p.rect_filled(rect, 2.0, t.accent); @@ -1560,7 +1561,9 @@ pub fn checkbox(ui: &mut Ui, on: &mut bool, label: &str) -> Response { p.rect_filled(rect, 2.0, t.field); p.rect_stroke(rect, 2.0, Stroke::new(1.5, if resp.hovered() { t.text_dim } else { t.text_faint }), StrokeKind::Inside); } - let l = ui.add(egui::Label::new(egui::RichText::new(tl!(label)).color(t.text_dim)).sense(Sense::click())); + let l = ui + .add(egui::Label::new(egui::RichText::new(tl!(label)).color(t.text_dim)).selectable(false).sense(Sense::click())) + .on_hover_cursor(egui::CursorIcon::PointingHand); resp.union(l) }) .inner; @@ -1628,6 +1631,27 @@ fn clean(text: &str) -> String { mod tests { use egui::{Key, Modifiers}; + #[test] + fn checkbox_label_is_a_button_target_not_selectable_text() { + use egui::CursorIcon; + use egui_kittest::{Harness, kittest::Queryable}; + + let mut h = Harness::builder().with_size(egui::vec2(300.0, 80.0)).build_ui_state( + |ui, on: &mut bool| { + super::checkbox(ui, on, "Show Transform Controls"); + }, + false, + ); + h.run_steps(2); + let label = h.get_by_label("Show Transform Controls").rect(); + h.hover_at(label.center()); + h.run_steps(2); + assert_eq!(h.output().platform_output.cursor_icon, CursorIcon::PointingHand); + h.get_by_label("Show Transform Controls").click(); + h.run_steps(2); + assert!(*h.state()); + } + /// #3208: a rounded swatch's checker is one shared, repeating, unblurred two-by-two tile on /// the rounded rect, scaled so a cell stays `cell` points, so nothing shows past the corners. #[test] From be877c27d0cb9db43a11fad5c74615eec388664c Mon Sep 17 00:00:00 2001 From: McClabe <57244142+rozaqabdul656@users.noreply.github.com> Date: Mon, 12 Oct 2026 17:20:00 +0700 Subject: [PATCH 14/92] fix(ui): keep filter jobs polling on idle Linux (#3961) --- crates/ui-egui/src/jobs_ui.rs | 19 ++++++++++++++++--- crates/ui-egui/src/jobs_ui_tests.rs | 21 +++++++++++++++++++++ crates/ui-egui/src/lib.rs | 3 +++ 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/crates/ui-egui/src/jobs_ui.rs b/crates/ui-egui/src/jobs_ui.rs index 301460fc..f0164c19 100644 --- a/crates/ui-egui/src/jobs_ui.rs +++ b/crates/ui-egui/src/jobs_ui.rs @@ -368,11 +368,9 @@ pub fn tick(app: &mut PhotocraftApp, ctx: &egui::Context) { // Keep checking on a cancelled save's worker until it returns. ctx.request_repaint_after(std::time::Duration::from_millis(50)); } - if !app.session.has_jobs() { + if !keep_polling(app, ctx) { return; } - // Animate progress and poll for results at display rate; the UI thread only draws. - ctx.request_repaint_after(std::time::Duration::from_millis(16)); if let Some(job) = job_in_view(app) && !ctx.text_edit_focused() && ctx.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Escape)) @@ -381,6 +379,21 @@ pub fn tick(app: &mut PhotocraftApp, ctx: &egui::Context) { } } +/// Keep the event loop awake while a background document job exists. +/// +/// Jobs can be started by a menu or dialog while the current frame is being drawn, after +/// [`tick`] has already run. Calling this from the shell after drawing avoids leaving such a job +/// unapplied on an otherwise idle event loop (notably Wayland): its document would remain locked, +/// making Undo and Redo appear unavailable. +pub fn keep_polling(app: &PhotocraftApp, ctx: &egui::Context) -> bool { + if !app.session.has_jobs() { + return false; + } + // Animate progress and poll for results at display rate; the UI thread only draws. + ctx.request_repaint_after(std::time::Duration::from_millis(16)); + true +} + /// The job the user is looking at: the open tab in view, the active document's job, or (for /// the status bar) the newest running job. pub fn job_in_view(app: &PhotocraftApp) -> Option { diff --git a/crates/ui-egui/src/jobs_ui_tests.rs b/crates/ui-egui/src/jobs_ui_tests.rs index 1893075a..9d5c1550 100644 --- a/crates/ui-egui/src/jobs_ui_tests.rs +++ b/crates/ui-egui/src/jobs_ui_tests.rs @@ -104,6 +104,27 @@ fn the_frame_loop_keeps_running_during_a_slow_job_and_esc_cancels_it() { assert!(h.query_by_label("Esc to cancel").is_none(), "the dialog closed"); } +#[test] +fn a_job_started_while_drawing_requests_the_follow_up_poll() { + let mut h = app_harness(); + let gate = Arc::new(AtomicBool::new(false)); + let job = slow_job(h.state_mut(), &gate); + let repaints = Arc::new(AtomicUsize::new(0)); + let seen = repaints.clone(); + h.ctx.set_request_repaint_callback(move |_| { + seen.fetch_add(1, Ordering::Relaxed); + }); + + // A job may start from a menu or dialog after the frame's initial `jobs_ui::tick`. + // The UI must still schedule a poll, or an idle Wayland event loop leaves the document + // locked after the worker finishes and blocks Edit > Undo / Redo. + assert!(crate::jobs_ui::keep_polling(h.state(), &h.ctx)); + assert_eq!(repaints.load(Ordering::Relaxed), 1); + + crate::jobs_ui::cancel(h.state_mut(), job); + h.run_steps(2); +} + #[test] fn a_finished_job_lands_as_one_undo_step_and_the_dialog_cancel_button_works() { let mut h = app_harness(); diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs index a16dca00..4dcc7256 100644 --- a/crates/ui-egui/src/lib.rs +++ b/crates/ui-egui/src/lib.rs @@ -1732,6 +1732,9 @@ impl eframe::App for PhotocraftApp { let _ = w.send(serde_json::json!({"ok": true, "result": null})); } } + // A menu or dialog can start a filter after `jobs_ui::tick` ran in this frame. Keep + // polling it even when the platform would otherwise put the event loop to sleep. + jobs_ui::keep_polling(self, &ctx); // Menus and buttons in this frame may have asked for a file dialog. self.poll_file_dialog(&ctx, Some(frame)); } From ce16e100b0e0f9c05a36b05c3ac2575ac64436a3 Mon Sep 17 00:00:00 2001 From: zenjabba Date: Mon, 12 Oct 2026 06:20:16 -0400 Subject: [PATCH 15/92] Expose WebP and optional Batch export quality (#3956) Co-authored-by: zenjabba <679864+zenjabba@users.noreply.github.com> --- crates/ui-egui/src/view_cmds.rs | 21 +- crates/ui-egui/tests/batch_export_options.rs | 327 +++++++++++++++++++ 2 files changed, 345 insertions(+), 3 deletions(-) create mode 100644 crates/ui-egui/tests/batch_export_options.rs diff --git a/crates/ui-egui/src/view_cmds.rs b/crates/ui-egui/src/view_cmds.rs index f5b6f60b..f0404633 100644 --- a/crates/ui-egui/src/view_cmds.rs +++ b/crates/ui-egui/src/view_cmds.rs @@ -882,6 +882,21 @@ pub fn form_body(ui: &mut egui::Ui, f: &mut Map) { egui::Grid::new("form-dialog").num_columns(2).spacing([12.0, 6.0]).show(ui, |ui| { for k in keys { let v = f.get(&k).cloned().unwrap_or(Value::Null); + if k == "quality" && f.get("__command").and_then(Value::as_str) == Some("file.automate.batch") { + ui.label(label(&k)); + let mut custom = v.as_f64().is_some(); + let mut quality = v.as_f64().or_else(|| f.get("__batchQuality").and_then(Value::as_f64)).unwrap_or(8.0).clamp(0.0, 12.0) as f32; + ui.horizontal(|ui| { + crate::widgets::checkbox(ui, &mut custom, tl!("Custom")); + ui.add_enabled_ui(custom, |ui| crate::widgets::value_field(ui, &mut quality, 0.0..=12.0, "", 74.0)); + }); + // None preserves the command's existing JPEG and lossless WebP defaults. + // The inactive custom value is shell state, never a command parameter. + f.insert("__batchQuality".into(), json!(quality)); + f.insert(k, if custom { json!(quality) } else { Value::Null }); + ui.end_row(); + continue; + } let new = match &v { Value::Array(_) | Value::Object(_) | Value::Null => continue, Value::Bool(b) => { @@ -1106,7 +1121,7 @@ fn front(app: &mut PhotocraftApp, id: &str, params: &Value) -> Option dialog( app, json!({"input": dir, "output": format!("{dir}/processed"), "format": "jpg", "quality": 8, "width": 0, "height": 0, "convertToSrgb": true}), - json!({"format": ["jpg", "png", "psd", "tiff"]}), + json!({"format": ["jpg", "png", "psd", "tiff", "webp"]}), ), "file.automate.batch" => { let Some(action) = crate::actions::selected_action(app) else { @@ -1116,8 +1131,8 @@ fn front(app: &mut PhotocraftApp, id: &str, params: &Value) -> Option; + +fn harness() -> Harness { + let mut h = egui_kittest::Harness::builder().with_size(egui::vec2(1100.0, 760.0)).with_max_steps(64).wgpu().build_eframe(|cc| { + PhotocraftApp::setup_context(&cc.egui_ctx, Default::default()); + let mut app = PhotocraftApp::new(photocraft_engine::Session::new(), Default::default()); + app.session.prefs.edit(|p| p.interface.language = "en".into()); + if let Some(rs) = cc.wgpu_render_state.as_ref() { + app.set_wgpu(rs.clone()); + } + app.run("file.new", json!({"width": 8, "height": 8, "background": "white"})).unwrap(); + app.run("actions.record", json!({"name": "Invert"})).unwrap(); + app.run("image.adjustments.invert", json!({})).unwrap(); + app.run("actions.stop", json!({})).unwrap(); + app + }); + h.run_steps(4); + h +} + +fn open(h: &mut Harness, command: &str) { + let ctx = h.ctx.clone(); + menus::invoke(h.state_mut(), &ctx, command, json!({})).expect("open the real menu dialog"); + h.run_steps(5); +} + +fn evidence(h: &mut Harness, name: &str) { + if let Some(dir) = std::env::var_os("PHOTOCRAFT_BATCH_EVIDENCE_DIR") { + std::fs::create_dir_all(&dir).unwrap(); + h.render().expect("offscreen UI render").save(Path::new(&dir).join(format!("{name}.png"))).unwrap(); + } +} + +fn open_format_choices(h: &mut Harness) { + let label = h.get_by_label("Format").rect(); + // The full app also draws the workspace and layer-blend dropdowns behind this modal. + // Target the actual form field beside Format, like the existing numeric-field harnesses. + h.query_all_by_role(egui::accesskit::Role::ComboBox) + .find(|n| { + let r = n.rect(); + r.left() >= label.right() && (r.center().y - label.center().y).abs() < 3.0 + }) + .expect("format dropdown beside its label") + .click(); + h.run_steps(3); +} + +fn choose_webp(h: &mut Harness) { + open_format_choices(h); + h.query_by_label("WebP").or_else(|| h.query_by_label("Webp")).expect("WebP output choice").click(); + h.run_steps(3); +} + +fn replace_text(h: &mut Harness, value: &str) { + h.event(egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND }); + h.event(egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: false, repeat: false, modifiers: egui::Modifiers::COMMAND }); + h.event(egui::Event::Text(value.into())); + h.run_steps(3); +} + +fn edit_path(h: &mut Harness, name: &str, value: &Path) { + let label = h.get_by_label(name).rect(); + h.query_all_by_role(egui::accesskit::Role::TextInput) + .find(|n| { + let r = n.rect(); + r.left() >= label.right() && (r.center().y - label.center().y).abs() < 3.0 + }) + .expect("path text field beside its label") + .click(); + h.run_steps(2); + replace_text(h, &value.to_string_lossy()); + h.get_by_label(name).click(); + h.run_steps(2); +} + +fn edit_quality(h: &mut Harness, value: &str) { + let label = h.get_by_label("Quality").rect(); + h.query_all_by_role(egui::accesskit::Role::SpinButton) + .find(|n| { + let r = n.rect(); + r.left() >= label.right() && (r.center().y - label.center().y).abs() < 3.0 + }) + .expect("quality numeric field beside its label") + .click(); + h.run_steps(2); + replace_text(h, value); + h.get_by_label("Quality").click(); + h.run_steps(3); +} + +#[test] +fn batch_menu_offers_webp() { + let _gpu = photocraft_testkit::gpu_lock(); + let mut h = harness(); + open(&mut h, "file.automate.batch"); + open_format_choices(&mut h); + evidence(&mut h, "batch-formats"); + assert!(h.query_by_label("WebP").or_else(|| h.query_by_label("Webp")).is_some(), "Batch must offer the supported WebP output format"); +} + +#[test] +fn batch_menu_offers_quality() { + let _gpu = photocraft_testkit::gpu_lock(); + let mut h = harness(); + open(&mut h, "file.automate.batch"); + evidence(&mut h, "batch-quality"); + assert!(h.query_by_label("Quality").is_some(), "Batch must expose its supported output quality"); +} + +#[test] +fn image_processor_menu_offers_webp() { + let _gpu = photocraft_testkit::gpu_lock(); + let mut h = harness(); + open(&mut h, "file.scripts.imageProcessor"); + open_format_choices(&mut h); + evidence(&mut h, "image-processor-formats"); + assert!(h.query_by_label("WebP").or_else(|| h.query_by_label("Webp")).is_some(), "Image Processor must offer the supported WebP output format"); +} + +struct Scratch(PathBuf); + +impl Scratch { + fn new() -> Self { + let now = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos(); + let path = std::env::temp_dir().join(format!("photocraft-batch-options-{}-{now}", std::process::id())); + std::fs::create_dir_all(&path).unwrap(); + Self(path) + } +} + +impl Drop for Scratch { + fn drop(&mut self) { + let _ = std::fs::remove_dir_all(&self.0); + } +} + +fn pattern() -> Image { + let mut data = Vec::new(); + for y in 0..48u32 { + for x in 0..64u32 { + data.extend([(x * 13 + y * 3) as u8, (y * 17 + x * 5) as u8, ((x ^ y) * 11) as u8]); + } + } + Image::from_u8(64, 48, ChannelLayout::Rgb, data).unwrap() +} + +#[test] +fn existing_engine_batch_and_image_processor_support_webp_quality() { + let dir = Scratch::new(); + let input = dir.0.join("owned-pattern.png"); + let source = pattern(); + std::fs::write(&input, photocraft_codecs::encode(&source, Format::Png, &EncodeOptions::default()).unwrap()).unwrap(); + let mut app = PhotocraftApp::new(photocraft_engine::Session::new(), Default::default()); + app.run("file.new", json!({"width": 8, "height": 8})).unwrap(); + let doc = app.session.active().unwrap().doc.clone(); + let revision = app.session.active().unwrap().revision; + let history = app.session.active().unwrap().history.entries(); + let prefs = serde_json::to_value(app.session.prefs()).unwrap(); + + for (command, prefix) in [("file.automate.batch", "batch"), ("file.scripts.imageProcessor", "processor")] { + let expected: Vec = source.data().iter().map(|v| if prefix == "batch" { 255 - v } else { *v }).collect(); + let mut outputs = Vec::new(); + for quality in [Value::Null, json!(0), json!(12)] { + let out = dir.0.join(format!("{prefix}-{quality}")); + std::fs::create_dir(&out).unwrap(); + let result = app + .run(command, json!({"input": [input], "output": out, "steps": [["image.adjustments.invert", {}]], "format": "webp", "quality": quality})) + .unwrap(); + assert_eq!(result["errors"], json!([]), "{command}: {result}"); + let path = result["files"][0].as_str().unwrap(); + assert!(path.ends_with(".webp")); + let bytes = std::fs::read(path).unwrap(); + let decoded = photocraft_codecs::decode_as(Format::WebP, &bytes).unwrap(); + assert_eq!(decoded.dimensions(), (64, 48)); + assert_eq!(decoded.layout(), ChannelLayout::Rgb); + if quality.is_null() && prefix == "batch" { + assert_eq!(decoded.data(), expected, "default Batch WebP is lossless, and the action was applied"); + } + outputs.push(bytes); + } + assert_ne!(outputs[1], outputs[2], "{command}: low and high quality must affect the encoder"); + assert!(outputs[1].len() < outputs[2].len(), "{command}: this synthetic pattern grows at higher quality"); + } + let active = app.session.active().unwrap(); + assert!(Arc::ptr_eq(&active.doc, &doc), "batch commands leave the active document untouched"); + assert_eq!(active.revision, revision); + assert_eq!(active.history.entries(), history); + assert_eq!(serde_json::to_value(app.session.prefs()).unwrap(), prefs); +} + +#[test] +fn batch_custom_quality_is_bounded_dialog_local_and_reversible() { + let _gpu = photocraft_testkit::gpu_lock(); + let mut h = harness(); + open(&mut h, "file.automate.batch"); + assert!(h.state().ui.dialogs.last().unwrap().fields["quality"].is_null(), "default command quality remains unset"); + h.get_by_label("Custom").click(); + h.run_steps(3); + edit_quality(&mut h, "-5"); + assert_eq!(h.state().ui.dialogs.last().unwrap().fields["quality"].as_f64(), Some(0.0)); + edit_quality(&mut h, "99"); + assert_eq!(h.state().ui.dialogs.last().unwrap().fields["quality"].as_f64(), Some(12.0)); + edit_quality(&mut h, "5"); + h.get_by_label("Custom").click(); + h.run_steps(3); + assert!(h.state().ui.dialogs.last().unwrap().fields["quality"].is_null()); + h.get_by_label("Custom").click(); + h.run_steps(3); + assert_eq!(h.state().ui.dialogs.last().unwrap().fields["quality"].as_f64(), Some(5.0), "switching defaults does not lose the dialog's custom value"); + h.get_by_label("Cancel").click(); + h.run_steps(3); + open(&mut h, "file.automate.batch"); + assert!(h.state().ui.dialogs.last().unwrap().fields["quality"].is_null(), "reopening returns to the existing default"); +} + +#[test] +fn batch_and_processor_real_controls_write_the_chosen_webp_quality() { + let _gpu = photocraft_testkit::gpu_lock(); + let dir = Scratch::new(); + let input = dir.0.join("input"); + std::fs::create_dir(&input).unwrap(); + let original = pattern(); + std::fs::write(input.join("owned-pattern.png"), photocraft_codecs::encode(&original, Format::Png, &EncodeOptions::default()).unwrap()).unwrap(); + let mut h = harness(); + let doc = h.state().session.active().unwrap().doc.clone(); + let revision = h.state().session.active().unwrap().revision; + let history = h.state().session.active().unwrap().history.entries(); + let prefs = serde_json::to_value(h.state().session.prefs()).unwrap(); + let actions = serde_json::to_value(&h.state().session.actions.list).unwrap(); + for (command, prefix) in [("file.automate.batch", "batch"), ("file.scripts.imageProcessor", "processor")] { + let mut outputs = Vec::new(); + for quality in [0, 12] { + let output = dir.0.join(format!("{prefix}-{quality}")); + open(&mut h, command); + if prefix == "batch" { + assert!(h.state().ui.dialogs.last().unwrap().fields["quality"].is_null()); + h.get_by_label("Custom").click(); + h.run_steps(3); + } else { + let fields = &h.state().ui.dialogs.last().unwrap().fields; + assert_eq!(fields["quality"], json!(8)); + assert_eq!(fields["width"], json!(0)); + assert_eq!(fields["height"], json!(0)); + assert_eq!(fields["convertToSrgb"], json!(true)); + } + choose_webp(&mut h); + edit_path(&mut h, "Input", &input); + edit_path(&mut h, "Output", &output); + edit_quality(&mut h, &quality.to_string()); + evidence(&mut h, &format!("{prefix}-webp-quality-{quality}")); + h.get_by_label("OK").click(); + h.run_steps(5); + assert!(h.state().ui.dialogs.is_empty()); + let bytes = std::fs::read(output.join("owned-pattern.webp")).expect("the actual dialog confirmation writes the selected WebP"); + let decoded = photocraft_codecs::decode_as(Format::WebP, &bytes).unwrap(); + assert_eq!(decoded.dimensions(), (64, 48)); + assert_eq!(decoded.layout(), ChannelLayout::Rgb); + let (_, params) = h.state().session.journal.last().unwrap(); + assert_eq!(params["format"], json!("webp")); + assert_eq!(params["quality"].as_f64(), Some(f64::from(quality))); + assert!(params.as_object().unwrap().keys().all(|k| !k.starts_with("__")), "private shell values never become command params"); + outputs.push(bytes); + } + assert_ne!(outputs[0], outputs[1], "{command}: actual chosen quality reaches the encoder"); + assert!(outputs[0].len() < outputs[1].len()); + } + let active = h.state().session.active().unwrap(); + assert!(Arc::ptr_eq(&active.doc, &doc)); + assert_eq!((active.revision, active.history.entries()), (revision, history)); + assert_eq!(serde_json::to_value(h.state().session.prefs()).unwrap(), prefs); + assert_eq!(serde_json::to_value(&h.state().session.actions.list).unwrap(), actions); +} + +#[test] +fn batch_default_quality_keeps_lossless_webp_and_existing_jpeg_bytes() { + let _gpu = photocraft_testkit::gpu_lock(); + let dir = Scratch::new(); + let input = dir.0.join("input"); + std::fs::create_dir(&input).unwrap(); + let original = pattern(); + std::fs::write(input.join("owned-pattern.png"), photocraft_codecs::encode(&original, Format::Png, &EncodeOptions::default()).unwrap()).unwrap(); + let mut h = harness(); + for format in ["webp", "jpg"] { + let output = dir.0.join(format!("ui-default-{format}")); + let reference = dir.0.join(format!("engine-existing-default-{format}")); + open(&mut h, "file.automate.batch"); + if format == "webp" { + choose_webp(&mut h); + } else { + open_format_choices(&mut h); + h.get_by_label("Jpg").click(); + h.run_steps(3); + } + edit_path(&mut h, "Input", &input); + edit_path(&mut h, "Output", &output); + assert!(h.state().ui.dialogs.last().unwrap().fields["quality"].is_null()); + evidence(&mut h, &format!("batch-default-{format}")); + h.get_by_label("OK").click(); + h.run_steps(5); + let result = std::fs::read(output.join(format!("owned-pattern.{format}"))).unwrap(); + let mut session = photocraft_engine::Session::new(); + let r = session + .execute("file.automate.batch", json!({"input": input, "output": reference, "steps": [["image.adjustments.invert", {}]], "format": format})) + .unwrap(); + assert_eq!(r["errors"], json!([])); + assert_eq!( + result, + std::fs::read(reference.join(format!("owned-pattern.{format}"))).unwrap(), + "{format}: UI default equals the command's existing unset quality" + ); + if format == "webp" { + let decoded = photocraft_codecs::decode_as(Format::WebP, &result).unwrap(); + let expected: Vec = original.data().iter().map(|v| 255 - v).collect(); + assert_eq!(decoded.data(), expected, "default WebP remains lossless after the recorded action"); + } + } +} From 27f56eb76258a7f69ad97ff648618b4ec713f6d4 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 12 Oct 2026 06:20:44 -0400 Subject: [PATCH 16/92] feat(compose): Lab documents evaluate Invert, Posterize, Threshold, Brightness/Contrast and Gradient Map on L, a, b (#4038) In Lab documents Photoshop evaluates these adjustments on the Lab channels, not on the screen RGB colour: - Invert and Posterize act on L, a and b alike (normalised L/100, (a+128)/255, (b+128)/255; Invert is n -> 1 - n). - Brightness/Contrast (modern and legacy) applies its tone curve to L only; a and b are unchanged. - Threshold splits on L alone and outputs neutral black or white. - Gradient Map is driven by L (Reverse uses 1 - L). Adjustment layers (CPU compositor) and destructive Image > Adjustments both go through the new `adjust::apply_in`; the GPU compositor defers these adjustments to the CPU in Lab documents. Levels and Curves keep their Lab records; other adjustments stay on the screen colour. Co-authored-by: Claude Opus 5.5 --- crates/compose/src/adjust.rs | 206 ++++++++++++++++++++++++++++-- crates/compose/src/lib.rs | 4 +- crates/compose/src/tests.rs | 115 +++++++++++++++++ crates/engine/src/pixels.rs | 2 +- crates/engine/src/pixels_tests.rs | 18 +++ crates/gpu/src/plan.rs | 34 ++++- 6 files changed, 363 insertions(+), 16 deletions(-) diff --git a/crates/compose/src/adjust.rs b/crates/compose/src/adjust.rs index 0f26c613..357d8ac0 100644 --- a/crates/compose/src/adjust.rs +++ b/crates/compose/src/adjust.rs @@ -3,8 +3,8 @@ //! Formulas are documented approximations of Photoshop behaviour. Exact matching is tuned in //! milestone M7 against Photoshop-rendered PSD composites (the oracle in `testkit`). -use photocraft_color::SampleType; -use photocraft_color::convert::{D50, SRGB_TO_XYZ_D50, XYZ_D50_TO_SRGB, mat3_mul, rgb_to_gray, srgb_to_linear}; +use photocraft_color::convert::{D50, SRGB_TO_XYZ_D50, XYZ_D50_TO_SRGB, lab_to_srgb, mat3_mul, rgb_to_gray, srgb_to_lab, srgb_to_linear}; +use photocraft_color::{ColorMode, SampleType}; use photocraft_doc::Adjustment; use photocraft_doc::adjust::{CurvePoint, HueRange, LevelsChannel, ToneSpace, lut3d_len}; @@ -92,11 +92,8 @@ pub fn apply_depth(adj: &Adjustment, buf: &mut Buffer, transfer: Transfer, depth // 27.11, brightness +40 with contrast +30 maps 128 to 185 (brightness first), while // the corpus's brightness -23 with contrast -26 (psd-tools) needs contrast first; // contrast 80 keeps 128 at 128 (a 0.5 pivot moved it to 130). - let b = brightness / 255.0; - let c = contrast.clamp(-100.0, 99.0); - let k = if c >= 0.0 { 1.0 / (1.0 - c / 100.0) } else { 1.0 + c / 100.0 }; - let (pre, post) = if c >= 0.0 { (b, 0.0) } else { (0.0, b) }; - map_rgb(buf, |px| px.map(|v| ((v + pre - LEGACY_PIVOT) * k + LEGACY_PIVOT + post).clamp(0.0, 1.0))) + let f = legacy_brightness_contrast(*brightness, *contrast); + map_rgb(buf, |px| px.map(&f)) } Adjustment::BrightnessContrast { brightness, contrast, .. } => { // Modern (CS3+) Brightness/Contrast, reverse-engineered from Photoshop ground truth @@ -236,6 +233,99 @@ pub fn apply_depth(adj: &Adjustment, buf: &mut Buffer, transfer: Transfer, depth } } +/// Legacy Brightness/Contrast as one channel's tone curve (see [`apply_depth`]). +fn legacy_brightness_contrast(brightness: f32, contrast: f32) -> impl Fn(f32) -> f32 { + let b = brightness / 255.0; + let c = contrast.clamp(-100.0, 99.0); + let k = if c >= 0.0 { 1.0 / (1.0 - c / 100.0) } else { 1.0 + c / 100.0 }; + let (pre, post) = if c >= 0.0 { (b, 0.0) } else { (0.0, b) }; + move |v: f32| ((v + pre - LEGACY_PIVOT) * k + LEGACY_PIVOT + post).clamp(0.0, 1.0) +} + +/// Applies an adjustment in a document of colour `mode`: [`apply_depth`], except that in Lab +/// documents the adjustments Photoshop evaluates on the L, a and b channels do so (see +/// [`lab_channel_adjustment`]). +pub fn apply_in(adj: &Adjustment, buf: &mut Buffer, transfer: Transfer, depth: Option, mode: ColorMode) { + if mode == ColorMode::Lab && lab_channel_adjustment(adj) { + apply_lab(adj, buf); + } else { + apply_depth(adj, buf, transfer, depth); + } +} + +/// Whether a Lab document evaluates `adj` on its L, a and b channels rather than on the screen +/// colour: Invert and Posterize (L, a and b alike), Brightness/Contrast (L only), Threshold +/// (split on L, neutral result) and Gradient Map (driven by L). Levels and Curves carry their own +/// Lab records ([`ToneSpace::Lab`]); everything else stays on the screen colour. +pub fn lab_channel_adjustment(adj: &Adjustment) -> bool { + matches!( + adj, + Adjustment::Invert + | Adjustment::Posterize { .. } + | Adjustment::Threshold { .. } + | Adjustment::BrightnessContrast { .. } + | Adjustment::GradientMap { .. } + ) +} + +/// Encoded sRGB → Lab normalised the way Photoshop's channels hold it: L/100, (a+128)/255, +/// (b+128)/255. +fn lab_norm(c: [f32; 3]) -> [f32; 3] { + let l = srgb_to_lab(c); + [l[0] / 100.0, (l[1] + 128.0) / 255.0, (l[2] + 128.0) / 255.0] +} + +/// The inverse of [`lab_norm`]. +fn lab_denorm(n: [f32; 3]) -> [f32; 3] { + lab_to_srgb([n[0] * 100.0, n[1] * 255.0 - 128.0, n[2] * 255.0 - 128.0]) +} + +/// The Lab evaluation of a [`lab_channel_adjustment`] (no-op for any other adjustment). +fn apply_lab(adj: &Adjustment, buf: &mut Buffer) { + match adj { + // n → 1 - n on every channel: L → 100 - L and a, b mirrored about neutral. + Adjustment::Invert => map_rgb(buf, |c| lab_denorm(lab_norm(c).map(|v| 1.0 - v.clamp(0.0, 1.0)))), + Adjustment::Posterize { levels } => map_rgb(buf, |c| lab_denorm(lab_norm(c).map(|v| posterize(v, *levels)))), + Adjustment::Threshold { level } => { + // Split on L alone (on the 8-bit grid); the result is neutral black or white. + let t = (level * 255.0).round(); + map_rgb(buf, |c| [if (lab_norm(c)[0].clamp(0.0, 1.0) * 255.0).round() >= t { 1.0 } else { 0.0 }; 3]) + } + Adjustment::BrightnessContrast { brightness, contrast, legacy } => { + let legacy_curve = legacy_brightness_contrast(*brightness, *contrast); + let curve = |v: f32| if *legacy { legacy_curve(v) } else { modern_contrast(modern_brightness(v, *brightness), *contrast).clamp(0.0, 1.0) }; + // The tone curve on L only. Added as the difference of two round trips (like + // `tone_in_space`) so a and b, and colours a round trip moves, stay put. + map_rgb(buf, |c| { + let n = lab_norm(c); + let l = curve(n[0]); + if l == n[0] { + return c; + } + let (before, after) = (lab_denorm(n), lab_denorm([l, n[1], n[2]])); + std::array::from_fn(|i| (c[i] + after[i] - before[i]).clamp(0.0, 1.0)) + }) + } + Adjustment::GradientMap { stops, reverse, dither } => { + let (w, x0, y0) = (buf.rect.width().max(1) as usize, buf.rect.x0, buf.rect.y0); + for (i, p) in buf.px.iter_mut().enumerate() { + if p[3] <= 0.0 { + continue; + } + // Driven by L: equal lightness maps to the same stop colour whatever the chroma. + let l = lab_norm([p[0], p[1], p[2]])[0].clamp(0.0, 1.0); + let mut o = gradient(stops, if *reverse { 1.0 - l } else { l }); + if *dither { + let d = bayer4(x0 + (i % w) as i32, y0 + (i / w) as i32) / 255.0; + o = o.map(|v| (v + d).clamp(0.0, 1.0)); + } + p[..3].copy_from_slice(&o); + } + } + _ => {} + } +} + /// Float RGB curve channels with no edit must preserve samples outside the LUT domain. /// Edited curves retain the existing spline/LUT behaviour until HDR extrapolation has an oracle. pub fn float_tone_identity(adj: &Adjustment, depth: Option) -> [bool; 3] { @@ -293,7 +383,7 @@ pub fn tone_luts_depth(adj: &Adjustment, depth: Option) -> [Vec /// through the conversions the document's surfaces use. The change is added as a difference of /// two round trips, so channels a curve leaves alone (and out-of-gamut colours) stay exact. fn tone_in_space(space: ToneSpace, luts: &[Vec; 4], c: [f32; 3]) -> [f32; 3] { - use photocraft_color::convert::{cmyk_to_rgb, lab_to_srgb, rgb_to_cmyk, srgb_to_lab}; + use photocraft_color::convert::{cmyk_to_rgb, rgb_to_cmyk}; let (before, after) = match space { ToneSpace::Cmyk => { let ink = rgb_to_cmyk(c); @@ -1214,6 +1304,106 @@ mod tone_tests { assert!(a.px.iter().zip(&b.px).all(|(x, y)| (x[0] - y[0]).abs() <= 0.5 / 255.0 + 1e-6)); assert!(a.px.iter().zip(&b.px).any(|(x, y)| x[0] != y[0])); } + + /// `adj` applied in a Lab document to one encoded sRGB colour, returned as (L, a, b). + fn in_lab(adj: &Adjustment, c: [f32; 3]) -> [f32; 3] { + let mut b = Buffer::filled(crate::Rect::new(0, 0, 1, 1), [c[0], c[1], c[2], 1.0]); + apply_in(adj, &mut b, Transfer::Srgb, Some(SampleType::U8), ColorMode::Lab); + srgb_to_lab([b.px[0][0], b.px[0][1], b.px[0][2]]) + } + + /// A muted, in-gamut colour from (L, a, b). + fn lab(l: f32, a: f32, b: f32) -> [f32; 3] { + lab_to_srgb([l, a, b]) + } + + fn near(got: [f32; 3], want: [f32; 3], tol: f32) -> bool { + got.iter().zip(want).all(|(g, w)| (g - w).abs() <= tol) + } + + #[test] + fn lab_invert_flips_l_a_and_b() { + let got = in_lab(&Adjustment::Invert, lab(30.0, 12.0, -18.0)); + // n -> 1 - n: L -> 100 - L, a -> -a - 1, b -> -b - 1 (mirrored on the 0..255 grid). + assert!(near(got, [70.0, -13.0, 17.0], 0.6), "{got:?}"); + // On the screen colour it would not be a mirror in Lab. + let mut rgb = Buffer::filled(crate::Rect::new(0, 0, 1, 1), [0.0, 0.0, 0.0, 1.0]); + let c = lab(30.0, 12.0, -18.0); + rgb.px[0] = [c[0], c[1], c[2], 1.0]; + apply(&Adjustment::Invert, &mut rgb); + assert!(!near(srgb_to_lab([rgb.px[0][0], rgb.px[0][1], rgb.px[0][2]]), got, 1.0)); + } + + #[test] + fn lab_posterize_steps_l_a_and_b() { + let got = in_lab(&Adjustment::Posterize { levels: 2 }, lab(70.0, 20.0, -30.0)); + // Two levels: each normalised channel snaps to 0 or 1 (L 100, a and b at +127 / -128). + assert!(near(got, srgb_to_lab(lab_denorm([1.0, 1.0, 0.0])), 1e-3), "{got:?}"); + let grey = in_lab(&Adjustment::Posterize { levels: 255 }, lab(50.0, 0.0, 0.0)); + assert!(near(grey, [50.0, 0.0, 0.0], 1.1), "255 levels is within a step of the identity: {grey:?}"); + } + + #[test] + fn lab_threshold_splits_on_l_with_a_neutral_result() { + let t = Adjustment::Threshold { level: 0.5 }; + // A saturated blue (L ≈ 32) and yellow (L ≈ 97): black and white, nothing in between. + for (c, white) in [([0.0, 0.0, 1.0], false), ([1.0, 1.0, 0.0], true), (lab(52.0, 40.0, 30.0), true), (lab(48.0, -40.0, 30.0), false)] { + let mut b = Buffer::filled(crate::Rect::new(0, 0, 1, 1), [c[0], c[1], c[2], 1.0]); + apply_in(&t, &mut b, Transfer::Srgb, None, ColorMode::Lab); + let v = if white { 1.0 } else { 0.0 }; + assert_eq!(b.px[0], [v, v, v, 1.0], "{c:?}"); + } + } + + #[test] + fn lab_brightness_contrast_moves_l_only() { + for legacy in [false, true] { + let adj = Adjustment::BrightnessContrast { brightness: 40.0, contrast: 30.0, legacy }; + let before = [45.0, 15.0, -20.0]; + let got = in_lab(&adj, lab(before[0], before[1], before[2])); + assert!(got[0] > before[0] + 5.0, "{legacy}: L rises: {got:?}"); + assert!((got[1] - before[1]).abs() < 0.5 && (got[2] - before[2]).abs() < 0.5, "{legacy}: a, b kept: {got:?}"); + } + } + + #[test] + fn lab_gradient_map_follows_l() { + let stops = vec![(0.0, [1.0, 0.0, 0.0]), (1.0, [0.0, 0.0, 1.0])]; + for reverse in [false, true] { + let map = Adjustment::GradientMap { stops: stops.clone(), reverse, dither: false }; + // A grey and a saturated colour with the same L map to the same colour. + let grey = in_lab(&map, lab(60.0, 0.0, 0.0)); + let green = in_lab(&map, lab(60.0, -50.0, 40.0)); + assert!(near(grey, green, 1e-3), "{reverse}: {grey:?} vs {green:?}"); + let t = if reverse { 0.4 } else { 0.6 }; + let want = srgb_to_lab([1.0 - t, 0.0, t]); + assert!(near(grey, want, 0.05), "{reverse}: {grey:?} vs {want:?}"); + } + } + + #[test] + fn other_modes_and_adjustments_keep_the_screen_colour_path() { + let c = [0.2, 0.5, 0.7, 1.0]; + let lab_only = [Adjustment::Invert, Adjustment::Threshold { level: 0.47 }, Adjustment::Posterize { levels: 4 }]; + for adj in + lab_only.iter().chain([&Adjustment::HueSaturation { hue: 30.0, saturation: 0.0, lightness: 0.0, colorize: false, ranges: HueRange::defaults() }]) + { + for mode in [ColorMode::Rgb, ColorMode::Cmyk, ColorMode::Grayscale, ColorMode::Lab] { + let (mut a, mut b) = (Buffer::filled(crate::Rect::new(0, 0, 1, 1), c), Buffer::filled(crate::Rect::new(0, 0, 1, 1), c)); + apply_in(adj, &mut a, Transfer::Srgb, None, mode); + apply_depth(adj, &mut b, Transfer::Srgb, None); + assert_eq!(a.px == b.px, mode != ColorMode::Lab || !lab_channel_adjustment(adj), "{adj:?} in {mode:?}"); + } + } + // Transparent pixels are left alone and odd values never panic. + let mut t = Buffer::filled(crate::Rect::new(0, 0, 2, 1), [f32::NAN, 2.0, -1.0, 0.0]); + for adj in lab_only.iter().chain([&Adjustment::GradientMap { stops: vec![], reverse: true, dither: true }]) { + apply_in(adj, &mut t, Transfer::Srgb, None, ColorMode::Lab); + let mut odd = Buffer::filled(crate::Rect::new(0, 0, 1, 1), [f32::NAN, f32::INFINITY, -3.0, 1.0]); + apply_in(adj, &mut odd, Transfer::Srgb, None, ColorMode::Lab); + } + assert!(t.px[0][1] == 2.0); + } } /// Legacy Brightness/Contrast scales contrast around 128 of 255 (contrast 80 keeps 128 at 128, diff --git a/crates/compose/src/lib.rs b/crates/compose/src/lib.rs index 37c6167e..a7c05761 100644 --- a/crates/compose/src/lib.rs +++ b/crates/compose/src/lib.rs @@ -1248,7 +1248,7 @@ fn composite_layer_plain(layer: &Layer, clipped: &[Layer], backdrop: &mut Buffer // Adjustment layers transform the backdrop, then blend the result back in. if let LayerContent::Adjustment(adj) = &layer.content { let mut adjusted = backdrop.clone(); - adjust::apply_depth(adj, &mut adjusted, cx.transfer, Some(cx.depth)); + adjust::apply_in(adj, &mut adjusted, cx.transfer, Some(cx.depth), cx.mode); // Clipped layers onto an adjustment are uncommon; they composite atop the adjusted result. advanced::composite_clipped(clipped, &mut adjusted, cx); let mv = mask_vals(layer, rect, cx); @@ -1589,7 +1589,7 @@ fn composite_atop_any(layer: &Layer, base: &mut Buffer, cx: &Ctx) { let rect = base.rect; if let LayerContent::Adjustment(adj) = &layer.content { let mut adjusted = base.clone(); - adjust::apply_depth(adj, &mut adjusted, cx.transfer, Some(cx.depth)); + adjust::apply_in(adj, &mut adjusted, cx.transfer, Some(cx.depth), cx.mode); let mv = mask_vals(layer, rect, cx); for (i, p) in base.px.iter_mut().enumerate() { let k = layer.opacity * layer.fill_opacity * mask_k(&mv, i); diff --git a/crates/compose/src/tests.rs b/crates/compose/src/tests.rs index 853767ae..c56b7de4 100644 --- a/crates/compose/src/tests.rs +++ b/crates/compose/src/tests.rs @@ -2203,3 +2203,118 @@ fn outer_glow_does_not_paint_through_a_zero_fill_layer() { assert!(opaque[0] > 0.9 && opaque[1] > 0.8, "{technique:?}: opaque fill disappeared: {opaque:?}"); } } + +// Lab documents: Invert mirrors L, a and b; Threshold splits on L with a neutral result; Gradient +// Map follows L. Rendered through the document compositor at every depth. +#[test] +fn lab_documents_evaluate_invert_threshold_and_gradient_map_on_lab() { + use photocraft_color::convert::{lab_to_srgb, srgb_to_lab}; + let c = lab_to_srgb([30.0, 12.0, -18.0]); + for depth in SampleType::ALL { + let render = |adj: Adjustment| { + let mut d = Document::with_background("t", Size::new(4, 4), ColorMode::Lab, depth, Color::rgb(c[0], c[1], c[2])); + d.layers.push(Layer::new("adj", LayerContent::Adjustment(adj))); + let p = flatten(&d).px[5]; + srgb_to_lab([p[0], p[1], p[2]]) + }; + let near = |got: [f32; 3], want: [f32; 3], tol: f32| got.iter().zip(want).all(|(g, w)| (g - w).abs() <= tol); + let inv = render(Adjustment::Invert); + assert!(near(inv, [70.0, -13.0, 17.0], 1.0), "{depth:?}: {inv:?}"); + let th = render(Adjustment::Threshold { level: 0.25 }); + assert!(near(th, [100.0, 0.0, 0.0], 0.5), "{depth:?}: L 30 is above level 64: {th:?}"); + let gm = render(Adjustment::GradientMap { stops: vec![(0.0, [0.0; 3]), (1.0, [1.0; 3])], reverse: false, dither: false }); + let want = srgb_to_lab([0.3; 3]); + assert!(near(gm, want, 1.0), "{depth:?}: L 30 → 30 % of the way: {gm:?} vs {want:?}"); + } +} + +/// `adj` over a one-colour Lab document (background `rgb`) at `depth`, read back as Lab. +fn lab_doc_adjusted(rgb: [f32; 3], adj: Adjustment, depth: SampleType) -> [f32; 3] { + let mut doc = Document::with_background("lab", Size::new(4, 4), ColorMode::Lab, depth, Color::rgb(rgb[0], rgb[1], rgb[2])); + doc.layers.push(Layer::new("adj", LayerContent::Adjustment(adj))); + let p = px(&doc, 1, 1); + photocraft_color::convert::srgb_to_lab([p[0], p[1], p[2]]) +} + +fn near3(got: [f32; 3], want: [f32; 3], tol: f32, what: &str) { + assert!(got.iter().zip(want).all(|(g, w)| (g - w).abs() <= tol), "{what}: got {got:?}, want {want:?}"); +} + +/// A muted, in-gamut colour (L ≈ 46, a ≈ 10, b ≈ -20) and its Lab coordinates. +const MUTED: [f32; 3] = [0.40, 0.42, 0.60]; + +#[test] +fn lab_documents_invert_and_posterize_l_a_and_b() { + let lab = photocraft_color::convert::srgb_to_lab(MUTED); + for depth in SampleType::ALL { + // Invert: every normalised channel n -> 1 - n, so L -> 100 - L and a, b -> their opposites + // (-a - 1 on the 0..255 grid). + let inv = lab_doc_adjusted(MUTED, Adjustment::Invert, depth); + near3(inv, [100.0 - lab[0], -lab[1] - 1.0, -lab[2] - 1.0], 1.0, &format!("{depth:?} invert")); + // An RGB invert would land elsewhere: lightness 100 - L is the Lab rule. + let rgb_inv = photocraft_color::convert::srgb_to_lab(MUTED.map(|v| 1.0 - v)); + assert!((rgb_inv[0] - inv[0]).abs() > 2.0, "{depth:?}: {rgb_inv:?} vs {inv:?}"); + // Posterize, three levels: the same steps on L, a and b (here all land on the middle + // step: L ≈ 50 and a, b ≈ -1, a neutral grey). + let post = lab_doc_adjusted(MUTED, Adjustment::Posterize { levels: 3 }, depth); + let n = [lab[0] / 100.0, (lab[1] + 128.0) / 255.0, (lab[2] + 128.0) / 255.0].map(|v| adjust::posterize(v, 3)); + let want = [n[0] * 100.0, n[1] * 255.0 - 128.0, n[2] * 255.0 - 128.0]; + assert!(want[0] > 45.0 && want[1].abs() < 2.0 && want[2].abs() < 2.0, "{want:?}"); + near3(post, want, 1.0, &format!("{depth:?} posterize")); + } +} + +#[test] +fn lab_documents_brightness_contrast_moves_lightness_only() { + let lab = photocraft_color::convert::srgb_to_lab(MUTED); + for depth in SampleType::ALL { + for legacy in [true, false] { + let got = lab_doc_adjusted(MUTED, Adjustment::BrightnessContrast { brightness: 40.0, contrast: 20.0, legacy }, depth); + assert!(got[0] > lab[0] + 5.0, "{depth:?} legacy {legacy}: {got:?}"); + near3([lab[0], got[1], got[2]], lab, 0.75, &format!("{depth:?} legacy {legacy}: a, b kept")); + } + } +} + +#[test] +fn lab_documents_threshold_on_lightness_with_a_neutral_result() { + for depth in SampleType::ALL { + // A saturated yellow is light (L ≈ 97): white, not a coloured result. + let yellow = lab_doc_adjusted([1.0, 1.0, 0.0], Adjustment::Threshold { level: 0.5 }, depth); + near3(yellow, [100.0, 0.0, 0.0], 0.5, &format!("{depth:?} yellow")); + // Pure blue has L ≈ 30: black. + let blue = lab_doc_adjusted([0.0, 0.0, 1.0], Adjustment::Threshold { level: 0.5 }, depth); + near3(blue, [0.0, 0.0, 0.0], 0.5, &format!("{depth:?} blue")); + // Mid grey L 53.4 against level 128 (n 0.502): Lab L decides, not RGB luminance. + let level = 0.52; + let grey = lab_doc_adjusted([0.5; 3], Adjustment::Threshold { level }, depth); + near3(grey, [100.0, 0.0, 0.0], 0.5, &format!("{depth:?} grey")); + } +} + +#[test] +fn lab_documents_gradient_map_follows_lightness() { + let stops = vec![(0.0, [0.0, 0.0, 1.0]), (1.0, [1.0, 1.0, 0.0])]; + // A grey and a saturated colour of the same L map to the same colour. + let red = [0.9, 0.1, 0.1]; + let l = photocraft_color::convert::srgb_to_lab(red)[0]; + let grey = photocraft_color::convert::lab_to_srgb([l, 0.0, 0.0]); + for depth in SampleType::ALL { + for reverse in [false, true] { + let adj = Adjustment::GradientMap { stops: stops.clone(), reverse, dither: false }; + let a = lab_doc_adjusted(red, adj.clone(), depth); + let b = lab_doc_adjusted(grey, adj.clone(), depth); + near3(a, b, 1.0, &format!("{depth:?} reverse {reverse}")); + let t = if reverse { 1.0 - l / 100.0 } else { l / 100.0 }; + let want = photocraft_color::convert::srgb_to_lab([t, t, 1.0 - t]); + near3(a, want, 1.5, &format!("{depth:?} reverse {reverse}")); + } + } + // In RGB documents the map still follows RGB luminance: red and grey differ there. + let mut buf = Buffer::filled(Rect::new(0, 0, 1, 1), [red[0], red[1], red[2], 1.0]); + let adj = Adjustment::GradientMap { stops, reverse: false, dither: false }; + adjust::apply_in(&adj, &mut buf, adjust::Transfer::Srgb, None, ColorMode::Rgb); + let mut grey_buf = Buffer::filled(Rect::new(0, 0, 1, 1), [grey[0], grey[1], grey[2], 1.0]); + adjust::apply_in(&adj, &mut grey_buf, adjust::Transfer::Srgb, None, ColorMode::Rgb); + assert!((buf.px[0][0] - grey_buf.px[0][0]).abs() > 0.05, "{:?} {:?}", buf.px[0], grey_buf.px[0]); +} diff --git a/crates/engine/src/pixels.rs b/crates/engine/src/pixels.rs index 323d6ccd..2ba5b5dc 100644 --- a/crates/engine/src/pixels.rs +++ b/crates/engine/src/pixels.rs @@ -116,7 +116,7 @@ fn adjusted(s: &Surface, r: Rect, adj: &Adjustment, selection: Option<&Surface>, // 32-bit documents get the float behaviour of an adjustment layer there (Levels doesn't clip); // integer depths keep the unrounded, clipped curves. let depth = (fmt.sample == photocraft_color::SampleType::F32).then_some(fmt.sample); - adjust::apply_depth(adj, &mut buf, adjust::Transfer::for_document(mode, fmt.sample), depth); + adjust::apply_in(adj, &mut buf, adjust::Transfer::for_document(mode, fmt.sample), depth, mode); let w = r.width() as usize; let mut out = Vec::with_capacity(raw.len()); for (i, (a, o)) in buf.px.iter().zip(&orig.px).enumerate() { diff --git a/crates/engine/src/pixels_tests.rs b/crates/engine/src/pixels_tests.rs index 0da48801..c0dc368e 100644 --- a/crates/engine/src/pixels_tests.rs +++ b/crates/engine/src/pixels_tests.rs @@ -241,3 +241,21 @@ fn benchmark_clear_large_selection() { println!("#3463 clear 8000x6000, background {background}, feather {feather}: {:?}", t.elapsed()); } } + +/// Image › Adjustments › Invert in a Lab document mirrors L, a and b, at every depth. +#[test] +fn invert_in_a_lab_document_mirrors_l_a_and_b() { + use photocraft_color::convert::{lab_to_srgb, srgb_to_lab}; + let c = lab_to_srgb([30.0, 12.0, -18.0]); + for depth in SampleType::ALL { + let fmt = PixelFormat { mode: ColorMode::Lab, sample: depth, alpha: true }; + let mut s = Surface::new(fmt); + let r = Rect::new(0, 0, 2, 2); + s.write_region(r, &(0..4).flat_map(|_| from_rgba(&fmt, [c[0], c[1], c[2], 1.0])).collect::>()); + adjust_surface(&mut s, &Adjustment::Invert, None, ColorMode::Lab); + let px = s.read_region(Rect::new(1, 1, 2, 2)); + let rgba = photocraft_raster::to_rgba(&fmt, &px); + let got = srgb_to_lab([rgba[0], rgba[1], rgba[2]]); + assert!(got.iter().zip([70.0, -13.0, 17.0]).all(|(g, w)| (g - w).abs() < 1.0), "{depth:?}: {got:?}"); + } +} diff --git a/crates/gpu/src/plan.rs b/crates/gpu/src/plan.rs index a5218f82..f5a3b573 100644 --- a/crates/gpu/src/plan.rs +++ b/crates/gpu/src/plan.rs @@ -934,7 +934,7 @@ impl<'a> Planner<'a> { /// adjust::apply_with on a slot (consumes it). fn adjust(&mut self, adj: &Adjustment, src: Slot) -> Result { - if !adjustment_on_gpu(adj) { + if !adjustment_on_gpu(adj, self.cx.mode) { return Err(Unsupported(format!("{} on CMYK/Lab channels (evaluated on the CPU)", adj.label()))); } if let Adjustment::GradientMap { stops, .. } = adj { @@ -1512,10 +1512,15 @@ fn to_row(t: &[f32]) -> [f32; 4096] { row } -/// Whether the adjustment kernel can evaluate `adj`: Levels and Curves on CMYK ink or Lab -/// channels convert through ICC profiles per pixel, which only the CPU does. -pub fn adjustment_on_gpu(adj: &Adjustment) -> bool { - !matches!(adj, Adjustment::Levels { space: ToneSpace::Cmyk | ToneSpace::Lab, .. } | Adjustment::Curves { space: ToneSpace::Cmyk | ToneSpace::Lab, .. }) +/// Whether the adjustment kernel can evaluate `adj` in a document of colour `mode`: Levels and +/// Curves on CMYK ink or Lab channels convert through ICC profiles per pixel, and so do the +/// adjustments a Lab document evaluates on L, a and b (`photocraft_compose::adjust::lab_channel_adjustment`), +/// which only the CPU does. +pub fn adjustment_on_gpu(adj: &Adjustment, mode: photocraft_color::ColorMode) -> bool { + let tone_in_space = + matches!(adj, Adjustment::Levels { space: ToneSpace::Cmyk | ToneSpace::Lab, .. } | Adjustment::Curves { space: ToneSpace::Cmyk | ToneSpace::Lab, .. }); + let lab_channels = mode == photocraft_color::ColorMode::Lab && photocraft_compose::adjust::lab_channel_adjustment(adj); + !tone_in_space && !lab_channels } /// A tone transfer as the shader's `t_decode`/`t_encode` exponent (0: the sRGB curve). @@ -1731,6 +1736,25 @@ mod tests { use photocraft_color::{Color, ColorMode, SampleType}; use photocraft_geom::Size; + #[test] + fn lab_channel_adjustments_defer_to_the_cpu_in_lab_documents() { + let lab_rules = [ + Adjustment::Invert, + Adjustment::Posterize { levels: 4 }, + Adjustment::Threshold { level: 0.5 }, + Adjustment::BrightnessContrast { brightness: 10.0, contrast: 5.0, legacy: false }, + Adjustment::GradientMap { stops: vec![(0.0, [0.0; 3]), (1.0, [1.0; 3])], reverse: false, dither: false }, + ]; + for adj in &lab_rules { + assert!(!adjustment_on_gpu(adj, ColorMode::Lab), "{adj:?}"); + for mode in [ColorMode::Rgb, ColorMode::Cmyk, ColorMode::Grayscale] { + assert!(adjustment_on_gpu(adj, mode), "{adj:?} in {mode:?}"); + } + } + // Screen-colour adjustments stay on the GPU in Lab documents. + assert!(adjustment_on_gpu(&Adjustment::Exposure { exposure: 1.0, offset: 0.0, gamma: 1.0 }, ColorMode::Lab)); + } + #[test] fn native_cmyk_fills_fall_back_only_without_a_valid_cache() { use photocraft_doc::{FillCache, GradientStyle}; From 04396dd85f7e234702cd09ef48b0e8b2f58b7aed Mon Sep 17 00:00:00 2001 From: Valentin Klein Date: Mon, 12 Oct 2026 12:27:57 +0200 Subject: [PATCH 17/92] PSD: composite_rgba8 checks the output budget and converts planes fallibly (#3639) (#3651) Co-authored-by: Claude Opus 5.5 --- crates/psd/src/pixels.rs | 81 +++++++++++++++++++++++++++++++--------- 1 file changed, 64 insertions(+), 17 deletions(-) diff --git a/crates/psd/src/pixels.rs b/crates/psd/src/pixels.rs index 013d8217..d4948457 100644 --- a/crates/psd/src/pixels.rs +++ b/crates/psd/src/pixels.rs @@ -31,35 +31,58 @@ pub fn f32_to_bytes(samples: &[f32]) -> Vec { samples.iter().flat_map(|s| s.to_be_bytes()).collect() } +/// Allocates `len` bytes, reporting a machine without that much memory instead of aborting. +fn try_buffer(len: usize) -> Result> { + let mut out = Vec::new(); + out.try_reserve_exact(len).map_err(|_| PsdError::LimitExceeded("not enough memory for the converted plane"))?; + Ok(out) +} + /// Expands a 1-bit plane (MSB first, rows padded to bytes) to one byte per -/// pixel (0 or 1). -pub fn unpack_bits(bytes: &[u8], width: usize, height: usize) -> Vec { +/// pixel (0 or 1). Errors with [`PsdError::LimitExceeded`] when the plane +/// size overflows or cannot be allocated. +pub fn unpack_bits(bytes: &[u8], width: usize, height: usize) -> Result> { + unpack_bits_with(bytes, width, height, |bit| bit) +} + +/// Shared 1-bit expansion; `map` turns each bit (0 or 1) into the output byte. +fn unpack_bits_with(bytes: &[u8], width: usize, height: usize, map: impl Fn(u8) -> u8) -> Result> { + let len = width.checked_mul(height).ok_or(PsdError::LimitExceeded("plane size overflow"))?; let rb = width.div_ceil(8); - let mut out = Vec::with_capacity(width * height); + let mut out = try_buffer(len)?; for y in 0..height { for x in 0..width { - let b = bytes.get(y * rb + x / 8).copied().unwrap_or(0); - out.push((b >> (7 - (x % 8))) & 1); + let b = y.checked_mul(rb).and_then(|row| bytes.get(row + x / 8)).copied().unwrap_or(0); + out.push(map((b >> (7 - (x % 8))) & 1)); } } - out + Ok(out) } /// Converts one plane of samples at `depth` to 8-bit. pub fn plane_to_u8(bytes: &[u8], depth: u16, width: usize, height: usize) -> Result> { Ok(match depth { - 1 => unpack_bits(bytes, width, height).into_iter().map(|b| if b == 1 { 0 } else { 255 }).collect(), - 8 => bytes.to_vec(), - 16 => bytes.as_chunks::<2>().0.iter().map(|b| ((u32::from(u16::from_be_bytes(*b)) * 255 + 32767) / 65535) as u8).collect(), - 32 => bytes - .as_chunks::<4>() - .0 - .iter() - .map(|b| { + 1 => unpack_bits_with(bytes, width, height, |b| if b == 1 { 0 } else { 255 })?, + 8 => { + let mut out = try_buffer(bytes.len())?; + out.extend_from_slice(bytes); + out + } + 16 => { + let chunks = bytes.as_chunks::<2>().0; + let mut out = try_buffer(chunks.len())?; + out.extend(chunks.iter().map(|b| ((u32::from(u16::from_be_bytes(*b)) * 255 + 32767) / 65535) as u8)); + out + } + 32 => { + let chunks = bytes.as_chunks::<4>().0; + let mut out = try_buffer(chunks.len())?; + out.extend(chunks.iter().map(|b| { let v = f32::from_be_bytes(*b); if v.is_nan() { 0 } else { (v.clamp(0.0, 1.0) * 255.0).round() as u8 } - }) - .collect(), + })); + out + } d => return Err(PsdError::Unsupported(format!("depth {d}"))), }) } @@ -282,6 +305,10 @@ impl PsdFile { h.validate()?; let (w, hh) = (h.width as usize, h.height as usize); let n = w.checked_mul(hh).ok_or(PsdError::LimitExceeded("composite size overflow"))?; + // Same budget as `Layer::rgba8`: refuse before decoding or converting any plane. + if n.checked_mul(4).is_none_or(|len| len as u64 > crate::compression::MAX_DECODED_BYTES) { + return Err(PsdError::LimitExceeded("RGBA output exceeds MAX_DECODED_BYTES")); + } let cc = color_channel_count(h.color_mode)?; if usize::from(h.channels) < cc { return Err(PsdError::invalid("fewer channels than the color mode requires")); @@ -358,7 +385,7 @@ mod tests { #[test] fn unpack_bits_rows() { - assert_eq!(unpack_bits(&[0b1010_0000, 0b1000_0000], 3, 2), vec![1, 0, 1, 1, 0, 0]); + assert_eq!(unpack_bits(&[0b1010_0000, 0b1000_0000], 3, 2).unwrap(), vec![1, 0, 1, 1, 0, 0]); } #[test] @@ -369,6 +396,26 @@ mod tests { assert!(plane_to_u8(&[], 12, 0, 0).is_err()); } + /// A plane size that overflows or cannot be allocated is an error, not a panic or abort. + #[test] + fn plane_conversion_reports_absurd_sizes() { + assert!(matches!(unpack_bits(&[0], usize::MAX / 2, 4), Err(PsdError::LimitExceeded(_)))); + assert!(matches!(plane_to_u8(&[0], 1, usize::MAX / 2, 4), Err(PsdError::LimitExceeded(_)))); + assert!(matches!(unpack_bits(&[0], 1 << 40, 1 << 20), Err(PsdError::LimitExceeded(_)))); + } + + /// A bitmap composite whose RGBA output is over the decode budget is refused up front. + #[test] + fn composite_rgba8_checks_the_output_budget_first() { + let mut file = crate::testgen::small(Version::Psb, crate::Compression::Zip); + file.header.color_mode = ColorMode::Bitmap; + file.header.depth = 1; + file.header.channels = 1; + file.header.width = 60_000; + file.header.height = 60_000; + assert!(matches!(file.composite_rgba8(), Err(PsdError::LimitExceeded("RGBA output exceeds MAX_DECODED_BYTES")))); + } + #[test] fn rgb_interleave_checks_planes_and_preserves_alpha() { let color = [Cow::Borrowed(&[1, 2][..]), Cow::Borrowed(&[3, 4][..]), Cow::Borrowed(&[5, 6][..])]; From 7c77143b97d2e4530dda666dbdd8677483f858e3 Mon Sep 17 00:00:00 2001 From: Valentin Klein Date: Mon, 12 Oct 2026 12:28:09 +0200 Subject: [PATCH 18/92] PSD: don't preallocate knots from untrusted path length counts (#3635) (#3654) Co-authored-by: Claude Opus 5.5 --- crates/psd/src/path.rs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/crates/psd/src/path.rs b/crates/psd/src/path.rs index ea345b8c..79f055cb 100644 --- a/crates/psd/src/path.rs +++ b/crates/psd/src/path.rs @@ -155,7 +155,8 @@ impl PathData { out.push(PsdSubpath { closed: r.selector == selector::CLOSED_LENGTH, operation: r.u16_at(2) as i16, - knots: Vec::with_capacity(remaining.min(4096)), + // No preallocation: the count is untrusted (u16) and PsdKnot is 56 bytes. + knots: Vec::new(), }); } else if r.is_knot() { let closed = r.selector <= 2; @@ -261,6 +262,19 @@ mod tests { ] } + #[test] + fn subpaths_does_not_preallocate_from_untrusted_counts() { + let mut bytes = Vec::new(); + for _ in 0..100_000 { + bytes.extend_from_slice(&selector::CLOSED_LENGTH.to_be_bytes()); + bytes.extend_from_slice(&0xFFFFu16.to_be_bytes()); + bytes.extend_from_slice(&[0u8; 22]); + } + let subs = PathData::from_bytes(&bytes).unwrap().subpaths(); + assert_eq!(subs.len(), 100_000); + assert!(subs.iter().all(|s| s.knots.capacity() == 0)); + } + #[test] fn subpaths_roundtrip_and_bytes_are_stable() { let p = PathData::from_subpaths(&sample(), true); From 16341720c0166050b43b64c13f1d106577853b9c Mon Sep 17 00:00:00 2001 From: Valentin Klein Date: Mon, 12 Oct 2026 12:28:14 +0200 Subject: [PATCH 19/92] PSD: bound the zero padding of undersized pattern channels (#3652) (#3686) Co-authored-by: Claude Opus 5.5 --- crates/psd/src/patterns.rs | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/crates/psd/src/patterns.rs b/crates/psd/src/patterns.rs index 00e61934..04d5c24c 100644 --- a/crates/psd/src/patterns.rs +++ b/crates/psd/src/patterns.rs @@ -26,6 +26,11 @@ use crate::header::Version; /// Largest pattern edge accepted (Photoshop's own limit is far lower). const MAX_EDGE: u32 = 30_000; +/// Budget for zero-padded channel planes summed over one pattern. Photoshop writes every channel +/// at the pattern rectangle, so a smaller channel rectangle is only padding; without this cap a +/// few hundred bytes (1x1 channels, a huge pattern rectangle) would allocate up to +/// `MAX_DECODED_BYTES` of zeros. Matches `abr::MAX_TOTAL_BYTES`. +const MAX_PADDED_PATTERN_BYTES: u64 = 512 << 20; // A PackBits run packet emits at most 128 bytes from a 2-byte packet. const MAX_RLE_EXPANSION: u64 = 64; @@ -154,6 +159,7 @@ fn read_pattern(r: &mut Rd) -> Result { let mut channels = Vec::new(); let mut depth = 8u16; let mut decoded_bytes = 0u64; + let mut padded_bytes = 0u64; for _ in 0..count + 2 { if v.p >= body.len() { break; @@ -193,6 +199,12 @@ fn read_pattern(r: &mut Rd) -> Result { if decoded_bytes > MAX_DECODED_BYTES { return Err(PsdError::LimitExceeded("pattern data exceeds MAX_DECODED_BYTES")); } + if cw != w as usize || ch != h as usize { + padded_bytes = padded_bytes.checked_add(plane_bytes).ok_or(PsdError::LimitExceeded("pattern padded size overflow"))?; + if padded_bytes > MAX_PADDED_PATTERN_BYTES { + return Err(PsdError::LimitExceeded("padded pattern channels exceed MAX_PADDED_PATTERN_BYTES")); + } + } let _ = layout.decoded_len()?; let compression = if comp == 1 { Compression::Rle @@ -554,13 +566,13 @@ mod tests { let vma = pattern_vma_rect_offset(4, &p); set_i32(&mut global, vma + 8, 30_000); set_i32(&mut global, vma + 12, 30_000); - assert!(matches!(parse_pattern_block(&global), Err(PsdError::LimitExceeded("pattern data exceeds MAX_DECODED_BYTES")))); + assert!(matches!(parse_pattern_block(&global), Err(PsdError::LimitExceeded(_)))); let mut standalone = write_pat_file(std::slice::from_ref(&p)).unwrap(); let vma = pattern_vma_rect_offset(10, &p); set_i32(&mut standalone, vma + 8, 30_000); set_i32(&mut standalone, vma + 12, 30_000); - assert!(matches!(parse_pat_file(&standalone), Err(PsdError::LimitExceeded("pattern data exceeds MAX_DECODED_BYTES")))); + assert!(matches!(parse_pat_file(&standalone), Err(PsdError::LimitExceeded(_)))); let mut abr = crate::abr::write_v6( 1, @@ -658,6 +670,17 @@ mod tests { assert!(matches!(zeroed_pattern_plane(usize::MAX), Err(PsdError::LimitExceeded("not enough memory for the padded pattern channel")))); } + #[test] + fn tiny_channels_in_a_huge_pattern_rect_are_not_zero_padded_without_bound() { + // 3 channels of 5x3 padded to 30000x30000 would allocate 2.7 GB of zeros. + let p = pat(8, false); + let mut global = write_pattern_block(std::slice::from_ref(&p)).unwrap(); + let vma = pattern_vma_rect_offset(4, &p); + set_i32(&mut global, vma + 8, 30_000); + set_i32(&mut global, vma + 12, 30_000); + assert!(matches!(parse_pattern_block(&global), Err(PsdError::LimitExceeded("padded pattern channels exceed MAX_PADDED_PATTERN_BYTES")))); + } + #[test] fn zero_size_pattern_rectangles_are_rejected() { let p = pat(8, false); From 64a02107bad9281e0cebfad3afab66481d79cbb8 Mon Sep 17 00:00:00 2001 From: Valentin Klein Date: Mon, 12 Oct 2026 12:28:18 +0200 Subject: [PATCH 20/92] PSD: cap descriptor list/object preallocation from untrusted counts (#3636) (#3699) Co-authored-by: Claude Opus 5.5 --- crates/psd/src/descriptor.rs | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/crates/psd/src/descriptor.rs b/crates/psd/src/descriptor.rs index 3e0cc251..b0e64ba4 100644 --- a/crates/psd/src/descriptor.rs +++ b/crates/psd/src/descriptor.rs @@ -349,6 +349,15 @@ impl VersionedDescriptor { } } +/// Most items preallocated for a file-declared count. `check_count` only +/// guarantees a few bytes per item while parsed items are far larger, so the +/// count must not drive the up-front reservation (or abort on allocation). +const MAX_PREALLOC: usize = 4096; + +fn vec_for_count(n: u32) -> Vec { + Vec::with_capacity((n as usize).min(MAX_PREALLOC)) +} + fn read_descriptor(r: &mut Reader<'_>, depth: usize) -> Result { if depth > MAX_DEPTH { return Err(PsdError::LimitExceeded("descriptor nesting too deep")); @@ -358,7 +367,7 @@ fn read_descriptor(r: &mut Reader<'_>, depth: usize) -> Result { let n = r.u32()?; // Each item needs at least 5 (1-byte string key) + 4 (type) + 1 (bool). r.check_count(u64::from(n), 10)?; - let mut items = Vec::with_capacity(n as usize); + let mut items = vec_for_count(n); for _ in 0..n { let key = Id::read(r)?; let v = read_value(r, depth + 1)?; @@ -380,7 +389,7 @@ fn read_typed_value(r: &mut Reader<'_>, ty: &[u8; 4], depth: usize) -> Result { let n = r.u32()?; r.check_count(u64::from(n), 8)?; - let mut items = Vec::with_capacity(n as usize); + let mut items = vec_for_count(n); for _ in 0..n { items.push(read_reference_item(r)?); } @@ -391,7 +400,7 @@ fn read_typed_value(r: &mut Reader<'_>, ty: &[u8; 4], depth: usize) -> Result { let n = r.u32()?; r.check_count(u64::from(n), 4)?; - let mut items = Vec::with_capacity(n as usize); + let mut items = vec_for_count(n); for _ in 0..n { items.push(read_value(r, depth + 1)?); } @@ -571,6 +580,22 @@ mod tests { Class { name: UnicodeString::new(name), class_id: Id::new(id) } } + #[test] + fn declared_counts_do_not_drive_preallocation() { + assert!(vec_for_count::(u32::MAX).capacity() <= MAX_PREALLOC); + // A 1M-item list of booleans parses (items grow the vector as needed). + let n = 1_000_000u32; + let mut data = n.to_be_bytes().to_vec(); + for _ in 0..n { + data.extend_from_slice(b"bool\x01"); + } + let mut r = Reader::new(&data); + match read_typed_value(&mut r, b"VlLs", 0).unwrap() { + Value::List(v) => assert_eq!(v.len(), n as usize), + other => panic!("expected list, got {other:?}"), + } + } + pub(crate) fn sample() -> Descriptor { Descriptor::new("null") .with("Nm ", Value::Text(UnicodeString::new_nul("Hello \u{1F600}"))) From 2cb396d1544f063732c685f413892fd8fec8eca4 Mon Sep 17 00:00:00 2001 From: Scott Macdonald Date: Mon, 12 Oct 2026 06:28:33 -0400 Subject: [PATCH 21/92] fix(engine): Displace smart filter ignores its mapPath displacement map (#3676) A Displace applied to a smart object is recorded as a smart filter and rendered by apply_smart_filters -> filters::apply_filter_to_surface, both when it is added and on every later re-render (replace contents, toggling a filter, transforms). That path built FilterParams with params_for alone, which leaves Displace's map as None; only run_filter resolved `mapPath` (through filters_ext::resolve, which needs the session). With no map, algo's displace returns the source unchanged, so the smart filter was a silent no-op. apply_filter_to_surface now resolves `mapPath` through the same file read and import the direct command uses (filters_ext::map_from_path, shared by resolve and the new session-free resolve_map_path). A map that can no longer be read on re-render leaves the pixels alone, as for an unknown filter; the command still refuses an unreadable map when the filter is added. `mapDocument` needs the session and stays unresolved on re-render. Regression test: smart_cmds::tests:: displace_smart_filter_reads_its_map_path_on_re_render (8/16/32-bit). Co-authored-by: Claude Opus 5.5 --- crates/engine/src/filters.rs | 5 ++++- crates/engine/src/filters_ext.rs | 30 +++++++++++++++++++++++---- crates/engine/src/smart_cmds/tests.rs | 30 +++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 5 deletions(-) diff --git a/crates/engine/src/filters.rs b/crates/engine/src/filters.rs index 2ccc999b..40b51189 100644 --- a/crates/engine/src/filters.rs +++ b/crates/engine/src/filters.rs @@ -185,7 +185,10 @@ pub fn apply_filter_to_surface( if id == crate::plugin_cmds::RUN { return crate::plugin_cmds::apply_to_surface(id, params, surf, selection, canvas); } - let fp = params_for(id, params)?; + let mut fp = params_for(id, params)?; + // A map that can no longer be read (moved or deleted since) leaves the pixels alone, like an + // unknown filter; the command itself already refused an unreadable map when it was added. + crate::filters_ext::resolve_map_path(&mut fp, params).ok()?; let sel_bounds = selection.map(photocraft_raster::Surface::content_bounds); let content = surf.content_bounds(); let area = algo::output_area(&fp, content, bounds, sel_bounds); diff --git a/crates/engine/src/filters_ext.rs b/crates/engine/src/filters_ext.rs index bf1656ca..f1787fd1 100644 --- a/crates/engine/src/filters_ext.rs +++ b/crates/engine/src/filters_ext.rs @@ -435,10 +435,8 @@ pub(crate) fn resolve(s: &Session, fp: &mut FilterParams, p: &Value) -> Result<( return Ok(()); } let layer = p.get("mapLayer").and_then(Value::as_u64); - let img = if let Some(path) = p.get("mapPath").and_then(Value::as_str).filter(|p| !p.is_empty()) { - let bytes = std::fs::read(path).map_err(|e| EngineError::Other(format!("cannot read displacement map `{path}`: {e}")))?; - let imported = crate::file_cmds::import(path, &bytes).map_err(|e| EngineError::Other(format!("cannot open displacement map `{path}`: {e}")))?; - map_from_document(&imported, layer) + let img = if let Some(path) = map_path(p) { + map_from_path(path, layer)? } else if let Some(d) = p.get("mapDocument") { let docs = s.documents(); let found = match d { @@ -454,6 +452,30 @@ pub(crate) fn resolve(s: &Session, fp: &mut FilterParams, p: &Value) -> Result<( Ok(()) } +fn map_path(p: &Value) -> Option<&str> { + p.get("mapPath").and_then(Value::as_str).filter(|p| !p.is_empty()) +} + +/// Displace's map read from a file (flattened, or its `mapLayer`). +fn map_from_path(path: &str, layer: Option) -> Result> { + let bytes = std::fs::read(path).map_err(|e| EngineError::Other(format!("cannot read displacement map `{path}`: {e}")))?; + let imported = crate::file_cmds::import(path, &bytes).map_err(|e| EngineError::Other(format!("cannot open displacement map `{path}`: {e}")))?; + Ok(map_from_document(&imported, layer)) +} + +/// The session-free part of [`resolve`]: Displace's `mapPath`. Smart filters record params, not +/// the map, so their re-render reads the map again here; without it the filter passed the pixels +/// through. `mapDocument` needs the session and is left unresolved. +pub(crate) fn resolve_map_path(fp: &mut FilterParams, p: &Value) -> Result<()> { + if let FilterParams::Displace { map, .. } = fp + && map.is_none() + && let Some(path) = map_path(p) + { + *map = map_from_path(path, p.get("mapLayer").and_then(Value::as_u64))?.map(Arc::new); + } + Ok(()) +} + /// Resolves inputs read from the target layer itself: the layer mask as Lens Blur depth. pub(crate) fn resolve_in_layer(fp: &mut FilterParams, layer: &Layer, bounds: Rect) { if let FilterParams::LensBlur { depth: DepthSource::LayerMask, depth_map, .. } = fp diff --git a/crates/engine/src/smart_cmds/tests.rs b/crates/engine/src/smart_cmds/tests.rs index 2ee54322..90bb325a 100644 --- a/crates/engine/src/smart_cmds/tests.rs +++ b/crates/engine/src/smart_cmds/tests.rs @@ -977,3 +977,33 @@ fn inspect_reports_the_smart_source() { assert_eq!(source(&s)["kind"], "embedded"); assert!(source(&s)["fileName"].is_string()); } + +#[test] +fn displace_smart_filter_reads_its_map_path_on_re_render() { + let dir = std::env::temp_dir().join(format!("pcraft-displace-{}", std::process::id())); + std::fs::create_dir_all(&dir).unwrap(); + // A white map displaces by the full scale; mid-grey would not move anything. + let white = Document::with_background( + "map", + Size::new(W as u32, H as u32), + photocraft_color::ColorMode::Rgb, + photocraft_color::SampleType::U8, + photocraft_color::Color::rgba(1.0, 1.0, 1.0, 1.0), + ); + let map = dir.join("white.png"); + std::fs::write(&map, photocraft_io::export(&white, "png", &Default::default()).unwrap().bytes).unwrap(); + for depth in DEPTHS { + let mut s = session(depth); + paint(&mut s); + convert(&mut s); + let before = flat(&s); + s.execute("filter.distort.displace", json!({"horizontal": 8, "vertical": 8, "mapPath": map.to_str().unwrap()})).unwrap(); + assert!(max_diff(&before, &flat(&s)) > 0.1, "the smart filter displaced the pixels at {depth}-bit"); + // A later re-render (here: hide and show the filter) reads the map again. + s.execute("layer.smartFilter.setVisible", json!({"index": 0, "visible": false})).unwrap(); + assert_eq!(max_diff(&before, &flat(&s)), 0.0, "hidden at {depth}-bit"); + s.execute("layer.smartFilter.setVisible", json!({"index": 0, "visible": true})).unwrap(); + assert!(max_diff(&before, &flat(&s)) > 0.1, "shown again at {depth}-bit"); + } + std::fs::remove_dir_all(&dir).ok(); +} From 5ed758763d1b77e188d66ab782490e9639b6421c Mon Sep 17 00:00:00 2001 From: Scott Macdonald Date: Mon, 12 Oct 2026 06:28:38 -0400 Subject: [PATCH 22/92] PSD: smart object Trnf frames the custom warp's control points, not the source rect (#3677) A placed layer with a custom warp (warpCustom, a 4 x 4 customEnvelopeWarp mesh) can have control points outside its source rect 0..w x 0..h. Photoshop maps the bounding box of those 16 control points onto the Trnf quad. PhotoCraft mapped the source rect onto it, so a mesh that spills past the source counted the overhang twice and the re-rendered smart object came out stretched. Measured against Photoshop's own export of a real shirt mockup (4200 x 4800 source, mesh spilling to x = -9, y = -88): before, a ~1.6% vertical stretch, the tile offset growing from 0 to -16 px top to bottom; after, alignment is exact everywhere and the RMSE against Photoshop is 0.49%. The bounding box of the evaluated warp outline (rather than the control points) fixed that file but put another at 5.4% RMSE, so it is the control-point box. - blocks::placed_frame: the shared rule. The control-point box of a single-patch custom warp, else the source rect; a degenerate or non-finite box falls back to the source rect. - blocks::parse_smart (and so smart_map::parse_sold): the affine maps that frame onto Trnf. - smart_map::quad_points: export writes Trnf (and PlLd's quad) as the image of the same frame, so a spilled mesh round-trips and quad_moved keeps the imported Trnf as stored. Distort / Perspective placements keep the source rect, matching parse_smart_perspective. Refs #579. Co-authored-by: Claude Opus 5.5 --- crates/io/src/blocks.rs | 78 +++++++++++++++++++++++++++++++++++++- crates/io/src/smart_map.rs | 29 +++++++++++++- 2 files changed, 104 insertions(+), 3 deletions(-) diff --git a/crates/io/src/blocks.rs b/crates/io/src/blocks.rs index 329ee35f..3a6b220d 100644 --- a/crates/io/src/blocks.rs +++ b/crates/io/src/blocks.rs @@ -582,6 +582,22 @@ pub(crate) fn parse_prefix_versioned(data: &[u8]) -> Option { VersionedDescriptor::parse_prefix(data).ok().map(|(v, _)| v.descriptor) } +/// The source-space box Photoshop maps onto a placed layer's `Trnf` quad: the bounding box of a +/// single-patch custom warp's 16 control points, which may spill past the source, else the source +/// rect `0..w × 0..h`. Mapping the source rect instead counts the overhang twice and stretches the +/// placement. A degenerate or non-finite box falls back to the source rect. +pub(crate) fn placed_frame(warp: Option<&photocraft_geom::warp::Warp>, w: f64, h: f64) -> [f64; 4] { + let rect = [0.0, 0.0, w, h]; + let Some(m) = warp.filter(|wp| wp.style == photocraft_geom::warp::WarpStyle::Custom).and_then(|wp| wp.mesh.as_ref()).filter(|m| m.points.len() == 16) + else { + return rect; + }; + let inf = f64::INFINITY; + let b = m.points.iter().fold([inf, inf, -inf, -inf], |b, [x, y]| [b[0].min(*x), b[1].min(*y), b[2].max(*x), b[3].max(*y)]); + let ok = b.iter().all(|v| v.is_finite()) && b[2] - b[0] > 1e-9 && b[3] - b[1] > 1e-9; + if ok { b } else { rect } +} + /// Smart object identifier and transform from `SoLd`/`PlLd` (best effort). pub fn parse_smart(key: &[u8; 4], data: &[u8]) -> (String, Affine) { // SoLd: 'soLD' + version(4) + versioned descriptor. @@ -596,7 +612,10 @@ pub fn parse_smart(key: &[u8; 4], data: &[u8]) -> (String, Affine) { let p: Vec = pts.iter().filter_map(|v| num(Some(v))).collect(); let (w, h) = (num(sz.get("Wdth")).unwrap_or(0.0), num(sz.get("Hght")).unwrap_or(0.0)); if p.len() == 8 && w > 0.0 && h > 0.0 { - affine = Affine { m: [(p[2] - p[0]) / w, (p[3] - p[1]) / w, (p[6] - p[0]) / h, (p[7] - p[1]) / h, p[0], p[1]] }; + let [x0, y0, x1, y1] = placed_frame(parse_placed_warp(key, data).as_ref(), w, h); + let (bw, bh) = (x1 - x0, y1 - y0); + let (a, b, c, d) = ((p[2] - p[0]) / bw, (p[3] - p[1]) / bw, (p[6] - p[0]) / bh, (p[7] - p[1]) / bh); + affine = Affine { m: [a, b, c, d, p[0] - a * x0 - c * y0, p[1] - b * x0 - d * y0] }; } } (id, affine) @@ -899,6 +918,63 @@ mod more_tests { assert_eq!(parse_smart(b"PlLd", &data).0, ""); } + /// `SoLd` data with a 50 × 25 source, the quad `trnf` and, when given, a custom warp whose + /// 16 control points are `pts`. + fn sold_with_warp(trnf: [f64; 8], pts: Option<&[[f64; 2]]>) -> Vec { + use photocraft_psd::descriptor::ObjectArray; + let e = |t: &str, v: &str| Value::Enumerated { type_id: Id::new(t), value: Id::new(v) }; + let mut d = Descriptor::new("null") + .with("Idnt", Value::Text(UnicodeString::new_nul("uuid-1"))) + .with("Trnf", Value::List(trnf.map(Value::Double).to_vec())) + .with("Sz ", Value::Descriptor(Descriptor::new("Pnt ").with("Wdth", Value::Double(50.0)).with("Hght", Value::Double(25.0)))); + if let Some(pts) = pts { + let bounds = Descriptor::new("Rctn") + .with("Top ", Value::Double(0.0)) + .with("Left", Value::Double(0.0)) + .with("Btom", Value::Double(25.0)) + .with("Rght", Value::Double(50.0)); + let mesh = Descriptor::new("null") + .with("Hrzn", Value::UnitFloats { unit: *b"#Pxl", values: pts.iter().map(|p| p[0]).collect() }) + .with("Vrtc", Value::UnitFloats { unit: *b"#Pxl", values: pts.iter().map(|p| p[1]).collect() }); + let warp = Descriptor::new("warp").with("warpStyle", e("warpStyle", "warpCustom")).with("bounds", Value::Descriptor(bounds)).with( + "customEnvelopeWarp", + Value::Descriptor(Descriptor::new("customEnvelopeWarp").with("meshPoints", Value::ObjectArray(ObjectArray { prefix: 16, body: mesh }))), + ); + d = d.with("warp", Value::Descriptor(warp)); + } + let mut data = b"soLD".to_vec(); + data.extend_from_slice(&4u32.to_be_bytes()); + data.extend(VersionedDescriptor::new(d).to_bytes()); + data + } + + /// Photoshop's `Trnf` is the image of the custom warp's control-point bounding box, not of the + /// source rect: a mesh spilling to x = -10, y = -5 and x = 60 frames a 70 × 30 box. + #[test] + fn smart_transform_maps_the_warp_control_box_onto_the_quad() { + let mut pts = photocraft_geom::warp::BezierMesh::identity([0.0, 0.0, 50.0, 25.0], 1, 1).points; + pts[0] = [-10.0, -5.0]; + pts[15] = [60.0, 25.0]; + let quad = [100.0, 200.0, 240.0, 200.0, 240.0, 260.0, 100.0, 260.0]; + let (_, a) = parse_smart(b"SoLd", &sold_with_warp(quad, Some(&pts))); + assert_eq!(a.m, [2.0, 0.0, 0.0, 2.0, 120.0, 210.0]); + // Without a warp the source rect is the frame, as before. + assert_eq!(parse_smart(b"SoLd", &sold_with_warp(quad, None)).1.m, [2.8, 0.0, 0.0, 2.4, 100.0, 200.0]); + } + + /// A custom mesh with no area (every control point on one spot) can't frame the quad: the + /// source rect does, with no division by zero. + #[test] + fn smart_transform_with_a_degenerate_warp_box_uses_the_source_rect() { + let quad = [100.0, 200.0, 240.0, 200.0, 240.0, 260.0, 100.0, 260.0]; + let (_, a) = parse_smart(b"SoLd", &sold_with_warp(quad, Some(&[[7.0, 7.0]; 16]))); + assert_eq!(a.m, [2.8, 0.0, 0.0, 2.4, 100.0, 200.0]); + let mut warp = photocraft_geom::warp::Warp::preset(photocraft_geom::warp::WarpStyle::Custom, 0.0, [0.0, 0.0, 50.0, 25.0]); + warp.mesh = Some(photocraft_geom::warp::BezierMesh { us: vec![0.0, 1.0], vs: vec![0.0, 1.0], points: vec![[f64::NAN, 1.0]; 16] }); + assert_eq!(placed_frame(Some(&warp), 50.0, 25.0), [0.0, 0.0, 50.0, 25.0]); + assert_eq!(placed_frame(None, 50.0, 25.0), [0.0, 0.0, 50.0, 25.0]); + } + #[test] fn effects_switch() { let mut lfx = vec![0, 0, 0, 0]; diff --git a/crates/io/src/smart_map.rs b/crates/io/src/smart_map.rs index d4c02894..2a7cc5c5 100644 --- a/crates/io/src/smart_map.rs +++ b/crates/io/src/smart_map.rs @@ -526,7 +526,9 @@ pub struct PlacedSpec<'a> { pub filter_fx: Option, } -/// Where the source corners land (top-left, top-right, bottom-right, bottom-left), as x, y pairs. +/// Where the frame corners land (top-left, top-right, bottom-right, bottom-left), as x, y pairs. +/// The frame is [`crate::blocks::placed_frame`] for an affine placement (the inverse of +/// `parse_smart`), the source rect for a projective one (as `parse_smart_perspective` reads it). fn quad_points(s: &PlacedSpec<'_>) -> [f64; 8] { let (w, h) = s.size; let [a, b, c, d, e, f] = s.transform.m; @@ -534,8 +536,9 @@ fn quad_points(s: &PlacedSpec<'_>) -> [f64; 8] { Some(p) => photocraft_algo::transform::Homography(*p).apply(x, y), None => (a * x + c * y + e, b * x + d * y + f), }; + let [x0, y0, x1, y1] = if s.perspective.is_some() { [0.0, 0.0, w, h] } else { crate::blocks::placed_frame(s.warp, w, h) }; let mut out = [0.0; 8]; - for (i, (x, y)) in [(0.0, 0.0), (w, 0.0), (w, h), (0.0, h)].into_iter().enumerate() { + for (i, (x, y)) in [(x0, y0), (x1, y0), (x1, y1), (x0, y1)].into_iter().enumerate() { (out[2 * i], out[2 * i + 1]) = map(x, y); } out @@ -1080,6 +1083,28 @@ mod tests { } } + /// Export writes `Trnf` as the image of the custom warp's control-point box, the inverse of + /// import: a spilled mesh comes back with the same transform and the quad Photoshop expects. + #[test] + fn warp_control_box_quad_round_trips() { + use photocraft_geom::warp::BezierMesh; + let mut mesh = BezierMesh::identity([0.0, 0.0, 50.0, 25.0], 1, 1); + mesh.points[0] = [-10.0, -5.0]; + mesh.points[15] = [60.0, 25.0]; + let mut warp = Warp::preset(WarpStyle::Custom, 0.0, [0.0, 0.0, 50.0, 25.0]); + warp.mesh = Some(mesh); + let transform = Affine { m: [2.0, 0.0, 0.0, 2.0, 120.0, 210.0] }; + let spec = PlacedSpec { idnt: "i", placed: "p", transform, perspective: None, size: (50.0, 25.0), dpi: 72.0, warp: Some(&warp), filter_fx: None }; + let sold = sold_bytes(None, &spec, &mut Vec::new()); + let p = parse_sold(&sold).expect("parses"); + let Some(Value::List(q)) = p.descriptor.get("Trnf") else { panic!("no Trnf") }; + let q: Vec = q.iter().filter_map(|v| num(Some(v))).collect(); + assert_eq!(q, [100.0, 200.0, 240.0, 200.0, 240.0, 260.0, 100.0, 260.0]); + assert_eq!(p.transform, transform); + // The imported quad reads as unmoved, so the template's `Trnf` is kept as stored. + assert!(!quad_moved(&p.descriptor, &spec)); + } + #[test] fn hex_and_uuid() { assert_eq!(from_hex(&to_hex(&[0, 1, 0xab, 0xff])), Some(vec![0, 1, 0xab, 0xff])); From 590bec7998ac32dd830e4760791eb451901f118c Mon Sep 17 00:00:00 2001 From: Scott Macdonald Date: Mon, 12 Oct 2026 06:28:55 -0400 Subject: [PATCH 23/92] feat(io): import Photoshop Displace smart filters with their embedded map (#3680) A Displace smart filter (Fltr class `Dspl`, filterID 1148416108) was not in the modelled filter list, so it became psd.unsupportedFilter and rendered as a pass-through. Mockup PSDs that bend a replaceable design over fabric (a design smart object with Displace then Gaussian Blur) rendered flat. Photoshop stores the displacement map inside the filter: `DspD` (raw data) holds u32 LE height, u32 LE width, u16 LE mode 3, then two 8-bit planes (horizontal, vertical) and padding, next to HrzS/VrtS (scale %), DspM (StrF stretch / Tile), UndA (RptE repeat / WrpA wrap), EmbF and DspF (an alias to the author's map file, usually unavailable). The filter now maps to filter.distort.displace. As for Camera Raw, the whole item (with the map) is kept as hex in `__displacePsd`, so it re-renders, survives .pcraft and is written back to PSD with only the editable settings and blending replaced. params_for resolves the embedded map, so the smart filter re-render applies it, stretched over the document canvas (the bounds smart filters already pass). Another mode, a missing or truncated map, or unknown enum values keep the item opaque as before. The map parser uses checked sizes and caps maps at 2^26 pixels. Tests: displace_map unit tests (layout, every truncation, hostile and corrupted headers, round trip, edited settings, opaque fallbacks, bad exports) and smart_psd::displace_psd_filter_renders_with_its_embedded_map (8/16/32-bit: renders displaced, PSD export/import and .pcraft keep it). Co-authored-by: Claude Opus 5.5 --- crates/engine/src/filters_ext.rs | 3 +- crates/engine/tests/smart_psd.rs | 65 ++++++ crates/io/src/displace_map.rs | 343 +++++++++++++++++++++++++++++++ crates/io/src/smart_map.rs | 21 +- 4 files changed, 427 insertions(+), 5 deletions(-) create mode 100644 crates/io/src/displace_map.rs diff --git a/crates/engine/src/filters_ext.rs b/crates/engine/src/filters_ext.rs index f1787fd1..dae5e9b9 100644 --- a/crates/engine/src/filters_ext.rs +++ b/crates/engine/src/filters_ext.rs @@ -153,7 +153,8 @@ pub fn params_for(id: &str, p: &Value) -> Option { vertical: f(p, "vertical", 10.0).clamp(-999.0, 999.0), stretch: s(p, "fit", "stretch") != "tile", undefined: undefined(p, "repeat"), - map: None, + // A Displace imported from PSD carries its map; `mapPath` / `mapDocument` resolve later. + map: photocraft_io::smart_map::displace_embedded_map(p), }, "filter.distort.shear" => FilterParams::Shear { points: list::<[f32; 2]>(p, "points").unwrap_or_else(|| { diff --git a/crates/engine/tests/smart_psd.rs b/crates/engine/tests/smart_psd.rs index 8b86f2c8..5f4c7bf6 100644 --- a/crates/engine/tests/smart_psd.rs +++ b/crates/engine/tests/smart_psd.rs @@ -403,3 +403,68 @@ fn edited_psd_smart_objects_drop_their_old_file() { let SmartSource::Linked { path } = &sm.source else { panic!() }; assert_eq!(uuids, vec![path.clone()]); } + +/// A Displace smart filter from a Photoshop mockup PSD carries its displacement map embedded +/// (`DspD`, stretched over the canvas): it re-renders displaced instead of passing the pixels +/// through, and keeps that map through PSD export, `.pcraft` and a PSD re-import. +#[test] +fn displace_psd_filter_renders_with_its_embedded_map() { + use photocraft_psd::descriptor::{Descriptor, Id, UnicodeString, Value}; + for depth in [8, 16, 32] { + let mut s = session(depth); + s.execute("layer.smartObjects.convertToSmartObject", json!({})).unwrap(); + let id = photocraft_doc::LayerId(s.active().unwrap().active_layer.unwrap().0); + // Photoshop's layout: height, width, mode 3, horizontal plane (all right), vertical plane + // (neutral), padding. 128/255 is a hair over mid-grey: a sub-pixel vertical shift. + let (mw, mh) = (12u32, 8u32); + let n = (mw * mh) as usize; + let mut tdta = [mh.to_le_bytes().as_slice(), &mw.to_le_bytes(), &3u16.to_le_bytes()].concat(); + tdta.extend(std::iter::repeat_n(255, n).chain(std::iter::repeat_n(128, n)).chain(std::iter::repeat_n(0, mw as usize))); + let e = |t: &str, v: &str| Value::Enumerated { type_id: Id::new(t), value: Id::new(v) }; + let fltr = Descriptor::new("Dspl") + .with("HrzS", Value::Integer(10)) + .with("VrtS", Value::Integer(10)) + .with("DspM", e("DspM", "StrF")) + .with("UndA", e("UndA", "RptE")) + .with("DspF", Value::Alias(b"Macintosh HD:displace.psd".to_vec())) + .with("EmbF", Value::Boolean(true)) + .with("DspD", Value::RawData(tdta)); + let item = Descriptor::new("filterFX") + .with("Nm ", Value::Text(UnicodeString::new_nul("Displace..."))) + .with("enab", Value::Boolean(true)) + .with("hasoptions", Value::Boolean(true)) + .with("Fltr", Value::Descriptor(fltr)) + .with("filterID", Value::Integer(1148416108)); + let filter = photocraft_io::smart_map::filter_from_item(&item); + assert_eq!(filter.command, "filter.distort.displace"); + s.edit("displace", |doc, _| { + let mut l = doc.layer(id).unwrap().clone(); + let LayerContent::Smart(sm) = &mut l.content else { panic!("smart") }; + sm.smart_filters.push(filter.clone()); + assert!(refresh_layer(doc, &mut l).unwrap()); + *doc.layer_mut(id).unwrap() = l; + Ok(()) + }) + .unwrap(); + let doc = s.active().unwrap().doc.clone(); + let alpha = |doc: &Document, x: i32| smart(doc).1.cache.unwrap().pixel(x, 30)[3]; + // 10 % of 128 px at full map contrast: the content (x 8..80) is read from 12.8 px to the + // right, so it moves left over the canvas edge and leaves its right edge. + assert!(alpha(&doc, 2) > 0.99 && alpha(&doc, 75) < 0.01, "depth {depth}: {} {}", alpha(&doc, 2), alpha(&doc, 75)); + + let out = photocraft_io::export(&doc, "psd", &Default::default()).unwrap(); + assert!(out.warnings.is_empty(), "{:?}", out.warnings); + assert_eq!(structure_errors(&out.bytes), Vec::::new()); + let back = photocraft_io::import("displace.psd", &out.bytes).unwrap().document; + let native = photocraft_format::load_from_bytes(&photocraft_format::save_to_bytes(&back, &Default::default()).unwrap()).unwrap(); + for doc in [&back, &native] { + let (bid, after) = smart(doc); + assert_eq!(after.smart_filters, vec![filter.clone()], "depth {depth}"); + let mut l = doc.layer(photocraft_doc::LayerId(bid)).unwrap().clone(); + assert!(refresh_layer(doc, &mut l).unwrap()); + let LayerContent::Smart(sm) = &l.content else { panic!("smart") }; + let (a, b) = (sm.cache.as_ref().unwrap(), smart(&s.active().unwrap().doc).1.cache.unwrap()); + assert_eq!((a.pixel(2, 30)[3], a.pixel(75, 30)[3]), (b.pixel(2, 30)[3], b.pixel(75, 30)[3]), "depth {depth}: re-render"); + } + } +} diff --git a/crates/io/src/displace_map.rs b/crates/io/src/displace_map.rs new file mode 100644 index 00000000..8993663c --- /dev/null +++ b/crates/io/src/displace_map.rs @@ -0,0 +1,343 @@ +//! Displace smart filters (`Fltr` class `Dspl`) as observed in Photoshop-authored mockup PSDs. +//! +//! The filter descriptor holds the scales (`HrzS`, `VrtS`, percent), the fit (`DspM`: `StrF` +//! stretch or `Tile`), the undefined areas (`UndA`: `RptE` repeat edge pixels or `WrpA` wrap), +//! an alias to the map file on the author's disk (`DspF`, usually unavailable), `EmbF` (true) and +//! the map itself, embedded as raw data (`DspD`, type `tdta`): +//! +//! ```text +//! u32 LE height, u32 LE width, u16 LE mode (3 observed), then two 8-bit planes of +//! width * height bytes (horizontal map, vertical map), then padding +//! ``` +//! +//! The whole `filterFX` item (with the map) is kept verbatim in the params as a template +//! ([`TEMPLATE_KEY`]), so the filter re-renders, survives `.pcraft` and is written back to PSD +//! with only the editable settings replaced. Anything else (another mode, a missing or truncated +//! map, unknown enum values) stays an opaque [`super::UNSUPPORTED_FILTER`]. + +use std::sync::Arc; + +use photocraft_algo::Image; +use photocraft_doc::SmartFilter; +use photocraft_geom::Rect; +use photocraft_psd::descriptor::{Descriptor, Id, Value}; +use serde_json::{Value as J, json}; + +use super::{blend_options, from_hex, get_desc, int, set, to_hex}; +use crate::blocks::{enum_of, num}; + +pub(super) const CLASS: &str = "Dspl"; +pub(super) const COMMAND: &str = "filter.distort.displace"; +const FILTER_ID: i32 = super::code(b"Dspl"); +pub(super) const TEMPLATE_KEY: &str = "__displacePsd"; +/// The embedded map (raw data). +const MAP_KEY: &str = "DspD"; +/// `tdta` header: height, width (u32 LE) and mode (u16 LE). +const HEADER: usize = 10; +/// The only map layout seen in Photoshop files: two 8-bit planes. +const MODE_TWO_PLANES: u16 = 3; +/// 8K × 8K: far beyond the observed document-sized maps, and bounds the f32 map we build. +const MAX_MAP_PIXELS: usize = 1 << 26; +/// The template is the item plus the map; a little room for the rest of the descriptor. +const MAX_TEMPLATE_BYTES: usize = 2 * MAX_MAP_PIXELS + (1 << 20); + +const FITS: [(&[u8], &str); 2] = [(b"StrF", "stretch"), (b"Tile", "tile")]; +const UNDEFINED: [(&[u8], &str); 2] = [(b"RptE", "repeat"), (b"WrpA", "wrap")]; + +/// A parsed embedded map: size and the two 8-bit planes (borrowed from the blob). +#[derive(Debug, PartialEq)] +pub(super) struct EmbeddedMap<'a> { + pub width: usize, + pub height: usize, + pub horizontal: &'a [u8], + pub vertical: &'a [u8], +} + +/// Parses an embedded displacement map; `None` for any other mode, a zero or oversized map, or a +/// blob shorter than the header plus both planes. +pub(super) fn parse_map(data: &[u8]) -> Option> { + let u32_at = |i: usize| Some(u32::from_le_bytes(data.get(i..i + 4)?.try_into().ok()?)); + let height = usize::try_from(u32_at(0)?).ok()?; + let width = usize::try_from(u32_at(4)?).ok()?; + let mode = u16::from_le_bytes(data.get(8..HEADER)?.try_into().ok()?); + let n = width.checked_mul(height)?; + if mode != MODE_TWO_PLANES || n == 0 || n > MAX_MAP_PIXELS { + return None; + } + let horizontal = data.get(HEADER..HEADER.checked_add(n)?)?; + let vertical = data.get(HEADER + n..HEADER.checked_add(n.checked_mul(2)?)?)?; + Some(EmbeddedMap { width, height, horizontal, vertical }) +} + +fn fltr_map(item: &Descriptor) -> Option> { + match get_desc(item, "Fltr")?.get(MAP_KEY)? { + Value::RawData(b) => parse_map(b), + _ => None, + } +} + +fn lookup<'a>(table: &[(&[u8], &'a str)], v: &[u8]) -> Option<&'a str> { + table.iter().find(|(k, _)| *k == v).map(|(_, s)| *s) +} + +/// Editable settings of a `Dspl` descriptor, `None` when one is missing or unknown. +fn settings(f: &Descriptor) -> Option { + let scale = |k| num(f.get(k)).filter(|v| v.is_finite() && (-999.0..=999.0).contains(v)); + Some(json!({ + "horizontal": scale("HrzS")?, + "vertical": scale("VrtS")?, + "fit": lookup(&FITS, enum_of(f, "DspM")?)?, + "undefinedAreas": lookup(&UNDEFINED, enum_of(f, "UndA")?)?, + })) +} + +/// `filter.distort.displace` params for a Displace item with an embedded map. +pub(super) fn import_params(item: &Descriptor) -> Option { + let f = get_desc(item, "Fltr")?; + if !f.class_id.is(CLASS) { + return None; + } + let mut params = settings(f)?; + fltr_map(item)?; + // Neutral blending in the template: the model's own fields replace it on export. + let mut template = item.clone(); + let neutral = SmartFilter { command: String::new(), params: J::Null, blend: photocraft_color::BlendMode::Normal, opacity: 1.0, visible: true }; + set(&mut template, "blendOptions", blend_options(&neutral)); + set(&mut template, "enab", Value::Boolean(true)); + params.as_object_mut()?.insert(TEMPLATE_KEY.into(), json!(to_hex(&template.to_bytes()))); + Some(params) +} + +/// The template item of `params`, checked to be a Displace filter with a readable map. +fn template(params: &J) -> Result { + let raw = params.get(TEMPLATE_KEY).ok_or("a Displace map from a file or document is not written to PSD")?; + let raw = raw.as_str().ok_or("the Displace PSD data must be hex text")?; + if raw.len() > MAX_TEMPLATE_BYTES * 2 { + return Err("the Displace PSD data is too large".into()); + } + let bytes = from_hex(raw).ok_or("the Displace PSD data is not valid hex")?; + let item = Descriptor::from_bytes(&bytes).map_err(|e| format!("the Displace PSD data is unreadable ({e})"))?; + if !item.class_id.is("filterFX") || int(&item, "filterID") != Some(FILTER_ID) || fltr_map(&item).is_none() { + return Err("the Displace PSD data is not a Displace filter with an embedded map".into()); + } + Ok(item) +} + +/// The `filterFXList` item: the template with the current scales, fit and undefined areas. +pub(super) fn export_item(params: &J) -> Result { + let object = params.as_object().ok_or("Displace parameters must be an object")?; + if let Some(k) = object.keys().find(|k| !super::is_meta(k) && !["horizontal", "vertical", "fit", "undefinedAreas"].contains(&k.as_str())) { + return Err(format!("Displace setting `{k}` has no PSD equivalent next to its embedded map")); + } + let mut item = template(params)?; + let mut f = get_desc(&item, "Fltr").ok_or("the Displace PSD data has no filter")?.clone(); + let scale = |k: &str, d: f64| -> Result { + let v = params.get(k).map_or(Some(d), J::as_f64).filter(|v| v.is_finite()).ok_or(format!("Displace `{k}` must be a number"))?; + Ok(Value::Integer(v.round().clamp(-999.0, 999.0) as i32)) + }; + let choice = |k: &str, table: &[(&[u8], &str)], d: &str| -> Result { + let v = params.get(k).map_or(Some(d), J::as_str).ok_or(format!("Displace `{k}` must be text"))?; + let code = table.iter().find(|(_, s)| *s == v).map(|(c, _)| *c).ok_or(format!("Displace `{k}` is not one of the PSD values"))?; + Ok(Id::new(std::str::from_utf8(code).map_err(|e| e.to_string())?)) + }; + // Keep the template's enum types; only the values change. + let set_enum = |f: &mut Descriptor, key: &str, value: Id| { + let type_id = match f.get(key) { + Some(Value::Enumerated { type_id, .. }) => type_id.clone(), + _ => Id::new(key), + }; + set(f, key, Value::Enumerated { type_id, value }); + }; + set(&mut f, "HrzS", scale("horizontal", 10.0)?); + set(&mut f, "VrtS", scale("vertical", 10.0)?); + set_enum(&mut f, "DspM", choice("fit", &FITS, "stretch")?); + set_enum(&mut f, "UndA", choice("undefinedAreas", &UNDEFINED, "repeat")?); + set(&mut item, "Fltr", Value::Descriptor(f)); + Ok(item) +} + +/// The displacement map embedded in Displace params imported from PSD (`None` when there is +/// none or it is unreadable). The two planes become the first two channels; identical planes +/// (every file seen so far) become one channel, which Displace reads for both directions. +pub fn embedded_map(params: &J) -> Option> { + let item = template(params).ok()?; + let m = fltr_map(&item)?; + let rect = Rect::new(0, 0, i32::try_from(m.width).ok()?, i32::try_from(m.height).ok()?); + let v = |b: u8| f32::from(b) / 255.0; + let (ch, data) = if m.horizontal == m.vertical { + (1, m.horizontal.iter().map(|&b| v(b)).collect()) + } else { + (3, m.horizontal.iter().zip(m.vertical).flat_map(|(&h, &w)| [v(h), v(w), 0.5]).collect()) + }; + Some(Arc::new(Image { rect, ch, data })) +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::smart_map::{UNSUPPORTED_FILTER, filter_from_item, item_for_filter}; + + /// A `tdta` blob: `w`×`h`, horizontal plane `h_of(i)`, vertical `v_of(i)`, then `pad` zeros. + fn tdta(w: u32, h: u32, h_of: impl Fn(usize) -> u8, v_of: impl Fn(usize) -> u8, pad: usize) -> Vec { + let n = (w * h) as usize; + let mut b = Vec::new(); + b.extend(h.to_le_bytes()); + b.extend(w.to_le_bytes()); + b.extend(MODE_TWO_PLANES.to_le_bytes()); + b.extend((0..n).map(h_of)); + b.extend((0..n).map(v_of)); + b.extend(std::iter::repeat_n(0, pad)); + b + } + + /// A `filterFXList` item as Photoshop writes a Displace smart filter. + fn item(map: Vec) -> Descriptor { + let e = |t: &str, v: &str| Value::Enumerated { type_id: Id::new(t), value: Id::new(v) }; + Descriptor::new("filterFX") + .with("Nm ", Value::Text(photocraft_psd::descriptor::UnicodeString::new_nul("Displace..."))) + .with( + "blendOptions", + blend_options(&SmartFilter { + command: String::new(), + params: J::Null, + blend: photocraft_color::BlendMode::Normal, + opacity: 1.0, + visible: true, + }), + ) + .with("enab", Value::Boolean(true)) + .with("hasoptions", Value::Boolean(true)) + .with( + "Fltr", + Value::Descriptor( + Descriptor::new(CLASS) + .with("HrzS", Value::Integer(10)) + .with("VrtS", Value::Integer(10)) + .with("DspM", e("DspM", "StrF")) + .with("UndA", e("UndA", "RptE")) + .with("DspF", Value::Alias(b"Macintosh HD:maps:displace.psd".to_vec())) + .with("EmbF", Value::Boolean(true)) + .with(MAP_KEY, Value::RawData(map)), + ), + ) + .with("filterID", Value::Integer(FILTER_ID)) + } + + #[test] + fn filter_id_is_dspl() { + assert_eq!(FILTER_ID, 1148416108); + } + + #[test] + fn parses_the_observed_layout() { + let b = tdta(3, 2, |i| i as u8, |i| 100 + i as u8, 3); + let m = parse_map(&b).unwrap(); + assert_eq!((m.width, m.height), (3, 2)); + assert_eq!(m.horizontal, &[0, 1, 2, 3, 4, 5]); + assert_eq!(m.vertical, &[100, 101, 102, 103, 104, 105]); + } + + #[test] + fn hostile_maps_are_rejected_without_panicking() { + let good = tdta(4, 4, |i| i as u8, |i| i as u8, 0); + for len in 0..good.len() { + assert!(parse_map(&good[..len]).is_none(), "truncated to {len}"); + } + let header = |h: u32, w: u32, mode: u16| [h.to_le_bytes().as_slice(), &w.to_le_bytes(), &mode.to_le_bytes(), &[0; 64]].concat(); + assert!(parse_map(&header(u32::MAX, u32::MAX, 3)).is_none()); + assert!(parse_map(&header(1 << 16, 1 << 16, 3)).is_none()); + assert!(parse_map(&header(0, 4, 3)).is_none()); + assert!(parse_map(&header(2, 2, 2)).is_none()); + assert!(parse_map(&header(2, 2, 4)).is_none()); + assert!(parse_map(&header(2, 2, 3)).is_some()); + // Every possible short blob, and a few corrupted bytes of a good one. + for seed in 0..512u32 { + let mut b = good.clone(); + let i = (seed as usize * 7) % b.len(); + b[i] = b[i].wrapping_add(seed as u8 | 1); + let _ = parse_map(&b); + let _ = embedded_map(&json!({TEMPLATE_KEY: to_hex(&item(b).to_bytes())})); + } + } + + #[test] + fn displace_items_map_to_the_command_and_round_trip() { + let src = item(tdta(4, 3, |i| (i * 20) as u8, |i| (i * 20) as u8, 4)); + let f = filter_from_item(&src); + assert_eq!(f.command, COMMAND); + assert_eq!( + (f.params["horizontal"].as_f64(), f.params["fit"].as_str(), f.params["undefinedAreas"].as_str()), + (Some(10.0), Some("stretch"), Some("repeat")) + ); + assert_eq!(item_for_filter(&f).unwrap(), src, "unchanged settings write the original item back"); + let map = embedded_map(&f.params).unwrap(); + assert_eq!((map.rect, map.ch), (Rect::new(0, 0, 4, 3), 1)); + assert_eq!(map.data[1], 20.0 / 255.0); + + let mut edited = f.clone(); + edited.params["horizontal"] = json!(-25.4); + edited.params["fit"] = json!("tile"); + edited.params["undefinedAreas"] = json!("wrap"); + edited.opacity = 0.5; + let back = filter_from_item(&item_for_filter(&edited).unwrap()); + assert_eq!(back.command, COMMAND); + assert_eq!( + (back.params["horizontal"].as_f64(), back.params["fit"].as_str(), back.params["undefinedAreas"].as_str()), + (Some(-25.0), Some("tile"), Some("wrap")) + ); + assert_eq!(back.opacity, 0.5); + assert!(embedded_map(&back.params).is_some(), "the map survives"); + } + + #[test] + fn different_planes_drive_each_direction() { + let f = filter_from_item(&item(tdta(2, 1, |_| 255, |_| 0, 0))); + let map = embedded_map(&f.params).unwrap(); + assert_eq!(map.ch, 3); + assert_eq!(&map.data[..3], &[1.0, 0.0, 0.5]); + } + + #[test] + fn unreadable_displace_filters_stay_opaque() { + let only_alias = { + let mut i = item(Vec::new()); + let mut f = get_desc(&i, "Fltr").unwrap().clone(); + f.items.retain(|(k, _)| !k.is(MAP_KEY)); + set(&mut i, "Fltr", Value::Descriptor(f)); + i + }; + let mut bad_enum = item(tdta(2, 2, |_| 0, |_| 0, 0)); + let mut f = get_desc(&bad_enum, "Fltr").unwrap().clone(); + set(&mut f, "DspM", Value::Enumerated { type_id: Id::new("DspM"), value: Id::new("Huh?") }); + set(&mut bad_enum, "Fltr", Value::Descriptor(f)); + let wrong_mode = item([tdta(2, 2, |_| 0, |_| 0, 0)[..8].to_vec(), 1u16.to_le_bytes().to_vec(), vec![0; 8]].concat()); + for src in [only_alias, bad_enum, wrong_mode, item(vec![1, 2, 3])] { + let f = filter_from_item(&src); + assert_eq!(f.command, UNSUPPORTED_FILTER); + assert_eq!(item_for_filter(&f).unwrap(), src); + } + } + + #[test] + fn bad_exports_report_errors() { + let ok = filter_from_item(&item(tdta(2, 2, |_| 0, |_| 0, 0))).params; + let with = |k: &str, v: J| { + let mut p = ok.clone(); + p[k] = v; + p + }; + for p in [ + J::Null, + json!({"horizontal": 10}), + json!({TEMPLATE_KEY: "zz"}), + json!({TEMPLATE_KEY: 12}), + json!({TEMPLATE_KEY: to_hex(&Descriptor::new("filterFX").with("filterID", Value::Integer(FILTER_ID)).to_bytes())}), + with("horizontal", json!("big")), + with("fit", json!("squash")), + with("mapPath", json!("/tmp/map.psd")), + ] { + assert!(export_item(&p).is_err(), "{p}"); + } + assert!(embedded_map(&json!({TEMPLATE_KEY: "0".repeat(MAX_TEMPLATE_BYTES * 2 + 2)})).is_none()); + } +} diff --git a/crates/io/src/smart_map.rs b/crates/io/src/smart_map.rs index 2a7cc5c5..ab9349fb 100644 --- a/crates/io/src/smart_map.rs +++ b/crates/io/src/smart_map.rs @@ -18,6 +18,9 @@ //! to their command id and dialog parameters; any other filter becomes a //! [`UNSUPPORTED_FILTER`] entry that keeps its descriptor verbatim (hex in `params.psd`), so it is //! listed, can be hidden, reordered or deleted, and is written back unchanged. +//! +//! Camera Raw and Displace keep their whole item as a template next to the editable settings +//! (Displace's carries the embedded displacement map, see `displace_map.rs`). use photocraft_color::{BlendMode, ColorMode, PixelFormat, SampleType}; use photocraft_doc::{LayerMask, SmartFilter}; @@ -34,6 +37,10 @@ use crate::blocks::{enum_of, get_desc, num}; #[path = "camera_raw_map.rs"] mod camera_raw; +#[path = "displace_map.rs"] +mod displace; + +pub use displace::embedded_map as displace_embedded_map; /// Command id of a Photoshop smart filter PhotoCraft does not implement. Its params hold the /// filter's name, Photoshop filter id and descriptor (`psd`, hex); it renders as a pass-through. @@ -312,10 +319,10 @@ pub fn filter_from_item(item: &Descriptor) -> SmartFilter { let class = fltr.map(|f| String::from_utf8_lossy(f.class_id.as_bytes()).into_owned()); let filter_id = int(item, "filterID").unwrap_or(0); let class = class.or_else(|| KNOWN.iter().find(|k| k.filter_id == filter_id).map(|k| k.class.to_string())); - let known = if class.as_deref() == Some(camera_raw::CLASS) { - camera_raw::import_params(item).map(|p| (camera_raw::COMMAND, p)) - } else { - class.as_deref().and_then(|c| known_params(c, fltr)) + let known = match class.as_deref() { + Some(camera_raw::CLASS) => camera_raw::import_params(item).map(|p| (camera_raw::COMMAND, p)), + Some(displace::CLASS) => displace::import_params(item).map(|p| (displace::COMMAND, p)), + c => c.and_then(|c| known_params(c, fltr)), }; let (command, params) = match known { Some((c, p)) => (c.to_string(), p), @@ -460,6 +467,12 @@ pub fn item_for_filter(f: &SmartFilter) -> Result { set(&mut d, "enab", Value::Boolean(f.visible)); return Ok(d); } + if f.command == displace::COMMAND { + let mut d = displace::export_item(&f.params)?; + set(&mut d, "blendOptions", blend_options(f)); + set(&mut d, "enab", Value::Boolean(f.visible)); + return Ok(d); + } if f.command == UNSUPPORTED_FILTER { let raw = f.params.get("psd").and_then(J::as_str).and_then(from_hex).ok_or("its filter data is missing")?; let mut d = Descriptor::from_bytes(&raw).map_err(|e| format!("its filter data is unreadable ({e})"))?; From 304720b1a088cfeee4164cd482b1416008c20ef1 Mon Sep 17 00:00:00 2001 From: Arthur Wagner <97618574+arthurdeka@users.noreply.github.com> Date: Mon, 12 Oct 2026 07:30:14 -0300 Subject: [PATCH 24/92] Gradient Map: edit color stops on the ramp (#3982) * Gradient Map: edit color stops on the ramp (#2958) * Gradient Map: keep stop removal scoped to the editor * Gradient Map: fit selected stop controls in narrow Properties panels --------- Co-authored-by: Brandon Thomas Co-authored-by: Claude Opus 5.5 --- contributors/people.toml | 3 + crates/ui-egui/src/adjust_dialog.rs | 31 +++++ crates/ui-egui/src/adjust_editors.rs | 152 +++++++++++++++++---- crates/ui-egui/src/adjust_editors_tests.rs | 134 ++++++++++++++++++ 4 files changed, 294 insertions(+), 26 deletions(-) diff --git a/contributors/people.toml b/contributors/people.toml index e182a211..37220e0e 100644 --- a/contributors/people.toml +++ b/contributors/people.toml @@ -117,3 +117,6 @@ sync_github_name = true [people.FredApps] sync_github_name = true + +[people.arthurdeka] +sync_github_name = true diff --git a/crates/ui-egui/src/adjust_dialog.rs b/crates/ui-egui/src/adjust_dialog.rs index 71392662..7c978353 100644 --- a/crates/ui-egui/src/adjust_dialog.rs +++ b/crates/ui-egui/src/adjust_dialog.rs @@ -437,6 +437,37 @@ mod tests { assert!(std::sync::Arc::ptr_eq(&before, &after)); assert!(harness.state().ui.dialogs.is_empty()); } + + #[test] + fn gradient_map_dialog_handles_preview_without_committing_until_ok() { + use egui_kittest::kittest::Queryable; + let mut h = Harness::builder().with_size(egui::vec2(1200.0, 900.0)).build_ui_state(|ui, app| crate::dialogs::show(app, ui.ctx()), app_with_image()); + PhotocraftApp::setup_context(&h.ctx, Default::default()); + let id = open(h.state_mut(), "image.adjustments.gradientMap").unwrap(); + h.run_steps(4); + let doc = h.state().session.active().unwrap().doc.clone(); + let steps = h.state().session.active().unwrap().history.past_len(); + let strip = h.get_by_label("Gradient stops").rect(); + let start = egui::pos2(strip.left() + 8.0, strip.top() + 36.0); + let to = start + egui::vec2((strip.width() - 16.0) * 0.3, 0.0); + h.hover_at(start); + h.run_steps(1); + h.drag_at(start); + h.run_steps(1); + h.hover_at(to); + h.run_steps(1); + h.drop_at(to); + h.run_steps(3); + let stops = h.state().ui.dialogs[0].fields["stops"].as_array().unwrap(); + assert!((stops[0][0].as_f64().unwrap() - 0.3).abs() < 0.001); + assert!(std::sync::Arc::ptr_eq(&doc, &h.state().session.active().unwrap().doc), "dialog edits are previews"); + assert_eq!(h.state().session.active().unwrap().history.past_len(), steps); + crate::dialogs::confirm(h.state_mut(), id).unwrap(); + h.run_steps(2); + assert_eq!(h.state().session.active().unwrap().history.past_len(), steps + 1); + h.state_mut().run("edit.undo", json!({})).unwrap(); + assert_eq!(*h.state().session.active().unwrap().doc, *doc); + } #[test] fn curves_pencil_drag_draws_the_map_and_confirm_applies_it() { let mut h = Harness::builder().with_size(egui::vec2(1200.0, 900.0)).build_ui_state(|ui, app| crate::dialogs::show(app, ui.ctx()), app_with_image()); diff --git a/crates/ui-egui/src/adjust_editors.rs b/crates/ui-egui/src/adjust_editors.rs index a939d20e..4d25d822 100644 --- a/crates/ui-egui/src/adjust_editors.rs +++ b/crates/ui-egui/src/adjust_editors.rs @@ -1244,10 +1244,108 @@ fn sample_stops(s: &[Stop], t: f32) -> [f32; 3] { sorted.last().map_or([t; 3], |l| l.1) } +#[derive(Clone, Copy)] +struct MapStopDrag { + index: usize, + offset: f32, + changed: bool, +} + +/// Keep selection on the same stop when it crosses another stop (including coincident stops). +fn move_map_stop(stops: &mut [Stop], index: usize, location: f32) -> Option { + let stop = stops.get_mut(index)?; + stop.0 = round(location.clamp(0.0, 1.0), 0.001); + let location = stop.0; + let rank = stops.iter().enumerate().filter(|(i, s)| *i != index && (s.0 < location || (s.0 == location && *i < index))).count(); + stops.sort_by(|a, b| a.0.total_cmp(&b.0)); + Some(rank) +} + +fn gradient_map_strip(ui: &mut egui::Ui, stops: &mut Vec, cx: &EditorCx, selected: &mut usize) -> Edit { + let t = Tokens::get(ui.ctx()); + let key = cx.mem.with("gm-stop-drag"); + let mut edit = Edit::default(); + let w = ui.available_width().min(300.0); + let (outer, resp) = ui.allocate_exact_size(vec2(w, 44.0), Sense::click_and_drag()); + resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, ui.is_enabled(), tl!("Gradient stops"))); + let bar = Rect::from_min_max(outer.min + vec2(8.0, 2.0), pos2(outer.right() - 8.0, outer.top() + 26.0)); + let x_of = |loc: f32| bar.left() + loc * bar.width(); + let loc_of = |x: f32| ((x - bar.left()) / bar.width().max(1.0)).clamp(0.0, 1.0); + let hit = + |pos: Pos2, stops: &[Stop]| stops.iter().enumerate().rev().find(|(_, s)| pos.y >= bar.bottom() && (x_of(s.0) - pos.x).abs() <= 6.0).map(|(i, _)| i); + if resp.drag_started() + && let Some(pos) = ui.input(|i| i.pointer.press_origin()) + && let Some(index) = hit(pos, stops) + { + *selected = index; + let offset = stops.get(index).map_or(0.0, |s| pos.x - x_of(s.0)); + ui.data_mut(|d| d.insert_temp(key, MapStopDrag { index, offset, changed: false })); + } + if let Some(mut drag) = ui.data(|d| d.get_temp::(key)) { + if (resp.dragged() || resp.drag_stopped()) + && let Some(pos) = resp.interact_pointer_pos() + { + let location = round(loc_of(pos.x - drag.offset), 0.001); + let changed = stops.get(drag.index).is_some_and(|s| s.0 != location); + if let Some(index) = move_map_stop(stops, drag.index, location) { + drag.index = index; + drag.changed |= changed; + *selected = index; + edit.changed |= changed; + } + } + if resp.drag_stopped() { + edit.commit = drag.changed; + ui.data_mut(|d| d.remove::(key)); + } else if ui.input(|i| i.pointer.primary_down()) { + ui.data_mut(|d| d.insert_temp(key, drag)); + } else { + ui.data_mut(|d| d.remove::(key)); + } + } + if resp.clicked() + && let Some(pos) = resp.interact_pointer_pos() + { + resp.request_focus(); + if let Some(index) = hit(pos, stops) { + *selected = index; + } else if stops.len() < 64 { + let at = round(loc_of(pos.x), 0.001); + let color = sample_stops(stops, at); + stops.push((at, color)); + let index = stops.len() - 1; + *selected = move_map_stop(stops, index, at).unwrap_or(0); + edit.add(Edit::discrete(true)); + } + } + if resp.hovered() && ui.input(|i| i.pointer.hover_pos()).is_some_and(|pos| hit(pos, stops).is_some()) || resp.dragged() { + ui.ctx().set_cursor_icon(egui::CursorIcon::ResizeHorizontal); + } + // Markers address un-reversed locations, as in the Gradient Tool; Reverse changes the image. + let cols: Vec = (0..=48).map(|i| color32(sample_stops(stops, i as f32 / 48.0))).collect(); + spectrum_bar(ui.painter(), bar, &cols); + ui.painter().rect_stroke(bar, 0.0, Stroke::new(1.0, t.field_border), StrokeKind::Outside); + for (i, (at, color)) in stops.iter().enumerate() { + let x = x_of(*at); + let border = if i == *selected { t.accent } else { t.text_dim }; + let body = Rect::from_center_size(pos2(x, bar.bottom() + 10.0), vec2(10.0, 10.0)); + ui.painter().add(egui::Shape::convex_polygon( + vec![pos2(x, bar.bottom() + 1.0), pos2(x + 5.0, body.top()), pos2(x - 5.0, body.top())], + border, + Stroke::NONE, + )); + ui.painter().rect_filled(body, 1.0, color32(*color)); + ui.painter().rect_stroke(body, 1.0, Stroke::new(1.0, border), StrokeKind::Outside); + } + edit +} + fn gradient_map(ui: &mut egui::Ui, v: &mut Value, cx: &EditorCx) -> Edit { let t = Tokens::get(ui.ctx()); let mut e = Edit::default(); let mut stops = read_stops(v); + let selection = cx.mem.with("gm-stop-selection"); + let mut selected = ui.data(|d| d.get_temp::(selection)).unwrap_or(0).min(stops.len().saturating_sub(1)); // Photoshop's gradient picker: the same library as the Gradient tool and Gradients panel // (built-in groups and the user's own), Foreground/Background resolved to the current colours. let [fg, bg] = cx.swatches.map(|c| [c[0], c[1], c[2], 1.0]); @@ -1257,7 +1355,7 @@ fn gradient_map(ui: &mut egui::Ui, v: &mut Value, cx: &EditorCx) -> Edit { let (press, close) = crate::press_menu::PressCombo::before(ui, cx.mem.with("gm-preset")); let combo = egui::ComboBox::from_id_salt(cx.mem.with("gm-preset")) .selected_text(tl!("Custom")) - .width(190.0) + .width(ui.available_width().min(190.0)) .height(420.0) .icon(widgets::chevron_icon) .close_behavior(close) @@ -1282,47 +1380,46 @@ fn gradient_map(ui: &mut egui::Ui, v: &mut Value, cx: &EditorCx) -> Edit { press.after(&combo.response); if let Some(p) = picked { stops = p; + selected = 0; + ui.data_mut(|d| d.remove::(cx.mem.with("gm-stop-drag"))); write_stops(v, &stops); e.add(Edit::discrete(true)); } }); - // The gradient. - let w = ui.available_width().min(300.0); - let (r, _) = ui.allocate_exact_size(vec2(w, 22.0), Sense::hover()); - let reverse = flag(v, "reverse", false); - let cols: Vec = (0..=48) - .map(|i| { - let x = i as f32 / 48.0; - color32(sample_stops(&stops, if reverse { 1.0 - x } else { x })) - }) - .collect(); - spectrum_bar(ui.painter(), r, &cols); - ui.painter().rect_stroke(r, 0.0, Stroke::new(1.0, t.field_border), StrokeKind::Outside); - ui.add_space(4.0); - // Stops: colour, location, remove. - let mut remove = None; - let mut changed = false; - for (i, s) in stops.iter_mut().enumerate() { + let strip = gradient_map_strip(ui, &mut stops, cx, &mut selected); + let mut changed = strip.changed; + e.add(strip); + // The selected stop's colour and location, like the Gradient Tool's compact stop editor. + let mut location = None; + let mut remove = false; + let can_remove = stops.len() > 2; + if let Some(s) = stops.get_mut(selected) { ui.horizontal(|ui| { + label(ui, tl!("Color:")); let r = color_button(ui, &mut s.1); changed |= r.changed; e.add(r); + ui.add_enabled_ui(can_remove, |ui| { + remove = crate::icons::button(ui, "x", 20.0, false, tl!("Remove stop")).clicked(); + }); + }); + ui.horizontal(|ui| { + label(ui, tl!("Location:")); let mut loc = s.0 * 100.0; let rl = widgets::value_field(ui, &mut loc, 0.0..=100.0, "%", 70.0); if rl.changed() { - s.0 = (loc / 100.0).clamp(0.0, 1.0); + location = Some(loc / 100.0); changed = true; } e.add(Edit::of(&rl)); - if crate::icons::button(ui, "x", 20.0, false, tl!("Remove stop")).clicked() { - remove = Some(i); - } }); } - if let Some(i) = remove - && stops.len() > 2 - { - stops.remove(i); + if let Some(loc) = location { + selected = move_map_stop(&mut stops, selected, loc).unwrap_or(0); + } + if remove && can_remove { + stops.remove(selected); + selected = selected.min(stops.len() - 1); changed = true; e.add(Edit::discrete(true)); } @@ -1332,6 +1429,8 @@ fn gradient_map(ui: &mut egui::Ui, v: &mut Value, cx: &EditorCx) -> Edit { sorted.sort_by(|a, b| a.0.total_cmp(&b.0)); let at = sorted.windows(2).max_by(|a, b| (a[1].0 - a[0].0).total_cmp(&(b[1].0 - b[0].0))).map_or(0.5, |w| (w[0].0 + w[1].0) / 2.0); stops.push((at, sample_stops(&stops, at))); + let index = stops.len() - 1; + selected = move_map_stop(&mut stops, index, at).unwrap_or(0); changed = true; e.add(Edit::discrete(true)); } @@ -1339,6 +1438,7 @@ fn gradient_map(ui: &mut egui::Ui, v: &mut Value, cx: &EditorCx) -> Edit { write_stops(v, &stops); e.changed = true; } + ui.data_mut(|d| d.insert_temp(selection, selected)); ui.horizontal(|ui| { for (key, text) in [("reverse", tl!("Reverse")), ("dither", tl!("Dither"))] { let mut b = flag(v, key, false); diff --git a/crates/ui-egui/src/adjust_editors_tests.rs b/crates/ui-egui/src/adjust_editors_tests.rs index 3a591c43..478b2de6 100644 --- a/crates/ui-egui/src/adjust_editors_tests.rs +++ b/crates/ui-egui/src/adjust_editors_tests.rs @@ -449,6 +449,140 @@ fn map_stops(a: &Adjustment) -> Vec<(f32, [u8; 3])> { } } +fn map_handle(h: &Harness<'_, PhotocraftApp>, at: f32) -> Pos2 { + let strip = h.get_by_label("Gradient stops").rect(); + Pos2::new(strip.left() + 8.0 + at * (strip.width() - 16.0), strip.top() + 36.0) +} + +#[test] +fn gradient_map_handle_drag_previews_and_commits_once_after_crossing_stops() { + for depth in [8, 16, 32] { + let mut h = app_harness("gradientMap", "rgb", depth); + let (id, _) = layer(&h); + h.state_mut() + .run( + "layer.setAdjustment", + json!({ + "layer": id.0, "stops": [[0, "#000000"], [0.25, "#ff0000"], [0.5, "#00ff00"], [1, "#ffffff"]] + }), + ) + .unwrap(); + h.run_steps(3); + let before = layer(&h).1; + let steps = h.state().session.active().unwrap().history.past_len(); + let start = map_handle(&h, 0.25); + h.hover_at(start); + h.run_steps(1); + h.drag_at(start); + h.run_steps(1); + for location in [0.4, 0.5, 0.6, 0.75] { + let to = map_handle(&h, location); + h.hover_at(to); + h.run_steps(1); + assert!(h.state().live_adjust.is_some(), "{depth}: live preview"); + assert_eq!(h.state().session.active().unwrap().history.past_len(), steps, "{depth}: dragging records no history"); + } + let end = map_handle(&h, 0.8); + h.drop_at(end); + h.run_steps(3); + assert_eq!(map_stops(&layer(&h).1), vec![(0.0, [0, 0, 0]), (0.5, [0, 255, 0]), (0.8, [255, 0, 0]), (1.0, [255, 255, 255])]); + assert_eq!(h.ctx.data(|d| d.get_temp::(crate::adjust_editors::layer_mem(id).with("gm-stop-selection"))), Some(2)); + assert!(h.state().live_adjust.is_none()); + assert_eq!(h.state().session.active().unwrap().history.past_len(), steps + 1); + let after = layer(&h).1; + h.state_mut().run("edit.undo", json!({})).unwrap(); + h.run_steps(3); + assert_eq!(layer(&h).1, before); + h.state_mut().run("edit.redo", json!({})).unwrap(); + h.run_steps(3); + assert_eq!(layer(&h).1, after); + } +} + +#[test] +fn gradient_map_strip_adds_selects_and_removes_stops_without_deleting_the_last_pair() { + let mut h = app_harness("gradientMap", "rgb", 8); + let (id, original) = layer(&h); + let steps = h.state().session.active().unwrap().history.past_len(); + let middle = map_handle(&h, 0.5); + click(&mut h, middle); + let added = map_stops(&layer(&h).1); + assert_eq!(added.len(), 3); + assert!((added[1].0 - 0.5).abs() < 0.001); + assert_eq!(added[1].1, [128, 128, 128]); + assert_eq!(h.state().session.active().unwrap().history.past_len(), steps + 1); + let first = map_handle(&h, 0.0); + click(&mut h, first); + assert_eq!(h.ctx.data(|d| d.get_temp::(crate::adjust_editors::layer_mem(id).with("gm-stop-selection"))), Some(0)); + assert_eq!(h.state().session.active().unwrap().history.past_len(), steps + 1, "selection is view state"); + click(&mut h, middle); + let remove = h.get_by_label("Remove stop").rect().center(); + click(&mut h, remove); + assert_eq!(layer(&h).1, original); + assert_eq!(h.state().session.active().unwrap().history.past_len(), steps + 2); + let first = map_handle(&h, 0.0); + click(&mut h, first); + let remove = h.get_by_label("Remove stop").rect().center(); + click(&mut h, remove); + assert_eq!(layer(&h).1, original, "keep two stops"); +} + +#[test] +fn gradient_map_drag_clamps_at_the_endpoints_and_reverse_keeps_stop_coordinates() { + let mut h = app_harness("gradientMap", "rgb", 8); + let reverse = label_rect(&h, "Reverse").unwrap().center(); + click(&mut h, reverse); + let first = map_handle(&h, 0.0); + let target = map_handle(&h, 0.3); + drag(&mut h, first, target); + assert!((map_stops(&layer(&h).1)[0].0 - 0.3).abs() < 0.001); + let target = map_handle(&h, 0.3); + drag(&mut h, target, first - vec2(60.0, 0.0)); + assert_eq!(map_stops(&layer(&h).1)[0].0, 0.0); + let last = map_handle(&h, 1.0); + let beyond = last + vec2(60.0, 0.0); + let before = layer(&h).1; + let steps = h.state().session.active().unwrap().history.past_len(); + drag(&mut h, last, beyond); + assert_eq!(layer(&h).1, before); + assert_eq!(h.state().session.active().unwrap().history.past_len(), steps, "a clamped no-op makes no history"); +} + +#[test] +fn gradient_map_stop_controls_fit_a_narrow_properties_panel_in_every_theme() { + use crate::adjust_editors::{EditorCx, editor}; + for kind in crate::theme::ThemeKind::ALL { + for width in [240.0, 280.0] { + let mut h = Harness::builder().with_size(vec2(width, 360.0)).build_ui_state( + |ui, values: &mut serde_json::Value| { + if !ui.ctx().fonts(|f| f.families().contains(&egui::FontFamily::Name("medium".into()))) { + return; + } + let cx = EditorCx { + mem: egui::Id::new("map-layout"), + hist: None, + gray: false, + swatches: [[0.0; 3], [1.0; 3]], + gradients: Vec::new(), + dialog: false, + dynamic_color_sliders: true, + }; + editor(ui, "gradientMap", values, &cx); + }, + json!({"stops": [[0, "#000000"], [1, "#ffffff"]]}), + ); + PhotocraftApp::setup_context(&h.ctx, kind); + h.run_steps(4); + for role in [egui::accesskit::Role::Button, egui::accesskit::Role::ComboBox, egui::accesskit::Role::SpinButton] { + for control in h.query_all_by_role(role) { + let r = control.rect(); + assert!(r.left() >= 0.0 && r.right() <= width && r.width() >= 8.0, "{kind:?} width {width}: {role:?} {r:?}"); + } + } + } + } +} + /// Issue #1588: the Gradient Map preset picker offers the session's gradient library (built-in /// groups beyond Basics and the user's own saved gradients), and picking one writes its stops as /// one history step. From e4298f554be7fe0a20b9754dc3e8383fa44a33d2 Mon Sep 17 00:00:00 2001 From: kayrockscreenprinting Date: Mon, 12 Oct 2026 03:37:15 -0700 Subject: [PATCH 25/92] Free Transform: a layer's style shows while the box is open, drawn from the transformed layer (#3653) (#3696) * Free Transform: layer styles render with the transformed layer (#3653), work in progress Co-Authored-By: Claude Opus 5.5 * Free Transform: a layer's style shows while the box is open, drawn from the transformed layer (#3653) The live preview drew the moving pixels as a bare texture on a mesh, so Stroke, Drop Shadow and every other effect vanished while the box was open (and for type, shapes, groups and smart objects the style was baked into the texture, cut off at the layer's bounds and stretched with the box). A styled layer is now composited for the preview: the moving texels are resampled through the box and the style is laid over them by the CPU compositor's composite_with_effects, the code that draws the layer once the transform is applied. A stroke keeps its width when the box is enlarged and a shadow keeps its direction when it is turned, as after the commit. The composite is made at screen resolution (never finer than the document), with the style's sizes scaled to match, within a pixel budget from a measured cost per effect: about 30 ms per rebuild while dragging and 120 ms at rest. It is rebuilt only when the box, the zoom or the layer changes. Still plain: the selected part of a styled layer, and Warp mode. Co-Authored-By: Claude Opus 5.5 * Merge fix: Warp on type reads the texels as the session did (bare when the box draws the style) Co-Authored-By: Claude Opus 5.5 * Format the type warp texel read Co-Authored-By: Claude Opus 5.5 * Free Transform: Content-Aware Scale's preview has no styled composite Main added a TransformPreview initializer for Content-Aware Scale (#3103) after this branch started; give it the new field so the merge builds. Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 Co-authored-by: Brandon Thomas --- crates/engine/src/image_cmds.rs | 4 +- crates/ui-egui/src/lib.rs | 4 + crates/ui-egui/src/transform_fx.rs | 693 +++++++++++++++++++++ crates/ui-egui/src/transform_fx_tests.rs | 277 ++++++++ crates/ui-egui/src/transform_tex.rs | 2 +- crates/ui-egui/src/transform_tool.rs | 64 +- crates/ui-egui/src/transform_undo_tests.rs | 6 +- 7 files changed, 1039 insertions(+), 11 deletions(-) create mode 100644 crates/ui-egui/src/transform_fx.rs create mode 100644 crates/ui-egui/src/transform_fx_tests.rs diff --git a/crates/engine/src/image_cmds.rs b/crates/engine/src/image_cmds.rs index 93a9990b..f477bd22 100644 --- a/crates/engine/src/image_cmds.rs +++ b/crates/engine/src/image_cmds.rs @@ -99,7 +99,9 @@ pub(crate) fn reidentify_copied_layers(doc: &mut Document) { } } -pub(crate) fn scale_effects(fx: &mut Effects, k: f32) { +/// Scale every size and distance of a style by `k` (Image Size's Scale Styles, Layer Style › +/// Scale Effects, and previews that draw a style at a reduced resolution). +pub fn scale_effects(fx: &mut Effects, k: f32) { for e in &mut fx.items { match e { Effect::DropShadow(s) | Effect::InnerShadow(s) => { diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs index 4dcc7256..1115b949 100644 --- a/crates/ui-egui/src/lib.rs +++ b/crates/ui-egui/src/lib.rs @@ -193,6 +193,7 @@ mod tool_cursor; pub mod tool_feedback; pub(crate) mod tool_memory; mod tool_reset; +pub mod transform_fx; pub mod transform_tex; pub mod transform_tool; mod type_font_preview; @@ -2270,6 +2271,9 @@ mod pencil_tests; #[cfg(test)] mod pixel_aspect_tests; +#[cfg(test)] +mod transform_fx_tests; + #[cfg(test)] mod transform_undo_tests; diff --git a/crates/ui-egui/src/transform_fx.rs b/crates/ui-egui/src/transform_fx.rs new file mode 100644 index 00000000..3b56225e --- /dev/null +++ b/crates/ui-egui/src/transform_fx.rs @@ -0,0 +1,693 @@ +//! Layer styles in the Free Transform live preview (#3653). +//! +//! The box previews the moving pixels as a texture on a mesh (transform_tex.rs), which leaves +//! the layer's style out: Stroke, Drop Shadow and the rest vanished while the box was open. +//! Baking the style into that texture would go wrong as soon as the box scales or turns, because +//! a style isn't transformed with its layer: it is drawn again from the layer's new shape (a +//! stroke keeps its width, a shadow its angle and distance). So a styled layer is composited +//! here instead. The moving texels are resampled through the box, the style is laid over them by +//! the CPU compositor's `composite_with_effects` (the code that draws the layer once the +//! transform is applied), and the result is drawn in place of the mesh. +//! +//! The work follows the screen, not the document: the composite is made at the resolution it is +//! shown at (never finer than the document), with the style's sizes scaled to match, and within +//! a pixel [`budget`] that keeps a rebuild near [`DRAG_MS`] while the pointer is down and near +//! [`REST_MS`] once the box rests. Past the budget the resolution drops instead of the frame +//! rate, and comes back when the pointer is released. It is rebuilt only when the box, the zoom +//! or the layer changes. +//! +//! The composite is drawn over transparency with Normal blending, like the mesh it replaces: a +//! layer's or an effect's blend mode shows against the layers under it only after the commit. + +use std::sync::{Arc, Mutex, PoisonError}; + +use egui::{Color32, ColorImage, TextureHandle, TextureId, TextureOptions}; +use photocraft_algo::transform::Homography; +use photocraft_color::{BlendMode, PixelFormat}; +use photocraft_compose::Buffer; +use photocraft_compose::effects::{self, TextureCtx}; +use photocraft_doc::{Document, Effect, Layer, LayerContent}; +use photocraft_geom::Rect; +use photocraft_raster::Surface; + +use crate::transform_tex::PreviewTextures; + +/// What a rebuild should take while the pointer is down (a drag rebuilds every frame), in +/// milliseconds on the machine [`pixel_cost_ns`] was measured on. +pub const DRAG_MS: f64 = 30.0; +/// What a rebuild should take once the box rests. +pub const REST_MS: f64 = 120.0; +/// The fewest work pixels a budget asks for, however costly the style. +pub const MIN_PIXELS: f64 = 0.25e6; +/// The most work pixels in a composite, whatever was asked for. +pub const MAX_PIXELS: f64 = 8.0e6; +/// Work coordinates stay within this, so rectangle arithmetic on them cannot overflow. +const COORD_LIMIT: f64 = 5.0e8; +/// At this many screen pixels per document pixel the composite is shown with crisp texels, +/// like the canvas around it. +const CRISP_ZOOM: f32 = 2.0; + +/// Where and how finely a styled preview is composited. Rectangles are in work pixels: document +/// pixels times `scale`. +#[derive(Clone, Copy, Debug, PartialEq)] +pub struct Plan { + /// Work pixels per document pixel, at most 1. + pub scale: f64, + /// The box: the layer's bounds after the transform. + pub bounds: Rect, + /// What is composited and drawn: the bounds grown by the style's reach, inside the canvas. + pub shown: Rect, + /// The moving texels resampled for it: `shown` grown by twice the reach, so every effect + /// over `shown` sees all of the shape it depends on, also past the canvas edge. + pub content: Rect, +} + +impl Plan { + /// `shown` in document pixels: where the composite is drawn. + pub fn doc_rect(&self) -> [f32; 4] { + let k = 1.0 / self.scale; + [self.shown.x0, self.shown.y0, self.shown.x1, self.shown.y1].map(|v| (f64::from(v) * k) as f32) + } +} + +/// Rough cost of compositing one work pixel with `layer`'s style, in nanoseconds: measured per +/// effect at default settings on an Apple M3 Pro, release build. A Stroke costs the most by far +/// (two chamfer distance fields over the whole composite, 46 ns whatever its width); shadows and +/// glows build one blurred map (5 to 7 ns), Satin and Bevel & Emboss a little more (8 to 14 ns) +/// and overlays next to nothing. Resampling, laying the style on and the upload add about 12 ns. +pub fn pixel_cost_ns(layer: &Layer) -> f64 { + let enabled = || layer.effects.items.iter().filter(|e| e.enabled()); + let maps: f64 = enabled() + .map(|e| match e { + Effect::Stroke(_) | Effect::ColorOverlay { .. } | Effect::GradientOverlay { .. } | Effect::PatternOverlay { .. } => 1.0, + Effect::Satin(_) | Effect::BevelEmboss(_) => 12.0, + Effect::DropShadow(_) | Effect::InnerShadow(_) | Effect::OuterGlow(_) | Effect::InnerGlow(_) => 6.0, + }) + .sum(); + // Every Stroke reads the same two distance fields. + let fields = if enabled().any(|e| matches!(e, Effect::Stroke(_))) { 46.0 } else { 0.0 }; + 12.0 + maps + fields +} + +/// Work pixels a composite of `layer` may have: what fits in [`DRAG_MS`] while the pointer is +/// down and in [`REST_MS`] once the box rests. +pub fn budget(layer: &Layer, dragging: bool) -> f64 { + let ms = if dragging { DRAG_MS } else { REST_MS }; + (ms * 1.0e6 / pixel_cost_ns(layer)).clamp(MIN_PIXELS, MAX_PIXELS) +} + +/// The moving layer as the compositor styles it at `scale`: its style at that scale with its +/// opacity, fill and Advanced Blending, over plain pixels (the texels are rendered already, with +/// the masks applied). +pub fn work_layer(layer: &Layer, scale: f64) -> Layer { + let mut l = layer.clone(); + l.content = LayerContent::Raster(Surface::new(PixelFormat::RGBA8)); + l.mask = None; + l.vector_mask = None; + l.fill_cache = None; + l.blend = BlendMode::Normal; + photocraft_engine::image_cmds::scale_effects(&mut l.effects, scale as f32); + l.effects.reference = l.effects.reference.map(|(x, y)| (x * scale, y * scale)); + l +} + +/// Plan the composite of `layer` moved onto `quad` (document pixels, clockwise from top-left) in +/// a document of `canvas` pixels, shown at `zoom` screen pixels per document pixel, within +/// `budget` work pixels. `None` when nothing of it is on the canvas or the box isn't finite. +pub fn plan(layer: &Layer, canvas: [u32; 2], quad: [[f64; 2]; 4], zoom: f32, budget: f64) -> Option<(Plan, Layer)> { + if quad.iter().flatten().any(|v| !v.is_finite()) { + return None; + } + let (min, max) = quad.iter().fold(([f64::MAX; 2], [f64::MIN; 2]), |(lo, hi), q| ([lo[0].min(q[0]), lo[1].min(q[1])], [hi[0].max(q[0]), hi[1].max(q[1])])); + let budget = if budget.is_finite() { budget.clamp(1.0, MAX_PIXELS) } else { MIN_PIXELS }; + let mut scale = if zoom.is_finite() && zoom > 0.0 { f64::from(zoom).min(1.0) } else { 1.0 }; + // The reach of the style is in work pixels too, so the area isn't simply the scale squared: + // shrink until it fits (a few rounds settle it). + for round in 0..6 { + let work = work_layer(layer, scale); + let reach = effects::margin(&work); + let edge = |v: f64, up: bool| { + let v = (v * scale).clamp(-COORD_LIMIT, COORD_LIMIT); + (if up { v.ceil() } else { v.floor() }) as i32 + }; + let bounds = Rect::new(edge(min[0], false), edge(min[1], false), edge(max[0], true), edge(max[1], true)); + let canvas = Rect::new(0, 0, edge(f64::from(canvas[0]), true), edge(f64::from(canvas[1]), true)); + let shown = bounds.inflate(reach).intersect(&canvas); + if bounds.is_empty() || shown.is_empty() { + return None; + } + let content = shown.inflate(2 * reach); + let area = f64::from(content.width()) * f64::from(content.height()); + if area <= budget { + return Some((Plan { scale, bounds, shown, content }, work)); + } + if round == 5 { + break; + } + scale *= (budget / area).sqrt() * 0.98; + if !(scale.is_finite() && scale > 0.0) { + return None; + } + } + None +} + +/// One row of `out` per `y`, in parallel on native targets. +fn rows(out: &mut [T], width: usize, y0: i32, row: impl Fn(i32, &mut [T]) + Sync) { + bands(out, width, |i, o| row(y0.saturating_add(i as i32), o)); +} + +/// The moving texels (`image`, premultiplied, of which `uv` covers the box's source rectangle) +/// drawn over `rect` as straight-alpha floats. `to_unit` takes a work pixel to the unit square +/// of the source rectangle, and `inside` is a work point within the box. The edges of the +/// rectangle fade over one texel, as a resampled layer's do; `nearest` keeps texels whole. +pub fn resample(image: &ColorImage, uv: [f32; 2], to_unit: &Homography, inside: [f64; 2], rect: Rect, nearest: bool) -> Buffer { + let mut out = Buffer::transparent(rect); + let [iw, ih] = image.size; + let (tw, th) = (f64::from(uv[0]) * iw as f64, f64::from(uv[1]) * ih as f64); + let m = to_unit.0; + // The side of the horizon the box is on: a projective map sends the far side elsewhere. + let side = (m[6] * inside[0] + m[7] * inside[1] + m[8]).signum(); + if iw == 0 || ih == 0 || !(tw > 0.0 && th > 0.0) || !side.is_finite() { + return out; + } + let texel = |x: i64, y: i64| -> [f32; 4] { + let (x, y) = (x.clamp(0, iw as i64 - 1) as usize, y.clamp(0, ih as i64 - 1) as usize); + image.pixels.get(y * iw + x).map_or([0.0; 4], |c| c.to_array().map(f32::from)) + }; + let fade = |t: f64, n: f64| (t + 0.5).min(n - t + 0.5).clamp(0.0, 1.0) as f32; + let straight = |p: [f32; 4]| -> [f32; 4] { + let c = Color32::from_rgba_premultiplied(p[0].round() as u8, p[1].round() as u8, p[2].round() as u8, p[3].round() as u8); + let [r, g, b, _] = c.to_srgba_unmultiplied(); + // The alpha keeps its fraction: a soft edge would band at 8 bits. + [f32::from(r) / 255.0, f32::from(g) / 255.0, f32::from(b) / 255.0, (p[3] / 255.0).clamp(0.0, 1.0)] + }; + let width = rect.width() as usize; + rows(&mut out.px, width, rect.y0, |y, row| { + let py = f64::from(y) + 0.5; + for (i, o) in row.iter_mut().enumerate() { + let px = f64::from(rect.x0) + i as f64 + 0.5; + let w = m[6] * px + m[7] * py + m[8]; + if w * side <= 1e-12 { + continue; + } + let (tx, ty) = ((m[0] * px + m[1] * py + m[2]) / w * tw, (m[3] * px + m[4] * py + m[5]) / w * th); + if !(tx.is_finite() && ty.is_finite()) { + continue; + } + if nearest { + if tx >= 0.0 && ty >= 0.0 && tx < tw && ty < th { + *o = straight(texel(tx as i64, ty as i64)); + } + continue; + } + let cover = fade(tx, tw) * fade(ty, th); + if cover <= 0.0 { + continue; + } + let (fx, fy) = (tx - 0.5, ty - 0.5); + let (x0, y0) = (fx.floor(), fy.floor()); + let (ax, ay) = ((fx - x0) as f32, (fy - y0) as f32); + let (x0, y0) = (x0 as i64, y0 as i64); + let (a, b, c, d) = (texel(x0, y0), texel(x0 + 1, y0), texel(x0, y0 + 1), texel(x0 + 1, y0 + 1)); + let mut p = [0.0f32; 4]; + for (k, v) in p.iter_mut().enumerate() { + let (top, bottom) = (a[k] + (b[k] - a[k]) * ax, c[k] + (d[k] - c[k]) * ax); + *v = (top + (bottom - top) * ay) * cover; + } + if p[3] > 0.0 { + *o = straight(p); + } + } + }); + out +} + +/// The texels a composite reads and how they map onto the box. +pub struct Source<'a> { + /// The moving texels at some level of their mip chain, premultiplied. + pub image: &'a ColorImage, + /// The extent of `image` covering the box's source rectangle. + pub uv: [f32; 2], + /// The box (document pixels, clockwise from top-left). + pub quad: [[f64; 2]; 4], + /// Nearest Neighbor interpolation. + pub nearest: bool, +} + +/// Composite the moving texels with `work`'s style over `plan.shown`, on transparency. `work` +/// and `plan` come from [`plan`]; `doc` gives the global light and the patterns. +pub fn compose(doc: &Document, work: &Layer, plan: &Plan, source: &Source) -> Option { + let s = plan.scale; + let to_quad = Homography::rect_to_quad([0.0, 0.0, 1.0, 1.0], source.quad.map(|q| [q[0] * s, q[1] * s]))?; + let to_unit = to_quad.inverse()?; + let inside = source.quad.iter().fold([0.0; 2], |c, q| [c[0] + q[0] * s / 4.0, c[1] + q[1] * s / 4.0]); + let content = resample(source.image, source.uv, &to_unit, inside, plan.content, source.nearest); + let shape: Vec = content.px.iter().map(|p| p[3]).collect(); + let anchor = work.effects.reference.unwrap_or((f64::from(plan.bounds.x0), f64::from(plan.bounds.y0))); + let maps = effects::build_maps(work, shape, plan.content, &doc.global_light, &TextureCtx { rect: plan.content, patterns: &doc.patterns, anchor }); + // The maps hold what every pixel needs of its surroundings, so the style is laid over the + // content band by band, in parallel, as the compositor does tile by tile. + let shown = plan.shown; + let width = shown.width() as usize; + let mut out = Buffer::transparent(shown); + bands(&mut out.px, width * BAND_ROWS, |i, px| { + let y0 = shown.y0.saturating_add((i * BAND_ROWS) as i32); + let band = Rect::new(shown.x0, y0, shown.x1, y0.saturating_add((px.len() / width.max(1)) as i32)); + let mut over = Buffer::transparent(band); + effects::composite_with_effects(work, &crop(&content, band), &mut over, &maps, plan.bounds, &doc.patterns); + for (o, p) in px.iter_mut().zip(over.px) { + *o = p; + } + }); + Some(out) +} + +/// Rows composited per parallel band. +const BAND_ROWS: usize = 64; + +/// `rect` of `buf` (transparent where `buf` doesn't reach). +fn crop(buf: &Buffer, rect: Rect) -> Buffer { + let mut out = Buffer::transparent(rect); + let part = rect.intersect(&buf.rect); + if part.is_empty() { + return out; + } + let (sw, dw, n) = (buf.rect.width() as usize, rect.width() as usize, part.width() as usize); + for y in part.y0..part.y1 { + let s0 = (y - buf.rect.y0) as usize * sw + (part.x0 - buf.rect.x0) as usize; + let d0 = (y - rect.y0) as usize * dw + (part.x0 - rect.x0) as usize; + if let (Some(src), Some(dst)) = (buf.px.get(s0..s0 + n), out.px.get_mut(d0..d0 + n)) { + dst.copy_from_slice(src); + } + } + out +} + +/// `out` in chunks of `len`, each with its index, in parallel on native targets. +fn bands(out: &mut [T], len: usize, band: impl Fn(usize, &mut [T]) + Sync) { + #[cfg(not(target_arch = "wasm32"))] + { + use rayon::prelude::*; + out.par_chunks_mut(len.max(1)).enumerate().for_each(|(i, o)| band(i, o)); + } + #[cfg(target_arch = "wasm32")] + for (i, o) in out.chunks_mut(len.max(1)).enumerate() { + band(i, o); + } +} + +/// `buf` as premultiplied texels. +fn image(buf: &Buffer) -> ColorImage { + let (w, h) = (buf.rect.width() as usize, buf.rect.height() as usize); + let mut px = vec![Color32::TRANSPARENT; w * h]; + rows(&mut px, w, 0, |y, row| { + let src = buf.px.get(y as usize * w..).unwrap_or(&[]); + for (o, p) in row.iter_mut().zip(src) { + let v = p.map(|c| (c.clamp(0.0, 1.0) * 255.0 + 0.5) as u8); + *o = Color32::from_rgba_unmultiplied(v[0], v[1], v[2], v[3]); + } + }); + ColorImage::new([w, h], px) +} + +/// What a styled preview is drawn from this frame. +pub struct Frame<'a> { + /// The document: its size, global light and patterns. + pub doc: &'a Document, + /// The moving layer as it is now: its style, opacity, fill and Advanced Blending. + pub layer: &'a Layer, + /// Changes whenever `doc` does. + pub revision: u64, + pub texels: &'a PreviewTextures, + pub quad: [[f64; 2]; 4], + /// How much the box enlarges its source (1 = same size). + pub quad_scale: f32, + pub nearest: bool, + /// Screen pixels per document pixel. + pub zoom: f32, + /// The pointer is down: composite within the smaller [`budget`]. + pub dragging: bool, +} + +impl Frame<'_> { + /// The plan for this frame, the layer it composites and the texel level it reads. + pub fn plan(&self) -> Option<(Plan, Layer, u32)> { + let (plan, work) = plan(self.layer, [self.doc.size.width, self.doc.size.height], self.quad, self.zoom, budget(self.layer, self.dragging))?; + let level = PreviewTextures::choose(plan.scale as f32, self.quad_scale, self.nearest).0; + Some((plan, work, level)) + } + + /// The composite a [`Frame::plan`] describes. + pub fn compose(&self, plan: &Plan, work: &Layer, level: u32) -> Option { + let (texels, uv): (Arc, [f32; 2]) = self.texels.level_image(level)?; + compose(self.doc, work, plan, &Source { image: &texels, uv, quad: self.quad, nearest: self.nearest }) + } +} + +#[derive(Clone, PartialEq)] +struct Key { + revision: u64, + quad: [u64; 8], + plan: Plan, + level: u32, + nearest: bool, + crisp: bool, +} + +struct Shown { + key: Key, + tex: TextureHandle, + rect: [f32; 4], +} + +#[derive(Default)] +struct State { + shown: Option, + /// Composites made so far. + builds: u64, +} + +/// The styled composite of a Free Transform session's moving layer, kept until the box, the +/// zoom or the layer changes. +pub struct StyledPreview { + name: String, + state: Mutex, +} + +impl StyledPreview { + /// `name` keys the texture in egui. + pub fn new(name: String) -> Self { + Self { name, state: Mutex::new(State::default()) } + } + + /// How many times the composite was made: once per change of the box, the zoom or the layer. + pub fn builds(&self) -> u64 { + self.state.lock().unwrap_or_else(PoisonError::into_inner).builds + } + + /// The composite for `frame` and the document rectangle it covers (x0, y0, x1, y1), + /// compositing it again if anything it depends on changed. `None` when there is nothing to + /// draw this way: the caller falls back to the plain texels. + pub fn texture(&self, ctx: &egui::Context, frame: &Frame) -> Option<(TextureId, [f32; 4])> { + let (plan, work, level) = frame.plan()?; + let crisp = plan.scale >= 1.0 && frame.zoom >= CRISP_ZOOM; + let q = frame.quad.map(|q| q.map(f64::to_bits)); + let key = Key { + revision: frame.revision, + quad: [q[0][0], q[0][1], q[1][0], q[1][1], q[2][0], q[2][1], q[3][0], q[3][1]], + plan, + level, + nearest: frame.nearest, + crisp, + }; + let mut state = self.state.lock().unwrap_or_else(PoisonError::into_inner); + if let Some(s) = state.shown.as_ref().filter(|s| s.key == key) { + return Some((s.tex.id(), s.rect)); + } + let out = frame.compose(&plan, &work, level)?; + let options = if crisp { TextureOptions::NEAREST } else { TextureOptions::LINEAR }; + let tex = ctx.load_texture(self.name.clone(), image(&out), options); + let (id, rect) = (tex.id(), plan.doc_rect()); + state.shown = Some(Shown { key, tex, rect }); + state.builds += 1; + Some((id, rect)) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use photocraft_color::Color; + use photocraft_doc::{Contour, FxCommon, FxPaint, Shadow, StrokeFx, StrokePosition}; + + const BLUE: Color32 = Color32::from_rgb(0, 0, 255); + + fn stroke(size: f32) -> Effect { + Effect::Stroke(StrokeFx { + common: FxCommon::new(BlendMode::Normal, 1.0), + size, + position: StrokePosition::Outside, + paint: FxPaint::Color(Color::rgb(1.0, 0.0, 0.0)), + }) + } + + fn shadow(distance: f32) -> Effect { + Effect::DropShadow(Shadow { + common: FxCommon::new(BlendMode::Normal, 1.0), + color: Color::rgb(0.0, 1.0, 0.0), + // Lit from the top-left: the shadow falls to the bottom-right. + angle: 135.0, + use_global_light: false, + distance, + spread: 1.0, + size: 0.0, + contour: Contour::Linear, + anti_alias: false, + noise: 0.0, + knocks_out: true, + }) + } + + fn styled(effects: Vec) -> Layer { + let mut l = Layer::raster("styled", PixelFormat::RGBA8); + l.effects.items = effects; + l + } + + fn doc() -> Document { + Document::new("t", photocraft_geom::Size::new(200, 200), photocraft_color::ColorMode::Rgb, photocraft_color::SampleType::U8) + } + + fn rect_quad(r: [f64; 4]) -> [[f64; 2]; 4] { + [[r[0], r[1]], [r[2], r[1]], [r[2], r[3]], [r[0], r[3]]] + } + + /// The composite of a blue `w`×`h` block of texels moved onto `quad`, and its plan. + fn composite(layer: &Layer, w: usize, h: usize, quad: [[f64; 2]; 4], zoom: f32) -> (Buffer, Plan) { + let texels = ColorImage::new([w, h], vec![BLUE; w * h]); + let (plan, work) = plan(layer, [200, 200], quad, zoom, budget(layer, false)).expect("on the canvas"); + let out = compose(&doc(), &work, &plan, &Source { image: &texels, uv: [1.0, 1.0], quad, nearest: false }).expect("composited"); + (out, plan) + } + + /// The composite at a document point. + fn at(out: &Buffer, plan: &Plan, x: f64, y: f64) -> [f32; 4] { + let (x, y) = ((x * plan.scale).floor() as i32, (y * plan.scale).floor() as i32); + if out.rect.contains(x, y) { out.get(x, y) } else { [0.0; 4] } + } + + fn is(p: [f32; 4], rgb: [f32; 3]) -> bool { + p[3] > 0.99 && p.iter().zip(rgb).all(|(a, b)| (a - b).abs() < 0.02) + } + + const RED: [f32; 3] = [1.0, 0.0, 0.0]; + const GREEN: [f32; 3] = [0.0, 1.0, 0.0]; + const FILL: [f32; 3] = [0.0, 0.0, 1.0]; + + #[test] + fn the_style_is_drawn_around_the_moved_pixels() { + // Moved, not resized: the block at 60..100 × 80..100 with a 4 px stroke around it. + let l = styled(vec![stroke(4.0)]); + let (out, plan) = composite(&l, 40, 20, rect_quad([60.0, 80.0, 100.0, 100.0]), 1.0); + assert_eq!(plan.scale, 1.0); + assert!(is(at(&out, &plan, 80.0, 90.0), FILL), "the pixels themselves"); + assert!(is(at(&out, &plan, 60.0, 80.0), FILL) && is(at(&out, &plan, 99.0, 99.0), FILL), "exact at the corners: no resampling blur"); + for (x, y) in [(57.0, 90.0), (102.0, 90.0), (80.0, 77.0), (80.0, 102.0)] { + assert!(is(at(&out, &plan, x, y), RED), "stroke at {x},{y}: {:?}", at(&out, &plan, x, y)); + } + for (x, y) in [(54.0, 90.0), (105.0, 90.0), (80.0, 74.0), (80.0, 105.0)] { + assert_eq!(at(&out, &plan, x, y)[3], 0.0, "nothing past the stroke at {x},{y}"); + } + } + + #[test] + fn a_stroke_keeps_its_width_when_the_box_is_enlarged() { + // The 20×20 block enlarged four times: the stroke stays 4 px wide, not 16. + let l = styled(vec![stroke(4.0)]); + let (out, plan) = composite(&l, 20, 20, rect_quad([60.0, 60.0, 140.0, 140.0]), 1.0); + assert!(is(at(&out, &plan, 100.0, 100.0), FILL)); + assert!(is(at(&out, &plan, 57.0, 100.0), RED) && is(at(&out, &plan, 142.0, 100.0), RED)); + assert_eq!(at(&out, &plan, 53.0, 100.0)[3], 0.0, "{:?}", at(&out, &plan, 53.0, 100.0)); + assert_eq!(at(&out, &plan, 146.0, 100.0)[3], 0.0); + } + + #[test] + fn a_shadow_keeps_its_direction_when_the_box_is_turned() { + // Turned a half turn (the quad's corners swapped round): the shadow still falls to the + // bottom-right of the block, not to the top-left with the pixels. + let l = styled(vec![shadow(10.0)]); + let upright = rect_quad([80.0, 80.0, 120.0, 120.0]); + let turned = [upright[2], upright[3], upright[0], upright[1]]; + for quad in [upright, turned] { + let (out, plan) = composite(&l, 40, 40, quad, 1.0); + assert!(is(at(&out, &plan, 100.0, 100.0), FILL)); + assert!(is(at(&out, &plan, 124.0, 124.0), GREEN), "{:?}", at(&out, &plan, 124.0, 124.0)); + assert_eq!(at(&out, &plan, 76.0, 76.0)[3], 0.0, "no shadow on the lit side"); + } + } + + #[test] + fn a_zoomed_out_view_composites_at_screen_resolution() { + // At 50 % the work is a quarter of the pixels and the 4 px stroke is 2 work pixels, + // still 4 document pixels where it is drawn. + let l = styled(vec![stroke(4.0)]); + let (out, plan) = composite(&l, 40, 40, rect_quad([60.0, 60.0, 100.0, 100.0]), 0.5); + assert_eq!(plan.scale, 0.5); + assert_eq!(plan.bounds, Rect::new(30, 30, 50, 50)); + assert_eq!(out.rect, plan.shown); + assert!(is(at(&out, &plan, 80.0, 80.0), FILL)); + assert!(is(at(&out, &plan, 57.0, 80.0), RED) && is(at(&out, &plan, 103.0, 80.0), RED)); + assert_eq!(at(&out, &plan, 53.0, 80.0)[3], 0.0); + let r = plan.doc_rect(); + assert!(r[0] <= 56.0 && r[2] >= 104.0, "{r:?}"); + // Zoomed in, the work is never finer than the document. + assert_eq!(composite(&l, 40, 40, rect_quad([60.0, 60.0, 100.0, 100.0]), 8.0).1.scale, 1.0); + } + + #[test] + fn the_part_past_the_canvas_is_left_out_but_still_shapes_the_style() { + // The block hangs over the left edge: nothing is composited past the canvas, and no + // stroke is drawn along the canvas edge, where the layer goes on. + let l = styled(vec![stroke(4.0)]); + let (out, plan) = composite(&l, 40, 20, rect_quad([-20.0, 80.0, 20.0, 100.0]), 1.0); + assert_eq!(plan.shown.x0, 0); + assert!(is(at(&out, &plan, 0.0, 90.0), FILL), "{:?}", at(&out, &plan, 0.0, 90.0)); + assert!(is(at(&out, &plan, 22.0, 90.0), RED)); + // Wholly off the canvas: nothing to composite. + assert!(plan_of(&l, rect_quad([-90.0, 0.0, -50.0, 20.0])).is_none()); + } + + fn plan_of(l: &Layer, quad: [[f64; 2]; 4]) -> Option { + plan(l, [200, 200], quad, 1.0, budget(l, false)).map(|p| p.0) + } + + #[test] + fn opacity_and_fill_apply_as_in_the_compositor() { + // Fill 0 %: the pixels go, the stroke stays. Opacity 50 %: all of it at half strength. + let mut l = styled(vec![stroke(4.0)]); + l.fill_opacity = 0.0; + let (out, plan) = composite(&l, 40, 40, rect_quad([60.0, 60.0, 100.0, 100.0]), 1.0); + assert_eq!(at(&out, &plan, 80.0, 80.0)[3], 0.0); + assert!(is(at(&out, &plan, 57.0, 80.0), RED)); + l.fill_opacity = 1.0; + l.opacity = 0.5; + let (out, plan) = composite(&l, 40, 40, rect_quad([60.0, 60.0, 100.0, 100.0]), 1.0); + assert!((at(&out, &plan, 80.0, 80.0)[3] - 0.5).abs() < 0.01 && (at(&out, &plan, 57.0, 80.0)[3] - 0.5).abs() < 0.01); + } + + #[test] + fn the_work_stays_within_the_budget() { + // A box over a huge canvas at 100 %: the scale drops until the composite fits. + let l = styled(vec![stroke(8.0), shadow(40.0)]); + let quad = rect_quad([0.0, 0.0, 12_000.0, 8_000.0]); + for budget in [budget(&l, true), budget(&l, false)] { + let (p, work) = plan(&l, [12_000, 8_000], quad, 1.0, budget).expect("planned"); + let area = f64::from(p.content.width()) * f64::from(p.content.height()); + assert!(area <= budget && area > budget * 0.5, "{area} of {budget}"); + assert!(p.scale < 1.0); + // The style shrank with it. + let Some(Effect::Stroke(s)) = work.effects.items.first() else { panic!("stroke") }; + assert!((f64::from(s.size) - 8.0 * p.scale).abs() < 1e-3); + } + } + + #[test] + fn hostile_boxes_are_refused_not_composited() { + let l = styled(vec![stroke(4.0)]); + let ok = rect_quad([60.0, 60.0, 100.0, 100.0]); + for bad in [f64::NAN, f64::INFINITY, f64::NEG_INFINITY] { + let mut q = ok; + q[2][0] = bad; + assert!(plan_of(&l, q).is_none()); + } + // Astronomically large or far away: planned within the budget or refused, never a huge + // allocation or an overflow. + for q in [rect_quad([-1e300, -1e300, 1e300, 1e300]), rect_quad([1e18, 1e18, 1e18 + 40.0, 1e18 + 40.0]), rect_quad([0.0, 0.0, 1e12, 1.0])] { + if let Some(p) = plan_of(&l, q) { + assert!(f64::from(p.content.width()) * f64::from(p.content.height()) <= budget(&l, false), "{p:?}"); + } + } + // A collapsed box, a zero or NaN zoom and an absurd budget. + assert!(plan_of(&l, [[80.0, 80.0]; 4]).is_none()); + for zoom in [0.0, -1.0, f32::NAN, f32::INFINITY] { + assert_eq!(plan(&l, [200, 200], ok, zoom, budget(&l, false)).map(|p| p.0.scale), Some(1.0)); + } + for budget in [f64::NAN, f64::INFINITY, -5.0, 0.0] { + if let Some((p, _)) = plan(&l, [200, 200], ok, 1.0, budget) { + assert!(f64::from(p.content.width()) * f64::from(p.content.height()) <= MAX_PIXELS); + } + } + // A degenerate quad that passes the plan (a bow tie collapsed onto a line) composites + // to nothing instead of dividing by zero. + let line = [[60.0, 60.0], [100.0, 100.0], [60.0, 60.0], [100.0, 100.0]]; + if let Some((p, work)) = plan(&l, [200, 200], line, 1.0, budget(&l, false)) { + let texels = ColorImage::new([4, 4], vec![BLUE; 16]); + assert!(compose(&doc(), &work, &p, &Source { image: &texels, uv: [1.0, 1.0], quad: line, nearest: false }).is_none()); + } + } + + /// The style is laid on in parallel bands: the result is the one a single pass gives. + #[test] + fn bands_join_without_a_seam() { + let l = styled(vec![stroke(5.0), shadow(12.0)]); + let quad = [[40.0, 20.0], [150.0, 40.0], [130.0, 180.0], [20.0, 150.0]]; + let texels = ColorImage::new([30, 40], (0..1200).map(|i| if i % 7 == 0 { Color32::TRANSPARENT } else { BLUE }).collect()); + let (plan, work) = plan(&l, [200, 200], quad, 1.0, budget(&l, false)).expect("planned"); + assert!(plan.shown.height() as usize > 2 * BAND_ROWS, "{:?}", plan.shown); + let source = Source { image: &texels, uv: [1.0, 1.0], quad, nearest: false }; + let banded = compose(&doc(), &work, &plan, &source).expect("composited"); + // The same in one pass. + let to_unit = Homography::rect_to_quad([0.0, 0.0, 1.0, 1.0], quad).and_then(|h| h.inverse()).expect("invertible"); + let content = resample(&texels, [1.0, 1.0], &to_unit, [85.0, 97.5], plan.content, false); + let shape = content.px.iter().map(|p| p[3]).collect(); + let anchor = (f64::from(plan.bounds.x0), f64::from(plan.bounds.y0)); + let maps = effects::build_maps(&work, shape, plan.content, &doc().global_light, &TextureCtx { rect: plan.content, patterns: &[], anchor }); + let mut whole = Buffer::transparent(plan.shown); + effects::composite_with_effects(&work, &crop(&content, plan.shown), &mut whole, &maps, plan.bounds, &[]); + assert_eq!(banded.rect, whole.rect); + assert!(banded.px == whole.px, "banded and whole composites differ"); + assert!(whole.px.iter().any(|p| is(*p, RED)) && whole.px.iter().any(|p| is(*p, GREEN)) && whole.px.iter().any(|p| is(*p, FILL))); + } + + #[test] + fn the_budget_follows_what_the_style_costs() { + // A drag gets a quarter of the time a resting box does, and a Stroke (two distance + // fields) far fewer pixels than a shadow. + let (stroked, shadowed) = (styled(vec![stroke(4.0)]), styled(vec![shadow(10.0)])); + assert!(budget(&stroked, true) < budget(&stroked, false)); + assert!((budget(&shadowed, false) / budget(&shadowed, true) - REST_MS / DRAG_MS).abs() < 1e-9); + assert!(budget(&stroked, true) * 3.0 < budget(&shadowed, true), "{} vs {}", budget(&stroked, true), budget(&shadowed, true)); + // Two strokes share their distance fields; an effect switched off costs nothing. + assert!(pixel_cost_ns(&styled(vec![stroke(4.0), stroke(9.0)])) < pixel_cost_ns(&stroked) + 2.0); + let mut off = styled(vec![stroke(4.0), shadow(10.0)]); + if let Some(Effect::Stroke(s)) = off.effects.items.first_mut() { + s.common.enabled = false; + } + assert_eq!(pixel_cost_ns(&off), pixel_cost_ns(&shadowed)); + // However heavy or light the style, the budget stays within its limits. + let heavy = styled((0..200).map(|_| shadow(10.0)).collect()); + assert_eq!(budget(&heavy, true), MIN_PIXELS); + assert_eq!(budget(&styled(Vec::new()), false), MAX_PIXELS); + } + + #[test] + fn resampling_handles_empty_texels_and_nearest_neighbor() { + let unit = Homography::rect_to_quad([0.0, 0.0, 1.0, 1.0], rect_quad([0.0, 0.0, 8.0, 8.0])).and_then(|h| h.inverse()).expect("invertible"); + let r = Rect::new(-2, -2, 10, 10); + let empty = ColorImage::new([0, 0], Vec::new()); + assert!(resample(&empty, [1.0, 1.0], &unit, [4.0, 4.0], r, false).px.iter().all(|p| p[3] == 0.0)); + // A 2×2 checker enlarged four times: Nearest Neighbor keeps hard texels, bilinear blends. + let checker = ColorImage::new([2, 2], vec![Color32::WHITE, Color32::BLACK, Color32::BLACK, Color32::WHITE]); + let hard = resample(&checker, [1.0, 1.0], &unit, [4.0, 4.0], r, true); + assert_eq!(hard.get(3, 0), [1.0, 1.0, 1.0, 1.0]); + assert_eq!(hard.get(4, 0), [0.0, 0.0, 0.0, 1.0]); + assert_eq!(hard.get(-1, 0)[3], 0.0); + let soft = resample(&checker, [1.0, 1.0], &unit, [4.0, 4.0], r, false); + let mid = soft.get(3, 0); + assert!(mid[0] > 0.2 && mid[0] < 0.8, "{mid:?}"); + // The uv extent limits what is read: half the texels, so only the left column shows. + let half = resample(&checker, [0.5, 1.0], &unit, [4.0, 4.0], r, true); + assert_eq!(half.get(7, 0), [1.0, 1.0, 1.0, 1.0]); + } +} diff --git a/crates/ui-egui/src/transform_fx_tests.rs b/crates/ui-egui/src/transform_fx_tests.rs new file mode 100644 index 00000000..0eb860da --- /dev/null +++ b/crates/ui-egui/src/transform_fx_tests.rs @@ -0,0 +1,277 @@ +//! Free Transform previews a styled layer with its style (#3653), through the real session and +//! canvas: at every bit depth and colour mode, for pixel layers and groups, following edits made +//! while the box is open, and matching what the commit leaves. + +use photocraft_compose::Buffer; +use photocraft_doc::{Layer, LayerId}; +use serde_json::json; + +use crate::PhotocraftApp; +use crate::transform_fx::Plan; + +/// A 200 × 160 document with a 40 × 20 blue block at (60, 60) on its own layer, wearing a 4 px +/// red outside Stroke. +fn app(mode: &str, depth: u32) -> PhotocraftApp { + let mut app = PhotocraftApp::new(photocraft_engine::Session::new(), crate::Services::default()); + app.run("file.new", json!({"width": 200, "height": 160, "mode": mode, "depth": depth})).unwrap(); + app.run("layer.new.layer", json!({"name": "styled"})).unwrap(); + app.run("select.rect", json!({"x": 60, "y": 60, "width": 40, "height": 20})).unwrap(); + app.run("edit.fill", json!({"color": "#0000ff"})).unwrap(); + app.run("select.deselect", json!({})).unwrap(); + app.run("layer.layerStyle.stroke", json!({"size": 4, "color": "#ff0000", "position": "outside"})).unwrap(); + app.sync_views(); + app +} + +fn begin(app: &mut PhotocraftApp) { + crate::transform_tool::begin(app, &egui::Context::default()).unwrap(); +} + +/// What the box draws for the styled layer at `zoom`: `None` when it draws the bare pixels. +fn composite(app: &PhotocraftApp, zoom: f32) -> Option<(Buffer, Plan)> { + let (_, frame) = crate::transform_tool::styled_frame(app, zoom, false)?; + let (plan, work, level) = frame.plan()?; + Some((frame.compose(&plan, &work, level)?, plan)) +} + +/// The composite at a document point. +fn at(c: &(Buffer, Plan), x: f64, y: f64) -> [f32; 4] { + let (x, y) = ((x * c.1.scale).floor() as i32, (y * c.1.scale).floor() as i32); + if c.0.rect.contains(x, y) { c.0.get(x, y) } else { [0.0; 4] } +} + +fn set_quad(app: &mut PhotocraftApp, quad: [[f64; 2]; 4]) { + app.ui.transform.as_mut().unwrap().quad = quad; +} + +fn active(app: &PhotocraftApp) -> LayerId { + app.session.active().unwrap().active_layer.unwrap() +} + +fn edit_layer(app: &mut PhotocraftApp, f: impl FnOnce(&mut Layer)) { + let id = active(app); + app.session + .edit("edit", |doc, _| { + f(doc.layer_mut(id).unwrap()); + Ok(()) + }) + .unwrap(); +} + +#[test] +fn the_style_shows_while_the_box_is_open_at_every_depth_and_mode() { + for (mode, depth) in [("rgb", 8), ("rgb", 16), ("rgb", 32), ("gray", 8), ("gray", 16), ("cmyk", 8), ("cmyk", 16), ("lab", 8)] { + let mut app = app(mode, depth); + begin(&mut app); + let c = composite(&app, 1.0).unwrap_or_else(|| panic!("{mode}/{depth}: styled")); + let (fill, stroke) = (at(&c, 80.0, 70.0), at(&c, 57.0, 70.0)); + assert!(fill[3] > 0.99 && stroke[3] > 0.99, "{mode}/{depth}: {fill:?} {stroke:?}"); + assert!(fill.iter().zip(stroke).any(|(a, b)| (a - b).abs() > 0.1), "{mode}/{depth}: the stroke has its own colour: {fill:?} {stroke:?}"); + if mode == "rgb" { + assert!(stroke[0] > 0.9 && stroke[2] < 0.1 && fill[2] > 0.9 && fill[0] < 0.1, "{depth}: {fill:?} {stroke:?}"); + } + assert_eq!(at(&c, 53.0, 70.0)[3], 0.0, "{mode}/{depth}: nothing past the stroke"); + // Twice the size about the middle: the block is 40..120 × 50..90 and the stroke is + // still 4 px, drawn round the new edge. + set_quad(&mut app, [[40.0, 50.0], [120.0, 50.0], [120.0, 90.0], [40.0, 90.0]]); + let c = composite(&app, 1.0).unwrap(); + assert!(at(&c, 80.0, 70.0)[3] > 0.99 && at(&c, 37.0, 70.0)[3] > 0.99 && at(&c, 122.0, 70.0)[3] > 0.99, "{mode}/{depth}"); + assert!(at(&c, 37.0, 70.0).iter().zip(stroke).all(|(a, b)| (a - b).abs() < 0.02), "{mode}/{depth}: the same stroke"); + assert_eq!(at(&c, 33.0, 70.0)[3], 0.0, "{mode}/{depth}: the stroke did not grow with the box"); + assert_eq!(at(&c, 126.0, 70.0)[3], 0.0, "{mode}/{depth}"); + } +} + +/// The preview is the layer as the commit leaves it: same stroke, same shadow, same place. +#[test] +fn the_preview_matches_the_committed_layer() { + for (mode, depth) in [("rgb", 8), ("rgb", 16), ("rgb", 32), ("gray", 8)] { + let mut app = app(mode, depth); + app.run("layer.layerStyle.dropShadow", json!({"distance": 9, "size": 4, "opacity": 80, "add": true})).unwrap(); + begin(&mut app); + // One and a half times the size, turned 20° about the middle of the block (80, 70). + let (sin, cos) = 20f64.to_radians().sin_cos(); + let quad = [[-30.0, -15.0], [30.0, -15.0], [30.0, 15.0], [-30.0, 15.0]].map(|[x, y]: [f64; 2]| [80.0 + x * cos - y * sin, 70.0 + x * sin + y * cos]); + set_quad(&mut app, quad); + let (shown, plan) = composite(&app, 1.0).unwrap(); + crate::transform_tool::commit(&mut app); + assert!(app.ui.transform.is_none(), "{mode}/{depth}: committed"); + // The committed layer alone, over transparency. + let st = app.session.active().unwrap(); + let mut solo = (*st.doc).clone(); + let id = st.active_layer.unwrap(); + for l in solo.layers.iter_mut() { + l.visible = l.id == id; + } + let committed = photocraft_compose::render(&solo, plan.shown); + let premultiplied = |p: &[f32; 4]| [p[0] * p[3], p[1] * p[3], p[2] * p[3], p[3]]; + let (mut sum, mut off) = (0.0f64, 0usize); + for (a, b) in shown.px.iter().zip(&committed.px) { + let d = premultiplied(a).iter().zip(premultiplied(b)).map(|(x, y)| (x - y).abs()).fold(0.0f32, f32::max); + sum += f64::from(d); + off += usize::from(d > 0.25); + } + let n = shown.px.len(); + assert!(n > 4000, "{mode}/{depth}: {n}"); + // The commit resamples bicubic and the preview bilinear, so soft edges differ a little + // (a mean of 0.002 here); a stroke of another width or a shadow falling elsewhere would + // differ over whole bands. + assert!(sum / n as f64 <= 0.006, "{mode}/{depth}: mean difference {}", sum / n as f64); + assert!(off * 500 <= n, "{mode}/{depth}: {off} of {n} pixels differ"); + // Something is there to compare: fill, stroke and shadow. + assert!(committed.px.iter().filter(|p| p[3] > 0.5).count() > 2000, "{mode}/{depth}"); + } +} + +/// Groups (like type, shapes and smart objects) preview from a flattened render of the layer, +/// which is read without the layer's own style and opacity: the box applies them itself. +#[test] +fn a_styled_group_previews_with_its_style_once() { + let mut app = app("rgb", 8); + app.session + .edit("group", |doc, active| { + let id = active.unwrap(); + let at = doc.layers.iter().position(|l| l.id == id).unwrap(); + let mut child = doc.layers.remove(at); + let style = std::mem::take(&mut child.effects.items); + let mut group = Layer::group("group", vec![child]); + group.effects.items = style; + group.opacity = 0.5; + *active = Some(group.id); + doc.layers.insert(at, group); + Ok(()) + }) + .unwrap(); + begin(&mut app); + let pv = app.transform_preview.as_ref().unwrap(); + // The texels are the bare pixels over their own bounds: no stroke, no opacity yet. + assert_eq!(pv.texture.size(), [40, 20]); + let (texels, _) = pv.texture.level_image(0).unwrap(); + assert!(texels.pixels.iter().all(|p| *p == egui::Color32::from_rgb(0, 0, 255)), "{:?}", texels.pixels.first()); + // The composite has the stroke round them, all of it at the group's 50 %. + let c = composite(&app, 1.0).unwrap(); + let (fill, stroke) = (at(&c, 80.0, 70.0), at(&c, 57.0, 70.0)); + assert!((fill[3] - 0.5).abs() < 0.01 && fill[2] > 0.9, "{fill:?}"); + assert!((stroke[3] - 0.5).abs() < 0.01 && stroke[0] > 0.9, "{stroke:?}"); + assert_eq!(at(&c, 53.0, 70.0)[3], 0.0); +} + +#[test] +fn edits_made_while_the_box_is_open_show_in_the_styled_preview() { + let mut app = app("rgb", 8); + begin(&mut app); + assert!(composite(&app, 1.0).is_some()); + // Opacity. + edit_layer(&mut app, |l| l.opacity = 0.3); + let c = composite(&app, 1.0).unwrap(); + assert!((at(&c, 57.0, 70.0)[3] - 0.3).abs() < 0.01 && (at(&c, 80.0, 70.0)[3] - 0.3).abs() < 0.01); + // Fill 0 %: the pixels go and the stroke stays (the outline-only look). + edit_layer(&mut app, |l| { + l.opacity = 1.0; + l.fill_opacity = 0.0; + }); + let c = composite(&app, 1.0).unwrap(); + assert_eq!(at(&c, 80.0, 70.0)[3], 0.0); + assert!(at(&c, 57.0, 70.0)[3] > 0.99); + // A wider stroke. + app.run("layer.layerStyle.stroke", json!({"size": 10, "color": "#ff0000", "position": "outside"})).unwrap(); + assert!(at(&composite(&app, 1.0).unwrap(), 52.0, 70.0)[3] > 0.99); + // The style switched off, then the layer hidden: the box draws the bare pixels (or nothing). + edit_layer(&mut app, |l| l.effects.enabled = false); + assert!(composite(&app, 1.0).is_none()); + edit_layer(&mut app, |l| l.effects.enabled = true); + assert!(composite(&app, 1.0).is_some()); + edit_layer(&mut app, |l| l.visible = false); + assert!(composite(&app, 1.0).is_none()); +} + +#[test] +fn layers_without_a_style_and_other_boxes_keep_the_plain_preview() { + // No style: nothing to composite, also if one is added once the box is open (its texels + // were not read for it). + let mut plain = app("rgb", 8); + edit_layer(&mut plain, |l| l.effects.items.clear()); + begin(&mut plain); + assert!(composite(&plain, 1.0).is_none()); + plain.run("layer.layerStyle.stroke", json!({"size": 4, "color": "#ff0000"})).unwrap(); + assert!(composite(&plain, 1.0).is_none()); + // The selected part of a styled layer: its style belongs to that part and the rest together. + let mut part = app("rgb", 8); + part.run("select.rect", json!({"x": 60, "y": 60, "width": 20, "height": 20})).unwrap(); + begin(&mut part); + assert_eq!(part.ui.transform.as_ref().unwrap().rect, [60.0, 60.0, 80.0, 80.0]); + assert!(composite(&part, 1.0).is_none()); + // Transform Selection moves an outline, not the layer. + let mut outline = app("rgb", 8); + outline.run("select.rect", json!({"x": 60, "y": 60, "width": 20, "height": 20})).unwrap(); + crate::transform_tool::begin_selection(&mut outline, &egui::Context::default()).unwrap(); + assert!(composite(&outline, 1.0).is_none()); + // Warp mode draws its own mesh. + let mut warp = app("rgb", 8); + crate::transform_tool::begin_warp(&mut warp, &egui::Context::default()).unwrap(); + assert!(composite(&warp, 1.0).is_none()); +} + +#[test] +fn the_work_follows_the_zoom_and_never_the_document_size() { + let mut app = app("rgb", 8); + begin(&mut app); + // Zoomed out to 25 %: a sixteenth of the pixels. + let (full, half) = (composite(&app, 1.0).unwrap(), composite(&app, 0.25).unwrap()); + assert_eq!(full.1.scale, 1.0); + assert_eq!(half.1.scale, 0.25); + assert!(half.0.px.len() * 8 < full.0.px.len(), "{} vs {}", half.0.px.len(), full.0.px.len()); + assert!(at(&half, 80.0, 70.0)[3] > 0.99 && at(&half, 57.0, 70.0)[3] > 0.99 && at(&half, 50.0, 70.0)[3] == 0.0); + // Zoomed in: the document's own pixels, no finer. + assert_eq!(composite(&app, 16.0).unwrap().1.scale, 1.0); + // A box dragged out to an absurd size stays within the budget. + set_quad(&mut app, [[-4.0e6, -4.0e6], [4.0e6, -4.0e6], [4.0e6, 4.0e6], [-4.0e6, 4.0e6]]); + if let Some((buf, _)) = composite(&app, 1.0) { + assert!(buf.px.len() as f64 <= crate::transform_fx::MAX_PIXELS); + } + // A box that isn't a box: the bare pixels, no panic. + set_quad(&mut app, [[f64::NAN; 2]; 4]); + assert!(composite(&app, 1.0).is_none()); + set_quad(&mut app, [[70.0, 70.0]; 4]); + assert!(composite(&app, 1.0).is_none()); +} + +/// Through the real canvas: the composite is made once per change, not once per frame, the box +/// still drags, undoes and commits as before, and the committed layer keeps its style. +#[test] +fn the_canvas_draws_the_styled_preview_and_reuses_it_between_frames() { + let mut h = crate::transform_undo_tests::harness(); + h.state_mut().run("layer.layerStyle.stroke", json!({"size": 4, "color": "#00ff00", "position": "outside"})).unwrap(); + h.run_steps(2); + let steps = h.state().session.active().unwrap().history.entries().len(); + crate::transform_undo_tests::begin(&mut h); + let builds = |h: &egui_kittest::Harness<'static, PhotocraftApp>| crate::transform_tool::styled_frame(h.state(), 1.0, false).unwrap().0.builds(); + assert_eq!(builds(&h), 1, "composited when the box opened"); + h.run_steps(5); + assert_eq!(builds(&h), 1, "and kept while nothing changes"); + // Drag the bottom-right corner out: the composite follows the box. + crate::transform_undo_tests::drag(&mut h, [200.0, 160.0], [260.0, 196.0]); + let after_drag = builds(&h); + assert!(after_drag > 1, "{after_drag}"); + let quad = h.state().ui.transform.as_ref().unwrap().quad; + assert!(quad[2][0] > 250.0, "{quad:?}"); + h.run_steps(5); + assert_eq!(builds(&h), after_drag, "at rest again"); + // Zooming rebuilds it for the new scale. + h.state_mut().ui.views[0].zoom = 0.5; + h.run_steps(2); + assert_eq!(builds(&h), after_drag + 1); + // Undo steps the box back (not the document), and the composite follows. + h.key_press_modifiers(egui::Modifiers::COMMAND, egui::Key::Z); + h.run_steps(2); + assert_eq!(h.state().ui.transform.as_ref().unwrap().quad[2], [200.0, 160.0]); + assert_eq!(h.state().session.active().unwrap().history.entries().len(), steps); + assert_eq!(builds(&h), after_drag + 2); + // Enter commits: one history step, the style still on the layer. + h.key_press(egui::Key::Enter); + h.run_steps(3); + let app = h.state(); + assert!(app.ui.transform.is_none() && app.transform_preview.is_none()); + let st = app.session.active().unwrap(); + assert!(photocraft_compose::effects::has_effects(st.doc.layer(st.active_layer.unwrap()).unwrap())); +} diff --git a/crates/ui-egui/src/transform_tex.rs b/crates/ui-egui/src/transform_tex.rs index e1ddb504..bd847045 100644 --- a/crates/ui-egui/src/transform_tex.rs +++ b/crates/ui-egui/src/transform_tex.rs @@ -90,7 +90,7 @@ impl PreviewTextures { } /// Level `n` of the mip chain (built on demand by 2×2 box filtering) and its uv extent. - fn level_image(&self, n: u32) -> Option<(Arc, [f32; 2])> { + pub(crate) fn level_image(&self, n: u32) -> Option<(Arc, [f32; 2])> { let mut imgs = self.images.lock().unwrap_or_else(PoisonError::into_inner); while imgs.len() <= n as usize { let prev = imgs.last()?; diff --git a/crates/ui-egui/src/transform_tool.rs b/crates/ui-egui/src/transform_tool.rs index 6d1c2288..84d1031b 100644 --- a/crates/ui-egui/src/transform_tool.rs +++ b/crates/ui-egui/src/transform_tool.rs @@ -64,6 +64,9 @@ pub struct TransformPreview { pub opacity: f32, /// The layers stacked over the moving one, drawn over its pixels ([`Above`]). above: Option, + /// A layer with a style: its pixels composited with the style as the box has them now, + /// drawn instead of the bare pixels (transform_fx.rs, #3653). + styled: Option, gesture: Option, /// Warp-mode drag in progress. warp_drag: Option, @@ -213,7 +216,10 @@ pub fn begin(app: &mut PhotocraftApp, ctx: &egui::Context) -> Result<(), String> // The layers covering the moving pixels draw over them instead of under them. let above = Above::new(ctx, format!("transform-{session}-above"), &doc, id, max_side); above.hide_in(&mut pd.layers); - let (image, uv) = preview_image(&doc, id, lifted.as_ref(), b, max_side); + // A style is drawn again from the pixels as the box moves them, so they are read without it. + // Not for the selected part of a layer: its style belongs to that part and the rest together. + let styled = lifted.is_none() && photocraft_compose::effects::has_effects(layer); + let (image, uv) = preview_image(&doc, id, lifted.as_ref(), b, max_side, styled); let texture = crate::transform_tex::PreviewTextures::new(ctx, format!("transform-{session}"), image, uv); app.transform_preview = Some(TransformPreview { session, @@ -221,6 +227,7 @@ pub fn begin(app: &mut PhotocraftApp, ctx: &egui::Context) -> Result<(), String> texture, opacity: layer.opacity * layer.fill_opacity, above: Some(above), + styled: styled.then(|| crate::transform_fx::StyledPreview::new(format!("transform-{session}-styled"))), follow: Some(Follow { revision, hidden: lifted.is_none() }), gesture: None, warp_drag: None, @@ -330,6 +337,7 @@ pub(crate) fn begin_content_aware( tool: app.ui.tool, path: None, content_aware: Some(live), + styled: None, }); app.ui.transform = Some(TransformSession { session, @@ -430,6 +438,7 @@ fn begin_lone( texture, opacity: 0.6, above: None, + styled: None, follow: None, gesture: None, warp_drag: None, @@ -479,6 +488,7 @@ fn begin_path(app: &mut PhotocraftApp, ctx: &egui::Context, params: serde_json:: doc, texture, opacity: 1.0, + styled: None, gesture: None, warp_drag: None, split_tool: None, @@ -562,6 +572,7 @@ pub fn begin_selection(app: &mut PhotocraftApp, ctx: &egui::Context) -> Result<( texture, opacity: 1.0, above: None, + styled: None, follow: None, gesture: None, warp_drag: None, @@ -681,7 +692,8 @@ fn enter_type_warp(app: &mut PhotocraftApp, ctx: &egui::Context) { && let Some(pv) = app.transform_preview.as_mut() { let max_side = ctx.input(|i| i.max_texture_side).max(app.gpu.as_ref().map_or(1, |g| g.max_texture_side())); - let (image, uv) = preview_image(&plain, id, None, b, max_side); + // Read as the session's texels were: without the style when the box draws it itself. + let (image, uv) = preview_image(&plain, id, None, b, max_side, pv.styled.is_some()); pv.texture = crate::transform_tex::PreviewTextures::new(ctx, format!("transform-{session}"), image, uv); } let warp = @@ -717,13 +729,15 @@ pub fn leave_warp(app: &mut PhotocraftApp) { /// Texels of the moving pixels over `b`: full resolution unless the long side exceeds the GPU's /// `max_side` (#91: this used to be capped at 2048 px, so big layers previewed blurry), plus the -/// uv extent covering `b`. +/// uv extent covering `b`. `bare` leaves the layer's own style, opacity and fill out of a +/// flattened render: the styled preview applies them to the moved pixels itself. fn preview_image( doc: &Document, id: LayerId, lifted: Option<&photocraft_raster::Surface>, b: photocraft_geom::Rect, max_side: usize, + bare: bool, ) -> (egui::ColorImage, [f32; 2]) { let layer = doc.layer(id); // Linked masks move with the pixels, so the moving texels carry them (#205). @@ -740,6 +754,11 @@ fn preview_image( l.visible = false; } } + if let Some(l) = solo.layer_mut(id).filter(|_| bare) { + l.effects.enabled = false; + l.opacity = 1.0; + l.fill_opacity = 1.0; + } let buf = photocraft_compose::render(&solo, b); let mut s = photocraft_raster::Surface::new(photocraft_color::PixelFormat::RGBA8); let flat: Vec = buf.px.iter().flat_map(|p| *p).collect(); @@ -1912,7 +1931,17 @@ pub fn draw_overlay(app: &PhotocraftApp, painter: &egui::Painter, xf: &ViewXform draw_warp(painter, xf, t, w, pv, guide); return; } - if let Some(h) = Homography::rect_to_quad([0.0, 0.0, 1.0, 1.0], t.quad) { + let ctx = painter.ctx(); + let styled = styled_frame(app, xf.zoom * ctx.pixels_per_point(), ctx.input(|i| i.pointer.any_down())).and_then(|(s, frame)| s.texture(ctx, &frame)); + if let Some((tex, r)) = styled { + let mut mesh = egui::Mesh::with_texture(tex); + for (x, y, u, v) in [(r[0], r[1], 0.0, 0.0), (r[2], r[1], 1.0, 0.0), (r[2], r[3], 1.0, 1.0), (r[0], r[3], 0.0, 1.0)] { + mesh.vertices.push(egui::epaint::Vertex { pos: pos2(x, y), uv: pos2(u, v), color: Color32::WHITE }); + } + mesh.add_triangle(0, 1, 2); + mesh.add_triangle(0, 2, 3); + painter.add(clip_to_canvas(mesh, canvas_size(pv), |p| xf.to_screen(p.x, p.y))); + } else if let Some(h) = Homography::rect_to_quad([0.0, 0.0, 1.0, 1.0], t.quad) { // A 24×24 grid keeps perspective previews straight. let n = 24; let zoom = xf.zoom * painter.ctx().pixels_per_point(); @@ -1984,6 +2013,29 @@ pub fn draw_overlay(app: &PhotocraftApp, painter: &egui::Painter, xf: &ViewXform } } +/// What the styled preview of the moving layer is drawn from (transform_fx.rs), at `zoom` screen +/// pixels per document pixel. `None` for a layer without a style (also once it is switched off +/// while the box is open) or a hidden one: the bare pixels are drawn instead. The style, opacity +/// and fill are the layer's as they are now, so edits made while the box is open show. +pub(crate) fn styled_frame(app: &PhotocraftApp, zoom: f32, dragging: bool) -> Option<(&crate::transform_fx::StyledPreview, crate::transform_fx::Frame<'_>)> { + let (t, pv) = (app.ui.transform.as_ref()?, app.transform_preview.as_ref()?); + let styled = pv.styled.as_ref().filter(|_| t.warp.is_none())?; + let st = app.session.active().filter(|st| st.doc.id == pv.doc.id)?; + let layer = st.doc.layer(LayerId(t.layer)).filter(|l| l.visible && photocraft_compose::effects::has_effects(l))?; + let frame = crate::transform_fx::Frame { + doc: &st.doc, + layer, + revision: st.revision, + texels: &pv.texture, + quad: t.quad, + quad_scale: quad_scale(t), + nearest: t.interpolation == "nearest", + zoom, + dragging, + }; + Some((styled, frame)) +} + /// The value shown beside the pointer while the box is dragged, like Photoshop's Show /// Transformation Values: the box's angle while rotating, its scale while resizing, the offset /// while moving. @@ -4318,7 +4370,7 @@ mod tests { let st = app.session.active().unwrap(); let id = st.active_layer.unwrap(); let b = photocraft_geom::Rect::new(8, 8, 24, 24); - let (img, _) = preview_image(&st.doc, id, None, b, 4096); + let (img, _) = preview_image(&st.doc, id, None, b, 4096, false); // Texel x = doc x − 8: x 10 is hidden by the mask, x 20 shows. assert_eq!(texel_alpha(&img, 12, 4), 255); assert_eq!(texel_alpha(&img, 2, 4), if linked { 0 } else { 255 }, "linked={linked}"); @@ -4333,7 +4385,7 @@ mod tests { let id = st.active_layer.unwrap(); let (lifted, _) = photocraft_engine::transform_cmds::split_selected(st.doc.layer(id).unwrap().surface().unwrap(), &sel).unwrap(); let b = photocraft_geom::Rect::new(8, 8, 20, 24); - let (img, _) = preview_image(&st.doc, id, Some(&lifted), b, 4096); + let (img, _) = preview_image(&st.doc, id, Some(&lifted), b, 4096, false); assert_eq!(texel_alpha(&img, 2, 4), 0, "masked"); assert_eq!(texel_alpha(&img, 10, 4), 255, "revealed"); } diff --git a/crates/ui-egui/src/transform_undo_tests.rs b/crates/ui-egui/src/transform_undo_tests.rs index 7db8cce5..2944456c 100644 --- a/crates/ui-egui/src/transform_undo_tests.rs +++ b/crates/ui-egui/src/transform_undo_tests.rs @@ -12,7 +12,7 @@ use crate::state::Tool; /// A 400 × 300 document with a 100 × 60 red rectangle on its own layer at (100, 100), the Move /// tool active, at 100 %. -fn harness() -> Harness<'static, PhotocraftApp> { +pub(crate) fn harness() -> Harness<'static, PhotocraftApp> { harness_tool(Tool::Move) } @@ -63,7 +63,7 @@ fn screen(h: &Harness<'static, PhotocraftApp>, p: [f64; 2]) -> Pos2 { } /// Press at document point `from`, drag to `to` in a few steps and release. -fn drag(h: &mut Harness<'static, PhotocraftApp>, from: [f64; 2], to: [f64; 2]) { +pub(crate) fn drag(h: &mut Harness<'static, PhotocraftApp>, from: [f64; 2], to: [f64; 2]) { let (a, b) = (screen(h, from), screen(h, to)); h.event(egui::Event::PointerMoved(a)); h.run_steps(1); @@ -77,7 +77,7 @@ fn drag(h: &mut Harness<'static, PhotocraftApp>, from: [f64; 2], to: [f64; 2]) { h.run_steps(3); } -fn begin(h: &mut Harness<'static, PhotocraftApp>) { +pub(crate) fn begin(h: &mut Harness<'static, PhotocraftApp>) { let ctx = h.ctx.clone(); crate::menus::invoke(h.state_mut(), &ctx, "edit.freeTransform", json!({})).unwrap(); h.run_steps(2); From 0dbc28866796a34e6ec3ec44b3418727964f27f8 Mon Sep 17 00:00:00 2001 From: Scott Macdonald Date: Mon, 12 Oct 2026 06:49:25 -0400 Subject: [PATCH 26/92] fix(algo): mesh warps filter their source when shrinking, so thin lines don't alias (#3672) (#3678) * fix(algo): mesh warps filter their source when shrinking, so thin lines don't alias warp_triangles (Edit > Transform > Warp, smart objects placed through a warp, Puppet, Lens and Wide Angle corrections) took one Catmull-Rom sample per output pixel with no minification filter. A large smart object placed small through a warp (a 4200x4800 design at ~1/3-1/4 size in a shirt mockup) came out with crinkled, doubled or missing grid lines where Photoshop's render is smooth. The affine path (transform::warp_surface) already pre-reduces below 50% for exactly this reason ("bicubic alone aliases below ~50%"); the mesh path had no equivalent. Each triangle now carries its inverse-map Jacobian, computed analytically from its vertices. Where it shrinks the source, an output pixel averages nx x ny bilinear subsamples over its source footprint, with about one subsample per source pixel per axis (anisotropic, capped at 8). Averaging happens in premultiplied space, before alpha is divided out. Triangles that keep or enlarge the source still take the exact single sample, so identity and unscaled warps are bit-for-bit unchanged. The per-tile source read grows by the subsamples' actual spread instead of a fixed pad. Per-pixel filtering is used rather than a global pre-reduce because a mesh warp's scale varies across the surface: one reduction factor over-blurs the parts that stay large or under-filters the parts that shrink most. Measured with an earlier cut of this approach (square bicubic subsampling) against Photoshop exports of real mockups (RMSE of the placed design): 1.78% -> 0.81% (White shirt), 0.49% -> 0.29% (Pepper). A mockup without a warp is unchanged. Test: a_shrinking_mesh_warp_is_prefiltered (8/16/32-bit). A 1 px grid every 4 px placed at 1/5 through an Arc must stay within 0.25 of its 9/16 area average. Before: 0.5625 off (solid black pixels). After: 0.20 off, which is the limit of a ~5 px box over a 4 px period. Perf (30 MP RGBA8 source, place_source with Arc 10, release, M-series, best of 7): 1/3 size: 55 ms -> 87 ms 1/1 size: 240 ms -> 239 ms (no subsampling: identical path) Co-authored-by: Claude Opus 5.5 * Use as_chunks for the opaque-pixel scan (clippy 1.99) Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 Co-authored-by: Brandon Thomas --- crates/algo/src/warp.rs | 107 ++++++++++++++++++++++++++++++++++------ 1 file changed, 93 insertions(+), 14 deletions(-) diff --git a/crates/algo/src/warp.rs b/crates/algo/src/warp.rs index 36d4a313..2ee8b191 100644 --- a/crates/algo/src/warp.rs +++ b/crates/algo/src/warp.rs @@ -6,7 +6,9 @@ //! interpolated barycentrically, then the source is sampled there (premultiplied, nearest / //! bilinear / Catmull-Rom bicubic, like Free Transform). Cells are a few source pixels across, so //! the piecewise-affine inverse is within a small fraction of a pixel of the true one; affine -//! maps (the identity included) are reproduced exactly. Where the warp folds over itself the +//! maps (the identity included) are reproduced exactly. Where the warp shrinks the source, each +//! pixel instead averages a grid of bilinear subsamples over its source footprint (about one per +//! source pixel), so thin lines don't alias. Where the warp folds over itself the //! later (lower-right) cell wins. Work is split per destination tile (parallel on native). use photocraft_color::PixelFormat; @@ -25,6 +27,9 @@ fn catmull_rom(t: f64) -> [f64; 4] { const CELL: f64 = 4.0; /// Most cells along one axis (bounds memory and time on huge layers). const MAX_CELLS: usize = 512; +/// Most subsamples per axis when a warp shrinks the source; also the longest source step per +/// destination pixel the filter follows (bounds the footprint each tile reads). +const MAX_SS: f64 = 8.0; /// Places a smart object's source image (`src`, its pixels in `src_rect`) in the document: /// through `warp` (source space) and then the affine `t` (source → document) in one resampling @@ -172,14 +177,37 @@ pub fn warp_triangles(src: &Surface, src_rect: Rect, verts: &[([f64; 2], [f64; 2 } let w = t.width() as usize; let h = t.height() as usize; - // Source position per destination pixel (NaN = not covered). + // Subsamples along one destination axis, from the source step `j` it makes: one where + // the warp keeps or enlarges the source, else about one per source pixel the output pixel + // spans (an area average, as the transform path gets from its pre-reduction; a single + // bicubic sample aliases thin lines when shrinking). The subsamples are bilinear: the + // box does the filtering, and it is ~4x cheaper than bicubic at no loss. + let count = |j: [f64; 2]| if interp == Interp::Nearest { 1 } else { j[0].hypot(j[1]).round().clamp(1.0, MAX_SS) as usize }; + // Source position per destination pixel (NaN = not covered) and the triangle it came + // from. Per triangle: its source step per destination pixel along x and y (`[dx_u, dx_v, + // dy_u, dy_v]`, the inverse map's Jacobian, constant over a triangle; zero when + // point-sampled) and the subsamples along each. let mut uv = vec![[f64::NAN; 2]; w * h]; - for tri in tris { + let mut owner = vec![0u32; w * h]; + let mut jac: Vec<([f64; 4], usize, usize)> = Vec::with_capacity(tris.len()); + for (k, tri) in tris.iter().enumerate() { let [(p0, s0), (p1, s1), (p2, s2)] = tri.map(|v| verts[v]); let det = (p1[0] - p0[0]) * (p2[1] - p0[1]) - (p2[0] - p0[0]) * (p1[1] - p0[1]); if det.abs() < 1e-12 { + jac.push(([0.0; 4], 1, 1)); continue; } + let (d1, d2) = ([s1[0] - s0[0], s1[1] - s0[1]], [s2[0] - s0[0], s2[1] - s0[1]]); + let (l1x, l1y, l2x, l2y) = ((p2[1] - p0[1]) / det, (p0[0] - p2[0]) / det, (p0[1] - p1[1]) / det, (p1[0] - p0[0]) / det); + // Capped, so a sliver triangle can't ask for an unbounded footprint. + let cap = |j: [f64; 2]| { + let l = j[0].hypot(j[1]); + if l > MAX_SS { [j[0] * MAX_SS / l, j[1] * MAX_SS / l] } else { j } + }; + let jx = cap([l1x * d1[0] + l2x * d2[0], l1x * d1[1] + l2x * d2[1]]); + let jy = cap([l1y * d1[0] + l2y * d2[0], l1y * d1[1] + l2y * d2[1]]); + let (nx, ny) = (count(jx), count(jy)); + jac.push(if nx * ny == 1 { ([0.0; 4], 1, 1) } else { ([jx[0], jx[1], jy[0], jy[1]], nx, ny) }); let bx0 = (p0[0].min(p1[0]).min(p2[0]) - 0.5).floor().max(f64::from(t.x0)) as i32; let by0 = (p0[1].min(p1[1]).min(p2[1]) - 0.5).floor().max(f64::from(t.y0)) as i32; let bx1 = (p0[0].max(p1[0]).max(p2[0]) + 0.5).ceil().min(f64::from(t.x1)) as i32; @@ -197,16 +225,18 @@ pub fn warp_triangles(src: &Surface, src_rect: Rect, verts: &[([f64; 2], [f64; 2 } let o = (y - t.y0) as usize * w + (x - t.x0) as usize; uv[o] = [l0 * s0[0] + l1 * s1[0] + l2 * s2[0], l0 * s0[1] + l1 * s1[1] + l2 * s2[1]]; + owner[o] = k as u32; } } } - // Source footprint of the covered pixels. + // Source footprint of the covered pixels, including the spread of their subsamples. let (mut fx0, mut fy0, mut fx1, mut fy1) = (f64::MAX, f64::MAX, f64::MIN, f64::MIN); - for q in uv.iter().filter(|q| !q[0].is_nan()) { - fx0 = fx0.min(q[0]); - fy0 = fy0.min(q[1]); - fx1 = fx1.max(q[0]); - fy1 = fy1.max(q[1]); + for (q, j) in uv.iter().zip(&owner).filter(|(q, _)| !q[0].is_nan()).map(|(q, &k)| (q, jac[k as usize].0)) { + let (ex, ey) = (0.5 * (j[0].abs() + j[2].abs()), 0.5 * (j[1].abs() + j[3].abs())); + fx0 = fx0.min(q[0] - ex); + fy0 = fy0.min(q[1] - ey); + fx1 = fx1.max(q[0] + ex); + fy1 = fy1.max(q[1] + ey); } if fx0 > fx1 { return None; @@ -233,11 +263,9 @@ pub fn warp_triangles(src: &Surface, src_rect: Rect, verts: &[([f64; 2], [f64; 2 let mut outp = vec![0.0f32; w * h * n]; let mut any = false; let mut acc = [0.0f64; 8]; - for (o, q) in uv.iter().enumerate() { - if q[0].is_nan() { - continue; - } - let (u, v) = (q[0] - 0.5, q[1] - 0.5); + let mut one = [0.0f64; 8]; + // One premultiplied sample at source position (u, v) (pixel centres at integers). + let point = |interp: Interp, u: f64, v: f64, acc: &mut [f64; 8]| { acc[..n].fill(0.0); match interp { Interp::Nearest => { @@ -276,6 +304,31 @@ pub fn warp_triangles(src: &Surface, src_rect: Rect, verts: &[([f64; 2], [f64; 2 } } } + }; + for (o, (q, &k)) in uv.iter().zip(&owner).enumerate() { + if q[0].is_nan() { + continue; + } + let (j, nx, ny) = jac[k as usize]; + if nx * ny == 1 { + point(interp, q[0] - 0.5, q[1] - 0.5, &mut acc); + } else { + acc[..n].fill(0.0); + for sy in 0..ny { + let t = (sy as f64 + 0.5) / ny as f64 - 0.5; + for sx in 0..nx { + let s = (sx as f64 + 0.5) / nx as f64 - 0.5; + point(Interp::Bilinear, q[0] + s * j[0] + t * j[2] - 0.5, q[1] + s * j[1] + t * j[3] - 0.5, &mut one); + for (c, v) in acc.iter_mut().zip(&one).take(n) { + *c += v; + } + } + } + let k = 1.0 / (nx * ny) as f64; + for c in acc.iter_mut().take(n) { + *c *= k; + } + } let al = acc[a].clamp(0.0, 1.0); // Float noise (a vertex a hair off the pixel grid) must not leave invisible // colour behind in transparent pixels. @@ -407,6 +460,32 @@ mod tests { assert!(c.y0 < r.y0 - 2 && c.x0 < r.x0 && c.x1 > r.x1, "the top rises and spreads past the box: {c:?}"); } + #[test] + fn a_shrinking_mesh_warp_is_prefiltered() { + // A warped smart object placed at ~1/5 size: a grid of 1 px lines every 4 px must come + // out its area average (9/16 white) everywhere, not point-sampled moiré (crinkled, + // doubled or missing lines), like the affine path's `large_downscale_is_prefiltered`. + for s in [SampleType::U8, SampleType::U16, SampleType::F32] { + let (w, h) = (400, 320); + let mut src = Surface::new(PixelFormat::new(ColorMode::Rgb, s, true)); + let px: Vec = + (0..h).flat_map(|y| (0..w).map(move |x| if x % 4 == 0 || y % 4 == 0 { 0.0 } else { 1.0 })).flat_map(|v| [v, v, v, 1.0]).collect(); + let r = Rect::new(0, 0, w, h); + src.write_region(r, &px); + let warp = Warp::preset(WarpStyle::Arc, 15.0, [0.0, 0.0, f64::from(w), f64::from(h)]); + let t = photocraft_geom::Affine { m: [0.2, 0.0, 0.0, 0.2, 7.0, 5.0] }; + let out = place_source(&src, r, &t, Some(&warp)).unwrap(); + let b = out.content_bounds(); + let o = out.read_region(b); + let opaque: Vec = o.as_chunks::<4>().0.iter().filter(|p| p[3] >= 0.999).map(|p| p[0]).collect(); + assert!(opaque.len() > 2000, "{s:?}: {} opaque pixels", opaque.len()); + let worst = opaque.iter().map(|v| (v - 0.5625).abs()).fold(0.0f32, f32::max); + // An area average over the ~5 px footprint still covers one or two lines per axis + // (up to 0.2 off); point sampling lands wholly on or off a line (up to 0.56 off). + assert!(worst < 0.25, "{s:?}: worst deviation from the area average {worst}"); + } + } + #[test] fn gray_masks_keep_their_default() { let mut m = Surface::with_default(PixelFormat::GRAY8, &[1.0]); From 4705fc59805c3a848a0d4a24781514cb875db5bb Mon Sep 17 00:00:00 2001 From: Nigel Ihza Firdausy <106657905+Ni-zav@users.noreply.github.com> Date: Mon, 12 Oct 2026 18:01:20 +0700 Subject: [PATCH 27/92] feat(io): open Krita .kra composites as editable raster documents (#3692) (#3700) * feat(io): open Krita .kra composites as editable raster documents (#3692) * cargo fmt Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Brandon Thomas Co-authored-by: Claude Opus 5.5 --- apps/photocraft/src/services.rs | 7 ++- crates/io/src/kra.rs | 108 ++++++++++++++++++++++++++++++++ crates/io/src/lib.rs | 10 +++ 3 files changed, 122 insertions(+), 3 deletions(-) create mode 100644 crates/io/src/kra.rs diff --git a/apps/photocraft/src/services.rs b/apps/photocraft/src/services.rs index 8342baa2..0b1a366a 100644 --- a/apps/photocraft/src/services.rs +++ b/apps/photocraft/src/services.rs @@ -20,9 +20,9 @@ mod recovery_tests; /// Photoshop brushes (.abr), gradients (.grd), swatches (.aco, .ase) and keyboard shortcut sets /// (.kys), which go to the preset libraries and Edit › Keyboard Shortcuts. const OPEN_EXTS: &[&str] = &[ - "pcraft", "pdn", "ora", "psd", "psb", "psdt", "png", "jpg", "jpeg", "tif", "tiff", "webp", "gif", "bmp", "tga", "ico", "qoi", "exr", "hdr", "pbm", "pgm", - "ppm", "pam", "pfm", "fits", "fit", "fts", "heic", "heif", "hif", "dng", "cr2", "cr3", "nef", "nrw", "arw", "pef", "orf", "rw2", "raf", "abr", "grd", - "svg", "svgz", "aco", "ase", "kys", "af", "afdesign", "afphoto", "afpub", + "pcraft", "pdn", "ora", "kra", "psd", "psb", "psdt", "png", "jpg", "jpeg", "tif", "tiff", "webp", "gif", "bmp", "tga", "ico", "qoi", "exr", "hdr", "pbm", + "pgm", "ppm", "pam", "pfm", "fits", "fit", "fts", "heic", "heif", "hif", "dng", "cr2", "cr3", "nef", "nrw", "arw", "pef", "orf", "rw2", "raf", "abr", + "grd", "svg", "svgz", "aco", "ase", "kys", "af", "afdesign", "afphoto", "afpub", ]; const SVG_EXTS: &[&str] = &["svg", "svgz"]; @@ -43,6 +43,7 @@ fn open_filters() -> Vec<(&'static str, Vec)> { ("All Formats", open_filter_extensions(OPEN_EXTS)), ("PhotoCraft", open_filter_extensions(&["pcraft"])), ("OpenRaster", open_filter_extensions(&["ora"])), + ("Krita", open_filter_extensions(&["kra"])), ("SVG", open_filter_extensions(SVG_EXTS)), ] } diff --git a/crates/io/src/kra.rs b/crates/io/src/kra.rs new file mode 100644 index 00000000..a3af8b11 --- /dev/null +++ b/crates/io/src/kra.rs @@ -0,0 +1,108 @@ +//! Krita .kra import: the merged PNG is an editable raster layer, not a replacement +//! for Krita's native layer tree. Never write this document back to the .kra source. +//! The ZIP reader checks entry bounds, sizes and CRC before the PNG decoder runs. + +use photocraft_codecs::{self as codecs, DecodeOptions, Format}; +use photocraft_format::zip::ZipReader; +use photocraft_raster::Interrupt; + +use crate::{ImportResult, IoError}; + +const MIMETYPE: &[u8] = b"application/x-krita"; +const MAX_ENTRY: usize = 512 << 20; +const MAX_PIXELS_BYTES: u64 = 1 << 30; + +fn invalid(message: impl Into) -> IoError { + IoError::Kra(message.into()) +} + +/// Krita writes its mimetype as the first, uncompressed ZIP entry. +pub(crate) fn is_kra(bytes: &[u8]) -> bool { + crate::ora::zip_mimetype(bytes).is_some_and(|mime| mime.trim_ascii() == MIMETYPE) +} + +/// Import Krita's official merged preview as a flattened, editable PhotoCraft document. +/// Do not silently pretend this imported a layered or lossless Krita document. +pub(crate) fn import(name: &str, bytes: &[u8], ctl: &Interrupt<'_>) -> Result { + ctl.check().map_err(|_| IoError::Cancelled)?; + let archive = ZipReader::new(bytes).map_err(|e| invalid(e.to_string()))?; + let mime = archive.read_by_name("mimetype", 256).map_err(|e| invalid(e.to_string()))?; + if mime.trim_ascii() != MIMETYPE { + return Err(invalid("the archive's mimetype is not application/x-krita")); + } + ctl.progress(0.10); + let merged = archive.read_by_name("mergedimage.png", MAX_ENTRY).map_err(|e| invalid(format!("mergedimage.png: {e}")))?; + if codecs::detect(&merged) != Some(Format::Png) { + return Err(invalid("mergedimage.png is not a PNG image")); + } + ctl.check().map_err(|_| IoError::Cancelled)?; + let mut opts = DecodeOptions::default(); + opts.limits.max_width = crate::ora::MAX_SIDE; + opts.limits.max_height = crate::ora::MAX_SIDE; + opts.limits.max_alloc = MAX_PIXELS_BYTES; + let image = codecs::decode_with(&merged, &opts).map_err(|e| invalid(format!("mergedimage.png: {e}")))?; + ctl.check().map_err(|_| IoError::Cancelled)?; + let mut result = crate::flat::image_to_document(name, &image)?; + result.source_read_only = true; + result.warnings.push("Krita layers, masks and editable document structure were not imported; only mergedimage.png is available".into()); + Ok(result) +} + +#[cfg(test)] +mod tests { + use super::*; + use photocraft_codecs::{ChannelLayout, EncodeOptions, Image, SampleType}; + use photocraft_format::zip::ZipWriter; + + fn png() -> Vec { + let image = Image::from_raw(2, 1, ChannelLayout::Rgba, SampleType::U8, vec![255, 0, 0, 255, 0, 0, 255, 128]).unwrap(); + codecs::encode(&image, Format::Png, &EncodeOptions::default()).unwrap() + } + + fn archive(mime: &[u8], with_merged: bool) -> Vec { + let mut zip = ZipWriter::new(); + zip.add("mimetype", mime).unwrap(); + zip.add("maindoc.xml", b"").unwrap(); + if with_merged { + zip.add("mergedimage.png", &png()).unwrap(); + } + zip.finish().unwrap() + } + + #[test] + fn imports_krita_composite_without_claiming_to_preserve_layers() { + let bytes = archive(MIMETYPE, true); + assert!(is_kra(&bytes)); + // The mimetype is authoritative even without a .kra extension. + for name in ["scene.kra", "download"] { + let r = crate::import(name, &bytes).unwrap(); + assert_eq!((r.document.size.width, r.document.size.height), (2, 1)); + assert_eq!(r.document.name, name); + assert_eq!(r.document.layers.len(), 1); + assert_eq!(r.document.layers[0].name, "Layer 0", "alpha-bearing composite"); + let pixels = r.document.layers[0].surface().unwrap(); + assert!(pixels.rgba(0, 0)[0] > 0.99); + assert!(pixels.rgba(1, 0)[2] > 0.99); + assert!((pixels.rgba(1, 0)[3] - 128.0 / 255.0).abs() < 0.01); + assert!(r.source_read_only, ".kra must not be overwritten by a flat save"); + assert!(!r.preview_only, "the flattened image is editable"); + assert!(r.warnings.iter().any(|w| w.contains("layers") && w.contains("not imported"))); + } + } + + #[test] + fn malformed_or_non_krita_archives_do_not_open_as_krita() { + let wrong = archive(b"image/openraster", true); + assert!(!is_kra(&wrong)); + assert!(import("wrong.kra", &wrong, &Interrupt::NONE).is_err()); + assert!(import("missing.kra", &archive(MIMETYPE, false), &Interrupt::NONE).is_err()); + assert!(import("broken.kra", b"not a zip", &Interrupt::NONE).is_err()); + } + + #[test] + fn a_png_with_a_misleading_kra_extension_remains_a_png() { + let r = crate::import("renamed.kra", &png()).unwrap(); + assert_eq!(r.document.size.width, 2); + assert!(!r.source_read_only, "a real PNG must not be treated as a Krita source"); + } +} diff --git a/crates/io/src/lib.rs b/crates/io/src/lib.rs index 9ea36199..0a9acbc1 100644 --- a/crates/io/src/lib.rs +++ b/crates/io/src/lib.rs @@ -18,6 +18,7 @@ //! * Paint.NET PDN3 documents open as editable bitmap layers (import only). //! * OpenRaster (`.ora`) documents open and save with their layers, groups, blend modes, //! opacity and visibility; see `ora`. +//! * Krita (`.kra`) documents open as their merged composite; source layers are not imported. //! * Affinity documents (`.af`, `.afdesign`, `.afphoto`, `.afpub`) open natively //! with no source save path, what isn't imported listed in the warnings; a file //! whose native data can't be read opens as its embedded preview; see `affinity`. @@ -41,6 +42,7 @@ pub mod effects_map; pub mod exr_parts; mod flat; mod gradient_bake; +mod kra; pub mod linked; mod multichannel_map; mod ora; @@ -80,6 +82,9 @@ pub enum IoError { /// OpenRaster read failure. #[error("OpenRaster: {0}")] Ora(String), + /// Krita document decode failure. + #[error("Krita: {0}")] + Kra(String), /// PSD parse/write failure. #[error("PSD: {0}")] Psd(#[from] PsdError), @@ -268,6 +273,11 @@ fn import_stages(name: &str, bytes: &[u8], ctl: &photocraft_raster::Interrupt, m if ora::is_ora(bytes) || has_extension(name, "ora") { return ora::import(name, bytes, ctl); } + // Krita files are ZIP containers carrying a merged PNG. A recognized raster signature + // still wins over a misleading .kra suffix (as with SVG imports). + if kra::is_kra(bytes) || (has_extension(name, "kra") && photocraft_codecs::detect(bytes).is_none()) { + return kra::import(name, bytes, ctl); + } if has_extension(name, "pdn") || bytes.starts_with(b"PDN3") { return pdn::import(name, bytes, ctl); } From 6547ca0b8459ef37e1dfb373cc00a81740ed74a4 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 12 Oct 2026 07:02:10 -0400 Subject: [PATCH 28/92] fix(psd): Multichannel alpha channels stay alpha; a save keeps resources and global blocks (#4031) - DisplayInfo kinds 0/1 (selected / masked areas) now import as alpha channels instead of black spot inks; a Multichannel composite still prints them as black ink, so the look is unchanged. - Saving a Multichannel PSD writes global light, grid and guides, saved / work / clipping paths, EXIF and every other imported resource (print settings, IPTC, layer-id seed, alpha ids while they match the channels), except the ones that only describe layers, plus the document-level tagged blocks (4-byte padded). Path writing and global-block padding are shared with the layered writer. Co-authored-by: Claude Opus 5.5 --- crates/compose/src/multichannel.rs | 15 ++- crates/io/src/channel_map.rs | 10 +- crates/io/src/multichannel_map.rs | 60 ++++++++++-- crates/io/src/psd_export.rs | 127 ++++++++++++++------------ crates/io/tests/multichannel.rs | 142 +++++++++++++++++++++++++++++ 5 files changed, 284 insertions(+), 70 deletions(-) create mode 100644 crates/io/tests/multichannel.rs diff --git a/crates/compose/src/multichannel.rs b/crates/compose/src/multichannel.rs index 63bec04b..88c0b2f3 100644 --- a/crates/compose/src/multichannel.rs +++ b/crates/compose/src/multichannel.rs @@ -3,7 +3,8 @@ //! Ink density `v` (the channel value, 1 = solid) of an ink with display colour `c` and solidity //! `s` turns the colour underneath `p` into `(1 − s·v)·p·(1 − v + v·c) + s·v·c`: transparent inks //! (solidity 0) multiply like overprinted process inks, opaque ones cover what is below, which is -//! how Photoshop previews spot channels. +//! how Photoshop previews spot channels. An alpha-type channel of a Multichannel document +//! (selected / masked areas) still prints, as a transparent black ink, like Photoshop shows it. use photocraft_doc::Document; use photocraft_geom::Rect; @@ -15,7 +16,7 @@ pub fn inks(doc: &Document, rect: Rect) -> Buffer { let mut buf = Buffer::filled(rect, [1.0, 1.0, 1.0, 1.0]); let mut vals = Vec::new(); for ch in &doc.channels { - let Some((ink, solidity)) = ch.spot else { continue }; + let (ink, solidity) = ch.spot.unwrap_or((photocraft_color::Color::BLACK, 0.0)); if ch.surface.content_bounds().intersect(&rect).is_empty() { continue; } @@ -65,7 +66,15 @@ mod tests { assert_eq!(r.px[1], [0.0, 1.0, 1.0, 1.0]); assert_eq!(r.px[2], [0.0, 0.0, 1.0, 1.0]); assert_eq!(r.px[3], [1.0, 0.0, 1.0, 1.0]); - // Alpha channels and other modes are not inks. + // An alpha-type channel prints as a black ink. + let mut k = Surface::new(fmt); + k.write_region(Rect::new(0, 0, 4, 1), &[0.5, 0.0, 0.0, 0.0]); + doc.channels.push(AlphaChannel::new("Alpha", k)); + let r = crate::flatten(&doc); + // 0.5 is stored as 128/255 in an 8-bit channel: within one 8-bit step. + assert!((r.px[0][0] - 0.5).abs() <= 1.0 / 255.0 && (r.px[0][1] - 0.5).abs() <= 1.0 / 255.0, "{:?}", r.px[0]); + assert_eq!(r.px[1], [0.0, 1.0, 1.0, 1.0]); + // Other modes have no inks. doc.mode = ColorMode::Rgb; assert_eq!(crate::flatten(&doc).px[1][3], 0.0); } diff --git a/crates/io/src/channel_map.rs b/crates/io/src/channel_map.rs index d3630bf3..bafde26f 100644 --- a/crates/io/src/channel_map.rs +++ b/crates/io/src/channel_map.rs @@ -1,10 +1,10 @@ //! Alpha / spot channel options <-> PSD `DisplayInfo` image resources (1077, and the older 1007). //! //! Layout (Adobe PSD spec, "DisplayInfo"): resource 1077 starts with a 4-byte version (1), then -//! one 14-byte record per extra channel: colour space (u16), four u16 colour components, opacity -//! (u16, 0..100), kind (u8: 0 = colour indicates selected areas, 1 = masked ("protected") areas, -//! 2 = spot channel) and one padding byte. Resource 1007 has the same records without the -//! version and without the spot kind. +//! one 13-byte record per extra channel: colour space (u16), four u16 colour components, opacity +//! (u16, 0..100) and kind (u8: 0 = colour indicates selected areas, 1 = masked ("protected") +//! areas, 2 = spot channel). Resource 1007 has the same records without the version and the spot +//! kind, each followed by a padding byte (14 bytes). use photocraft_color::{Color, ColorMode}; use photocraft_doc::{AlphaChannel, ColorIndicates}; @@ -59,6 +59,8 @@ pub(crate) fn apply_display_info(data: &[u8], versioned: bool, skip: usize, chan match rec[12] { 2 => c.spot = Some((color, opacity)), k => { + // An alpha channel, not an ink (a Multichannel import starts every channel as one). + c.spot = None; c.color = color; c.opacity = opacity; c.indicates = if k == 0 { ColorIndicates::SelectedAreas } else { ColorIndicates::MaskedAreas }; diff --git a/crates/io/src/multichannel_map.rs b/crates/io/src/multichannel_map.rs index d20a70ef..db31e743 100644 --- a/crates/io/src/multichannel_map.rs +++ b/crates/io/src/multichannel_map.rs @@ -9,13 +9,21 @@ use photocraft_color::{Color, ColorMode, PixelFormat, SampleType}; use photocraft_doc::{AlphaChannel, Document}; use photocraft_geom::Rect; -use photocraft_psd::file::LayerInfoPlacement; +use photocraft_psd::file::{GlobalLayerMask, LayerInfoPlacement}; use photocraft_psd::resources::{ImageResource, ResolutionInfo, ids, version_info_resource}; -use photocraft_psd::{ColorMode as PsdMode, Compression, Header, ImageData, PsdFile}; +use photocraft_psd::{ColorMode as PsdMode, Compression, Header, ImageData, PsdFile, TaggedBlock}; use photocraft_raster::Surface; use crate::pixels::{encode_be, psd_depth}; +/// Grid and guides. +const GRID_AND_GUIDES: u16 = 1032; +/// Alpha identifiers: one u32 per extra channel. +const ALPHA_IDENTIFIERS: u16 = 1053; +/// Resources that only describe layers: target layer (1024), layer groups (1026), layer +/// selection ids (1069) and layer groups enabled (1072). A Multichannel document has no layers. +const LAYER_ONLY_RESOURCES: [u16; 4] = [ids::LAYER_STATE, ids::LAYER_GROUP_INFO, 1069, 1072]; + /// Value of sample `i` of a big-endian plane. fn decode(plane: &[u8], i: usize, s: SampleType) -> f32 { match s { @@ -44,7 +52,8 @@ pub(crate) fn import(file: &PsdFile, all: &[u8], doc: &mut Document, names: &[St s.write_region(canvas, &vals); s.prune(); let name = names.get(k).cloned().filter(|s| !s.is_empty()).unwrap_or_else(|| format!("Channel {}", k + 1)); - // Without DisplayInfo the channels print in black, as Photoshop shows them. + // Without DisplayInfo the channels print in black, as Photoshop shows them. DisplayInfo + // turns alpha-type channels (selected / masked areas) back into alpha channels. doc.channels.push(AlphaChannel { spot: Some((Color::BLACK, 0.0)), ..AlphaChannel::new(name, s) }); } if let Some(r) = file.resource(crate::channel_map::DISPLAY_INFO) { @@ -97,17 +106,54 @@ pub(crate) fn document_to_psd(doc: &Document, force_psb: bool) -> (PsdFile, Vec< let image_data = ImageData::encode(Compression::Rle, &planes, &header) .or_else(|_| ImageData::encode(Compression::Raw, &planes, &header)) .unwrap_or(ImageData { compression: Compression::Raw, data: planes }); - let mut resources = vec![ImageResource::new(ids::RESOLUTION_INFO, ResolutionInfo::from_dpi(f64::from(doc.resolution_dpi)).to_bytes())]; + let mut resources = vec![ + ImageResource::new(ids::RESOLUTION_INFO, ResolutionInfo::from_dpi(f64::from(doc.resolution_dpi)).to_bytes()), + ImageResource::new(ids::GLOBAL_ANGLE, (doc.global_light.angle.round() as i32).to_be_bytes().to_vec()), + ImageResource::new(ids::GLOBAL_ALTITUDE, (doc.global_light.altitude.round() as i32).to_be_bytes().to_vec()), + ]; + // Grid and guides: Photoshop writes it in every file, guides or not. + resources.push(ImageResource::new(GRID_AND_GUIDES, crate::psd_export::guides_resource(doc))); if !channels.is_empty() { let names: Vec<&str> = channels.iter().map(|c| c.name.as_str()).collect(); resources.push(ImageResource::new(1006, crate::psd_export::pascal_names_resource(&names))); resources.push(ImageResource::new(1045, crate::psd_export::unicode_names_resource(&names))); resources.push(ImageResource::new(crate::channel_map::DISPLAY_INFO, crate::channel_map::display_info(&channels, false))); } + resources.extend(crate::psd_export::path_resources(doc, &mut warnings)); + // The XMP and EXIF resolution follow the ResolutionInfo resource, so no copy contradicts it. + let ppi = Some((doc.resolution_dpi, doc.resolution_dpi)).filter(|d| d.0 > 0.0); if let Some(x) = &doc.metadata.xmp { - resources.push(ImageResource::new(ids::XMP, x.as_bytes().to_vec())); + resources.push(ImageResource::new(ids::XMP, photocraft_codecs::export_xmp(x, ppi).as_bytes().to_vec())); + } + if let Some(e) = &doc.metadata.exif { + resources.push(ImageResource::new(ids::EXIF, photocraft_codecs::export_exif(e, ppi).into_owned())); + } + // Every other imported resource (print settings, IPTC, the layer-id seed, ...), except the + // ones that only describe layers and any already written above. + let written: Vec = resources.iter().map(|r| r.id).collect(); + for (id, name, data) in &doc.metadata.psd_resources { + if LAYER_ONLY_RESOURCES.contains(id) || written.contains(id) || !crate::psd_export::keep_imported_resource(doc, *id, data) { + continue; + } + // Alpha identifiers: one u32 per channel, only while they still match the channels. + if *id == ALPHA_IDENTIFIERS && data.len() != channels.len().saturating_mul(4) { + continue; + } + let mut r = ImageResource::new(*id, data.to_vec()); + r.name = crate::psd_export::legacy_name(name); + resources.push(r); + } + if let Some(data) = crate::annotations_map::fresh_scale_resource(doc) { + resources.push(ImageResource::new(crate::annotations_map::MEASUREMENT_SCALE, data)); } resources.push(version_info_resource(true)); + // Document-level tagged blocks (patterns, notes, ...) are valid without a layer section; a + // kept layer block would describe layers the document doesn't have. + let global_blocks: Vec = crate::annotations_map::export_blocks(doc, crate::pattern_map::export_global_blocks(doc)) + .into_iter() + .filter(|(_, key, _)| !matches!(key, b"Layr" | b"Lr16" | b"Lr32")) + .map(|(sig, key, data)| crate::psd_export::global_block(sig, key, &data)) + .collect(); let color_mode_data = photocraft_psd::hdr::color_mode_data_for_depth(header.depth); let file = PsdFile { header, @@ -115,8 +161,8 @@ pub(crate) fn document_to_psd(doc: &Document, force_psb: bool) -> (PsdFile, Vec< resources, layer_info: None, layer_info_placement: LayerInfoPlacement::Section, - global_layer_mask: None, - global_blocks: Vec::new(), + global_layer_mask: (!global_blocks.is_empty()).then(GlobalLayerMask::default), + global_blocks, layer_mask_trailing: Vec::new(), image_data, }; diff --git a/crates/io/src/psd_export.rs b/crates/io/src/psd_export.rs index 1c43a364..3d8d637e 100644 --- a/crates/io/src/psd_export.rs +++ b/crates/io/src/psd_export.rs @@ -1053,7 +1053,7 @@ fn effects_unchanged(l: &Layer) -> Option { Some(m == l.effects.enabled && items == l.effects.items) } -fn legacy_name(s: &str) -> Vec { +pub(crate) fn legacy_name(s: &str) -> Vec { s.chars().map(|c| if c.is_ascii() && !c.is_ascii_control() { c as u8 } else { b'?' }).take(255).collect() } @@ -1079,7 +1079,7 @@ pub(crate) fn pascal_names_resource(names: &[&str]) -> Vec { v } -fn guides_resource(doc: &Document) -> Vec { +pub(crate) fn guides_resource(doc: &Document) -> Vec { let mut v = Vec::new(); v.extend_from_slice(&1u32.to_be_bytes()); v.extend_from_slice(&576u32.to_be_bytes()); @@ -1095,6 +1095,72 @@ fn guides_resource(doc: &Document) -> Vec { v } +/// Path resources: saved paths (2000+), the work path (1025) and the clipping path name (2999), +/// the last only when the imported one doesn't already name the document's clipping path. +pub(crate) fn path_resources(doc: &Document, warnings: &mut Vec) -> Vec { + use crate::vector_map::{CLIPPING_PATH, WORK_PATH, path_from_resource, path_to_records}; + let mut out = Vec::new(); + let (w, h) = (doc.size.width, doc.size.height); + let max = (*crate::vector_map::SAVED_PATHS.end() - *crate::vector_map::SAVED_PATHS.start() + 1) as usize; + if doc.paths.len() > max { + warnings.push(format!("only {max} saved paths fit in PSD; the rest were dropped")); + } + for (i, p) in doc.paths.iter().take(max).enumerate() { + let data = match &p.psd_raw { + Some(r) if path_from_resource(r, w, h).as_ref() == Some(&p.path) => r.to_vec(), + _ => path_to_records(&p.path, w, h).to_bytes(), + }; + let mut r = ImageResource::new(crate::vector_map::SAVED_PATHS.start() + i as u16, data); + r.name = legacy_name(&p.name); + out.push(r); + } + if let Some(wp) = &doc.work_path { + out.push(ImageResource::new(WORK_PATH, path_to_records(wp, w, h).to_bytes())); + } + let raw_clip = doc.metadata.psd_resources.iter().find(|(id, _, _)| *id == CLIPPING_PATH); + let raw_name = raw_clip.map(|(_, _, d)| { + let n = usize::from(d.first().copied().unwrap_or(0)); + d.get(1..1 + n).map(|b| String::from_utf8_lossy(b).into_owned()).unwrap_or_default() + }); + if let Some(c) = &doc.clipping_path + && raw_name.as_deref() != Some(c.name.as_str()) + { + // Pascal name, then flatness as 16.16 fixed (best effort; see vector_map docs). + let mut data = vec![0u8]; + let name = legacy_name(&c.name); + data[0] = name.len() as u8; + data.extend_from_slice(&name); + data.extend_from_slice(&((c.flatness.max(0.0) * 65536.0) as u32).to_be_bytes()); + out.push(ImageResource::new(CLIPPING_PATH, data)); + } + out +} + +/// Whether an imported (unmodelled) resource still describes the document and is written back. +pub(crate) fn keep_imported_resource(doc: &Document, id: u16, data: &[u8]) -> bool { + // Measurement scale / count resources: only while they still describe the document. + if !crate::annotations_map::keep_resource(doc, id) { + return false; + } + // A preserved clipping-path resource is only valid while it names the current one. + if id == crate::vector_map::CLIPPING_PATH { + let n = usize::from(data.first().copied().unwrap_or(0)); + let raw_name = data.get(1..1 + n).map(|b| String::from_utf8_lossy(b).into_owned()).unwrap_or_default(); + return doc.clipping_path.as_ref().is_some_and(|c| c.name == raw_name); + } + true +} + +/// A document-level (global) tagged block. Photoshop pads these to a multiple of 4, and readers +/// such as psd-tools step to the next block that way: an even pad after `CAI ` (77 bytes) +/// misaligned every block after it (#200). +pub(crate) fn global_block(signature: [u8; 4], key: [u8; 4], data: &[u8]) -> TaggedBlock { + let mut tb = TaggedBlock::new(key, data.to_vec()); + tb.signature = signature; + tb.padding = Some(vec![0; (4 - data.len() % 4) % 4]); + tb +} + fn cmyk_of(fmt: &PixelFormat) -> bool { fmt.mode == ColorMode::Cmyk } @@ -1467,43 +1533,7 @@ fn document_to_psd_nested(doc: &Document, opts: &PsdExportOptions, depth: u32, c data.push(0); resources.push(ImageResource::new(crate::channel_map::QUICK_MASK_INFO, data)); } - // Paths: saved paths (2000+), the work path (1025), the clipping path name (2999). - { - use crate::vector_map::{CLIPPING_PATH, WORK_PATH, path_from_resource, path_to_records}; - let (w, h) = (doc.size.width, doc.size.height); - let max = (*crate::vector_map::SAVED_PATHS.end() - *crate::vector_map::SAVED_PATHS.start() + 1) as usize; - if doc.paths.len() > max { - ex.warnings.push(format!("only {max} saved paths fit in PSD; the rest were dropped")); - } - for (i, p) in doc.paths.iter().take(max).enumerate() { - let data = match &p.psd_raw { - Some(r) if path_from_resource(r, w, h).as_ref() == Some(&p.path) => r.to_vec(), - _ => path_to_records(&p.path, w, h).to_bytes(), - }; - let mut r = ImageResource::new(crate::vector_map::SAVED_PATHS.start() + i as u16, data); - r.name = legacy_name(&p.name); - resources.push(r); - } - if let Some(wp) = &doc.work_path { - resources.push(ImageResource::new(WORK_PATH, path_to_records(wp, w, h).to_bytes())); - } - let raw_clip = doc.metadata.psd_resources.iter().find(|(id, _, _)| *id == CLIPPING_PATH); - let raw_name = raw_clip.map(|(_, _, d)| { - let n = usize::from(d.first().copied().unwrap_or(0)); - d.get(1..1 + n).map(|b| String::from_utf8_lossy(b).into_owned()).unwrap_or_default() - }); - if let Some(c) = &doc.clipping_path - && raw_name.as_deref() != Some(c.name.as_str()) - { - // Pascal name, then flatness as 16.16 fixed (best effort; see vector_map docs). - let mut data = vec![0u8]; - let name = legacy_name(&c.name); - data[0] = name.len() as u8; - data.extend_from_slice(&name); - data.extend_from_slice(&((c.flatness.max(0.0) * 65536.0) as u32).to_be_bytes()); - resources.push(ImageResource::new(CLIPPING_PATH, data)); - } - } + resources.extend(path_resources(doc, &mut ex.warnings)); if let Some(groups) = link_group_resource(&doc.layers) { resources.push(ImageResource::new(ids::LAYER_GROUP_INFO, groups)); } @@ -1548,13 +1578,7 @@ fn document_to_psd_nested(doc: &Document, opts: &PsdExportOptions, depth: u32, c if !ex.records.is_empty() && matches!(&key, b"Lr16" | b"Lr32" | b"Layr") { continue; } - let mut tb = TaggedBlock::new(key, data.to_vec()); - tb.signature = sig; - // Photoshop pads document-level (global) blocks to a multiple of 4, and readers such as - // psd-tools step to the next block that way: an even pad after `CAI ` (77 bytes) - // misaligned every block after it (#200). - tb.padding = Some(vec![0; (4 - data.len() % 4) % 4]); - global_blocks.push(tb); + global_blocks.push(global_block(sig, key, &data)); } if let Some(txt2) = txt2 { let mut tb = TaggedBlock::new(*b"Txt2", txt2.clone()); @@ -1576,18 +1600,9 @@ fn document_to_psd_nested(doc: &Document, opts: &PsdExportOptions, depth: u32, c if *id == crate::slices_map::SLICES && slices_resource.is_some() { continue; } - // Measurement scale / count resources: only while they still describe the document. - if !crate::annotations_map::keep_resource(doc, *id) { + if !keep_imported_resource(doc, *id, data) { continue; } - // A preserved clipping-path resource is only valid while it names the current one. - if *id == crate::vector_map::CLIPPING_PATH { - let n = usize::from(data.first().copied().unwrap_or(0)); - let raw_name = data.get(1..1 + n).map(|b| String::from_utf8_lossy(b).into_owned()).unwrap_or_default(); - if doc.clipping_path.as_ref().is_none_or(|c| c.name != raw_name) { - continue; - } - } let mut r = ImageResource::new(*id, data.to_vec()); r.name = legacy_name(name); resources.push(r); diff --git a/crates/io/tests/multichannel.rs b/crates/io/tests/multichannel.rs new file mode 100644 index 00000000..d6016070 --- /dev/null +++ b/crates/io/tests/multichannel.rs @@ -0,0 +1,142 @@ +//! Multichannel PSDs: alpha-type channels and the document's resources and global blocks survive +//! an import → export → import round trip. + +use photocraft_doc::{ColorIndicates, Knot, NamedPath, Path, PathOp, Subpath}; +use photocraft_io::*; +use photocraft_psd::resources::ImageResource; +use photocraft_psd::{ColorMode, Compression, PsdFile, TaggedBlock, Version, testgen}; + +/// DisplayInfo (1077) record: RGB colour, opacity (0..100) and kind (0/1 alpha, 2 spot). +fn display_record(out: &mut Vec, rgb: [u16; 3], opacity: u16, kind: u8) { + out.extend_from_slice(&0u16.to_be_bytes()); + for v in [rgb[0], rgb[1], rgb[2], 0] { + out.extend_from_slice(&v.to_be_bytes()); + } + out.extend_from_slice(&opacity.to_be_bytes()); + out.push(kind); +} + +/// A two-channel Multichannel file: a cyan spot ink and an alpha channel (masked areas, red 50 %). +fn file(depth: u16) -> PsdFile { + let mut f = testgen::merged_only(Version::Psd, ColorMode::Multichannel, depth, Compression::Rle, 9, 5); + let mut info = 1u32.to_be_bytes().to_vec(); + display_record(&mut info, [0, 65535, 65535], 0, 2); + display_record(&mut info, [65535, 0, 0], 50, 1); + f.resources.push(ImageResource::new(1077, info)); + f +} + +fn roundtrip(d: &photocraft_doc::Document) -> (PsdFile, photocraft_doc::Document) { + let out = export(d, "x.psd", &ExportOptions::default()).unwrap(); + let back = PsdFile::from_bytes(&out.bytes).unwrap(); + let (doc, _) = psd_to_document(&back); + (back, doc) +} + +#[test] +fn alpha_type_channels_import_as_alpha_and_round_trip() { + for depth in [8, 16] { + let f = file(depth); + let (d, _) = psd_to_document(&f); + assert_eq!(d.channels.len(), 2); + assert_eq!(d.channels[0].spot.map(|(c, _)| c.to_rgb()), Some([0.0, 1.0, 1.0])); + let a = &d.channels[1]; + assert_eq!(a.spot, None, "an alpha-type channel is not a spot ink ({depth}-bit)"); + assert_eq!(a.color.to_rgb(), [1.0, 0.0, 0.0]); + assert!((a.opacity - 0.5).abs() < 1e-6); + assert_eq!(a.indicates, ColorIndicates::MaskedAreas); + + // It still prints as black ink, so the composite is what a black spot channel gives. + let mut as_ink = d.clone(); + as_ink.channels[1].spot = Some((photocraft_color::Color::BLACK, 0.0)); + assert_eq!(photocraft_compose::flatten(&d).px, photocraft_compose::flatten(&as_ink).px); + + // Saved back unchanged: same DisplayInfo, same planes, same channels on reopening. + let (back, d2) = roundtrip(&d); + assert_eq!(back.resource(1077).map(|r| r.data.clone()), f.resource(1077).map(|r| r.data.clone())); + assert_eq!(back.decode_merged().unwrap(), f.decode_merged().unwrap()); + assert_eq!(d2.channels[1].spot, None); + assert_eq!(d2.channels[1].indicates, ColorIndicates::MaskedAreas); + assert!((d2.channels[1].opacity - 0.5).abs() < 1e-6); + assert!(d2.channels[0].spot.is_some()); + } +} + +#[test] +fn resources_and_global_blocks_survive_a_save() { + let mut f = file(8); + let iptc = vec![0x1c, 2, 0, 0, 2, 0, 4]; + let print_flags = vec![0, 0, 0, 0, 0, 0, 0, 1, 0]; + let seed = 7u32.to_be_bytes().to_vec(); + let alpha_ids = [0u32, 1].iter().flat_map(|v| v.to_be_bytes()).collect::>(); + f.resources.push(ImageResource::new(1028, iptc.clone())); + f.resources.push(ImageResource::new(1011, print_flags.clone())); + f.resources.push(ImageResource::new(1044, seed.clone())); + f.resources.push(ImageResource::new(1053, alpha_ids.clone())); + // A target-layer index describes layers, which a Multichannel document doesn't have. + f.resources.push(ImageResource::new(1024, vec![0, 0])); + let fmsk = vec![0, 0, 0, 0, 0, 50]; + f.global_blocks.push(TaggedBlock::new(*b"FMsk", fmsk.clone())); + let (mut d, _) = psd_to_document(&f); + d.guides.horizontal.push(2.0); + d.guides.vertical.push(3.0); + d.global_light.angle = 60.0; + let path = + Path::new(vec![Subpath { closed: true, op: PathOp::Combine, knots: vec![Knot::corner(1.0, 1.0), Knot::corner(8.0, 1.0), Knot::corner(4.0, 4.0)] }]); + d.paths.push(NamedPath { name: "Outline".into(), path, psd_raw: None }); + + let (back, d2) = roundtrip(&d); + let res = |id: u16| back.resource(id).map(|r| r.data.clone()); + assert_eq!(res(1028), Some(iptc)); + assert_eq!(res(1011), Some(print_flags)); + assert_eq!(res(1044), Some(seed)); + assert_eq!(res(1053), Some(alpha_ids)); + assert_eq!(res(1024), None); + let blocks: Vec<_> = back.global_blocks.iter().filter(|b| &b.key == b"FMsk").collect(); + assert_eq!(blocks.len(), 1); + assert_eq!(blocks[0].data, fmsk); + assert_eq!(d2.guides.horizontal, vec![2.0]); + assert_eq!(d2.guides.vertical, vec![3.0]); + assert_eq!(d2.global_light.angle, 60.0); + // The file's own saved path and the new one. + let names: Vec<&str> = d2.paths.iter().map(|p| p.name.as_str()).collect(); + assert_eq!(names, ["Path 1", "Outline"]); + let anchors = |p: &Path| p.subpaths.iter().flat_map(|s| s.knots.iter().map(|k| (k.anchor.x, k.anchor.y))).collect::>(); + let (got, want) = (anchors(&d2.paths[1].path), anchors(&d.paths[1].path)); + assert_eq!(got.len(), want.len()); + assert!(got.iter().zip(&want).all(|(a, b)| (a.0 - b.0).abs() < 1e-3 && (a.1 - b.1).abs() < 1e-3), "{got:?}"); + assert_eq!(back.decode_merged().unwrap(), f.decode_merged().unwrap()); + + // Alpha identifiers that no longer match the channels are not written. + d.channels.pop(); + let (back, _) = roundtrip(&d); + assert!(back.resource(1053).is_none()); +} + +/// A Photoshop Multichannel file: its alpha-type channel stays an alpha channel and a save keeps +/// every resource except the thumbnail (regenerated) and every document-level block. +#[cfg(feature = "corpus")] +#[test] +fn corpus_multichannel_round_trip_keeps_channels_and_resources() { + let path = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../corpus/psd/psd-tools/colormodes/4x4_16bit_multichannel.psd"); + assert!(path.is_file(), "{} is missing: run `cargo xtask corpus --all`", path.display()); + let bytes = std::fs::read(&path).unwrap(); + let f = PsdFile::from_bytes(&bytes).unwrap(); + let (d, _) = psd_to_document(&f); + let alpha: Vec<_> = d.channels.iter().filter(|c| c.spot.is_none()).collect(); + assert!(!alpha.is_empty(), "the file's alpha-type channel imports as an alpha channel"); + for a in &alpha { + assert_eq!(a.indicates, ColorIndicates::MaskedAreas); + assert_eq!(a.color.to_rgb(), [1.0, 0.0, 0.0]); + assert!((a.opacity - 0.5).abs() < 1e-6); + } + let (back, d2) = roundtrip(&d); + assert_eq!(back.resource(1077).map(|r| r.data.clone()), f.resource(1077).map(|r| r.data.clone())); + assert_eq!(back.decode_merged().unwrap(), f.decode_merged().unwrap()); + assert_eq!(d2.channels.iter().filter(|c| c.spot.is_none()).count(), alpha.len()); + let mut lost: Vec = f.resources.iter().map(|r| r.id).filter(|id| back.resource(*id).is_none()).collect(); + lost.retain(|id| *id != 1036); + assert!(lost.is_empty(), "resources lost on save: {lost:?}"); + let keys = |f: &PsdFile| f.global_blocks.iter().map(|b| b.key).collect::>(); + assert_eq!(keys(&back), keys(&f)); +} From b564f2ca9c81c0d51c87d96ee559de75dfd75cfc Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 12 Oct 2026 07:04:33 -0400 Subject: [PATCH 29/92] fix(layers): identify the Background by structure, never by its English name (#4036) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Photoshop's Background is the bottom layer of a file without transparency: a pixel layer that is transparency- and position-locked, whatever the file's language calls it ("Hintergrund", "背景", "Arrière-plan"). We matched the name "Background" in compose (deep / shallow knockout), the engine (cut/clear, merge visible, transforms, warps, distort, erasers, styles, masks, crops, straighten, smart-object unpack) and the UI (Properties, layer row, tab title), so a localized file's deep knockout revealed transparency instead of the Background. - `Document::background` / `background_mut` / `is_background` and `Layer::has_background_traits` in the doc model replace every name check; `extra_cmds::background_to_layer` is the one "Background → Layer 0" conversion. - PSD import marks the bottom record position-locked when it is transparency-protected and has no transparency channel, with or without an `lspf` block. Affinity import and HDR Toning now lock the Background's position like every other place that creates one. Co-authored-by: Claude Opus 5.5 --- crates/compose/src/advanced.rs | 6 +-- crates/compose/src/advanced_tests.rs | 23 ++++++++++ crates/doc/src/lib.rs | 50 ++++++++++++++++++++++ crates/engine/src/adjust_cmds.rs | 1 + crates/engine/src/analysis_cmds.rs | 2 +- crates/engine/src/background_cmds.rs | 15 +++---- crates/engine/src/color_to_alpha_cmds.rs | 4 +- crates/engine/src/commands.rs | 2 +- crates/engine/src/distort_cmds.rs | 16 ++----- crates/engine/src/edit_cmds.rs | 13 +++--- crates/engine/src/eraser_cmds.rs | 21 +++------ crates/engine/src/extra_cmds.rs | 19 ++++---- crates/engine/src/float_cmds.rs | 4 +- crates/engine/src/frame_cmds.rs | 2 +- crates/engine/src/image_cmds.rs | 9 ++-- crates/engine/src/layer_copy_cmds.rs | 2 +- crates/engine/src/layer_multi_cmds.rs | 8 +--- crates/engine/src/lens_cmds.rs | 3 +- crates/engine/src/mode_cmds.rs | 3 +- crates/engine/src/perspective_crop_cmds.rs | 12 +++--- crates/engine/src/pick_cmds.rs | 2 +- crates/engine/src/presets/styles.rs | 8 +--- crates/engine/src/slice_cmds.rs | 2 +- crates/engine/src/smart_cmds.rs | 2 +- crates/engine/src/smart_cmds/unpack.rs | 3 +- crates/engine/src/transform_cmds.rs | 27 ++++++------ crates/engine/src/warp_cmds.rs | 8 ++-- crates/io/src/affinity.rs | 1 + crates/io/src/psd_import.rs | 10 +++++ crates/io/tests/psd_background.rs | 39 +++++++++++++++++ crates/ui-egui/src/canvas.rs | 2 +- crates/ui-egui/src/doc_props_ui.rs | 7 +-- crates/ui-egui/src/panels.rs | 2 +- 33 files changed, 213 insertions(+), 115 deletions(-) create mode 100644 crates/io/tests/psd_background.rs diff --git a/crates/compose/src/advanced.rs b/crates/compose/src/advanced.rs index 4a9cb3e8..6809c9e8 100644 --- a/crates/compose/src/advanced.rs +++ b/crates/compose/src/advanced.rs @@ -84,10 +84,10 @@ pub fn shapeless(layer: &Layer) -> bool { !layer.advanced.transparency_shapes && (layer.advanced.knockout != Knockout::None || effects::has_effects(layer)) } -/// The Background layer of a stack: the bottom layer, a locked, opaque-by-convention pixel layer -/// named "Background" (how PSD import and File › New create it). +/// Whether `l`, the bottom layer of a stack, is the Background: identified by its locks and kind, +/// never by its (localized) name ([`photocraft_doc::Document::background`]). pub fn is_background(l: &Layer) -> bool { - l.name == "Background" && l.locks.transparency && !l.clipped && matches!(l.content, LayerContent::Raster(_)) + l.has_background_traits() } /// What a deep knockout reveals over `rect`: the document's initial backdrop with its Background diff --git a/crates/compose/src/advanced_tests.rs b/crates/compose/src/advanced_tests.rs index c4e437a4..0ca3bdad 100644 --- a/crates/compose/src/advanced_tests.rs +++ b/crates/compose/src/advanced_tests.rs @@ -437,3 +437,26 @@ fn a_knockout_background_does_not_recurse() { let got = render(&d, Rect::from_xywh(0, 0, 1, 1)).px[0]; assert!(got[3] <= 1.0); } + +/// The Background is found by its structure, not its English name: a file from a German or +/// Japanese Photoshop calls it "Hintergrund" or "背景", and a deep knockout still reveals it. A +/// bottom layer merely called "Background", without the Background's locks, is not one. +#[test] +fn deep_knockout_reveals_a_localized_background() { + for depth in DEPTHS { + for name in ["Hintergrund", "背景", "Arrière-plan"] { + let mut d = doc(depth, true); + d.layers[0].name = name.into(); + let green = solid(&d, "green", full(&d), GREEN); + d.layers.push(green); + d.layers.push(knocker(&d, Knockout::Deep)); + check(&d, 2, 2, WHITE, name); + } + let mut d = doc(depth, true); + d.layers[0].locks = Default::default(); + let green = solid(&d, "green", full(&d), GREEN); + d.layers.push(green); + d.layers.push(knocker(&d, Knockout::Deep)); + check(&d, 2, 2, [0.0; 4], "an unlocked layer named Background"); + } +} diff --git a/crates/doc/src/lib.rs b/crates/doc/src/lib.rs index 5ff69e58..354de06d 100644 --- a/crates/doc/src/lib.rs +++ b/crates/doc/src/lib.rs @@ -636,6 +636,13 @@ pub struct Layer { } impl Layer { + /// Whether the layer has the Background's own properties: an unclipped pixel layer with + /// transparency and position locked. Only the bottom layer of a document with them is the + /// Background: use [`Document::background`] / [`Document::is_background`] to identify it. + pub fn has_background_traits(&self) -> bool { + self.locks.transparency && self.locks.position && !self.clipped && matches!(self.content, LayerContent::Raster(_)) + } + pub fn new(name: impl Into, content: LayerContent) -> Self { Layer { id: LayerId::fresh(), @@ -1040,6 +1047,25 @@ impl Document { self.path_of(id).map_or_else(Locks::default, |p| self.locks_at(&p)) } + /// The Background layer, identified structurally as Photoshop does, never by its name (a file + /// from a German or Japanese Photoshop names it "Hintergrund" or "背景"): the bottom layer of + /// the stack, a pixel layer that is not clipped, with transparency and position locked (a PSD + /// stores it without a transparency channel and transparency-protected; File › New and opaque + /// flat files create it the same way). + pub fn background(&self) -> Option<&Layer> { + self.layers.first().filter(|l| Layer::has_background_traits(l)) + } + + /// [`Self::background`], mutably. + pub fn background_mut(&mut self) -> Option<&mut Layer> { + self.layers.first_mut().filter(|l| Layer::has_background_traits(l)) + } + + /// Whether `id` is the document's Background layer ([`Self::background`]). + pub fn is_background(&self, id: LayerId) -> bool { + self.background().is_some_and(|b| b.id == id) + } + pub fn layer(&self, id: LayerId) -> Option<&Layer> { fn rec(layers: &[Layer], id: LayerId) -> Option<&Layer> { layers.iter().find_map(|l| if l.id == id { Some(l) } else { l.children().and_then(|ch| rec(ch, id)) }) @@ -1205,6 +1231,30 @@ mod tests { assert_eq!(s.pixel(100, 0), vec![0.0; 4]); } + /// The Background is the locked bottom pixel layer, whatever it is called. + #[test] + fn background_is_structural_not_named() { + let mut d = doc(); + let id = d.layers[0].id; + assert!(d.is_background(id)); + for name in ["Hintergrund", "背景", "Arrière-plan"] { + d.layers[0].name = name.into(); + assert_eq!(d.background().map(|l| l.id), Some(id), "{name}"); + } + // A layer called "Background" without the locks, or above the bottom, is not it. + let mut top = Layer::raster("Background", d.pixel_format()); + top.locks.transparency = true; + top.locks.position = true; + let top_id = top.id; + d.layers.push(top); + assert!(!d.is_background(top_id)); + d.layers[0].locks.position = false; + assert!(d.background().is_none()); + d.layers[0].locks.position = true; + d.layers[0].clipped = true; + assert!(d.background_mut().is_none()); + } + #[test] fn max_group_depth_counts_nesting_without_recursing() { let mut d = doc(); diff --git a/crates/engine/src/adjust_cmds.rs b/crates/engine/src/adjust_cmds.rs index 42dd44d7..48f6e562 100644 --- a/crates/engine/src/adjust_cmds.rs +++ b/crates/engine/src/adjust_cmds.rs @@ -428,6 +428,7 @@ fn hdr_toning(s: &mut Session, p: &Value) -> Result { let data: Vec = px.iter().flat_map(|q| photocraft_raster::from_rgba(&fmt, *q)).collect(); let mut bg = Layer::raster("Background", fmt); bg.locks.transparency = true; + bg.locks.position = true; crate::pixels_mut(&mut bg)?.write_region(doc.bounds(), &data); *active = Some(bg.id); doc.layers = vec![bg]; diff --git a/crates/engine/src/analysis_cmds.rs b/crates/engine/src/analysis_cmds.rs index b369479c..1ba04dfe 100644 --- a/crates/engine/src/analysis_cmds.rs +++ b/crates/engine/src/analysis_cmds.rs @@ -670,7 +670,7 @@ fn straighten(s: &mut Session, p: &Value) -> Result { return Ok(json!({"angle": 0.0})); } let st = s.active().ok_or(EngineError::NoDocument)?; - let active_bg = st.active_layer.and_then(|id| d.layer(id)).is_some_and(|l| l.name == "Background" && l.locks.position); + let active_bg = st.active_layer.and_then(|id| d.layer(id)).is_some_and(|l| d.is_background(l.id)); let crop = p.get("crop").and_then(Value::as_bool).unwrap_or(active_bg || st.active_layer.is_none()); let (w0, h0) = (f64::from(d.size.width), f64::from(d.size.height)); compound(s, "Straighten", |s| { diff --git a/crates/engine/src/background_cmds.rs b/crates/engine/src/background_cmds.rs index 1da5ebc9..81c47501 100644 --- a/crates/engine/src/background_cmds.rs +++ b/crates/engine/src/background_cmds.rs @@ -10,14 +10,13 @@ use photocraft_doc::{Document, Layer, LayerContent, LayerId}; use serde_json::{Value, json}; use crate::commands::CommandSpec; -use crate::extra_cmds::is_background; use crate::{EngineError, Result, Session}; const CMD: &str = "layer.new.backgroundFromLayer"; /// The document's Background layer, if it has one (always the bottom layer). pub(crate) fn background_id(doc: &Document) -> Option { - doc.layers.first().filter(|l| is_background(l)).map(|l| l.id) + doc.background().map(|l| l.id) } /// Refuses an edit that moved the Background `bg` (taken before the edit) off the bottom of the @@ -155,7 +154,7 @@ mod tests { assert_eq!(s.execute(CMD, json!({})).unwrap()["layer"], a.0); assert_eq!(order(&s), [a, l0, b], "{depth}: drops to the bottom"); let l = &doc(&s).layers[0]; - assert!(is_background(l) && l.name == "Background", "{depth}"); + assert!(doc(&s).is_background(l.id) && l.name == "Background", "{depth}"); assert_eq!(s.active().unwrap().active_layer, Some(a)); // Its pixels stay; transparency takes the background colour (blue). let red = pixel(&s, 3, 3); @@ -170,10 +169,10 @@ mod tests { assert!(s.undo()); assert_eq!(order(&s), [l0, a, b], "{depth}"); let l = doc(&s).layer(a).unwrap(); - assert!(!is_background(l) && l.name == "A"); + assert!(!doc(&s).is_background(l.id) && l.name == "A"); assert!(s.redo()); assert_eq!(order(&s), [a, l0, b], "{depth}"); - assert!(is_background(&doc(&s).layers[0])); + assert!(doc(&s).is_background(doc(&s).layers[0].id)); } } @@ -191,7 +190,7 @@ mod tests { assert_eq!(d.layers[1].id, l0); assert_eq!(d.layers[2].id, a); let bg = &d.layers[0]; - assert!(is_background(bg) && !bg.visible, "visibility is kept"); + assert!(d.is_background(bg.id) && !bg.visible, "visibility is kept"); assert_eq!(bg.opacity, 1.0); } @@ -211,7 +210,7 @@ mod tests { for p in [json!({"layer": "A"}), json!({"layer": -1}), json!({"layer": 1.5}), json!({"layer": 99999}), json!({"layer": [a.0]})] { assert!(s.execute(CMD, p.clone()).is_err(), "{p}"); } - assert!(!doc(&s).layers.iter().any(is_background)); + assert!(doc(&s).background().is_none()); // A group or an adjustment layer can't become the Background. s.execute("layer.select", json!({"layer": a.0})).unwrap(); s.execute("layer.groupLayers", json!({})).unwrap(); @@ -220,7 +219,7 @@ mod tests { s.execute("layer.newAdjustmentLayer.invert", json!({})).unwrap(); assert!(!s.is_enabled(CMD)); assert!(s.execute(CMD, json!({})).is_err()); - assert!(!doc(&s).layers.iter().any(is_background)); + assert!(doc(&s).background().is_none()); } #[test] diff --git a/crates/engine/src/color_to_alpha_cmds.rs b/crates/engine/src/color_to_alpha_cmds.rs index c3120f4a..a6208e82 100644 --- a/crates/engine/src/color_to_alpha_cmds.rs +++ b/crates/engine/src/color_to_alpha_cmds.rs @@ -92,7 +92,7 @@ fn enabled(s: &Session) -> std::result::Result<(), String> { if locks.pixels || locks.all { return Err(format!("the layer \"{}\" is locked", l.name)); } - if locks.transparency && !crate::extra_cmds::is_background(l) { + if locks.transparency && !d.doc.is_background(l.id) { return Err(format!("the transparency of layer \"{}\" is locked", l.name)); } Ok(()) @@ -217,7 +217,7 @@ mod tests { s.execute("edit.undo", json!({})).unwrap(); assert_eq!(name(&s), "Background"); let d = s.active().unwrap(); - assert!(crate::extra_cmds::is_background(d.doc.layer(d.active_layer.unwrap()).unwrap())); + assert!(d.doc.is_background(d.active_layer.unwrap())); } #[test] diff --git a/crates/engine/src/commands.rs b/crates/engine/src/commands.rs index 2ce0b376..3554e569 100644 --- a/crates/engine/src/commands.rs +++ b/crates/engine/src/commands.rs @@ -1416,7 +1416,7 @@ pub(crate) fn translate_layer(doc: &Document, l: &mut Layer, dx: i32, dy: i32) { pub(crate) fn layer_copy(doc: &Document, id: LayerId) -> Result { let src = doc.layer(id).ok_or(EngineError::NoLayer(id))?; // A copy of the Background layer is an ordinary, unlocked layer (Photoshop). - let from_background = src.name == "Background" && src.locks.transparency && doc.layers.first().is_some_and(|b| b.id == id); + let from_background = doc.is_background(id); let mut dup = src.duplicate(); dup.name = doc.copy_name(&dup.name); if from_background { diff --git a/crates/engine/src/distort_cmds.rs b/crates/engine/src/distort_cmds.rs index 75ebf529..c164eaf6 100644 --- a/crates/engine/src/distort_cmds.rs +++ b/crates/engine/src/distort_cmds.rs @@ -213,15 +213,6 @@ fn smart_layer(s: &Session) -> std::result::Result<(), String> { } } -/// Unlocks a Background layer for an operation that exposes transparency (as Photoshop does). -fn float_background(l: &mut Layer) { - if l.locks.position && l.name == "Background" { - l.locks.position = false; - l.locks.transparency = false; - l.name = "Layer 0".into(); - } -} - fn check_locks(l: &Layer, group: Locks, position: bool) -> Result<()> { let locks = l.locks.union(group); if locks.all || locks.pixels || (position && locks.position) { @@ -247,14 +238,15 @@ fn run_on_layer(s: &mut Session, cmd: &str, label: &str, p: &Value, moves: bool, let canvas = doc.bounds(); let selection = doc.selection.clone(); let group = crate::transform_cmds::group_locks(doc, id); + // A Background gains transparency when the distortion moves pixels (as in Photoshop). + if moves { + crate::extra_cmds::background_to_layer(doc, id); + } let l = doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?; if let LayerContent::Smart(_) = l.content { let sf = SmartFilter { command: cmd.to_string(), params: params.clone(), blend: photocraft_color::BlendMode::Normal, opacity: 1.0, visible: true }; return crate::smart_cmds::add_smart_filter(doc, id, sf, selection.as_ref()); } - if moves { - float_background(l); - } check_locks(l, group, moves)?; let LayerContent::Raster(surf) = &mut l.content else { return Err(EngineError::Other(format!("{label} needs a pixel layer (rasterize it first)"))); diff --git a/crates/engine/src/edit_cmds.rs b/crates/engine/src/edit_cmds.rs index f99a81a6..d4de2d54 100644 --- a/crates/engine/src/edit_cmds.rs +++ b/crates/engine/src/edit_cmds.rs @@ -82,7 +82,7 @@ fn whole_layers(d: &crate::DocState, ids: &[LayerId]) -> Option> { let mut copies = scratch_doc(&d.doc); for id in ids { let mut l = d.doc.layer(*id)?.clone(); - if crate::extra_cmds::is_background(&l) { + if d.doc.is_background(*id) { l.name = "Layer 0".into(); l.locks = Default::default(); } @@ -277,7 +277,8 @@ fn clear_selected(doc: &mut Document, id: LayerId, background: [f32; 4]) -> Resu /// Cut / Clear on a layer: makes the selected pixels transparent. The Background can't hold /// transparency, so there the area is filled with the background colour instead (Photoshop). pub(crate) fn clear_area(doc: &mut Document, id: LayerId, area: Rect, sel: Option<&Surface>, background: [f32; 4]) -> Result<()> { - let bg = crate::extra_cmds::is_background(doc.layer(id).ok_or(EngineError::NoLayer(id))?); + doc.layer(id).ok_or(EngineError::NoLayer(id))?; + let bg = doc.is_background(id); let surf = crate::commands::paint_surface(doc, id, &Value::Null)?; if bg { crate::pixels::try_fill_surface(surf, area, background, sel, true)?; @@ -461,7 +462,7 @@ fn merge_visible(s: &mut Session) -> Result { } let lowest = visible[0]; let base = doc.layers[lowest].clone(); - let is_background = base.name == "Background" && base.locks.transparency; + let is_background = lowest == 0 && doc.is_background(base.id); // Composite of visible layers only (hidden ones stay where they are). let mut solo = doc.clone(); solo.layers.retain(|l| l.visible); @@ -1363,7 +1364,7 @@ mod tests { let mut s = fresh(); s.execute(cmd, json!({})).unwrap(); let d = &s.active().unwrap().doc; - assert!(crate::extra_cmds::is_background(&d.layers[0]), "{cmd}: still the Background"); + assert!(d.is_background(d.layers[0].id), "{cmd}: still the Background"); assert_eq!(px(&s, 0, 8, 8), vec![1.0, 0.0, 0.0, 1.0], "{cmd}: cut area is the background colour"); assert_eq!(px(&s, 0, 30, 20), vec![1.0, 1.0, 1.0, 1.0], "{cmd}: outside untouched"); } @@ -1609,9 +1610,9 @@ mod tests { let st = s.active().unwrap(); assert_eq!(st.doc.layers.len(), 4); let pasted = &st.doc.layers[st.doc.layers.len() - 2]; - assert!(!crate::extra_cmds::is_background(pasted)); + assert!(!st.doc.is_background(pasted.id)); assert_eq!(pasted.locks, Default::default()); - assert!(crate::extra_cmds::is_background(&st.doc.layers[0]), "the real Background is untouched"); + assert!(st.doc.is_background(st.doc.layers[0].id), "the real Background is untouched"); } /// #2428: a smart object copied in one document pastes into another as a smart object, in diff --git a/crates/engine/src/eraser_cmds.rs b/crates/engine/src/eraser_cmds.rs index 98169aff..3fb546de 100644 --- a/crates/engine/src/eraser_cmds.rs +++ b/crates/engine/src/eraser_cmds.rs @@ -59,19 +59,6 @@ fn active_pixel_layer(s: &Session, cmd: &str) -> Result { s.active().and_then(|d| d.active_layer).ok_or_else(|| bad(cmd, "no active layer")) } -fn is_background(l: &Layer) -> bool { - l.name == "Background" && l.locks.transparency && l.locks.position && matches!(l.content, LayerContent::Raster(_)) -} - -/// Photoshop converts the Background to a normal layer before erasing to transparency. -fn unlock_background(l: &mut Layer) { - if is_background(l) { - l.name = "Layer 0".into(); - l.locks.transparency = false; - l.locks.position = false; - } -} - fn pixels_locked(doc: &Document, l: &Layer) -> Option { let locks = doc.effective_locks(l.id); (locks.pixels || locks.all).then(|| EngineError::Other(format!("Could not complete your request because the layer \"{}\" is locked", l.name))) @@ -114,7 +101,9 @@ fn magic_eraser(s: &mut Session, p: &Value) -> Result { let bg = s.tools.background; let dmg = s.edit("Magic Eraser", |doc, _| { let selection = doc.selection.clone(); - unlock_background(doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?); + // Photoshop converts the Background to a normal layer before erasing to transparency. + doc.layer(id).ok_or(EngineError::NoLayer(id))?; + crate::extra_cmds::background_to_layer(doc, id); let lock = doc.effective_locks(id).transparency; let l = doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?; let surf = l.surface_mut().ok_or_else(|| bad(CMD, "not a pixel layer"))?; @@ -149,15 +138,15 @@ fn background_eraser(s: &mut Session, p: &Value) -> Result { if let Some(e) = pixels_locked(&d.doc, l) { return Err(e); } - if d.doc.effective_locks(id).transparency && !is_background(l) { + if d.doc.effective_locks(id).transparency && !d.doc.is_background(id) { return Err(EngineError::Other(format!("Could not use the Background Eraser because the transparency of layer \"{}\" is locked", l.name))); } } let stroke = Stroke { brush, points: pts }; let dmg = s.edit("Background Eraser", |doc, _| { let selection = doc.selection.clone(); + crate::extra_cmds::background_to_layer(doc, id); let l = doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?; - unlock_background(l); let surf = l.surface_mut().ok_or_else(|| bad(CMD, "not a pixel layer"))?; Ok(apply_background_eraser(surf, &stroke, &bs, selection.as_ref())) })?; diff --git a/crates/engine/src/extra_cmds.rs b/crates/engine/src/extra_cmds.rs index 84c0e24d..cebb9ec8 100644 --- a/crates/engine/src/extra_cmds.rs +++ b/crates/engine/src/extra_cmds.rs @@ -43,13 +43,9 @@ fn has_clip_and_selection(s: &Session) -> std::result::Result<(), String> { d.doc.selection.as_ref().map(|_| ()).ok_or_else(|| "Paste Into needs a selection".into()) } -pub(crate) fn is_background(l: &Layer) -> bool { - l.name == "Background" && l.locks.transparency && l.locks.position && matches!(l.content, LayerContent::Raster(_)) -} - fn has_background(s: &Session) -> std::result::Result<(), String> { let d = s.active().ok_or("no document open")?; - d.doc.layers.first().filter(|l| is_background(l)).map(|_| ()).ok_or_else(|| "the document has no Background layer".into()) + d.doc.background().map(|_| ()).ok_or_else(|| "the document has no Background layer".into()) } /// The layers a layer-style command acts on: as [`crate::layer_multi_cmds::targets`], but with @@ -60,7 +56,7 @@ pub(crate) fn style_targets(s: &Session, p: &Value, fits: impl Fn(&Layer) -> boo return Ok(ids); } let d = s.active().ok_or(EngineError::NoDocument)?; - let ids: Vec = ids.into_iter().filter(|id| d.doc.layer(*id).is_some_and(|l| !is_background(l) && fits(l))).collect(); + let ids: Vec = ids.into_iter().filter(|id| d.doc.layer(*id).is_some_and(|l| !d.doc.is_background(l.id) && fits(l))).collect(); if ids.is_empty() { return Err(EngineError::Other("none of the selected layers can take this layer style change".into())); } @@ -441,7 +437,7 @@ pub fn reveal_all_bounds(doc: &Document) -> Rect { fn layer_from_background(s: &mut Session) -> Result { let id = s.edit("Layer From Background", |doc, active| { - let l = doc.layers.first_mut().filter(|l| is_background(l)).ok_or(EngineError::Other("the document has no Background layer".into()))?; + let l = doc.background_mut().ok_or(EngineError::Other("the document has no Background layer".into()))?; unlock_background(l); *active = Some(l.id); Ok(l.id) @@ -458,7 +454,14 @@ pub(crate) fn unlock_background(l: &mut Layer) { /// Before `id` gets a layer mask: the Background can't have one, so it becomes a normal layer /// first ("Layer 0"), as when adding a mask to it in Photoshop. Other layers are left alone. pub(crate) fn background_to_layer_for_mask(doc: &mut photocraft_doc::Document, id: photocraft_doc::LayerId) { - if let Some(l) = doc.layers.first_mut().filter(|l| l.id == id && is_background(l)) { + background_to_layer(doc, id); +} + +/// If `id` is the Background ([`photocraft_doc::Document::background`], whatever its name), turns +/// it into a normal layer ("Layer 0"), as Photoshop does before an edit the Background can't +/// take (moving, transforming, exposing transparency, a style). Other layers are left alone. +pub(crate) fn background_to_layer(doc: &mut photocraft_doc::Document, id: photocraft_doc::LayerId) { + if let Some(l) = doc.background_mut().filter(|l| l.id == id) { unlock_background(l); } } diff --git a/crates/engine/src/float_cmds.rs b/crates/engine/src/float_cmds.rs index 892f7547..aaab22fd 100644 --- a/crates/engine/src/float_cmds.rs +++ b/crates/engine/src/float_cmds.rs @@ -58,7 +58,7 @@ impl CutParts { // A mask has no alpha: it keeps its format, and the cut leaves background colour. let mut rest = if mask { surf.clone() } else { full.clone() }; let mut piece = Surface::new(with_alpha); - let fill = !copy && (mask || crate::extra_cmds::is_background(l)); + let fill = !copy && (mask || doc.is_background(layer)); // A mask's untouched pixels (its default, e.g. white) move too, so take the whole canvas. let b = sel.content_bounds().intersect(&if mask { doc.bounds() } else { surf.content_bounds() }); if !b.is_empty() { @@ -165,7 +165,7 @@ fn can_float(s: &Session) -> std::result::Result<(), String> { /// floating? The Background is position-locked, but its selected pixels move (Photoshop). pub fn locked_for_float(doc: &Document, l: &photocraft_doc::Layer) -> bool { let locks = doc.effective_locks(l.id); - locks.all || (locks.position && !crate::extra_cmds::is_background(l)) + locks.all || (locks.position && !doc.is_background(l.id)) } fn float(s: &mut Session, p: &Value) -> Result { diff --git a/crates/engine/src/frame_cmds.rs b/crates/engine/src/frame_cmds.rs index df84bdcf..c97006e7 100644 --- a/crates/engine/src/frame_cmds.rs +++ b/crates/engine/src/frame_cmds.rs @@ -137,7 +137,7 @@ fn new_frame(s: &mut Session, p: &Value) -> Result { let gid = match content { Some(id) => { let l = doc.layer(id).ok_or(EngineError::NoLayer(id))?; - if !matches!(l.content, LayerContent::Raster(_)) || crate::extra_cmds::is_background(l) { + if !matches!(l.content, LayerContent::Raster(_)) || doc.is_background(id) { return Err(bad("only a pixel layer (not the Background) can go in a frame".into())); } let gid = doc.insert_above(Some(id), Layer::group(name, vec![])); diff --git a/crates/engine/src/image_cmds.rs b/crates/engine/src/image_cmds.rs index f477bd22..9ccca87a 100644 --- a/crates/engine/src/image_cmds.rs +++ b/crates/engine/src/image_cmds.rs @@ -300,7 +300,7 @@ fn crop_doc(doc: &mut Document, cmd: &str, r: Rect, delete_pixels: bool, extensi // A Background cannot hold transparent pixels: like an opaque Canvas Size extension, the area // an extending Crop adds is filled with the extension (background) colour. if extends - && let Some(bg) = doc.layers.first_mut().filter(|l| crate::extra_cmds::is_background(l)) + && let Some(bg) = doc.background_mut() && let LayerContent::Raster(surf) = &mut bg.content { let old = old_canvas.translate(dx, dy); @@ -381,16 +381,13 @@ fn canvas_size(s: &mut Session, p: &Value) -> Result { // A shrink or no-op resize must not silently convert the Background. if ext[3] == 0.0 && (nw > ow as u32 || nh > oh as u32) - && let Some(bg) = doc.layers.first_mut() - && crate::extra_cmds::is_background(bg) + && let Some(bg) = doc.background_mut() { crate::extra_cmds::unlock_background(bg); } // The locked Background layer is extended with the extension colour. if ext[3] > 0.0 - && let Some(bg) = doc.layers.first_mut() - && bg.name == "Background" - && bg.locks.transparency + && let Some(bg) = doc.background_mut() && let LayerContent::Raster(surf) = &mut bg.content { let fmt = surf.format(); diff --git a/crates/engine/src/layer_copy_cmds.rs b/crates/engine/src/layer_copy_cmds.rs index 29eff4c8..9a42778d 100644 --- a/crates/engine/src/layer_copy_cmds.rs +++ b/crates/engine/src/layer_copy_cmds.rs @@ -163,7 +163,7 @@ fn copy_to_document(s: &mut Session, p: &Value) -> Result { let src_layer = sdoc.layer(*id).ok_or(EngineError::NoLayer(*id))?; let mut l = src_layer.duplicate(); // A dragged Background arrives as an ordinary layer (the destination keeps its own). - if crate::extra_cmds::is_background(src_layer) && sdoc.layers.first().is_some_and(|b| b.id == *id) { + if sdoc.is_background(*id) { l.name = ddoc.next_layer_name("Layer"); l.locks = Default::default(); } diff --git a/crates/engine/src/layer_multi_cmds.rs b/crates/engine/src/layer_multi_cmds.rs index 62006d08..f0bf4a50 100644 --- a/crates/engine/src/layer_multi_cmds.rs +++ b/crates/engine/src/layer_multi_cmds.rs @@ -44,7 +44,7 @@ pub(crate) fn mask_targets(s: &Session, p: &serde_json::Value) -> Result = ids.into_iter().filter(|id| d.doc.layer(*id).is_some_and(|l| l.mask.is_none() && !crate::extra_cmds::is_background(l))).collect(); + let ids: Vec = ids.into_iter().filter(|id| d.doc.layer(*id).is_some_and(|l| l.mask.is_none() && !d.doc.is_background(l.id))).collect(); if ids.is_empty() { return Err(EngineError::Other("none of the selected layers can take a layer mask".into())); } @@ -163,13 +163,9 @@ pub fn select(s: &mut Session, p: &Value) -> Result { Ok(json!({"selected": selected(s).iter().map(|l| l.0).collect::>()})) } -pub(crate) fn is_locked_background(l: &Layer) -> bool { - l.name == "Background" && l.locks.transparency && matches!(l.content, LayerContent::Raster(_)) -} - fn select_all_layers(s: &mut Session) -> Result { let d = s.active().ok_or(EngineError::NoDocument)?; - let ids: Vec = d.doc.walk().into_iter().filter(|(_, _, l)| !is_locked_background(l)).map(|(_, _, l)| l.id).collect(); + let ids: Vec = d.doc.walk().into_iter().filter(|(_, _, l)| !d.doc.is_background(l.id)).map(|(_, _, l)| l.id).collect(); if ids.is_empty() { return Err(EngineError::Other("there are no layers to select".into())); } diff --git a/crates/engine/src/lens_cmds.rs b/crates/engine/src/lens_cmds.rs index c0513cf3..31d69300 100644 --- a/crates/engine/src/lens_cmds.rs +++ b/crates/engine/src/lens_cmds.rs @@ -287,6 +287,7 @@ fn run_filter(s: &mut Session, cmd: &str, label: &str, stored: Value, float_bg: let canvas = doc.bounds(); let selection = doc.selection.clone(); let locks = doc.effective_locks(id); + let background = doc.is_background(id); let l = doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?; if let LayerContent::Smart(_) = l.content { let sf = SmartFilter { command: cmd.to_string(), params: stored.clone(), blend: photocraft_color::BlendMode::Normal, opacity: 1.0, visible: true }; @@ -296,7 +297,7 @@ fn run_filter(s: &mut Session, cmd: &str, label: &str, stored: Value, float_bg: return Err(EngineError::Other(format!("layer \"{}\" is locked", l.name))); } // A Background layer gains transparency when the edge mode exposes it (as in Photoshop). - if float_bg && l.locks.position && l.name == "Background" { + if float_bg && background { l.locks.position = false; l.locks.transparency = false; l.name = "Layer 0".into(); diff --git a/crates/engine/src/mode_cmds.rs b/crates/engine/src/mode_cmds.rs index def9440c..59653034 100644 --- a/crates/engine/src/mode_cmds.rs +++ b/crates/engine/src/mode_cmds.rs @@ -91,8 +91,9 @@ pub(crate) fn rotate_arbitrary(s: &mut Session, p: &Value) -> Result { let canvas = doc.bounds(); let fmt = doc.pixel_format(); let dpi = doc.resolution_dpi; + let background_id = doc.background().map(|l| l.id); for l in doc.layers.iter_mut() { - let background = l.name == "Background" && l.locks.position && matches!(l.content, LayerContent::Raster(_)); + let background = Some(l.id) == background_id; if background && let Some(surf) = l.surface_mut() { // The Background stays a Background: rotated pixels over the background colour. let src = surf.content_bounds(); diff --git a/crates/engine/src/perspective_crop_cmds.rs b/crates/engine/src/perspective_crop_cmds.rs index c8881e6f..8acaf42c 100644 --- a/crates/engine/src/perspective_crop_cmds.rs +++ b/crates/engine/src/perspective_crop_cmds.rs @@ -14,7 +14,7 @@ use photocraft_algo::transform::{Homography, Interp, convex_quad, quad_size, quad_to_rect, warp_surface_clipped}; use photocraft_color::PixelFormat; -use photocraft_doc::{Document, Layer, LayerContent, Size}; +use photocraft_doc::{Document, Layer, LayerContent, LayerId, Size}; use photocraft_geom::{Affine, Rect}; use photocraft_raster::Surface; use serde_json::{Value, json}; @@ -154,12 +154,13 @@ fn warp_gray(s: &Surface, h: &Homography, interp: Interp, clip: Rect) -> Result< } /// Maps every layer's pixels and masks through `h` into `clip`. -fn warp_layers(layers: &mut [Layer], h: &Homography, interp: Interp, clip: Rect, bg: &[f32]) -> Result<()> { +/// `background_id` is the id of the document's Background, if it has one. +fn warp_layers(layers: &mut [Layer], h: &Homography, interp: Interp, clip: Rect, bg: &[f32], background_id: Option) -> Result<()> { for l in layers { crate::allocation::checkpoint("a perspective crop")?; - let background = crate::extra_cmds::is_background(l); + let background = background_id == Some(l.id); match &mut l.content { - LayerContent::Group(g) => warp_layers(&mut g.children, h, interp, clip, bg)?, + LayerContent::Group(g) => warp_layers(&mut g.children, h, interp, clip, bg, None)?, LayerContent::Raster(surf) => { let warped = warp_surface_clipped(surf, surf.content_bounds(), h, interp, clip)?; *surf = if background { @@ -188,7 +189,8 @@ fn apply(doc: &mut Document, q: &[[f64; 2]; 4], h: &Homography, size: (u32, u32) let (w, ht) = size; let clip = Rect::from_xywh(0, 0, w, ht); let bg = photocraft_raster::from_rgba(&doc.pixel_format(), bg); - warp_layers(&mut doc.layers, h, interp, clip, &bg)?; + let background_id = doc.background().map(|l| l.id); + warp_layers(&mut doc.layers, h, interp, clip, &bg, background_id)?; for ch in doc.channels.iter_mut().chain(doc.quick_mask.as_mut()) { ch.surface = warp_gray(&ch.surface, h, interp, clip)?; } diff --git a/crates/engine/src/pick_cmds.rs b/crates/engine/src/pick_cmds.rs index ccb3b4ca..c8583305 100644 --- a/crates/engine/src/pick_cmds.rs +++ b/crates/engine/src/pick_cmds.rs @@ -126,7 +126,7 @@ pub fn layers_in_rect(doc: &Document, r: Rect, group: bool) -> Vec { let canvas = doc.bounds(); for (path, _, l) in doc.walk().iter().rev() { if matches!(l.content, LayerContent::Group(_) | LayerContent::Adjustment(_)) - || crate::layer_multi_cmds::is_locked_background(l) + || doc.is_background(l.id) || doc.effective_locks(l.id).all || !(1..=path.len()).all(|n| doc.layer_at(&path[..n]).is_some_and(|a| a.visible)) { diff --git a/crates/engine/src/presets/styles.rs b/crates/engine/src/presets/styles.rs index a8c60d6a..ee4607cf 100644 --- a/crates/engine/src/presets/styles.rs +++ b/crates/engine/src/presets/styles.rs @@ -191,13 +191,9 @@ fn apply(s: &mut Session, p: &Value) -> Result { let mode = doc.mode; let effects: Vec<_> = effects.iter().cloned().map(|e| e.in_mode(mode)).collect(); for id in &ids { - let l = doc.layer_mut(*id).ok_or(EngineError::NoLayer(*id))?; // Styles can't sit on the Background: Photoshop turns it into a normal layer first. - if l.name == "Background" && l.locks.transparency && l.locks.position && matches!(l.content, photocraft_doc::LayerContent::Raster(_)) { - l.name = "Layer 0".into(); - l.locks.transparency = false; - l.locks.position = false; - } + crate::extra_cmds::background_to_layer(doc, *id); + let l = doc.layer_mut(*id).ok_or(EngineError::NoLayer(*id))?; if add { l.effects.items.extend(effects.iter().cloned()); } else { diff --git a/crates/engine/src/slice_cmds.rs b/crates/engine/src/slice_cmds.rs index 0d3cceb6..959f1329 100644 --- a/crates/engine/src/slice_cmds.rs +++ b/crates/engine/src/slice_cmds.rs @@ -50,7 +50,7 @@ fn has_layer_for_slice(s: &Session) -> std::result::Result<(), String> { if matches!(l.content, LayerContent::Adjustment(_)) { return Err("adjustment layers have no bounds to slice".into()); } - if d.doc.layers.first().is_some_and(|b| b.id == id && b.name == "Background" && b.locks.transparency && b.locks.position) { + if d.doc.is_background(id) { return Err("the Background layer can't have a layer-based slice".into()); } if d.doc.slices.list.iter().any(|s| s.layer == Some(id)) { diff --git a/crates/engine/src/smart_cmds.rs b/crates/engine/src/smart_cmds.rs index 5678a8b7..e6322519 100644 --- a/crates/engine/src/smart_cmds.rs +++ b/crates/engine/src/smart_cmds.rs @@ -666,7 +666,7 @@ fn any_layer(l: &Layer, f: &dyn Fn(&Layer) -> bool) -> bool { /// blend mode, clipping and label stay on the smart layer. The cache is the exact composite, so /// the document looks the same before and after. pub fn layer_to_smart(doc: &Document, l: &Layer) -> Result { - let background = l.name == "Background" && l.locks.position; + let background = doc.is_background(l.id); let mut inner = l.clone(); inner.visible = true; inner.opacity = 1.0; diff --git a/crates/engine/src/smart_cmds/unpack.rs b/crates/engine/src/smart_cmds/unpack.rs index 8ddfa3d8..0fdf3ac3 100644 --- a/crates/engine/src/smart_cmds/unpack.rs +++ b/crates/engine/src/smart_cmds/unpack.rs @@ -32,9 +32,10 @@ fn contents(s: &Session, doc: &Document, sm: &SmartObject, intent: Intent, bpc: if src.depth != doc.depth { crate::image_cmds::convert_layers_depth(&mut src.layers, doc.depth); } + let background_id = src.background().map(|l| l.id); let mut layers = std::mem::take(&mut src.layers); for l in &mut layers { - if crate::extra_cmds::is_background(l) { + if Some(l.id) == background_id { l.name = "Layer 0".into(); l.locks = Default::default(); } diff --git a/crates/engine/src/transform_cmds.rs b/crates/engine/src/transform_cmds.rs index 44ea2e18..2b35b183 100644 --- a/crates/engine/src/transform_cmds.rs +++ b/crates/engine/src/transform_cmds.rs @@ -201,10 +201,10 @@ pub(crate) fn group_locks(doc: &Document, id: LayerId) -> Locks { } /// The locks a transform of `l` meets: its own and `group`'s (those it inherits). The Background's -/// position lock doesn't count: Photoshop turns it into a normal layer first ([`transform_layer`]). -fn transform_locks(l: &Layer, group: Locks) -> Locks { +/// position lock doesn't count: Photoshop turns it into a normal layer first. +fn transform_locks(l: &Layer, group: Locks, background: bool) -> Locks { let mut own = l.locks; - if own.position && l.name == "Background" { + if background { own.position = false; own.transparency = false; } @@ -217,29 +217,24 @@ fn transform_locks(l: &Layer, group: Locks) -> Locks { pub fn locked_for_transform(doc: &Document, id: LayerId) -> bool { let Some(l) = doc.layer(id) else { return false }; // An explicit stack rather than recursion: documents can nest deeply. - let mut stack = vec![(l, group_locks(doc, id))]; - while let Some((l, group)) = stack.pop() { - let locks = transform_locks(l, group); + let mut stack = vec![(l, group_locks(doc, id), doc.is_background(id))]; + while let Some((l, group, background)) = stack.pop() { + let locks = transform_locks(l, group, background); if locks.position || locks.all { return true; } if let LayerContent::Group(g) = &l.content { - stack.extend(g.children.iter().map(|c| (c, locks))); + stack.extend(g.children.iter().map(|c| (c, locks, false))); } } false } -/// `group` holds the locks `l` inherits from the groups around it ([`group_locks`]). +/// `group` holds the locks `l` inherits from the groups around it ([`group_locks`]). A Background +/// is turned into a normal layer by the caller first ([`crate::extra_cmds::background_to_layer`]). pub(crate) fn transform_layer(doc_sel: Option<&Surface>, group: Locks, l: &mut Layer, h: &Homography, affine: Option, interp: Interp) -> Result<()> { crate::allocation::checkpoint("transforming pixels")?; - let locks = transform_locks(l, group); - // Photoshop turns the Background into a normal layer before transforming it. - if l.locks.position && l.name == "Background" { - l.locks.position = false; - l.locks.transparency = false; - l.name = "Layer 0".into(); - } + let locks = transform_locks(l, group, false); if locks.position || locks.all { return Err(EngineError::Other(format!("layer \"{}\" is locked", l.name))); } @@ -493,6 +488,8 @@ fn transform(s: &mut Session, p: &Value) -> Result { let id = id.ok_or_else(|| EngineError::Other("no active layer".into()))?; let is_group = doc.layer(id).is_some_and(Layer::is_group); let group = group_locks(doc, id); + // Photoshop turns the Background into a normal layer before transforming it. + crate::extra_cmds::background_to_layer(doc, id); let l = doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?; transform_layer(if is_group { None } else { sel.as_ref() }, group, l, &h, affine, interp)?; if !h.is_identity() { diff --git a/crates/engine/src/warp_cmds.rs b/crates/engine/src/warp_cmds.rs index 49578cbb..844da503 100644 --- a/crates/engine/src/warp_cmds.rs +++ b/crates/engine/src/warp_cmds.rs @@ -110,12 +110,9 @@ pub fn warp_from_params(cmd: &str, p: &Value, rect: [f64; 4]) -> Result { Ok(w) } +/// A Background is turned into a normal layer by the caller first +/// ([`crate::extra_cmds::background_to_layer`]). fn warp_layer(doc_sel: Option<&Surface>, group: Locks, l: &mut Layer, w: &Warp, rect: Rect, interp: Interp) -> Result<()> { - if l.locks.position && l.name == "Background" { - l.locks.position = false; - l.locks.transparency = false; - l.name = "Layer 0".into(); - } let locks = l.locks.union(group); if locks.position || locks.all { return Err(EngineError::Other(format!("layer \"{}\" is locked", l.name))); @@ -270,6 +267,7 @@ fn apply(s: &mut Session, p: &Value, cmd: &str) -> Result { let sel = doc.selection.clone(); let is_group = doc.layer(id).is_some_and(Layer::is_group); let group = crate::transform_cmds::group_locks(doc, id); + crate::extra_cmds::background_to_layer(doc, id); let l = doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?; warp_layer(if is_group { None } else { sel.as_ref() }, group, l, &w, rect, interp)?; let snapshot = doc.clone(); diff --git a/crates/io/src/affinity.rs b/crates/io/src/affinity.rs index f829326e..efba868b 100644 --- a/crates/io/src/affinity.rs +++ b/crates/io/src/affinity.rs @@ -151,6 +151,7 @@ impl Builder { bg.prune(); let mut l = Layer::new("Background", LayerContent::Raster(bg)); l.locks.transparency = true; + l.locks.position = true; layers.insert(0, l); } self.doc.layers = layers; diff --git a/crates/io/src/psd_import.rs b/crates/io/src/psd_import.rs index 137381fc..ffe2d34e 100644 --- a/crates/io/src/psd_import.rs +++ b/crates/io/src/psd_import.rs @@ -706,6 +706,16 @@ pub fn psd_to_document_with(file: &PsdFile, ctl: &photocraft_raster::Interrupt) // its own profile, as the compositor and the PSD writer read them. let space = photocraft_compose::cmyk_space(&doc); doc.layers = photocraft_color::convert::with_cmyk_space(space.as_ref(), || cx.build(&tree, 0)); + // Photoshop's Background: the bottom record, a transparency-protected pixel layer stored + // without a transparency channel (-1). It is also position-locked, whatever its + // (localized) name and whether or not the file carries an `lspf` block. + if let (Some(rec), Some(bottom)) = (file.layers().first(), doc.layers.first_mut()) + && rec.flags.transparency_protected() + && !rec.channels.iter().any(|c| c.id == -1) + && matches!(bottom.content, LayerContent::Raster(_)) + { + bottom.locks.position = true; + } // Layer › Link Layers: resource 1026 holds one group id per layer record (0 = unlinked). if let Some(Ok(photocraft_psd::resources::ResourceData::LayerGroupInfo(groups))) = file.resources.iter().find(|r| r.id == ids::LAYER_GROUP_INFO).and_then(photocraft_psd::resources::ImageResource::parsed) diff --git a/crates/io/tests/psd_background.rs b/crates/io/tests/psd_background.rs new file mode 100644 index 00000000..d24d2440 --- /dev/null +++ b/crates/io/tests/psd_background.rs @@ -0,0 +1,39 @@ +//! A PSD's Background is recognised by its structure (the bottom record, transparency-protected, +//! stored without a transparency channel), whatever its name in the Photoshop language that +//! saved the file. + +use photocraft_io::psd_to_document; +use photocraft_psd::{ColorMode, Compression, PsdFile, TaggedBlock, Version, testgen}; + +/// `testgen::layered` with its bottom layer turned into a Photoshop Background named `name`. +fn file(name: &str, transparency_channel: bool) -> PsdFile { + let mut f = testgen::layered(Version::Psd, ColorMode::Rgb, 8, Compression::Rle); + let bottom = f.layers_mut().first_mut().unwrap(); + bottom.name = name.bytes().filter(u8::is_ascii).collect(); + bottom.blocks.retain(|b| &b.key != b"luni" && &b.key != b"lspf"); + bottom.blocks.push(TaggedBlock::unicode_name(name)); + bottom.flags.set_transparency_protected(true); + if !transparency_channel { + bottom.channels.retain(|c| c.id != -1); + } + f +} + +#[test] +fn a_localized_background_is_the_background() { + for name in ["Hintergrund", "背景", "Arrière-plan"] { + let (d, _) = psd_to_document(&file(name, false)); + let bg = d.background().unwrap_or_else(|| panic!("{name}: no Background")); + assert_eq!(bg.name, name); + assert!(bg.locks.transparency && bg.locks.position, "{name}"); + assert_eq!(bg.id, d.layers[0].id); + } +} + +#[test] +fn a_protected_layer_with_transparency_is_not_the_background() { + // Lock Transparent Pixels on an ordinary bottom layer: it keeps its transparency channel. + let (d, _) = psd_to_document(&file("Background", true)); + assert!(d.layers[0].locks.transparency); + assert!(d.background().is_none()); +} diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index 19f1cbf4..c9e4c6ce 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -2089,7 +2089,7 @@ const STUDIO_TAB_GAP: f32 = 4.0; fn pro_tab_title(app: &PhotocraftApp, i: usize) -> String { let Some(st) = app.session.documents().get(i) else { return String::new() }; let zoom = app.ui.views.get(i).map_or(100.0, |v| v.zoom * 100.0); - let active_layer = st.active_layer.and_then(|id| st.doc.layer(id)).filter(|l| !(l.name == "Background" && l.locks.transparency)); + let active_layer = st.active_layer.and_then(|id| st.doc.layer(id)).filter(|l| !st.doc.is_background(l.id)); let mask = app.session.active_index() == Some(i) && app.ui.mask_target && active_layer.is_some_and(|l| l.mask.is_some()); let model = if mask { tl!("Layer Mask").to_string() } else { mode_label(&st.doc).to_string() }; let layer = active_layer.map(|l| format!("{}, ", l.name)).unwrap_or_default(); diff --git a/crates/ui-egui/src/doc_props_ui.rs b/crates/ui-egui/src/doc_props_ui.rs index 2383590c..8c10b8c4 100644 --- a/crates/ui-egui/src/doc_props_ui.rs +++ b/crates/ui-egui/src/doc_props_ui.rs @@ -3,15 +3,16 @@ //! Rulers & Grids toggles. Every edit dispatches an engine or view command, so the panel stays thin. use egui::{Align2, Rect, RichText, Sense, Stroke, StrokeKind, pos2, vec2}; -use photocraft_doc::{ColorMode, Document, Layer, LayerContent, LayerId, SampleType}; +use photocraft_doc::{ColorMode, Document, Layer, LayerId, SampleType}; use serde_json::{Value, json}; use crate::theme::Tokens; use crate::{PhotocraftApp, icons, widgets}; -/// Photoshop's Background layer: the locked, opaque raster layer at the bottom of the stack. +/// Photoshop's Background layer: the locked, opaque raster layer at the bottom of the stack, +/// whatever its (localized) name ([`Document::background`]). pub fn is_background(doc: &Document, l: &Layer) -> bool { - l.name == "Background" && l.locks.transparency && matches!(l.content, LayerContent::Raster(_)) && doc.layers.first().is_some_and(|b| b.id == l.id) + doc.is_background(l.id) } /// Does the Properties panel show the Document view? (No layer selected, or the Background layer.) diff --git a/crates/ui-egui/src/panels.rs b/crates/ui-egui/src/panels.rs index 25f3653b..086d1c06 100644 --- a/crates/ui-egui/src/panels.rs +++ b/crates/ui-egui/src/panels.rs @@ -2689,7 +2689,7 @@ fn layer_row( let name_color = if l.visible { t.text } else { t.text_faint }; let font = if selected && !t.pro { theme::medium(13.0) } else { egui::FontId::proportional(if t.pro { 12.0 } else { 13.0 }) }; // Photoshop before 2026 set the Background layer's name in italics; 2026 sets it upright. - let italic = !t.pro && l.name == "Background" && l.locks.transparency; + let italic = !t.pro && doc.is_background(l.id); // Photoshop rows show only the name; the kind sub-label is a Studio-theme addition. let is_pixel = t.pro || matches!(l.content, LayerContent::Raster(_)); let name_rect = crate::layer_row_ui::truncated(&painter, &l.name, font, name_color, italic, name_right - x).map(|galley| { From 21f1012ce2ef3d90c2f6e867dd84c0edc13d6401 Mon Sep 17 00:00:00 2001 From: Valentin Klein Date: Mon, 12 Oct 2026 13:11:41 +0200 Subject: [PATCH 30/92] Codecs: refuse implausible PNG/WebP headers before allocating (#3691) (#3706) A tiny file declaring a huge image reserved the full output buffer before any data was checked. Add Limits::check_plausible (compression-ratio guard) and a fallible alloc_zeroed, use them in PNG and WebP, and lower the 32-bit default max_alloc to 1 GiB. Co-authored-by: Claude Opus 5.5 --- crates/codecs/src/codecs/png.rs | 8 ++++++-- crates/codecs/src/codecs/webp.rs | 7 +++++-- crates/codecs/src/options.rs | 29 +++++++++++++++++++++++++++-- crates/codecs/tests/limits.rs | 24 ++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 6 deletions(-) diff --git a/crates/codecs/src/codecs/png.rs b/crates/codecs/src/codecs/png.rs index 636238a7..2544a106 100644 --- a/crates/codecs/src/codecs/png.rs +++ b/crates/codecs/src/codecs/png.rs @@ -7,7 +7,7 @@ use crate::Format; use crate::error::CodecError; use crate::fidelity::Plan; use crate::image::{ChannelLayout, DecodeWarning, Image, Metadata, SampleType}; -use crate::options::{EncodeOptions, Limits, PngCompression}; +use crate::options::{EncodeOptions, Limits, PngCompression, alloc_zeroed}; const F: Format = Format::Png; pub(crate) const XMP_KEYWORD: &str = "XML:com.adobe.xmp"; @@ -29,6 +29,10 @@ pub(crate) fn decode(bytes: &[u8], limits: &Limits) -> Result let (w, h) = info.size(); // Worst case output: 4 channels x 16 bit. limits.check_bytes(w, h, 8)?; + // zlib never beats 1032:1; refuse a file too small for the declared image before the + // output buffer exists. Measured on the stored samples (before palette/bit expansion). + let stored = u64::from(w).saturating_mul(u64::from(h)).saturating_mul(info.bits_per_pixel() as u64).div_ceil(8); + Limits::check_plausible(stored, bytes.len(), 1100)?; } let mut reader = decoder.read_info().map_err(map_png_err)?; // APNG: the IDAT image is the first frame, or an extra default image when no fcTL precedes it. @@ -47,7 +51,7 @@ pub(crate) fn decode(bytes: &[u8], limits: &Limits) -> Result d => return Err(err(format!("unexpected output bit depth {d:?}"))), }; let size = reader.output_buffer_size().ok_or_else(|| err("image too large"))?; - let mut buf = vec![0u8; size]; + let mut buf = alloc_zeroed::(size)?; let out = reader.next_frame(&mut buf).map_err(map_png_err)?; buf.truncate(out.buffer_size()); // Collect ancillary chunks after IDAT. Tolerate malformed tails once pixels diff --git a/crates/codecs/src/codecs/webp.rs b/crates/codecs/src/codecs/webp.rs index c26c10c8..36473041 100644 --- a/crates/codecs/src/codecs/webp.rs +++ b/crates/codecs/src/codecs/webp.rs @@ -9,7 +9,7 @@ use crate::Format; use crate::error::CodecError; use crate::fidelity::Plan; use crate::image::{ChannelLayout, DecodeWarning, Image, Metadata, SampleType}; -use crate::options::{EncodeOptions, Limits}; +use crate::options::{EncodeOptions, Limits, alloc_zeroed}; const F: Format = Format::WebP; @@ -23,8 +23,11 @@ pub(crate) fn decode(bytes: &[u8], limits: &Limits) -> Result let (w, h) = dec.dimensions(); let layout = if dec.has_alpha() { ChannelLayout::Rgba } else { ChannelLayout::Rgb }; limits.check(w, h, layout, SampleType::U8)?; + // VP8L back-references and VP8 skipped macroblocks compress flat areas extremely well, so the + // ratio is generous; it still stops a header-only file from asking for a gigabyte. + Limits::check_plausible(u64::from(w) * u64::from(h) * layout.channels() as u64, bytes.len(), 1 << 16)?; let size = dec.output_buffer_size().ok_or_else(|| err("image too large"))?; - let mut buf = vec![0u8; size]; + let mut buf = alloc_zeroed::(size)?; dec.read_image(&mut buf).map_err(err)?; let icc = dec.icc_profile().ok().flatten(); let exif = dec.exif_metadata().ok().flatten(); diff --git a/crates/codecs/src/options.rs b/crates/codecs/src/options.rs index 79b288f3..9337f1e6 100644 --- a/crates/codecs/src/options.rs +++ b/crates/codecs/src/options.rs @@ -21,8 +21,10 @@ pub struct Limits { impl Default for Limits { fn default() -> Self { // 2^30 pixels (e.g. 32768²) and, on 64-bit targets, 8 GiB: enough for the large - // documents Photoshop users open (a 20000² RGBA 16-bit image is 3.2 GB). - let max_alloc = if cfg!(target_pointer_width = "64") { 8 << 30 } else { 2 << 30 }; + // documents Photoshop users open (a 20000² RGBA 16-bit image is 3.2 GB). On 32-bit + // targets (wasm32 has a 4 GiB address space shared with the document, history and + // the decoder's own buffers) 1 GiB is the most one buffer can safely ask for. + let max_alloc = if cfg!(target_pointer_width = "64") { 8 << 30 } else { 1 << 30 }; Limits { max_width: 1 << 18, max_height: 1 << 18, max_pixels: 1 << 30, max_alloc } } } @@ -60,6 +62,19 @@ impl Limits { Ok(()) } + /// Decompression-bomb guard for formats that compress: refuse a file too small to hold + /// `declared_bytes` of (stored, pre-expansion) image data, given that the compression + /// never beats `max_ratio`:1. Called before the output buffer is allocated, so a + /// header-only hostile file cannot make the decoder reserve gigabytes. A fixed 1 MiB of + /// slack keeps tiny images and headers with large metadata unaffected. + pub(crate) fn check_plausible(declared_bytes: u64, file_len: usize, max_ratio: u64) -> Result<(), CodecError> { + let capacity = (file_len as u64).saturating_mul(max_ratio).saturating_add(1 << 20); + if declared_bytes > capacity { + return Err(CodecError::LimitExceeded(format!("a {file_len} byte file cannot hold {declared_bytes} bytes of image data"))); + } + Ok(()) + } + pub(crate) fn alloc_usize(&self) -> usize { usize::try_from(self.max_alloc).unwrap_or(usize::MAX) } @@ -149,3 +164,13 @@ impl Default for EncodeOptions { } } } + +/// A zero-filled buffer of `len` elements, allocated fallibly: an allocation failure becomes +/// [`CodecError::LimitExceeded`] instead of aborting the process (which `catch_unwind` cannot +/// stop). +pub(crate) fn alloc_zeroed(len: usize) -> Result, CodecError> { + let mut v = Vec::new(); + v.try_reserve_exact(len).map_err(|_| CodecError::LimitExceeded(format!("cannot allocate {len} elements for the image")))?; + v.resize(len, T::default()); + Ok(v) +} diff --git a/crates/codecs/tests/limits.rs b/crates/codecs/tests/limits.rs index 3613b087..6969fea9 100644 --- a/crates/codecs/tests/limits.rs +++ b/crates/codecs/tests/limits.rs @@ -93,6 +93,30 @@ fn png_bomb_header_rejected_before_alloc() { assert!(is_limit(decode(&b))); } +#[test] +fn png_header_at_the_default_limit_needs_a_plausible_file_size() { + // 32768 x 32768 x RGBA16 is exactly the default max_alloc: it passes the dimension limits, + // but a ~100 byte file cannot hold it (zlib tops out near 1032:1), so it is refused before + // the 8 GiB output buffer is allocated. + let mut ihdr = Vec::new(); + ihdr.extend_from_slice(&32768u32.to_be_bytes()); + ihdr.extend_from_slice(&32768u32.to_be_bytes()); + ihdr.extend_from_slice(&[16, 6, 0, 0, 0]); + let mut b = b"\x89PNG\r\n\x1a\n".to_vec(); + b.extend(png_chunk(b"IHDR", &ihdr)); + b.extend(png_chunk(b"IDAT", &[0x78, 0x9C, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01])); + b.extend(png_chunk(b"IEND", &[])); + assert!(is_limit(decode(&b))); +} + +#[test] +fn png_highly_compressible_image_still_decodes() { + let img = Image::from_u8(3000, 3000, ChannelLayout::Rgba, vec![255u8; 3000 * 3000 * 4]).unwrap(); + let b = encode(&img, Format::Png, &EncodeOptions::default()).unwrap(); + assert!(b.len() < 100_000, "{}", b.len()); + assert_eq!(decode(&b).unwrap().width(), 3000); +} + const PNG_TEXT_BUDGET: usize = 64 << 10; fn png_text_decode(bytes: &[u8], max_alloc: usize) -> Result { From 7893a6e04d71aa04cc96b4064ae90981581ea57b Mon Sep 17 00:00:00 2001 From: Valentin Klein Date: Mon, 12 Oct 2026 13:12:00 +0200 Subject: [PATCH 31/92] PSD: avoid cloning layer data when padding and presize the output buffer (#3687) (#3707) Co-authored-by: Claude Opus 5.5 --- crates/psd/src/file.rs | 4 +++ crates/psd/src/layer.rs | 60 ++++++++++++++++++++++++++++++++++++----- crates/psd/src/tiff.rs | 8 +++--- 3 files changed, 63 insertions(+), 9 deletions(-) diff --git a/crates/psd/src/file.rs b/crates/psd/src/file.rs index 3c621bb2..330940e7 100644 --- a/crates/psd/src/file.rs +++ b/crates/psd/src/file.rs @@ -137,7 +137,11 @@ impl PsdFile { pub fn to_bytes(&self) -> Result> { let v = self.header.version; let psb = v.is_psb(); + // Reserve the pixel data up front: appending it to an empty Vec reallocates and copies + // repeatedly. Everything else (headers, resources, records) is small by comparison. + let hint = self.layer_info.as_ref().map_or(0, LayerInfo::channel_data_len).saturating_add(self.image_data.data.len()); let mut out = Vec::new(); + out.try_reserve(hint).map_err(|_| PsdError::LimitExceeded("not enough memory to serialize the file"))?; self.header.write(&mut out); out.put_len(self.color_mode_data.len() as u64, false)?; out.put(&self.color_mode_data); diff --git a/crates/psd/src/layer.rs b/crates/psd/src/layer.rs index cee67582..5450ed7e 100644 --- a/crates/psd/src/layer.rs +++ b/crates/psd/src/layer.rs @@ -684,15 +684,25 @@ impl LayerInfo { /// block in 4-byte units (psd-tools) misread the blocks after a body that /// is only padded to even. pub fn pad_to(&mut self, version: Version, align: u64) -> Result<()> { - let align = align.max(1); - let len = self.unpadded_len(version)?; - self.padding = Some(vec![0; ((align - len % align) % align) as usize]); + self.padding = Some(vec![0; self.pad_len(version, align)?]); Ok(()) } - /// Serializes the body (without a length field). - pub(crate) fn write_body(&self, out: &mut Vec, version: Version) -> Result<()> { - let start = out.len(); + /// Number of zero bytes [`Self::pad_to`] would set, without touching `self`. + pub(crate) fn pad_len(&self, version: Version, align: u64) -> Result { + let align = align.max(1); + let len = self.unpadded_len(version)?; + Ok(((align - len % align) % align) as usize) + } + + /// Bytes of channel data and their compression fields: the part of the body worth reserving up + /// front (the records are small next to the pixels). Saturates instead of overflowing. + pub(crate) fn channel_data_len(&self) -> usize { + self.layers.iter().flat_map(|l| &l.channels).filter(|c| c.compression.is_some()).fold(0usize, |n, c| n.saturating_add(2).saturating_add(c.data.len())) + } + + /// Serializes the body without any trailing padding (the padding field is ignored). + pub(crate) fn write_unpadded(&self, out: &mut Vec, version: Version) -> Result<()> { let n = i16::try_from(self.layers.len()).map_err(|_| PsdError::LimitExceeded("more than 32767 layers"))?; out.put_i16(if self.merged_alpha { -n } else { n }); for l in &self.layers { @@ -706,6 +716,13 @@ impl LayerInfo { } } } + Ok(()) + } + + /// Serializes the body (without a length field). + pub(crate) fn write_body(&self, out: &mut Vec, version: Version) -> Result<()> { + let start = out.len(); + self.write_unpadded(out, version)?; match &self.padding { Some(p) => out.put(p), None => { @@ -1022,6 +1039,37 @@ mod tests { assert_eq!(info.layers[0].decode_channel(0, 8, Version::Psd).unwrap(), Vec::::new()); } + /// Padding without cloning the layers writes the same bytes as `pad_to` on a clone, and the + /// channel data length hint is exact. + #[test] + fn unpadded_write_matches_pad_to_on_a_clone() { + use crate::{ColorMode, Compression, testgen}; + for version in [Version::Psd, Version::Psb] { + for depth in [8u16, 16, 32] { + for compression in [Compression::Raw, Compression::Rle] { + let file = testgen::layered(version, ColorMode::Rgb, depth, compression); + let mut info = file.layer_info.clone().unwrap(); + for align in [1u64, 2, 4, 8] { + let mut cloned = info.clone(); + cloned.pad_to(version, align).unwrap(); + let mut want = Vec::new(); + cloned.write_body(&mut want, version).unwrap(); + let pad = info.pad_len(version, align).unwrap(); + let mut got = Vec::new(); + info.write_unpadded(&mut got, version).unwrap(); + assert!(got.len() >= info.channel_data_len()); + got.resize(got.len() + pad, 0); + assert_eq!(got, want, "{version:?} {depth} {compression:?} align {align}"); + } + info.padding = Some(vec![7, 7]); + let mut with_padding = Vec::new(); + info.write_body(&mut with_padding, version).unwrap(); + assert!(with_padding.ends_with(&[7, 7])); + } + } + } + } + #[test] fn nondefault_padding_kept() { let info = LayerInfo { padding: Some(vec![0, 0]), ..Default::default() }; diff --git a/crates/psd/src/tiff.rs b/crates/psd/src/tiff.rs index 0d8f3688..7c8b1940 100644 --- a/crates/psd/src/tiff.rs +++ b/crates/psd/src/tiff.rs @@ -155,10 +155,12 @@ impl ImageSourceData { let version = self.version; let mut blocks = Vec::with_capacity(self.global_blocks.len() + 2); if let Some(info) = &self.layer_info { - let mut info = info.clone(); - info.pad_to(version, 4)?; + // Pad to 4 without cloning the layers (and all their pixel data) just to set `padding`. + let pad = info.pad_len(version, 4)?; let mut data = Vec::new(); - info.write_body(&mut data, version)?; + data.try_reserve(info.channel_data_len().saturating_add(pad)).map_err(|_| PsdError::LimitExceeded("not enough memory for the layer data"))?; + info.write_unpadded(&mut data, version)?; + data.resize(data.len() + pad, 0); blocks.push(padded_block(self.layer_info_key, data)); } if let Some(m) = &self.global_layer_mask { From 476f9838765f619dd3c5d93ddac8e6a5d2e10f5d Mon Sep 17 00:00:00 2001 From: Valentin Klein Date: Mon, 12 Oct 2026 13:12:13 +0200 Subject: [PATCH 32/92] Codecs: bound the TIFF IFD walk by a file-size entry budget (#3683) (#3711) Co-authored-by: Claude Opus 5.5 --- crates/codecs/src/codecs/tiff_ifd.rs | 50 +++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/crates/codecs/src/codecs/tiff_ifd.rs b/crates/codecs/src/codecs/tiff_ifd.rs index 45fe9ee7..199d44ec 100644 --- a/crates/codecs/src/codecs/tiff_ifd.rs +++ b/crates/codecs/src/codecs/tiff_ifd.rs @@ -145,6 +145,14 @@ impl<'a> File<'a> { Some(if self.le { u64::from_le_bytes(s) } else { u64::from_be_bytes(s) }) } + /// The declared entry count of the directory at `at`, before its table is parsed. + pub fn entry_count(&self, at: u64) -> Option { + if at < self.header_len() { + return None; + } + if self.big { self.u64_at(at) } else { self.u16_at(at).map(u64::from) } + } + /// The directory at `at`: its whole table, up to and including the next-IFD pointer, must /// be inside the file and after the header. pub fn ifd(&self, at: u64) -> Option { @@ -355,6 +363,10 @@ struct Walk<'a, 'f> { seen: HashSet, pages: Vec, complete: bool, + /// Directory entries that may still be parsed. Real directory tables are disjoint, so their + /// total size is bounded by the file; overlapping tables (a hostile file) would otherwise + /// make every one of thousands of directories cost a full 65,535-entry parse. + entry_budget: u64, } impl Walk<'_, '_> { @@ -366,6 +378,15 @@ impl Walk<'_, '_> { self.complete = false; return; } + let Some(n) = self.f.entry_count(at) else { + self.complete = false; + return; + }; + if n > self.entry_budget { + self.complete = false; + return; + } + self.entry_budget -= n; let Some(ifd) = self.f.ifd(at) else { self.complete = false; return; @@ -391,10 +412,37 @@ pub fn tiff_info(bytes: &[u8]) -> Result { } pub(crate) fn info_of(f: &File<'_>) -> Result { - let mut w = Walk { f, seen: HashSet::new(), pages: Vec::new(), complete: true }; + let mut w = Walk { f, seen: HashSet::new(), pages: Vec::new(), complete: true, entry_budget: (f.b.len() as u64) / 12 + 64 }; w.chain(f.first_ifd, None, 0); if w.pages.is_empty() { return Err(CodecError::malformed(Format::Tiff, "the first image directory is missing or cut off")); } Ok(TiffInfo { big_tiff: f.big, little_endian: f.le, pages: w.pages, complete: w.complete }) } + +#[cfg(test)] +mod tests { + use super::*; + + /// 10,000 directories 4 bytes apart, each declaring 65,535 overlapping entries: the walk must + /// stop after the file-size entry budget instead of parsing ~6.5e8 entries. + #[test] + fn overlapping_directory_tables_exhaust_the_entry_budget() { + let first = 8usize; + let table = 2 + 65_535 * 12 + 4; + let mut b = vec![0u8; first + table + 4 * 10_000]; + b[..8].copy_from_slice(&[b'I', b'I', 42, 0, first as u8, 0, 0, 0]); + for i in 0..10_000usize { + let at = first + 4 * i; + b[at..at + 2].copy_from_slice(&u16::MAX.to_le_bytes()); + let next_cell = at + 2 + 65_535 * 12; + let next = (first + 4 * (i + 1)) as u32; + if let Some(cell) = b.get_mut(next_cell..next_cell + 4) { + cell.copy_from_slice(&next.to_le_bytes()); + } + } + let info = tiff_info(&b).expect("the first directory is readable"); + assert!(!info.complete); + assert!(info.pages.len() < 200, "{} directories parsed", info.pages.len()); + } +} From e156a9ed85821fbd094d9700c03be11e3c4d2a8b Mon Sep 17 00:00:00 2001 From: Streetblock Date: Mon, 12 Oct 2026 13:12:34 +0200 Subject: [PATCH 33/92] perf(compose): select Normal RGB kernel once per buffer (#3715) --- crates/compose/src/lib.rs | 12 +++ crates/compose/src/psblend.rs | 31 ++++++-- crates/compose/src/tests.rs | 141 ++++++++++++++++++++++++++++++++++ 3 files changed, 177 insertions(+), 7 deletions(-) diff --git a/crates/compose/src/lib.rs b/crates/compose/src/lib.rs index a7c05761..01087f49 100644 --- a/crates/compose/src/lib.rs +++ b/crates/compose/src/lib.rs @@ -1674,6 +1674,18 @@ fn blend_into_fill(backdrop: &mut Buffer, src: &Buffer, mode: BlendMode, opacity /// [`blend_into`] mixing coverage in a `gamma` space (type layers). fn blend_into_g(backdrop: &mut Buffer, src: &Buffer, mode: BlendMode, opacity: f32, gamma: f32) { + // The blend space is constant in this loop. Some TLS implementations synchronise even a + // boolean read, so select the common Normal kernel once instead of once per pixel. + if mode == BlendMode::Normal && gamma == 1.0 && !psblend::LAB_MIX.with(|l| l.get()) { + for (i, b) in backdrop.px.iter_mut().enumerate() { + let s = src.px[i]; + if s[3] <= 0.0 { + continue; + } + *b = psblend::composite_normal_rgb(*b, s, opacity); + } + return; + } let rect = backdrop.rect; let w = rect.width() as i32; for (i, b) in backdrop.px.iter_mut().enumerate() { diff --git a/crates/compose/src/psblend.rs b/crates/compose/src/psblend.rs index afd84123..4cff6f30 100644 --- a/crates/compose/src/psblend.rs +++ b/crates/compose/src/psblend.rs @@ -210,13 +210,7 @@ pub fn composite(mode: BlendMode, backdrop: [f32; 4], source: [f32; 4], opacity: return [r[0], r[1], r[2], ao]; } if mode == BlendMode::Normal { - // Fast path: B(Cb, Cs) = Cs. - if ao <= 0.0 { - return [0.0; 4]; - } - let kb = ab * (1.0 - as_); - let inv = 1.0 / ao; - return [(kb * backdrop[0] + as_ * source[0]) * inv, (kb * backdrop[1] + as_ * source[1]) * inv, (kb * backdrop[2] + as_ * source[2]) * inv, ao]; + return normal_rgb(backdrop, source, as_, ao); } let cb = [backdrop[0], backdrop[1], backdrop[2]]; let cs = [source[0], source[1], source[2]]; @@ -232,6 +226,29 @@ pub fn composite(mode: BlendMode, backdrop: [f32; 4], source: [f32; 4], opacity: out } +/// Normal mixing outside Lab, for callers that select the blend space once per buffer. +#[inline] +pub(crate) fn composite_normal_rgb(backdrop: [f32; 4], source: [f32; 4], opacity: f32) -> [f32; 4] { + let ab = backdrop[3]; + let as_ = source[3] * opacity; + if as_ <= 0.0 { + return backdrop; + } + let ao = as_ + ab * (1.0 - as_); + normal_rgb(backdrop, source, as_, ao) +} + +#[inline] +fn normal_rgb(backdrop: [f32; 4], source: [f32; 4], as_: f32, ao: f32) -> [f32; 4] { + // B(Cb, Cs) = Cs. Keep the scalar composite's operation order and straight alpha. + if ao <= 0.0 { + return [0.0; 4]; + } + let kb = backdrop[3] * (1.0 - as_); + let inv = 1.0 / ao; + [(kb * backdrop[0] + as_ * source[0]) * inv, (kb * backdrop[1] + as_ * source[1]) * inv, (kb * backdrop[2] + as_ * source[2]) * inv, ao] +} + /// Photoshop's "Blend Text Colors Using Gamma" (Color Settings › Advanced, on at 1.45 by /// default): type layers mix their colour with the backdrop in linear light raised to 1 / 1.45 /// ([`text_encode`]), so anti-aliased glyph edges come out lighter over dark backdrops than a diff --git a/crates/compose/src/tests.rs b/crates/compose/src/tests.rs index c56b7de4..869c316d 100644 --- a/crates/compose/src/tests.rs +++ b/crates/compose/src/tests.rs @@ -40,6 +40,147 @@ fn normal_layer_over_background() { assert!(close4(px(&d, 5, 1), [1.0; 4])); } +// The pre-optimisation Normal formula, independent of the production helper. Its operation +// order matters: an algebraically equivalent premultiplied mix can round differently. +fn original_normal_rgb(backdrop: [f32; 4], source: [f32; 4], opacity: f32) -> [f32; 4] { + let ab = backdrop[3]; + let as_ = source[3] * opacity; + if as_ <= 0.0 { + return backdrop; + } + let ao = as_ + ab * (1.0 - as_); + if ao <= 0.0 { + return [0.0; 4]; + } + let kb = ab * (1.0 - as_); + let inv = 1.0 / ao; + [(kb * backdrop[0] + as_ * source[0]) * inv, (kb * backdrop[1] + as_ * source[1]) * inv, (kb * backdrop[2] + as_ * source[2]) * inv, ao] +} + +#[test] +fn normal_rgb_kernel_preserves_scalar_bits() { + let subnormal = f32::from_bits(1); + let backdrops = [[0.0, -0.0, 2.0, 0.0], [0.2, 0.4, 0.6, 0.5], [2.0, -0.25, 4.0, 1.0], [-1.0, 0.01, 1.0, -0.5], [1.0, -0.0, f32::MIN_POSITIVE, subnormal]]; + let sources = [ + [0.9, 0.1, 0.3, 1.0], + [0.25, 2.0, -1.0, 0.5], + [subnormal, 1e-20, 1.0, subnormal], + [0.5, 0.2, 0.7, -0.0], + [0.5, 0.2, 0.7, -0.5], + [f32::NAN, 0.2, 0.7, 0.0], + ]; + for b in backdrops { + for s in sources { + for opacity in [-1.0, -0.0, 0.0, 0.5, 1.0, 2.0] { + let want = original_normal_rgb(b, s, opacity); + let got = psblend::composite_normal_rgb(b, s, opacity); + assert_eq!(got.map(f32::to_bits), want.map(f32::to_bits), "{b:?} / {s:?} / {opacity}"); + } + } + } +} + +fn normal_rgb_test_buffers(fmt: PixelFormat) -> (Buffer, Buffer) { + let rect = Rect::new(-3, -2, 5, 0); + let mut bottom = Surface::new(fmt); + let mut top = Surface::new(fmt); + for y in rect.y0..rect.y1 { + for x in rect.x0..rect.x1 { + let i = ((y - rect.y0) * rect.width() as i32 + x - rect.x0) as usize; + let t = i as f32 / 16.0; + let b = [2.0 * t, 0.4, -0.25 + t, [0.0, 0.25, 0.75, 1.0][i % 4]]; + let s = [0.9 - t, 0.1 + t, 0.3, [0.0, -0.0, 0.5, 1.0][i % 4]]; + bottom.write_pixel(x, y, &photocraft_raster::from_rgba(&fmt, b)); + top.write_pixel(x, y, &photocraft_raster::from_rgba(&fmt, s)); + } + } + (surface_to_buffer(&bottom, rect), surface_to_buffer(&top, rect)) +} + +// Keep the old buffer dispatch as an oracle for the specialised loop and all of its fallbacks. +fn original_blend_into_g(backdrop: &mut Buffer, src: &Buffer, mode: BlendMode, opacity: f32, gamma: f32) { + let rect = backdrop.rect; + let w = rect.width() as i32; + for (i, b) in backdrop.px.iter_mut().enumerate() { + let mut s = src.px[i]; + if s[3] <= 0.0 { + continue; + } + let mut mode = mode; + if mode == BlendMode::Dissolve { + let x = rect.x0 + (i as i32 % w); + let y = rect.y0 + (i as i32 / w); + s[3] = if dissolve_noise(x, y) < s[3] * opacity { 1.0 } else { 0.0 }; + mode = BlendMode::Normal; + *b = blend::composite(mode, *b, s, 1.0); + continue; + } + *b = blend::composite_gamma(mode, *b, s, opacity, gamma); + } +} + +fn assert_buffer_bits(got: &Buffer, want: &Buffer) { + assert_eq!(got.rect, want.rect); + assert_eq!(got.px.len(), want.px.len()); + for (i, (got, want)) in got.px.iter().zip(&want.px).enumerate() { + assert_eq!(got.map(f32::to_bits), want.map(f32::to_bits), "pixel {i}: {got:?} vs {want:?}"); + } +} + +#[test] +fn normal_rgb_buffer_dispatch_and_fallbacks_preserve_bits() { + for fmt in [PixelFormat::RGBA8, PixelFormat::RGBA16, PixelFormat::RGBA32F] { + let (bottom, top) = normal_rgb_test_buffers(fmt); + for lab in [false, true] { + psblend::with_lab_mix(lab, || { + psblend::with_hdr(fmt.sample == SampleType::F32, || { + for mode in BlendMode::LAYER_MODES { + for gamma in [1.0, psblend::TEXT_GAMMA] { + for opacity in [0.0, 0.5, 1.0] { + let mut got = bottom.clone(); + let mut want = bottom.clone(); + original_blend_into_g(&mut want, &top, mode, opacity, gamma); + blend_into_g(&mut got, &top, mode, opacity, gamma); + assert_buffer_bits(&got, &want); + } + } + } + }); + }); + } + } +} + +#[test] +fn normal_rgb_buffer_preserves_alpha_skip_and_nested_scopes() { + let rect = Rect::new(-1, -1, 2, 0); + let bottom = Buffer::filled(rect, [-0.0, 0.4, 2.0, 0.75]); + let top = Buffer { rect, px: vec![[f32::NAN, 0.3, 0.1, -0.5], [0.2, 0.3, 0.1, -0.0], [0.2, 0.3, 0.1, f32::NAN]] }; + psblend::with_lab_mix(true, || { + psblend::with_hdr(true, || { + psblend::with_lab_mix(false, || { + psblend::with_hdr(false, || { + let mut got = bottom.clone(); + let mut want = bottom.clone(); + original_blend_into_g(&mut want, &top, BlendMode::Normal, -1.0, 1.0); + blend_into_g(&mut got, &top, BlendMode::Normal, -1.0, 1.0); + assert_buffer_bits(&got, &want); + assert_eq!(got.px[0].map(f32::to_bits), bottom.px[0].map(f32::to_bits)); + assert_eq!(got.px[1].map(f32::to_bits), bottom.px[1].map(f32::to_bits)); + }); + assert!(psblend::HDR.with(|h| h.get())); + }); + assert!(psblend::LAB_MIX.with(|l| l.get())); + assert!(psblend::HDR.with(|h| h.get())); + let mut got = bottom.clone(); + let mut want = bottom.clone(); + original_blend_into_g(&mut want, &top, BlendMode::Normal, 0.5, 1.0); + blend_into_g(&mut got, &top, BlendMode::Normal, 0.5, 1.0); + assert_buffer_bits(&got, &want); + }); + }); +} + #[test] fn opacity_and_fill_multiply() { let mut d = doc_white(4, 4); From 38236f90c24a1fd7f89094a4a1193be0690f08e1 Mon Sep 17 00:00:00 2001 From: Streetblock Date: Mon, 12 Oct 2026 13:12:47 +0200 Subject: [PATCH 34/92] perf(compose): allow empty vector masks in preview proxies (#3716) --- crates/compose/src/proxy.rs | 167 +++++++++++++++++++++++++++++++++++- 1 file changed, 165 insertions(+), 2 deletions(-) diff --git a/crates/compose/src/proxy.rs b/crates/compose/src/proxy.rs index 5560fae3..4fe3b879 100644 --- a/crates/compose/src/proxy.rs +++ b/crates/compose/src/proxy.rs @@ -83,15 +83,52 @@ pub fn proxy_document(doc: &Document, k: u32) -> Document { } /// Whether a proxy composite is a faithful reduction of `doc`: layer effects (whose sizes are in -/// document pixels) and vector masks (paths in document coordinates) would not scale with it. +/// document pixels) and nonempty vector masks (paths in document coordinates) would not scale +/// with it. Empty vector masks have constant coverage, including inversion and density. +/// Nonempty paths can still anchor fill layouts even when their mask density is zero. pub fn proxy_faithful(doc: &Document) -> bool { - doc.walk().iter().all(|(_, _, l)| !crate::effects::has_effects(l) && l.vector_mask.as_ref().is_none_or(|v| !v.enabled)) + doc.walk().iter().all(|(_, _, l)| !crate::effects::has_effects(l) && l.vector_mask.as_ref().is_none_or(|v| !v.enabled || v.path.is_empty())) } #[cfg(test)] mod tests { use super::*; use photocraft_color::{Color, ColorMode, PixelFormat, SampleType}; + use photocraft_doc::vector::{Knot, Path, Subpath, VectorMask}; + use photocraft_doc::{Effect, Fill, GradientStyle, LayerMask}; + + fn two_colors(size: Size, depth: SampleType) -> Document { + let mut doc = Document::new("mask", size, ColorMode::Rgb, depth); + let format = doc.pixel_format(); + for (name, color) in [("blue", [0.0, 0.0, 1.0, 1.0]), ("red", [1.0, 0.0, 0.0, 1.0])] { + doc.layers.push(Layer::new(name, LayerContent::Raster(Surface::with_default(format, &color)))); + } + doc + } + + fn assert_same_pixels(actual: &crate::Buffer, expected: &crate::Buffer) { + assert_same_pixels_within(actual, expected, 1e-6); + } + + fn assert_same_pixels_within(actual: &crate::Buffer, expected: &crate::Buffer, tolerance: f32) { + assert_eq!(actual.rect, expected.rect); + assert_eq!(actual.px.len(), expected.px.len()); + for (a, b) in actual.px.iter().zip(&expected.px) { + assert!(a.iter().zip(b).all(|(a, b)| (a - b).abs() <= tolerance), "{a:?} != {b:?}"); + } + } + + fn u16_coverage(value: f32) -> f32 { + // Feathered masks use the existing U16 combined-mask surface, including its default. + (value.clamp(0.0, 1.0) * 65535.0 + 0.5).floor() / 65535.0 + } + + fn opacity_reference(doc: &Document, coverage: f32) -> Document { + let mut reference = doc.clone(); + reference.layers[1].vector_mask = None; + reference.layers[1].opacity *= coverage; + reference + } #[test] fn downsample_picks_every_kth_pixel() { @@ -134,4 +171,130 @@ mod tests { assert_eq!((s.pixel(7, 15)[0], s.pixel(8, 0)[0]), (1.0, 0.0)); assert!(proxy_document(&Document::new("n", Size::new(8, 8), ColorMode::Rgb, SampleType::U8), 4).selection.is_none()); } + + #[test] + fn proxy_accepts_empty_paths_but_keeps_geometry_and_effect_guards() { + let mut doc = two_colors(Size::new(32, 16), SampleType::F32); + doc.layers[1].vector_mask = Some(VectorMask::new(Path::new(vec![Subpath::default()]))); + assert!(proxy_faithful(&doc)); + // A lone knot has no fillable segments, but still carries document coordinates. + doc.layers[1].vector_mask.as_mut().unwrap().path.subpaths[0].knots.push(Knot::corner(12.0, 8.0)); + assert!(!proxy_faithful(&doc)); + doc.layers[1].vector_mask.as_mut().unwrap().enabled = false; + assert!(proxy_faithful(&doc)); + doc.layers[1].vector_mask = Some(VectorMask::new(Path::default())); + doc.layers[1].effects.items.push(Effect::default_drop_shadow()); + doc.layers[1].effects.enabled = true; + assert!(!proxy_faithful(&doc)); + doc.layers[1].effects.items[0].set_enabled(false); + assert!(proxy_faithful(&doc)); + } + + #[test] + fn empty_vector_masks_keep_constant_coverage_at_every_depth() { + for depth in [SampleType::U8, SampleType::U16, SampleType::F32] { + let mut doc = two_colors(Size::new(32, 16), depth); + for path in [Path::default(), Path::new(vec![Subpath::default()])] { + for inverted in [false, true] { + for density in [0.0, 0.25, 1.0] { + for feather in [0.0, 4.0] { + let mut mask = VectorMask::new(path.clone()); + mask.path.inverted = inverted; + mask.density = density; + mask.feather = feather; + doc.layers[1].vector_mask = Some(mask); + assert!(proxy_faithful(&doc)); + let coverage = if inverted { 1.0 - density } else { 1.0 }; + let coverage = if feather > 0.0 { u16_coverage(coverage) } else { coverage }; + let expected = [coverage, 0.0, 1.0 - coverage, 1.0]; + let full = crate::render(&doc, doc.bounds()); + for pixel in &full.px { + assert!(pixel.iter().zip(expected).all(|(a, b)| (a - b).abs() < 1e-6), "{depth:?} {inverted} {density} {feather}: {pixel:?}"); + } + let proxy = proxy_document(&doc, 4); + assert_eq!(proxy.layers[1].vector_mask, doc.layers[1].vector_mask); + let reference = proxy_document(&opacity_reference(&doc, coverage), 4); + assert_same_pixels(&crate::render(&proxy, proxy.bounds()), &crate::render(&reference, reference.bounds())); + } + } + } + } + } + } + + #[test] + fn empty_vector_mask_multiplies_a_feathered_pixel_mask_on_the_proxy() { + let mut doc = two_colors(Size::new(32, 16), SampleType::F32); + let mut surface = Surface::with_default(PixelFormat::new(ColorMode::Grayscale, SampleType::F32, false), &[0.25]); + surface.fill_rect(Rect::new(0, 0, 16, 16), &[0.75]); + doc.layers[1].mask = Some(LayerMask { surface, density: 0.5, feather: 2.0, ..LayerMask::reveal_all() }); + let mut mask = VectorMask::new(Path { inverted: true, ..Path::default() }); + mask.density = 0.75; + mask.feather = 8.0; + doc.layers[1].vector_mask = Some(mask); + assert!(proxy_faithful(&doc)); + let reference = opacity_reference(&doc, 0.25); + for k in [1, 2, 4] { + let (actual, expected) = (proxy_document(&doc, k), proxy_document(&reference, k)); + // Q(0.25 * pixel) versus 0.25 * Q(pixel): U16 rounding differs by at most + // 0.625 / 65535. Allow one U16 level plus a small float arithmetic allowance. + assert_same_pixels_within(&crate::render(&actual, actual.bounds()), &crate::render(&expected, expected.bounds()), 1.0 / 65535.0 + 1e-6); + } + } + + #[test] + fn empty_vector_masks_keep_the_pixel_mask_gradient_frame() { + let mut doc = two_colors(Size::new(32, 16), SampleType::F32); + doc.layers[1].content = LayerContent::Fill(Fill::gradient(vec![(0.0, Color::BLACK), (1.0, Color::WHITE)], 0.0, 1.0, GradientStyle::Linear, false)); + let mut pixel = LayerMask::hide_all(); + pixel.surface.fill_rect(Rect::new(8, 4, 24, 12), &[1.0]); + doc.layers[1].mask = Some(pixel); + for inverted in [false, true] { + let mut mask = VectorMask::new(Path { inverted, ..Path::default() }); + mask.density = 0.5; + mask.feather = 3.0; + doc.layers[1].vector_mask = Some(mask); + assert!(proxy_faithful(&doc)); + assert_eq!(crate::fill_frame(&doc.layers[1], doc.bounds()), Rect::new(8, 4, 24, 12)); + let actual = proxy_document(&doc, 4); + assert_eq!(crate::fill_frame(&actual.layers[1], actual.bounds()), Rect::new(2, 1, 6, 3)); + let reference = proxy_document(&opacity_reference(&doc, u16_coverage(if inverted { 0.5 } else { 1.0 })), 4); + assert_same_pixels(&crate::render(&actual, actual.bounds()), &crate::render(&reference, reference.bounds())); + } + } + + #[test] + fn zero_density_geometry_still_blocks_the_proxy_and_anchors_a_gradient() { + let mut doc = Document::new("gradient", Size::new(64, 32), ColorMode::Rgb, SampleType::F32); + let fill = Fill::gradient(vec![(0.0, Color::BLACK), (1.0, Color::WHITE)], 0.0, 1.0, GradientStyle::Linear, false); + let mut layer = Layer::new("gradient", LayerContent::Fill(fill)); + let path = Path::new(vec![Subpath::polygon(&[(16.0, 8.0), (48.0, 8.0), (48.0, 24.0), (16.0, 24.0)])]); + let mut mask = VectorMask::new(path); + mask.density = 0.0; + layer.vector_mask = Some(mask); + doc.layers.push(layer); + assert!(!proxy_faithful(&doc)); + assert_eq!(crate::fill_frame(&doc.layers[0], doc.bounds()), Rect::new(16, 8, 48, 24)); + // Density zero reveals all pixels, but the unscaled path would still move the fill. + let forced_proxy = proxy_document(&doc, 4); + let exact = crate::render_reduced(&doc, 16, 8); + let wrong = crate::render(&forced_proxy, forced_proxy.bounds()); + assert!(exact.px.iter().zip(&wrong.px).any(|(a, b)| (a[0] - b[0]).abs() > 0.1)); + } + + #[test] + fn large_thumbnail_keeps_inverted_empty_mask_coverage() { + // Default-only surfaces exercise the large-document branch without allocating 17 MP. + let mut doc = two_colors(Size::new(4200, 4200), SampleType::F32); + let mut mask = VectorMask::new(Path { inverted: true, ..Path::default() }); + mask.density = 0.75; + mask.feather = 8.0; + doc.layers[1].vector_mask = Some(mask); + assert!(doc.size.area() > crate::PROXY_THUMBNAIL_PIXELS); + assert!(proxy_faithful(&doc)); + let actual = crate::thumbnail_buffer(&doc, 4); + assert_eq!(actual.rect, Rect::new(0, 0, 4, 4)); + let coverage = u16_coverage(0.25); + assert_eq!(actual.px, vec![[coverage, 0.0, 1.0 - coverage, 1.0]; 16]); + } } From e54adc250c5c706b1c3b1d6f633e38d8257c41ca Mon Sep 17 00:00:00 2001 From: Nigel Ihza Firdausy <106657905+Ni-zav@users.noreply.github.com> Date: Mon, 12 Oct 2026 18:12:55 +0700 Subject: [PATCH 35/92] feat(codecs): decode legacy PCX images and palettes (#3692) (#3701) Co-authored-by: Brandon Thomas Co-authored-by: Claude Opus 5.5 --- apps/photocraft/src/services.rs | 4 +- crates/codecs/src/codecs/mod.rs | 1 + crates/codecs/src/codecs/pcx.rs | 118 ++++++++++++++++++++++++++++++++ crates/codecs/src/format.rs | 16 ++++- crates/codecs/src/lib.rs | 4 +- crates/codecs/tests/pcx.rs | 100 +++++++++++++++++++++++++++ 6 files changed, 239 insertions(+), 4 deletions(-) create mode 100644 crates/codecs/src/codecs/pcx.rs create mode 100644 crates/codecs/tests/pcx.rs diff --git a/apps/photocraft/src/services.rs b/apps/photocraft/src/services.rs index 0b1a366a..f6695717 100644 --- a/apps/photocraft/src/services.rs +++ b/apps/photocraft/src/services.rs @@ -21,8 +21,8 @@ mod recovery_tests; /// (.kys), which go to the preset libraries and Edit › Keyboard Shortcuts. const OPEN_EXTS: &[&str] = &[ "pcraft", "pdn", "ora", "kra", "psd", "psb", "psdt", "png", "jpg", "jpeg", "tif", "tiff", "webp", "gif", "bmp", "tga", "ico", "qoi", "exr", "hdr", "pbm", - "pgm", "ppm", "pam", "pfm", "fits", "fit", "fts", "heic", "heif", "hif", "dng", "cr2", "cr3", "nef", "nrw", "arw", "pef", "orf", "rw2", "raf", "abr", - "grd", "svg", "svgz", "aco", "ase", "kys", "af", "afdesign", "afphoto", "afpub", + "pgm", "ppm", "pam", "pfm", "pcx", "fits", "fit", "fts", "heic", "heif", "hif", "dng", "cr2", "cr3", "nef", "nrw", "arw", "pef", "orf", "rw2", "raf", + "abr", "grd", "svg", "svgz", "aco", "ase", "kys", "af", "afdesign", "afphoto", "afpub", ]; const SVG_EXTS: &[&str] = &["svg", "svgz"]; diff --git a/crates/codecs/src/codecs/mod.rs b/crates/codecs/src/codecs/mod.rs index ea70ccc2..22845d93 100644 --- a/crates/codecs/src/codecs/mod.rs +++ b/crates/codecs/src/codecs/mod.rs @@ -5,6 +5,7 @@ pub(crate) mod fits; pub(crate) mod gif_frames; pub(crate) mod heif; pub(crate) mod jpeg; +pub(crate) mod pcx; pub(crate) mod png; pub(crate) mod pnm; pub(crate) mod tiff; diff --git a/crates/codecs/src/codecs/pcx.rs b/crates/codecs/src/codecs/pcx.rs new file mode 100644 index 00000000..43a3e973 --- /dev/null +++ b/crates/codecs/src/codecs/pcx.rs @@ -0,0 +1,118 @@ +//! ZSoft PCX (Paintbrush) reader: strictly bounded scanline RLE, 16/256-colour +//! palettes and 8-bit three-plane RGB. Read-only: modern saves should use PNG. + +use crate::SampleType; +use crate::error::CodecError; +use crate::format::Format; +use crate::image::{ChannelLayout, Image}; +use crate::options::Limits; + +const HEADER: usize = 128; + +fn bad(reason: impl std::fmt::Display) -> CodecError { + CodecError::malformed(Format::Pcx, reason) +} +fn le16(b: &[u8], i: usize) -> u16 { + u16::from_le_bytes([b[i], b[i + 1]]) +} + +/// PCX lacks a strong magic number. Require plausible complete header fields before +/// identifying it, rather than classifying every file starting with 0x0a as PCX. +pub(crate) fn looks_like_pcx(b: &[u8]) -> bool { + if b.len() < HEADER || b[0] != 0x0a || !matches!(b[1], 0 | 2 | 3 | 5) || b[2] != 1 { + return false; + } + let bits = b[3]; + let planes = b[65]; + let stride = u32::from(le16(b, 66)); + let (x0, y0, x1, y1) = (le16(b, 4), le16(b, 6), le16(b, 8), le16(b, 10)); + if x1 < x0 || y1 < y0 || !matches!(bits, 1 | 2 | 4 | 8) || !(1..=4).contains(&planes) { + return false; + } + let width = u32::from(x1 - x0) + 1; + let min_stride = (width * u32::from(bits)).div_ceil(8); + stride >= min_stride && stride > 0 && (bits != 8 || matches!(planes, 1 | 3)) && (bits == 8 || u32::from(bits) * u32::from(planes) <= 4) +} + +/// Read one compressed plane's row. RLE packets never cross a scanline. +fn read_row(b: &[u8], pos: &mut usize, out: &mut [u8]) -> Result<(), CodecError> { + let mut n = 0; + while n < out.len() { + let code = *b.get(*pos).ok_or_else(|| bad("truncated pixel RLE"))?; + *pos += 1; + let (count, value) = if code >= 0xc0 { + let count = usize::from(code & 0x3f); + let value = *b.get(*pos).ok_or_else(|| bad("truncated RLE packet"))?; + *pos += 1; + (count, value) + } else { + (1, code) + }; + if count == 0 || count > out.len() - n { + return Err(bad("RLE packet crosses a scanline or has zero length")); + } + out[n..n + count].fill(value); + n += count; + } + Ok(()) +} + +pub(crate) fn decode(b: &[u8], limits: &Limits) -> Result { + if !looks_like_pcx(b) { + return Err(bad("invalid PCX header or unsupported pixel layout")); + } + let (w, h) = (u32::from(le16(b, 8) - le16(b, 4)) + 1, u32::from(le16(b, 10) - le16(b, 6)) + 1); + limits.check(w, h, ChannelLayout::Rgb, SampleType::U8)?; + let (bits, planes, stride) = (usize::from(b[3]), usize::from(b[65]), usize::from(le16(b, 66))); + let row_len = stride.checked_mul(planes).ok_or_else(|| bad("row size overflow"))?; + let total = (w as usize).checked_mul(h as usize).and_then(|n| n.checked_mul(3)).ok_or_else(|| bad("pixel size overflow"))?; + // The last 769 bytes are the optional VGA palette for 8-bit indexed images. + let vga = bits == 8 && planes == 1 && b.len() >= HEADER + 769 && b[b.len() - 769] == 0x0c; + if bits == 8 && planes == 1 && !vga && le16(b, 68) != 2 { + return Err(bad("8-bit indexed PCX has no 256-colour palette")); + } + let image_end = if vga { b.len() - 769 } else { b.len() }; + let mut row = vec![0u8; row_len]; + let mut pixels = vec![0u8; total]; + let mut p = HEADER; + let width = w as usize; + for y in 0..h as usize { + for plane in row.chunks_mut(stride) { + read_row(&b[..image_end], &mut p, plane)?; + } + for x in 0..width { + let rgb = if bits == 8 && planes == 3 { + [row[x], row[stride + x], row[2 * stride + x]] + } else { + let index = if bits == 8 { + usize::from(row[x]) + } else { + let bit = x * bits; + let shift = 8 - bits - (bit % 8); + let mask = (1usize << bits) - 1; + (0..planes).fold(0usize, |v, plane| { + let sample = (usize::from(row[plane * stride + bit / 8]) >> shift) & mask; + v | sample << (plane * bits) + }) + }; + if vga { + let o = image_end + 1 + index * 3; + [b[o], b[o + 1], b[o + 2]] + } else if bits == 8 { + let g = index as u8; + [g, g, g] // palette-info 2: gray scale + } else { + let o = 16 + index * 3; + [b[o], b[o + 1], b[o + 2]] + } + }; + pixels[(y * width + x) * 3..(y * width + x + 1) * 3].copy_from_slice(&rgb); + } + } + let mut image = Image::from_u8(w, h, ChannelLayout::Rgb, pixels)?; + let (xdpi, ydpi) = (le16(b, 12), le16(b, 14)); + if xdpi > 0 && ydpi > 0 { + image.meta.dpi = Some((f32::from(xdpi), f32::from(ydpi))); + } + Ok(image) +} diff --git a/crates/codecs/src/format.rs b/crates/codecs/src/format.rs index 3d3fa542..ddb75871 100644 --- a/crates/codecs/src/format.rs +++ b/crates/codecs/src/format.rs @@ -15,6 +15,8 @@ pub enum Format { Ico, /// Netpbm family: PBM/PGM/PPM (P1–P6), PAM (P7) and PFM (`PF`/`Pf`). Pnm, + /// ZSoft Paintbrush: 1/2/4-bit planar palettes, 8-bit indexed and 24-bit RGB. + Pcx, Qoi, OpenExr, /// Radiance RGBE. @@ -56,6 +58,10 @@ pub struct FormatCaps { /// Formats that are enabled but intentionally not symmetric, with the reason. /// The test-suite asserts that every other enabled format is read+write. pub const ASYMMETRIC_EXCEPTIONS: &[(Format, &str)] = &[ + ( + Format::Pcx, + "PCX is supported for opening legacy paint and clipart assets. New files should use PNG; writing obsolete indexed and planar variants is intentionally not provided.", + ), ( Format::Avif, "AVIF encode uses ravif (pure Rust) but decoding requires dav1d (C); read stays unsupported \ @@ -78,7 +84,7 @@ const ALL_LAYOUTS: &[ChannelLayout] = &[L::Gray, L::GrayA, L::Rgb, L::Rgba, L::C impl Format { /// Every format known to the crate (enabled or not). - pub const ALL: [Format; 15] = [ + pub const ALL: [Format; 16] = [ Format::Png, Format::Jpeg, Format::Tiff, @@ -88,6 +94,7 @@ impl Format { Format::Tga, Format::Ico, Format::Pnm, + Format::Pcx, Format::Qoi, Format::OpenExr, Format::Hdr, @@ -117,6 +124,7 @@ impl Format { Format::Tga => "TGA", Format::Ico => "ICO", Format::Pnm => "Netpbm", + Format::Pcx => "PCX", Format::Qoi => "QOI", Format::OpenExr => "OpenEXR", Format::Hdr => "Radiance HDR", @@ -139,6 +147,7 @@ impl Format { Format::Tga => &["tga", "icb", "vda", "vst"], Format::Ico => &["ico"], Format::Pnm => &["pnm", "pbm", "pgm", "ppm", "pam", "pfm"], + Format::Pcx => &["pcx"], Format::Qoi => &["qoi"], Format::OpenExr => &["exr"], Format::Hdr => &["hdr"], @@ -159,6 +168,7 @@ impl Format { Format::Tga => "image/x-tga", Format::Ico => "image/x-icon", Format::Pnm => "image/x-portable-anymap", + Format::Pcx => "image/x-pcx", Format::Qoi => "image/qoi", Format::OpenExr => "image/x-exr", Format::Hdr => "image/vnd.radiance", @@ -207,6 +217,7 @@ pub fn caps(format: Format) -> FormatCaps { Format::Tga => FormatCaps { layouts: RGB_GRAY, ..base }, Format::Ico => FormatCaps { layouts: &[L::Rgba], ..base }, Format::Pnm => FormatCaps { depths: &[S::U8, S::U16, S::F32], layouts: ALL_LAYOUTS, ..base }, + Format::Pcx => FormatCaps { read: true, write: false, layouts: &[L::Rgb], alpha: false, ..base }, Format::Qoi => base, Format::OpenExr => FormatCaps { depths: &[S::F16, S::F32], layouts: RGB_GRAY, ..base }, Format::Hdr => FormatCaps { depths: &[S::F32], layouts: &[L::Rgb], alpha: false, lossy: true, ..base }, @@ -266,6 +277,9 @@ pub fn detect(bytes: &[u8]) -> Option { if b.starts_with(b"SIMPLE =") { return Some(Format::Fits); } + if crate::codecs::pcx::looks_like_pcx(b) { + return Some(Format::Pcx); + } if looks_like_tga(b) { return Some(Format::Tga); } diff --git a/crates/codecs/src/lib.rs b/crates/codecs/src/lib.rs index 424ec0b8..8278ac0d 100644 --- a/crates/codecs/src/lib.rs +++ b/crates/codecs/src/lib.rs @@ -43,7 +43,7 @@ pub use crate::resolution::{exif_resolution, export_exif, export_xmp, photoshop_ pub use crate::source_settings::{WebpEncoding, jpeg_quality, webp_encoding}; pub use half::f16; -use crate::codecs::{exr, fits, heif, jpeg, png, pnm, tiff, via_image, webp}; +use crate::codecs::{exr, fits, heif, jpeg, pcx, png, pnm, tiff, via_image, webp}; /// Detect the format and decode with default [`Limits`]. pub fn decode(bytes: &[u8]) -> Result { @@ -74,6 +74,7 @@ pub fn decode_as_with(format: Format, bytes: &[u8], opts: &DecodeOptions) -> Res Format::Tiff => tiff::decode(bytes, l), Format::WebP => webp::decode(bytes, l), Format::Pnm => pnm::decode(bytes, l), + Format::Pcx => pcx::decode(bytes, l), Format::Fits => fits::decode(bytes, l), Format::OpenExr => exr::decode(bytes, l), Format::Heif => heif::decode(bytes, l, opts.keep_orientation), @@ -216,6 +217,7 @@ pub fn encode(image: &Image, format: Format, opts: &EncodeOptions) -> Result tiff::encode(image, plan, opts), Format::WebP => webp::encode(image, plan, opts), Format::Pnm => pnm::encode(image, plan, opts), + Format::Pcx => Err(CodecError::unsupported(format, "PCX is import-only; save as PNG instead")), Format::Fits => fits::encode(image, plan, opts), Format::OpenExr => exr::encode(image, plan, opts), Format::Heif => Err(CodecError::unsupported(format, "encoding is not available in this build")), diff --git a/crates/codecs/tests/pcx.rs b/crates/codecs/tests/pcx.rs new file mode 100644 index 00000000..89661cb8 --- /dev/null +++ b/crates/codecs/tests/pcx.rs @@ -0,0 +1,100 @@ +use photocraft_codecs::{ChannelLayout, CodecError, Format, SampleType, caps, decode, decode_as, detect, encode, from_extension}; + +fn header(bits: u8, planes: u8, width: u16, height: u16, stride: u16) -> Vec { + let mut b = vec![0u8; 128]; + b[0] = 0x0a; // ZSoft + b[1] = 5; // PC Paintbrush 3.0+ + b[2] = 1; // RLE + b[3] = bits; + b[8..10].copy_from_slice(&(width - 1).to_le_bytes()); + b[10..12].copy_from_slice(&(height - 1).to_le_bytes()); + b[12..14].copy_from_slice(&300u16.to_le_bytes()); + b[14..16].copy_from_slice(&150u16.to_le_bytes()); + b[65] = planes; + b[66..68].copy_from_slice(&stride.to_le_bytes()); + b[68..70].copy_from_slice(&1u16.to_le_bytes()); + b +} + +fn rle_row(out: &mut Vec, row: &[u8]) { + for &value in row { + if value >= 0xc0 { + out.extend_from_slice(&[0xc1, value]); + } else { + out.push(value); + } + } +} + +#[test] +fn pcx_is_readable_but_not_writable() { + assert_eq!(from_extension("archive.PCX"), Some(Format::Pcx)); + assert!(caps(Format::Pcx).read && !caps(Format::Pcx).write); + let img = photocraft_codecs::Image::from_u8(1, 1, ChannelLayout::Rgb, vec![0, 0, 0]).unwrap(); + assert!(matches!(encode(&img, Format::Pcx, &Default::default()), Err(CodecError::Unsupported { .. }))); +} + +#[test] +fn decodes_three_plane_rgb_and_keeps_dpi() { + let mut b = header(8, 3, 2, 1, 2); + for row in [&[255, 0][..], &[0, 255][..], &[0, 0][..]] { + rle_row(&mut b, row); + } + assert_eq!(detect(&b), Some(Format::Pcx)); + let im = decode(&b).unwrap(); + assert_eq!(im.layout(), ChannelLayout::Rgb); + assert_eq!(im.sample_type(), SampleType::U8); + assert_eq!(im.dimensions(), (2, 1)); + assert_eq!(im.data(), &[255, 0, 0, 0, 255, 0]); + assert_eq!(im.meta.dpi, Some((300.0, 150.0))); +} + +#[test] +fn decodes_256_colour_vga_palette() { + let mut b = header(8, 1, 2, 1, 2); + rle_row(&mut b, &[1, 2]); + b.push(0x0c); + let mut palette = vec![0; 256 * 3]; + palette[3..6].copy_from_slice(&[255, 0, 0]); + palette[6..9].copy_from_slice(&[0, 255, 0]); + b.extend(palette); + assert_eq!(decode(&b).unwrap().data(), &[255, 0, 0, 0, 255, 0]); +} + +#[test] +fn decodes_4bit_and_monochrome_palettes() { + let mut four = header(4, 1, 2, 1, 2); + four[16 + 3..16 + 6].copy_from_slice(&[255, 0, 0]); + four[16 + 6..16 + 9].copy_from_slice(&[0, 0, 255]); + rle_row(&mut four, &[0x12, 0]); + assert_eq!(decode(&four).unwrap().data(), &[255, 0, 0, 0, 0, 255]); + + let mut one = header(1, 1, 2, 1, 2); + one[16 + 3..16 + 6].copy_from_slice(&[255, 0, 0]); + rle_row(&mut one, &[0x80, 0]); + assert_eq!(decode(&one).unwrap().data(), &[255, 0, 0, 0, 0, 0]); +} + +#[test] +fn rejects_truncated_and_overshooting_rle_without_panicking() { + let mut b = header(8, 3, 2, 1, 2); + assert!(decode_as(Format::Pcx, &b).is_err(), "header alone is truncated"); + b.extend([0xc5, 0xff]); // a five-pixel run cannot cross a two-byte row + assert!(decode_as(Format::Pcx, &b).is_err()); + let mut b = header(8, 3, 2, 1, 2); + b.extend([0xc1]); // missing run value + assert!(decode_as(Format::Pcx, &b).is_err()); + let mut b = header(8, 3, 2, 1, 2); + b[66..68].copy_from_slice(&0u16.to_le_bytes()); + assert_eq!(detect(&b), None, "invalid stride is not a PCX signature"); +} + +#[test] +fn refuses_headers_that_exceed_allocation_budget() { + let mut b = header(8, 3, 3000, 3000, 3000); + // The default decoder rejects the allocation before reading any scanline. + let opts = photocraft_codecs::DecodeOptions { limits: photocraft_codecs::Limits { max_alloc: 1024, ..Default::default() }, ..Default::default() }; + assert!(matches!(photocraft_codecs::decode_as_with(Format::Pcx, &b, &opts), Err(CodecError::LimitExceeded(_)))); + b[2] = 0; + assert_eq!(detect(&b), None, "unsupported uncompressed encoding"); +} From 0c2ca488aeac6f10ebd6f7af5a4569040931c052 Mon Sep 17 00:00:00 2001 From: Nicolas Falesy <112726756+nicolasfalesy@users.noreply.github.com> Date: Mon, 12 Oct 2026 07:13:06 -0400 Subject: [PATCH 36/92] fix(text): scale faux bold dilation with glyph scaling (#3705) (#3719) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When drawing faux-bold glyphs, the offset dilation was composed as `Xform(ox * r, oy * r).mul(&glyph)`. Because `Xform::mul(o)` applies `o` first (`self ∘ o`), the translation offset was added after the glyph's scaling transform, leaving faux bold dilation unscaled by horizontal and vertical font scaling. Applying the glyph transform to the offset transform (`glyph.mul(&offset)`) ensures dilation is performed in font-local coordinates and scaled proportionally with anisotropic glyph scaling, matching Photoshop. --- crates/text/src/render.rs | 2 +- crates/text/src/tests.rs | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/crates/text/src/render.rs b/crates/text/src/render.rs index 6068ae4a..acd9d511 100644 --- a/crates/text/src/render.rs +++ b/crates/text/src/render.rs @@ -72,7 +72,7 @@ fn draw(layout: &TextLayout, transform: &Xform, sink: &mut impl LineSink, only_c let offsets: &[(f64, f64)] = if bold { &[(-1.0, 0.0), (1.0, 0.0), (0.0, -1.0), (0.0, 1.0), (0.7, 0.7), (-0.7, -0.7), (0.7, -0.7), (-0.7, 0.7)] } else { &[(0.0, 0.0)] }; for &(ox, oy) in offsets { - let local = Xform([1.0, 0.0, 0.0, 1.0, ox * r, oy * r]).mul(&glyph); + let local = glyph.mul(&Xform([1.0, 0.0, 0.0, 1.0, ox * r, oy * r])); let settings = DrawSettings::unhinted(Size::new(face.size_px), LocationRef::new(&coords)); match warp { Some(w) => { diff --git a/crates/text/src/tests.rs b/crates/text/src/tests.rs index 8df4d81b..75b775b7 100644 --- a/crates/text/src/tests.rs +++ b/crates/text/src/tests.rs @@ -381,6 +381,41 @@ fn styles_change_pixels() { assert!(hrect.width() as f32 > prect.width() as f32 * 1.7); } +/// #3705: Faux bold dilation must scale with horizontal and vertical glyph scaling. +#[test] +fn faux_bold_scales_with_glyph_scaling() { + let mut e = TextEngine::new(); + let base = CharStyle { size_pt: 40.0, ..Default::default() }; + let ink = |e: &mut TextEngine, s: CharStyle| { + let (_, r) = e.render(&TextLayer { transform: Affine::translate(5.0, 50.0), ..styled("Hi", s) }, 72.0, PixelFormat::RGBA8); + (alpha_sum(&r.surface, r.rect), r.rect) + }; + let (_plain, prect) = ink(&mut e, base.clone()); + let (_bold, brect) = ink(&mut e, CharStyle { faux_bold: true, ..base.clone() }); + let unscaled_extra_w = brect.width() - prect.width(); + let unscaled_extra_h = brect.height() - prect.height(); + + // With 2x horizontal scale, the horizontal dilation scales with the glyph: + let hscaled = CharStyle { size_pt: 40.0, horizontal_scale: 2.0, ..Default::default() }; + let (_, phrect) = ink(&mut e, hscaled.clone()); + let (_, bhrect) = ink(&mut e, CharStyle { faux_bold: true, ..hscaled }); + let hscaled_extra_w = bhrect.width() - phrect.width(); + assert!( + hscaled_extra_w >= unscaled_extra_w * 2 - 1 && hscaled_extra_w <= unscaled_extra_w * 2 + 1, + "hscaled extra width {hscaled_extra_w} vs unscaled {unscaled_extra_w}" + ); + + // With 2x vertical scale, the vertical dilation scales with the glyph: + let vscaled = CharStyle { size_pt: 40.0, vertical_scale: 2.0, ..Default::default() }; + let (_, pvrect) = ink(&mut e, vscaled.clone()); + let (_, bvrect) = ink(&mut e, CharStyle { faux_bold: true, ..vscaled }); + let vscaled_extra_h = bvrect.height() - pvrect.height(); + assert!( + vscaled_extra_h >= unscaled_extra_h * 2 - 1 && vscaled_extra_h <= unscaled_extra_h * 2 + 1, + "vscaled extra height {vscaled_extra_h} vs unscaled {unscaled_extra_h}" + ); +} + #[test] fn multicolor_runs() { let mut e = TextEngine::new(); From 89312de597dbad53ca7e502da0008344d6bb6036 Mon Sep 17 00:00:00 2001 From: Fabio Lussi Date: Mon, 12 Oct 2026 13:13:32 +0200 Subject: [PATCH 37/92] Answer a repeat auth with "already authenticated" (#3723) A second `auth` frame on an authenticated TCP connection fell through to the method dispatcher and came back as an unknown method, in both the headless serve server and the desktop control server. A shared `security::repeat_auth_reply` now answers it with `already authenticated` (keeping the request id) and the connection keeps serving. Fixes #3668 Co-authored-by: Fabio Lussi <198260595+itrycodinganditsbad@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 --- apps/photocraft/src/control_server.rs | 48 ++++++++++++++++++++++++++- crates/automation/src/rpc.rs | 34 +++++++++++++++++-- crates/automation/src/security.rs | 23 +++++++++++++ docs/control-protocol.md | 2 ++ 4 files changed, 104 insertions(+), 3 deletions(-) diff --git a/apps/photocraft/src/control_server.rs b/apps/photocraft/src/control_server.rs index 932e31ee..b1282419 100644 --- a/apps/photocraft/src/control_server.rs +++ b/apps/photocraft/src/control_server.rs @@ -9,7 +9,7 @@ use std::time::Instant; use photocraft_automation::budgets::write_reply; use photocraft_automation::security::{ - ConnectionLimiter, LineRead, MAX_CONNECTIONS, MAX_REQUEST_BYTES, authentication_reply, configure_stream, read_bounded_line, + ConnectionLimiter, LineRead, MAX_CONNECTIONS, MAX_REQUEST_BYTES, authentication_reply, configure_stream, read_bounded_line, repeat_auth_reply, }; use photocraft_ui_egui::ControlRequest; use photocraft_ui_egui::control::{REPLY_DEADLINE, timeout_error}; @@ -79,6 +79,12 @@ fn serve(stream: TcpStream, token: &str, tx: Sender, ctx: egui:: } continue; } + if let Some(reply) = repeat_auth_reply(&line) { + if write_reply(&mut out, &reply).is_err() || out.flush().is_err() { + break; + } + continue; + } let reply = match serde_json::from_str::(&line) { Ok(msg) => { let id = msg.get("id").cloned().unwrap_or(Value::Null); @@ -202,4 +208,44 @@ mod tests { handler.join().unwrap(); server.join().unwrap(); } + + #[test] + fn repeat_auth_reports_already_authenticated_without_dispatching() { + const TOKEN: &str = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"; + let listener = TcpListener::bind("127.0.0.1:0").unwrap(); + let addr = listener.local_addr().unwrap(); + let (tx, rx) = channel::(); + let server = std::thread::spawn(move || { + let (stream, _) = listener.accept().unwrap(); + serve(stream, TOKEN, tx, egui::Context::default()); + }); + let handler = std::thread::spawn(move || { + let req = rx.recv_timeout(Duration::from_secs(5)).unwrap(); + assert_eq!(req.method, "test.after", "a repeat auth must not reach the UI dispatcher"); + req.reply.send(json!({"ok": true, "result": "still serving"})).unwrap(); + }); + let mut stream = TcpStream::connect(addr).unwrap(); + stream.set_read_timeout(Some(Duration::from_secs(5))).unwrap(); + let mut reader = BufReader::new(stream.try_clone().unwrap()); + let mut line = String::new(); + for id in ["auth", "again"] { + writeln!(stream, "{}", json!({"id": id, "method": "auth", "params": {"token": TOKEN}})).unwrap(); + line.clear(); + reader.read_line(&mut line).unwrap(); + } + let again: Value = serde_json::from_str(&line).unwrap(); + assert_eq!(again["id"], "again"); + assert_eq!(again["ok"], false); + assert_eq!(again["error"], "already authenticated"); + writeln!(stream, "{}", json!({"id": 9, "method": "test.after"})).unwrap(); + line.clear(); + reader.read_line(&mut line).unwrap(); + let after: Value = serde_json::from_str(&line).unwrap(); + assert_eq!(after["id"], 9); + assert_eq!(after["result"], "still serving"); + drop(reader); + drop(stream); + handler.join().unwrap(); + server.join().unwrap(); + } } diff --git a/crates/automation/src/rpc.rs b/crates/automation/src/rpc.rs index d513bfa8..87585046 100644 --- a/crates/automation/src/rpc.rs +++ b/crates/automation/src/rpc.rs @@ -30,7 +30,7 @@ use serde_json::{Value, json}; use crate::budgets::{BatchReplyBudget, write_reply}; use crate::security::{ ConnectionLimiter, LineRead, MAX_BATCH_STEPS, MAX_CONNECTIONS, MAX_REQUEST_BYTES, authentication_reply, configure_stream, discard_rest_of_line, - read_bounded_line, + read_bounded_line, repeat_auth_reply, }; use crate::{AutomationError, Headless}; @@ -288,7 +288,7 @@ fn serve_tcp_connection(h: &Mutex, stream: std::net::TcpStream, token: LineRead::Line => {} } let reply = if authenticated { - respond(h, &line) + repeat_auth_reply(&line).unwrap_or_else(|| respond(h, &line)) } else { let (reply, ok) = authentication_reply(&line, token); authenticated = ok; @@ -780,6 +780,36 @@ mod tests { assert!(v["result"].as_array().unwrap().iter().any(|m| m == "batch")); } + #[test] + fn tcp_repeat_auth_reports_already_authenticated_and_keeps_serving() { + use std::io::{BufReader, Write as _}; + const TOKEN: &str = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"; + let h = Arc::new(Mutex::new(Headless::new())); + let (tx, rx) = std::sync::mpsc::channel(); + std::thread::spawn(move || { + let _ = serve_tcp("127.0.0.1:0", h, TOKEN.into(), move |a| tx.send(a).unwrap()); + }); + let addr = rx.recv().unwrap(); + let mut s = std::net::TcpStream::connect(addr).unwrap(); + let mut reader = BufReader::new(s.try_clone().unwrap()); + let mut line = String::new(); + for id in ["auth", "again"] { + writeln!(s, r#"{{"id":"{id}","method":"auth","params":{{"token":"{TOKEN}"}}}}"#).unwrap(); + line.clear(); + reader.read_line(&mut line).unwrap(); + } + let again: Value = serde_json::from_str(&line).unwrap(); + assert_eq!(again["id"], "again"); + assert_eq!(again["ok"], false); + assert_eq!(again["error"], "already authenticated"); + writeln!(s, r#"{{"id":"m","method":"methods"}}"#).unwrap(); + line.clear(); + reader.read_line(&mut line).unwrap(); + let v: Value = serde_json::from_str(&line).unwrap(); + assert_eq!(v["id"], "m"); + assert_eq!(v["ok"], true); + } + #[test] fn tcp_rejects_requests_before_authentication() { use std::io::{BufReader, Write as _}; diff --git a/crates/automation/src/security.rs b/crates/automation/src/security.rs index 075427c0..4659a3ff 100644 --- a/crates/automation/src/security.rs +++ b/crates/automation/src/security.rs @@ -118,6 +118,18 @@ pub fn authentication_reply(line: &str, expected_token: &str) -> (Value, bool) { } } +/// Answer a repeat `auth` frame on an already authenticated connection. Returns `None` for any +/// other frame, which the caller dispatches as usual. +/// Without this, a second `auth` fell through to the method dispatcher as an unknown method. +pub fn repeat_auth_reply(line: &str) -> Option { + let req: Value = serde_json::from_str(line).ok()?; + if req.get("method").and_then(Value::as_str) != Some(AUTH_METHOD) { + return None; + } + let id = req.get("id").cloned().unwrap_or(Value::Null); + Some(json!({"id": id, "ok": false, "error": "already authenticated"})) +} + fn read_token_file(path: &Path) -> Result { let token = std::fs::read_to_string(path).map_err(|e| AutomationError::Io(format!("{}: {e}", path.display())))?; let token = token.trim().to_owned(); @@ -294,6 +306,17 @@ mod tests { assert_eq!(reply["result"]["authenticated"], true); } + #[test] + fn repeat_auth_on_an_authenticated_connection_says_so() { + let line = json!({"id": 3, "method": AUTH_METHOD, "params": {"token": "anything"}}).to_string(); + let reply = repeat_auth_reply(&line).unwrap(); + assert_eq!(reply["id"], 3); + assert_eq!(reply["ok"], false); + assert_eq!(reply["error"], "already authenticated"); + assert!(repeat_auth_reply(r#"{"id":4,"method":"methods"}"#).is_none()); + assert!(repeat_auth_reply("{not json").is_none()); + } + #[test] fn token_file_round_trips_between_server_and_client() { let path = std::env::temp_dir().join(format!("photocraft-control-token-{}-{}.txt", std::process::id(), generate_token().unwrap())); diff --git a/docs/control-protocol.md b/docs/control-protocol.md index c73a0be6..0d974c09 100644 --- a/docs/control-protocol.md +++ b/docs/control-protocol.md @@ -23,6 +23,8 @@ The first request on every TCP connection must authenticate. No other method is {"id": "auth", "method": "auth", "params": {"token": "<64 hexadecimal characters>"}} ``` +Authenticate once per connection. A later `auth` frame on the same connection gets `{"ok": false, "error": "already authenticated"}` and the connection keeps serving. + After the successful authentication reply, each request is one JSON line: ```json From 6751a460032f4619d8eabd3ddec6fb890a040c94 Mon Sep 17 00:00:00 2001 From: Valentin Klein Date: Mon, 12 Oct 2026 13:13:45 +0200 Subject: [PATCH 38/92] Codecs: integer fast paths for Image::convert (#3717) (#3729) U8/U16 depth changes and pure channel-copy layout changes (alpha add/drop, gray to RGB) skip the two intermediate f32 buffers. Output is bit-identical to the f32 route. Co-authored-by: Claude Opus 5.5 --- crates/codecs/src/image.rs | 111 +++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/crates/codecs/src/image.rs b/crates/codecs/src/image.rs index 01f5d4ca..92d8fb58 100644 --- a/crates/codecs/src/image.rs +++ b/crates/codecs/src/image.rs @@ -512,6 +512,8 @@ impl Image { out.extend_from_slice(&one); } out + } else if let Some(fast) = self.convert_int_direct(layout, sample) { + fast } else if layout == self.layout { quantize(&self.to_normalized(), sample) } else { @@ -531,6 +533,55 @@ impl Image { } } + /// Integer fast path of [`Image::convert`] for U8/U16 sources and targets whose result is + /// a pure channel copy: same colour model (alpha added as opaque, or dropped) or gray to + /// RGB. Bit-identical to the generic f32 route (see the equivalence tests) but without + /// the two intermediate f32 buffers. Returns `None` for everything else. + fn convert_int_direct(&self, layout: ChannelLayout, sample: SampleType) -> Option> { + let int = |s: SampleType| matches!(s, SampleType::U8 | SampleType::U16); + if !int(self.sample) || !int(sample) { + return None; + } + let gray_to_rgb = self.layout.is_gray() && layout.is_rgb(); + if !gray_to_rgb && !layout.same_model(self.layout) { + return None; + } + let one: &[u8] = match sample { + SampleType::U8 => &[u8::MAX], + _ => &u16::MAX.to_ne_bytes(), + }; + let (fc, tc) = (self.layout.channels(), layout.channels()); + let (sb, db) = (self.sample.bytes(), sample.bytes()); + let (src_color, dst_color) = (self.layout.color_channels(), layout.color_channels()); + let n = self.data.len() / (fc * sb); + let mut out = Vec::with_capacity(n.checked_mul(tc)?.checked_mul(db)?); + macro_rules! run { + ($conv:expr) => {{ + let conv = $conv; + for px in self.data.chunks_exact(fc * sb) { + for j in 0..dst_color { + let c = if src_color == 1 { 0 } else { j }; + conv(&px[c * sb..(c + 1) * sb], &mut out); + } + if layout.has_alpha() { + if self.layout.has_alpha() { + conv(&px[src_color * sb..(src_color + 1) * sb], &mut out); + } else { + out.extend_from_slice(one); + } + } + } + }}; + } + match (self.sample, sample) { + (SampleType::U8, SampleType::U8) => run!(|s: &[u8], o: &mut Vec| o.push(s[0])), + (SampleType::U16, SampleType::U16) => run!(|s: &[u8], o: &mut Vec| o.extend_from_slice(s)), + (SampleType::U8, SampleType::U16) => run!(|s: &[u8], o: &mut Vec| o.extend_from_slice(&(u16::from(s[0]) * 257).to_ne_bytes())), + _ => run!(|s: &[u8], o: &mut Vec| o.push(((u32::from(u16::from_ne_bytes([s[0], s[1]])) + 128) / 257) as u8)), + } + Some(out) + } + /// [`Image::convert`], borrowing `self` when it already has that layout and sample type /// (encoders use it so a full-size image isn't copied for nothing). pub fn converted(&self, layout: ChannelLayout, sample: SampleType) -> std::borrow::Cow<'_, Image> { @@ -661,6 +712,66 @@ mod tests { use super::*; + /// The generic f32 route `convert` used before the integer fast paths (the reference). + fn convert_via_f32(img: &Image, layout: ChannelLayout, sample: SampleType) -> Vec { + quantize(&convert_layout(&img.to_normalized(), img.layout, layout), sample) + } + + #[test] + fn int_fast_path_matches_f32_route_for_every_value() { + // Every U8 and every U16 value through every depth pair (alpha goes through the same per-sample conversion; covered by the layout test). + let all8: Vec = (0..=255).collect(); + let all16: Vec = (0..=65535).collect(); + for (src, to) in + [(SampleType::U8, SampleType::U8), (SampleType::U8, SampleType::U16), (SampleType::U16, SampleType::U8), (SampleType::U16, SampleType::U16)] + { + let img = if src == SampleType::U8 { + Image::from_u8(256, 1, ChannelLayout::Gray, all8.clone()).unwrap() + } else { + Image::from_u16(65536, 1, ChannelLayout::Gray, &all16).unwrap() + }; + for layout in [ChannelLayout::Gray, ChannelLayout::Rgb] { + assert_eq!(img.convert(layout, to).data(), &convert_via_f32(&img, layout, to)[..], "{src:?}->{to:?} {layout:?}"); + } + } + } + + #[test] + fn int_fast_path_matches_f32_route_for_every_layout() { + let mut seed = 0x9e3779b97f4a7c15u64; + let mut next = || { + seed ^= seed << 13; + seed ^= seed >> 7; + seed ^= seed << 17; + seed + }; + for from_s in [SampleType::U8, SampleType::U16] { + for from_l in ChannelLayout::ALL { + let n = 64 * from_l.channels(); + let mut vals = Vec::new(); + for i in 0..n { + // Edge values (0, 1, max-1, max, mid) mixed with random ones. + let r = next(); + let v = match i % 7 { + 0 => 0.0, + 1 => 1.0, + 2 => 1.0 / 255.0, + 3 => 254.0 / 255.0, + _ => (r % 65536) as f32 / 65535.0, + }; + vals.push(v); + } + let img = Image::from_normalized(64, 1, from_l, from_s, &vals).unwrap(); + for to_l in ChannelLayout::ALL { + for to_s in SampleType::ALL { + let got = img.convert(to_l, to_s); + assert_eq!(got.data(), &convert_via_f32(&img, to_l, to_s)[..], "{from_l:?}/{from_s:?} -> {to_l:?}/{to_s:?}"); + } + } + } + } + } + #[test] fn u8_u16_roundtrip_exact() { let v: Vec = (0..=255).collect(); From 3dd5fc1cdc631efcc213d849b86829602895b7ea Mon Sep 17 00:00:00 2001 From: Fabio Lussi Date: Mon, 12 Oct 2026 13:13:57 +0200 Subject: [PATCH 39/92] automation: say why a command is disabled in engine.commands (#3740) engine.commands, command.list and the MCP command_list tool now give each row a disabledReason (null when enabled, else the failed precondition) and needsDocument (true when the command is off because no document is open), so an agent can tell "open a document first" from "not runnable". enabled keeps its meaning. Both listings share one row builder in the engine. Fixes #3664 Co-authored-by: Fabio Lussi <198260595+itrycodinganditsbad@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 --- crates/automation/src/headless.rs | 16 +--------------- crates/automation/src/server.rs | 4 +++- crates/automation/tests/mcp.rs | 6 ++++++ crates/engine/src/commands.rs | 26 ++++++++++++++------------ crates/engine/src/tests.rs | 27 +++++++++++++++++++++++++++ docs/control-protocol.md | 6 +++--- 6 files changed, 54 insertions(+), 31 deletions(-) diff --git a/crates/automation/src/headless.rs b/crates/automation/src/headless.rs index 028ca09f..dc18afe2 100644 --- a/crates/automation/src/headless.rs +++ b/crates/automation/src/headless.rs @@ -317,21 +317,7 @@ impl Headless { } pub fn command_list(&self) -> Value { - Value::Array( - command_specs() - .iter() - .map(|c| { - json!({ - "id": c.id, - "label": c.label, - "menu": c.menu, - "shortcut": c.shortcut, - "params": c.params, - "enabled": self.session.is_enabled(c.id), - }) - }) - .collect(), - ) + Value::Array(command_specs().iter().map(|c| photocraft_engine::commands::list_entry(&self.session, c, self.session.disabled_reason(c.id))).collect()) } pub fn command_run(&mut self, id: &str, params: Value) -> Result { diff --git a/crates/automation/src/server.rs b/crates/automation/src/server.rs index 909e2219..c2f18b8b 100644 --- a/crates/automation/src/server.rs +++ b/crates/automation/src/server.rs @@ -792,7 +792,9 @@ impl PhotocraftMcp { } } - #[tool(description = "List engine commands: id, label, menu path, shortcut, parameter doc, enabled now.")] + #[tool(description = "List engine commands: id, label, menu path, shortcut, parameter doc, enabled now. \ + `disabledReason` says why a command is off (null when enabled); `needsDocument` is true when it is off because no \ + document is open: create or open one first (doc_new, doc_open).")] async fn command_list(&self, Parameters(p): Parameters) -> Result { let all = if let Some(r) = self.headless_op(|h| Ok(h.command_list())).await { r diff --git a/crates/automation/tests/mcp.rs b/crates/automation/tests/mcp.rs index 3ec39ebc..af5459af 100644 --- a/crates/automation/tests/mcp.rs +++ b/crates/automation/tests/mcp.rs @@ -170,6 +170,12 @@ async fn command_list_filters() { let enabled = json_of(&call(&client, "command_list", json!({"enabled_only": true})).await); assert!(enabled.as_array().unwrap().iter().any(|c| c["id"] == "file.new")); assert!(!enabled.as_array().unwrap().iter().any(|c| c["id"] == "layer.new.layer"), "needs a document"); + // The full list says why a document command is off with no document open (#3664). + let layer = all.as_array().unwrap().iter().find(|c| c["id"] == "layer.new.layer").unwrap(); + assert_eq!((layer["enabled"].clone(), layer["needsDocument"].clone()), (json!(false), json!(true)), "{layer}"); + assert!(layer["disabledReason"].as_str().is_some_and(|r| r.starts_with("no document")), "{layer}"); + let new = all.as_array().unwrap().iter().find(|c| c["id"] == "file.new").unwrap(); + assert_eq!((new["needsDocument"].clone(), new["disabledReason"].clone()), (json!(false), Value::Null), "{new}"); client.cancel().await.unwrap(); } diff --git a/crates/engine/src/commands.rs b/crates/engine/src/commands.rs index 3554e569..48caf85b 100644 --- a/crates/engine/src/commands.rs +++ b/crates/engine/src/commands.rs @@ -136,6 +136,19 @@ pub fn command_specs() -> &'static [CommandSpec] { ®istry().specs } +/// One `command.list` / `engine.commands` row for `c`, given why it can't run now (`None` = it can). +/// `disabledReason` is that message; `needsDocument` is true when the reason is that no document is +/// open (#3664), so an agent can tell "open or create a document first" from a precondition that a +/// document alone won't meet (a selection, an empty clipboard). +pub fn list_entry(s: &Session, c: &CommandSpec, reason: Option) -> Value { + let needs_document = + s.active().is_none() && reason.as_deref().is_some_and(|r| ["no document", "no active document", "no open document"].iter().any(|p| r.starts_with(p))); + json!({ + "id": c.id, "label": c.label, "menu": c.menu, "shortcut": c.shortcut, "params": c.params, + "enabled": reason.is_none(), "disabledReason": reason, "needsDocument": needs_document, + }) +} + pub fn find(id: &str) -> Option<&'static CommandSpec> { let registry = registry(); registry.by_id.get(id).and_then(|&index| registry.specs.get(index)) @@ -1014,18 +1027,7 @@ fn build() -> Vec { shortcut: None, params: "{}", enabled: always, - run: |s, _| { - Ok(Value::Array( - command_specs() - .iter() - .map(|c| { - json!({ - "id": c.id, "label": c.label, "menu": c.menu, "shortcut": c.shortcut, "params": c.params, "enabled": (c.enabled)(s).is_ok(), - }) - }) - .collect(), - )) - }, + run: |s, _| Ok(Value::Array(command_specs().iter().map(|c| list_entry(s, c, (c.enabled)(s).err())).collect())), journal: false, }, CommandSpec { diff --git a/crates/engine/src/tests.rs b/crates/engine/src/tests.rs index e4cbfe57..a35a19bb 100644 --- a/crates/engine/src/tests.rs +++ b/crates/engine/src/tests.rs @@ -767,6 +767,33 @@ fn command_list_reports_enablement() { assert_eq!(find("layer.new.layer")["enabled"], false); } +/// With no document open, a document command says so instead of only `enabled: false` (#3664). +#[test] +fn command_list_tells_no_document_from_other_preconditions() { + let mut s = Session::new(); + let list = s.execute("command.list", json!({})).unwrap(); + let find = |list: &Value, id: &str| list.as_array().unwrap().iter().find(|c| c["id"] == id).unwrap().clone(); + for id in ["paint.stroke", "layer.new.layer", "filter.blur.gaussianBlur"] { + let c = find(&list, id); + assert_eq!((c["enabled"].clone(), c["needsDocument"].clone()), (json!(false), json!(true)), "{id}: {c}"); + assert!(c["disabledReason"].as_str().is_some_and(|r| r.starts_with("no document")), "{id}: {c}"); + } + let new = find(&list, "file.new"); + assert_eq!((new["enabled"].clone(), new["needsDocument"].clone(), new["disabledReason"].clone()), (json!(true), json!(false), Value::Null)); + // A precondition that isn't the missing document keeps its own reason. + let paste = find(&list, "file.newFromClipboard"); + assert_eq!((paste["enabled"].clone(), paste["needsDocument"].clone()), (json!(false), json!(false))); + assert_eq!(paste["disabledReason"], "the clipboard is empty"); + // With a document, the same commands run; a missing selection is not a missing document. + let mut s = session_with_doc(); + let list = s.execute("command.list", json!({})).unwrap(); + assert_eq!(find(&list, "paint.stroke")["needsDocument"], false); + assert_eq!(find(&list, "paint.stroke")["disabledReason"], Value::Null); + let deselect = find(&list, "select.deselect"); + assert_eq!((deselect["enabled"].clone(), deselect["needsDocument"].clone()), (json!(false), json!(false))); + assert_eq!(deselect["disabledReason"], "no selection"); +} + #[test] fn translate_moves_pixels_and_respects_locks() { let mut s = session_with_doc(); diff --git a/docs/control-protocol.md b/docs/control-protocol.md index 0d974c09..3f0be8eb 100644 --- a/docs/control-protocol.md +++ b/docs/control-protocol.md @@ -90,7 +90,7 @@ Change the UI language without restarting with `prefs.set`: are documented in [UI localisation](localization.md). `prefs.get` and the existing preference store expose and persist the same setting; scripts keep using canonical command IDs. -`engine.execute` runs any command by id. `engine.commands` (or the engine command `command.list`) lists them all, with labels, menu paths, shortcuts, a parameter description, and whether each is currently enabled. Examples: +`engine.execute` runs any command by id. `engine.commands` (or the engine command `command.list`) lists them all, with labels, menu paths, shortcuts, a parameter description, and whether each is currently enabled. Each row carries `enabled` (bool), `disabledReason` (`null` when enabled, otherwise the precondition that failed, such as `"no document open"`, `"no selection"` or `"the clipboard is empty"`) and `needsDocument` (true when the command is off because no document is open, so the first step is to create or open one; a command may still have its own precondition after that, such as an active text layer. False when enabled or off for another reason). With no document open, nearly every document command reports `enabled: false, needsDocument: true`; plan around `needsDocument` rather than reading `enabled` alone (#3664). Examples: | Command | Params | |---|---| @@ -263,7 +263,7 @@ How each MCP tool maps onto control methods in bridge mode: |---|---| | `command_run {id, params, wait?}` | `engine.execute {command: id, params, wait}` | | `jobs_list` / `jobs_cancel {job?}` | `jobs.list` / `jobs.cancel {job?}` | -| `command_list {filter?, enabled_only?}` | `engine.commands` (filtered by the MCP server) | +| `command_list {filter?, enabled_only?}` | `engine.commands` (filtered by the MCP server; rows keep `disabledReason` and `needsDocument`) | | `doc_new {…}` | `engine.execute {command: "file.new", params}` | | `doc_inspect` | `engine.execute {command: "document.inspect"}` | | `doc_open {path}` | `app.open {path}` | @@ -321,7 +321,7 @@ no MCP framing, no app start-up per command. Configure its file access with the |---|---| | `engine.execute` | `{command, params?, wait?}`: any engine command (`wait: false` starts a long one as a background job: `{job, pending}`) | | `jobs.list` / `jobs.cancel` | `{}` / `{job?}`: background jobs; cancel one or all. Every request (and MCP tool call) first applies the jobs that finished, so `doc.save`, `doc.inspect`, `doc.render` and `session.list` include a finished job's result without polling `jobs.list` first | -| `engine.commands` | `{filter?}`: registry with params docs and enablement | +| `engine.commands` | `{filter?}`: registry with params docs and enablement (`enabled`, `disabledReason`, `needsDocument`) | | `session.list` | open documents and the active index | | `doc.open` / `doc.new` | `{path}` / `file.new` params | | `doc.place` | `{path, scale? (percent), fit? (true), center? ([x, y]), index?}`: places a file as a Smart Object layer above the active one and returns `{layer, scale, bounds}`. `path` resolves beneath the read root, so this is the capability-scoped `file.placeEmbedded` — that command itself still refuses an ambient path | From 53d814f6437db8a26d5a469f0f8198ab8f5fb658 Mon Sep 17 00:00:00 2001 From: FinnNk Date: Mon, 12 Oct 2026 12:32:23 +0100 Subject: [PATCH 40/92] feat: Photoshop's layer and selection keys (Ctrl+, toggle, Ctrl+\, /, Ctrl+Alt+2, Ctrl+Alt+Backspace, Tab rename, Alt-click thumbnail) (#3710) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(engine): Ctrl+, toggles a layer's visibility and / its transparency lock Photoshop's Ctrl+, (Cmd+, on macOS) hides the selected layers and, once they are all hidden, shows them again: its Layer menu item then reads Show Layers. layer.hideLayers now does the same, so the key toggles: it shows them only when every targeted layer is hidden. The / key toggles Lock Transparent Pixels, as the Layers panel's first lock button does (layer.toggleLockTransparency). With several layers selected, any unlocked one means lock them all; the Background, which can't take this lock, is left out. Each press is one undoable step. Co-Authored-By: Claude Opus 5.5 * feat(engine): Ctrl+\ targets the layer mask and Ctrl+Alt+2 loads luminosity Photoshop's Ctrl+\ (Cmd+\) targets the active layer's mask, as clicking its thumbnail does, beside Ctrl+2 for the composite (channel.target.layerMask; greyed when the layer has no mask). Its Ctrl+Alt+2 (Cmd+Option+2) loads the image's luminosity as a selection, the Ctrl-click on the composite channel (select.loadLuminosity). Co-Authored-By: Claude Opus 5.5 * feat(engine): Ctrl+Alt+Backspace fills from history Photoshop's Ctrl+Alt+Backspace (Cmd+Option+Delete) fills the selection, or the layer, from the History Brush's source state. edit.fillHistory is edit.fill with contents "history": the oldest state still held, unless "state" names another. It joins the other fill keys, so it honours the Channels panel target and appears with them in Keyboard Shortcuts. Co-Authored-By: Claude Opus 5.5 * feat(ui): Tab renames the next layer; Alt-click a thumbnail fits the layer While a layer name is being edited, Tab commits it and starts renaming the layer below, and Shift+Tab the layer above, as in Photoshop; the Background, which isn't renamed in place, ends it. Alt-clicking a layer's thumbnail selects the layer and fits its content on screen (View › Fit Layer(s) on Screen). Key tests cover Ctrl+,, /, Ctrl+\, Ctrl+Alt+2 and Ctrl+Alt+Backspace through the shortcut dispatcher. docs/ui-parity.md lists the new keys. Co-Authored-By: Claude Opus 5.5 * fix(ui): an explicit channel target drives the Layers panel's mask target After Ctrl+\ targeted the layer mask, Ctrl+2 moved the Channels target back to the composite, but the Layers panel kept the mask targeted (its own flag, which only ever followed the engine towards the mask), so painting still went to the mask. The same happened after clicking the mask thumbnail. Any channel.target command (Ctrl+2, Ctrl+\, Ctrl+3…) now sets the panel's mask and vector-mask targets from the engine's target. Co-Authored-By: Claude Opus 5.5 * Use Document::is_background after #4036 removed extra_cmds::is_background Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 Co-authored-by: Brandon Thomas --- crates/engine/src/channel_cmds.rs | 17 +++ crates/engine/src/channel_cmds/tests.rs | 27 ++++ crates/engine/src/extra_cmds.rs | 90 ++++++++++++- crates/engine/src/fill_key_cmds.rs | 52 +++++++- crates/ui-egui/src/layer_row_ui.rs | 18 ++- .../ui-egui/src/layer_row_ui/rename_tests.rs | 28 +++- crates/ui-egui/src/layer_shortcut_tests.rs | 124 ++++++++++++++++++ crates/ui-egui/src/lib.rs | 12 ++ crates/ui-egui/src/panels.rs | 15 +++ docs/ui-parity.md | 4 +- 10 files changed, 380 insertions(+), 7 deletions(-) create mode 100644 crates/ui-egui/src/layer_shortcut_tests.rs diff --git a/crates/engine/src/channel_cmds.rs b/crates/engine/src/channel_cmds.rs index a85ff75b..39ce9c82 100644 --- a/crates/engine/src/channel_cmds.rs +++ b/crates/engine/src/channel_cmds.rs @@ -1804,6 +1804,16 @@ pub fn specs() -> Vec { journal: false, }, spec!("channel.target.composite", "Target Composite Channel", [], Some("Cmd+2"), "{}", has_doc, |s, _| target_slot(s, 2)), + // ⌘\ targets the active layer's mask, as clicking its thumbnail does. + spec!("channel.target.layerMask", "Target Layer Mask", [], Some("Cmd+\\"), "{}", has_layer_mask, |s, _| target_cmd( + s, + &serde_json::json!({"channel": "mask"}) + )), + // ⌘⌥2 loads the image's luminosity as a selection (⌘-click on the composite channel). + spec!("select.loadLuminosity", "Load Luminosity", [], Some("Cmd+Alt+2"), "{}", has_doc, |s, _| load_selection( + s, + &serde_json::json!({"channel": "composite"}) + )), spec!("channel.target.slot3", "Target Channel 3", [], Some("Cmd+3"), "{}", slot_ok::<3>, |s, _| target_slot(s, 3)), spec!("channel.target.slot4", "Target Channel 4", [], Some("Cmd+4"), "{}", slot_ok::<4>, |s, _| target_slot(s, 4)), spec!("channel.target.slot5", "Target Channel 5", [], Some("Cmd+5"), "{}", slot_ok::<5>, |s, _| target_slot(s, 5)), @@ -1814,6 +1824,13 @@ pub fn specs() -> Vec { ] } +/// Target Layer Mask: the active layer has a mask. +fn has_layer_mask(s: &Session) -> std::result::Result<(), String> { + let st = s.active().ok_or("no document open")?; + let layer = st.active_layer.and_then(|id| st.doc.layer(id)).ok_or("no active layer")?; + layer.mask.as_ref().map(|_| ()).ok_or_else(|| "the active layer has no layer mask".to_string()) +} + fn slot_ok(s: &Session) -> std::result::Result<(), String> { let d = s.active().ok_or("no document open")?; let colors = color_count(&d.doc); diff --git a/crates/engine/src/channel_cmds/tests.rs b/crates/engine/src/channel_cmds/tests.rs index 1223c058..17727dc8 100644 --- a/crates/engine/src/channel_cmds/tests.rs +++ b/crates/engine/src/channel_cmds/tests.rs @@ -741,6 +741,33 @@ fn clear_with_an_alpha_channel_or_quick_mask_targeted_fills_it_not_the_layer() { assert_eq!(px(&s, 5, 5), layer, "the layer is untouched in Quick Mask mode"); } +#[test] +fn command_backslash_targets_the_layer_mask_and_command_2_the_composite() { + let mut s = session(); + s.execute("layer.new.layer", json!({})).unwrap(); + assert!(!s.is_enabled("channel.target.layerMask"), "no mask yet"); + assert!(s.execute("channel.target.layerMask", json!({})).is_err()); + s.execute("layer.layerMask.revealAll", json!({})).unwrap(); + s.execute("channel.target.composite", json!({})).unwrap(); + assert_eq!(crate::commands::find("channel.target.layerMask").and_then(|c| c.shortcut), Some("Cmd+\\")); + s.execute("channel.target.layerMask", json!({})).unwrap(); + assert_eq!(s.active().unwrap().channel_view.target, ChannelTarget::LayerMask); + s.execute("channel.target.composite", json!({})).unwrap(); + assert_eq!(s.active().unwrap().channel_view.target, ChannelTarget::Composite); +} + +#[test] +fn command_alt_2_loads_the_images_luminosity() { + let mut s = session(); + rect(&mut s, 0, 0, 20, 20, "replace"); + s.execute("edit.fill", json!({"contents": "black"})).unwrap(); + s.execute("select.deselect", json!({})).unwrap(); + assert_eq!(crate::commands::find("select.loadLuminosity").and_then(|c| c.shortcut), Some("Cmd+Alt+2")); + s.execute("select.loadLuminosity", json!({})).unwrap(); + assert!(sel_at(&s, 5, 5) < 0.01, "black: unselected"); + assert!(sel_at(&s, 30, 5) > 0.99, "white: selected"); +} + #[test] fn thumbnail_selection_shape_without_pixel_cache_uses_its_transparency() { for depth in [8, 16, 32] { diff --git a/crates/engine/src/extra_cmds.rs b/crates/engine/src/extra_cmds.rs index cebb9ec8..251acfb3 100644 --- a/crates/engine/src/extra_cmds.rs +++ b/crates/engine/src/extra_cmds.rs @@ -566,6 +566,35 @@ fn set_visible(s: &mut Session, p: &Value, visible: bool) -> Result { Ok(Value::Null) } +/// Layer › Hide Layers (⌘,): hide the targeted layers, or show them when every one is already +/// hidden, as Photoshop's item does (it reads Show Layers then), so ⌘, toggles. +fn hide_or_show(s: &mut Session, p: &Value) -> Result { + let st = s.active().ok_or(EngineError::NoDocument)?; + let targets = if crate::layer_multi_cmds::multi(s, p) { crate::layer_multi_cmds::selected(s) } else { vec![layer_param(s, p)?] }; + let all_hidden = targets.iter().all(|id| st.doc.layer(*id).is_some_and(|l| !l.visible)); + set_visible(s, p, all_hidden) +} + +/// `/`: Lock Transparent Pixels on or off for the targeted layers, as the Layers panel's first lock +/// button does. With several layers targeted, any unlocked one means lock them all. The +/// Background, which can't take this lock, is left out. +fn toggle_lock_transparency(s: &mut Session, p: &Value) -> Result { + let st = s.active().ok_or(EngineError::NoDocument)?; + let targets: Vec = if crate::layer_multi_cmds::multi(s, p) { crate::layer_multi_cmds::selected(s) } else { vec![layer_param(s, p)?] }; + let targets: Vec = targets.into_iter().filter(|id| st.doc.layer(*id).is_some_and(|l| !st.doc.is_background(l.id))).collect(); + if targets.is_empty() { + return Err(EngineError::Other("the Background layer can't lock transparent pixels".into())); + } + let lock = !targets.iter().all(|id| st.doc.layer(*id).is_some_and(|l| l.locks.transparency)); + s.edit(if lock { "Lock Transparent Pixels" } else { "Unlock Transparent Pixels" }, |doc, _| { + for id in &targets { + doc.layer_mut(*id).ok_or(EngineError::NoLayer(*id))?.locks.transparency = lock; + } + Ok(()) + })?; + Ok(json!({"locked": lock})) +} + /// Is the layer at `path` shown alone: it and its enclosing groups visible, every layer outside /// it hidden (the layers inside a group keep their own visibility)? fn shown_alone(doc: &Document, path: &[usize]) -> bool { @@ -916,8 +945,25 @@ pub fn specs() -> Vec { }, ungroup ), - spec!("layer.hideLayers", "Hide Layers", &["Layer"], Some("Cmd+,"), r##"{"layer":id?}"##, has_layer, |s, p| set_visible(s, p, false)), + spec!( + "layer.hideLayers", + "Hide Layers", + &["Layer"], + Some("Cmd+,"), + r##"{"layer":id?} (shows them instead when every targeted layer is already hidden, so ⌘, toggles)"##, + has_layer, + hide_or_show + ), spec!("layer.showLayers", "Show Layers", &[], None, r##"{"layer":id?}"##, has_layer, |s, p| set_visible(s, p, true)), + spec!( + "layer.toggleLockTransparency", + "Lock Transparent Pixels", + &[], + Some("/"), + r##"{"layer":id?} (toggles; several layers selected: locks them all unless every one is locked)"##, + has_layer, + toggle_lock_transparency + ), spec!( "layer.showOnly", "Show Only This Layer", @@ -1496,6 +1542,48 @@ mod tests { assert_eq!(doc(&s).layers[0].name, "Background"); } + #[test] + fn hide_layers_toggles_once_every_target_is_hidden() { + let mut s = session(8); + s.execute("layer.new.layer", json!({})).unwrap(); + let b = active(&s).id; + let visible = |s: &Session| doc(s).layer(b).unwrap().visible; + // Select › All Layers leaves out the Background, as in Photoshop. + let all = |s: &Session| crate::layer_multi_cmds::selected(s).iter().map(|id| doc(s).layer(*id).unwrap().visible).collect::>(); + s.execute("layer.hideLayers", json!({})).unwrap(); + assert!(!visible(&s)); + s.execute("layer.hideLayers", json!({})).unwrap(); + assert!(visible(&s), "⌘, again shows it"); + // Several selected: any one still shown means hide them all; then they all come back. + s.execute("layer.hideLayers", json!({"layer": b.0})).unwrap(); + s.execute("select.allLayers", json!({})).unwrap(); + assert!(all(&s).len() > 1); + s.execute("layer.hideLayers", json!({})).unwrap(); + assert!(all(&s).iter().all(|v| !v)); + s.execute("layer.hideLayers", json!({})).unwrap(); + assert!(all(&s).iter().all(|v| *v)); + } + + #[test] + fn slash_toggles_lock_transparent_pixels_but_not_on_the_background() { + let mut s = session(8); + let bg = doc(&s).layers[0].id; + assert!(doc(&s).is_background(bg)); + s.execute("layer.new.layer", json!({})).unwrap(); + let top = active(&s).id; + let locked = |s: &Session, id: LayerId| doc(s).layer(id).unwrap().locks.transparency; + assert_eq!(s.execute("layer.toggleLockTransparency", json!({})).unwrap()["locked"], true); + assert!(locked(&s, top)); + s.execute("layer.toggleLockTransparency", json!({})).unwrap(); + assert!(!locked(&s, top)); + s.undo(); + assert!(locked(&s, top), "one undoable step each"); + let bg_locks = doc(&s).layer(bg).unwrap().locks; + assert!(s.execute("layer.toggleLockTransparency", json!({"layer": bg.0})).is_err()); + assert_eq!(doc(&s).layer(bg).unwrap().locks, bg_locks, "the Background is left alone"); + assert!(s.execute("layer.toggleLockTransparency", json!({"layer": 999_999})).is_err()); + } + #[test] fn layer_utilities() { let mut s = session(8); diff --git a/crates/engine/src/fill_key_cmds.rs b/crates/engine/src/fill_key_cmds.rs index 6235b629..2ae2fe4d 100644 --- a/crates/engine/src/fill_key_cmds.rs +++ b/crates/engine/src/fill_key_cmds.rs @@ -1,5 +1,6 @@ //! Photoshop's fill keys (#249): ⌥⌫ fills the selection (or the whole layer) with the foreground -//! colour, ⌘⌫ with the background colour, and with ⇧ added they preserve transparency. Photoshop +//! colour, ⌘⌫ with the background colour, and with ⇧ added they preserve transparency. ⌘⌥⌫ fills +//! from history: the History Brush's source state (the oldest state still held). Photoshop //! has no menu item for them; here they are ordinary commands with default shortcuts, so they //! appear in Edit › Keyboard Shortcuts (Tools) and can be rebound, recorded and driven by agents. //! @@ -12,7 +13,7 @@ use crate::commands::CommandSpec; use crate::{EngineError, Result, Session}; /// The fill-key command ids (routed to the Channels panel target like `edit.fill`). -pub const IDS: [&str; 4] = ["edit.fillForeground", "edit.fillBackground", "edit.fillForegroundPreserve", "edit.fillBackgroundPreserve"]; +pub const IDS: [&str; 5] = ["edit.fillForeground", "edit.fillBackground", "edit.fillForegroundPreserve", "edit.fillBackgroundPreserve", "edit.fillHistory"]; const PARAMS: &str = r##"{"layer":id?,"target":"pixels"|"mask"|"quickMask"|{"channel":i}?}"##; @@ -39,6 +40,22 @@ fn fill(s: &mut Session, p: &Value, cmd: &str, background: bool, preserve: bool) (edit_fill.run)(s, &Value::Object(q)) } +/// ⌘⌥⌫: `edit.fill` from history, the History Brush's source unless `state` names another. +fn fill_history(s: &mut Session, p: &Value) -> Result { + const CMD: &str = "edit.fillHistory"; + let mut q: Map = match p { + Value::Object(m) => m.clone(), + Value::Null => Map::new(), + _ => return Err(EngineError::BadParams { cmd: CMD.into(), msg: "expected an object".into() }), + }; + for k in ["color", "contents", "pattern"] { + q.remove(k); + } + q.insert("contents".into(), json!("history")); + let edit_fill = crate::commands::find("edit.fill").ok_or_else(|| EngineError::Other("Fill is unavailable".into()))?; + (edit_fill.run)(s, &Value::Object(q)) +} + pub fn specs() -> Vec { vec![ CommandSpec { @@ -81,6 +98,16 @@ pub fn specs() -> Vec { run: |s, p| fill(s, p, "edit.fillBackgroundPreserve", true, true), journal: true, }, + CommandSpec { + id: "edit.fillHistory", + label: "Fill from History", + menu: &[], + shortcut: Some("Cmd+Alt+Backspace"), + params: r##"{"state":n? (default: the History Brush's source, the oldest state still held),"layer":id?,"target":"pixels"|"mask"|"quickMask"|{"channel":i}?,"preserveTransparency":bool?}"##, + enabled, + run: fill_history, + journal: true, + }, ] } @@ -133,6 +160,27 @@ mod tests { } } + #[test] + fn fill_from_history_restores_the_history_brush_source_in_the_selection() { + let mut s = session(); + assert_eq!(crate::commands::find("edit.fillHistory").and_then(|c| c.shortcut), Some("Cmd+Alt+Backspace")); + s.execute("edit.fillForeground", json!({})).unwrap(); + s.execute("select.rect", json!({"x": 0, "y": 0, "width": 4, "height": 6})).unwrap(); + s.execute("edit.fillHistory", json!({})).unwrap(); + // The oldest state (the new, transparent layer) comes back inside the selection only. + assert_eq!(px(&s, 1, 1)[3], 0.0); + assert_eq!(px(&s, 6, 1), [1.0, 0.0, 0.0, 1.0]); + // A named state, and refused ones change nothing. + s.execute("select.deselect", json!({})).unwrap(); + let steps = s.active().unwrap().history.past_len(); + for bad in [json!({"state": 99}), json!({"state": "x"}), json!(7)] { + assert!(s.execute("edit.fillHistory", bad.clone()).is_err(), "{bad}"); + } + assert_eq!(s.active().unwrap().history.past_len(), steps); + s.execute("edit.fillHistory", json!({"state": 1})).unwrap(); + assert_eq!(px(&s, 1, 1), [1.0, 0.0, 0.0, 1.0], "state 1 is after the foreground fill"); + } + #[test] fn background_fills_only_the_selection() { let mut s = session(); diff --git a/crates/ui-egui/src/layer_row_ui.rs b/crates/ui-egui/src/layer_row_ui.rs index d2656905..fb229fcb 100644 --- a/crates/ui-egui/src/layer_row_ui.rs +++ b/crates/ui-egui/src/layer_row_ui.rs @@ -295,8 +295,20 @@ pub fn end_rename(ctx: &egui::Context, commit: bool) -> Option<(String, Value)> if commit { r.commit_action() } else { None } } +/// Where Tab or ⇧Tab sends a rename: the layer it left and whether the next one is above. +fn next_rename_id() -> egui::Id { + egui::Id::new("layer-rename-next") +} + +/// The rename that Tab (`up` false) or ⇧Tab (`up` true) just left on `layer`, for the Layers panel +/// to continue on the layer below or above, as Photoshop does. Taken once. +pub fn take_next_rename(ctx: &egui::Context) -> Option<(u64, bool)> { + ctx.data_mut(|d| d.remove_temp::<(u64, bool)>(next_rename_id())) +} + /// Draw the rename field of `layer` in `rect` when it is the one being renamed, and handle its -/// keys and focus. Returns the rename command when it was committed this frame. +/// keys and focus. Returns the rename command when it was committed this frame. Tab and ⇧Tab +/// commit too and ask for the next rename ([`take_next_rename`]). pub fn rename_field(ui: &mut egui::Ui, layer: u64, rect: Rect) -> Option<(String, Value)> { let ctx = ui.ctx().clone(); let mut r = rename(&ctx).filter(|r| r.layer == layer)?; @@ -316,6 +328,10 @@ pub fn rename_field(ui: &mut egui::Ui, layer: u64, rect: Rect) -> Option<(String return None; } let (enter, tab, esc) = ctx.input(|i| (i.key_pressed(egui::Key::Enter), i.key_pressed(egui::Key::Tab), i.key_pressed(egui::Key::Escape))); + if tab { + let up = ctx.input(|i| i.modifiers.shift); + ctx.data_mut(|d| d.insert_temp(next_rename_id(), (layer, up))); + } if esc { store(&ctx, None); None diff --git a/crates/ui-egui/src/layer_row_ui/rename_tests.rs b/crates/ui-egui/src/layer_row_ui/rename_tests.rs index a4e985a2..4a7ea135 100644 --- a/crates/ui-egui/src/layer_row_ui/rename_tests.rs +++ b/crates/ui-egui/src/layer_row_ui/rename_tests.rs @@ -1,6 +1,7 @@ //! #314: renaming a layer in place works like Photoshop. A click anywhere else, Enter or Tab //! commits; Esc cancels; only one rename is open at a time, and starting another (double-click, -//! the context menu or Layer › Rename Layer) commits the first. +//! the context menu or Layer › Rename Layer) commits the first. Tab then renames the layer below, +//! ⇧Tab the layer above. use egui::{Event, Key, Modifiers, PointerButton, Pos2, pos2, vec2}; use egui_kittest::Harness; @@ -127,7 +128,8 @@ fn enter_and_tab_commit_and_escape_cancels() { start(&mut h, b); type_text(&mut h, "By Tab"); key(&mut h, Key::Tab); - assert_eq!((name(&h, b), renaming(&h.ctx)), ("By Tab".into(), None)); + assert_eq!((name(&h, b), renaming(&h.ctx)), ("By Tab".into(), Some(a)), "Tab commits and renames the layer below"); + key(&mut h, Key::Escape); start(&mut h, c); type_text(&mut h, "Never"); @@ -143,6 +145,28 @@ fn enter_and_tab_commit_and_escape_cancels() { assert_eq!(name(&h, c), "Gamma"); } +#[test] +fn shift_tab_renames_the_layer_above_and_tab_at_the_bottom_ends() { + let (mut h, [a, b, c]) = harness(1.0); + start(&mut h, b); + type_text(&mut h, "Middle"); + h.event(Event::ModifiersChanged(Modifiers::SHIFT)); + h.event(Event::Key { key: Key::Tab, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::SHIFT }); + h.event(Event::Key { key: Key::Tab, physical_key: None, pressed: false, repeat: false, modifiers: Modifiers::SHIFT }); + h.run_steps(1); + h.event(Event::ModifiersChanged(Modifiers::NONE)); + h.run_steps(2); + assert_eq!((name(&h, b), renaming(&h.ctx)), ("Middle".into(), Some(c)), "⇧Tab renames the layer above"); + // Typing replaces the next layer's name too, as the whole name starts selected. + type_text(&mut h, "Top"); + key(&mut h, Key::Enter); + assert_eq!((name(&h, c), renaming(&h.ctx)), ("Top".into(), None)); + // Tab from the lowest layer ends the rename: the Background below isn't renamed in place. + start(&mut h, a); + key(&mut h, Key::Tab); + assert_eq!(renaming(&h.ctx), None); +} + #[test] fn starting_another_rename_commits_the_first_and_only_one_is_open() { for ppp in [1.0, 2.0] { diff --git a/crates/ui-egui/src/layer_shortcut_tests.rs b/crates/ui-egui/src/layer_shortcut_tests.rs new file mode 100644 index 00000000..a363c340 --- /dev/null +++ b/crates/ui-egui/src/layer_shortcut_tests.rs @@ -0,0 +1,124 @@ +//! Photoshop's layer and selection keys reach their commands: ⌘, toggles visibility, ⌘\ targets +//! the mask, / toggles Lock Transparent Pixels, ⌘⌥2 loads luminosity, ⌘⌥⌫ fills from history. + +use egui::{Key, Modifiers}; +use serde_json::json; + +use crate::PhotocraftApp; + +fn app() -> PhotocraftApp { + let mut app = PhotocraftApp::new(photocraft_engine::Session::new(), crate::Services::default()); + app.run("file.new", json!({"width": 20, "height": 10})).unwrap(); + app.run("layer.new.layer", json!({})).unwrap(); + app +} + +fn press(app: &mut PhotocraftApp, key: Key, modifiers: Modifiers) { + let ctx = egui::Context::default(); + let raw = egui::RawInput { + events: vec![egui::Event::ModifiersChanged(modifiers), egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers }], + ..Default::default() + }; + ctx.begin_pass(raw); + crate::shortcuts::handle(app, &ctx); + ctx.end_pass().textures_delta.clear(); +} + +fn active(app: &PhotocraftApp) -> &photocraft_doc::Layer { + let st = app.session.active().unwrap(); + st.doc.layer(st.active_layer.unwrap()).unwrap() +} + +#[test] +fn command_comma_toggles_the_layers_visibility() { + let mut app = app(); + press(&mut app, Key::Comma, Modifiers::COMMAND); + assert!(!active(&app).visible); + press(&mut app, Key::Comma, Modifiers::COMMAND); + assert!(active(&app).visible); +} + +#[test] +fn slash_toggles_lock_transparent_pixels() { + let mut app = app(); + press(&mut app, Key::Slash, Modifiers::NONE); + assert!(active(&app).locks.transparency); + press(&mut app, Key::Slash, Modifiers::NONE); + assert!(!active(&app).locks.transparency); +} + +#[test] +fn command_backslash_targets_the_layer_mask() { + let mut app = app(); + app.run("layer.layerMask.revealAll", json!({})).unwrap(); + app.run("channel.target.composite", json!({})).unwrap(); + press(&mut app, Key::Backslash, Modifiers::COMMAND); + assert_eq!(app.session.active().unwrap().channel_view.target, photocraft_engine::channel_cmds::ChannelTarget::LayerMask); + assert!(app.ui.mask_target && app.layer_mask_targeted(), "the Layers panel targets the mask too"); + // Ctrl+2 goes back to the layer's pixels, in the Layers panel and for the tools. + press(&mut app, Key::Num2, Modifiers::COMMAND); + assert_eq!(app.session.active().unwrap().channel_view.target, photocraft_engine::channel_cmds::ChannelTarget::Composite); + assert!(!app.ui.mask_target && !app.layer_mask_targeted()); + // The same after targeting the mask by its thumbnail (the panel's own flag). + app.ui.mask_target = true; + app.sync_mask_targets(); + press(&mut app, Key::Num2, Modifiers::COMMAND); + assert!(!app.ui.mask_target && !app.layer_mask_targeted()); +} + +#[test] +fn command_alt_2_loads_luminosity() { + let mut app = app(); + press(&mut app, Key::Num2, Modifiers::COMMAND | Modifiers::ALT); + assert!(app.session.active().unwrap().doc.selection.is_some(), "the white image's luminosity selects it all"); +} + +#[test] +fn command_alt_backspace_fills_from_history() { + // The Background exists in the oldest state, so its pixels come back from there. + let mut app = PhotocraftApp::new(photocraft_engine::Session::new(), crate::Services::default()); + app.run("file.new", json!({"width": 20, "height": 10})).unwrap(); + app.run("tools.setColors", json!({"foreground": "#ff0000"})).unwrap(); + app.run("edit.fillForeground", json!({})).unwrap(); + assert_eq!(active(&app).surface().unwrap().pixel(3, 3)[1], 0.0, "red"); + press(&mut app, Key::Backspace, Modifiers::COMMAND | Modifiers::ALT); + assert_eq!(active(&app).surface().unwrap().pixel(3, 3)[1], 1.0, "white again"); +} + +/// ⌥-click a layer's thumbnail: select it and fit its content on screen. +#[test] +fn alt_click_on_a_layer_thumbnail_fits_the_layer() { + use egui::{Event, PointerButton, pos2, vec2}; + let mut s = photocraft_engine::Session::new(); + s.execute("file.new", json!({"width": 400, "height": 300})).unwrap(); + let small = s.execute("layer.new.layer", json!({"name": "Small"})).unwrap()["layer"].as_u64().unwrap(); + s.execute("select.rect", json!({"x": 300, "y": 200, "width": 20, "height": 10})).unwrap(); + s.execute("edit.fill", json!({"contents": "black"})).unwrap(); + s.execute("select.deselect", json!({})).unwrap(); + s.execute("layer.new.layer", json!({"name": "Top"})).unwrap(); + let mut h = egui_kittest::Harness::builder().with_size(vec2(1440.0, 900.0)).with_step_dt(1.0 / 60.0).with_max_steps(64).build_eframe(move |cc| { + PhotocraftApp::setup_context(&cc.egui_ctx, Default::default()); + PhotocraftApp::new(s, crate::Services::default()) + }); + let ctx = h.ctx.clone(); + let (r, _) = crate::control::ControlRequest::new("ui.set", json!({"dock": {"collapsed": ["color", "properties", "history", "navigator"]}})); + crate::control::handle(h.state_mut(), &ctx, &r); + h.run_steps(8); + let before = h.state().ui.views[0].clone(); + let row = crate::layer_row_ui::recorded(&h.ctx).into_iter().find(|r| r.layer == small).unwrap().row; + let at = pos2(row.left() + 46.0, row.center().y); + h.hover_at(at); + h.event(Event::ModifiersChanged(Modifiers::ALT)); + h.run_steps(1); + h.event(Event::PointerButton { pos: at, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::ALT }); + h.run_steps(1); + h.event(Event::PointerButton { pos: at, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::ALT }); + h.run_steps(1); + h.event(Event::ModifiersChanged(Modifiers::NONE)); + h.run_steps(3); + let app = h.state(); + assert_eq!(app.session.active().unwrap().active_layer, Some(photocraft_doc::LayerId(small))); + let v = &app.ui.views[0]; + assert_eq!(v.center, [310.0, 205.0], "centred on the layer's content"); + assert!(v.zoom > before.zoom * 4.0, "zoomed in on 20 × 10 px: {} -> {}", before.zoom, v.zoom); +} diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs index 1115b949..7705e356 100644 --- a/crates/ui-egui/src/lib.rs +++ b/crates/ui-egui/src/lib.rs @@ -890,6 +890,16 @@ impl PhotocraftApp { if gate.is_some() { self.session.authorize = None; } + // An explicit channel target (⌘2, ⌘\, ⌘3…) decides what the Layers panel targets too: + // ⌘2 after the mask was targeted goes back to the layer's pixels. + if result.is_ok() && id.starts_with("channel.target") { + if let Some(t) = self.session.active().map(|st| st.channel_view.target) { + use photocraft_engine::channel_cmds::ChannelTarget; + self.ui.mask_target = t == ChannelTarget::LayerMask; + self.ui.vector_mask_target = t == ChannelTarget::VectorMask; + } + self.sync_mask_targets(); + } result } @@ -2266,6 +2276,8 @@ mod pen_variants_tests; #[cfg(test)] mod color_replacement_tests; #[cfg(test)] +mod layer_shortcut_tests; +#[cfg(test)] mod pencil_tests; #[cfg(test)] diff --git a/crates/ui-egui/src/panels.rs b/crates/ui-egui/src/panels.rs index 086d1c06..d908af7a 100644 --- a/crates/ui-egui/src/panels.rs +++ b/crates/ui-egui/src/panels.rs @@ -2254,6 +2254,16 @@ fn layers(app: &mut PhotocraftApp, ui: &mut egui::Ui) { let below = Rect::from_min_max(pos2(last_rect.left(), last_rect.bottom()), pos2(last_rect.right(), ui.clip_rect().bottom())); layer_drop_zone(app, &ctx, ui, below, (last, last_rect), "below", &mut actions); } + // Tab / ⇧Tab in a rename: rename the layer below / above next, as in Photoshop. The + // Background isn't renamed in place (double-clicking it converts it), so it ends there. + if let Some((from, up)) = crate::layer_row_ui::take_next_rename(ui.ctx()) + && let Some(at) = drawn.iter().position(|(id, _)| id.0 == from) + && let Some(&(next, _)) = if up { at.checked_sub(1).and_then(|i| drawn.get(i)) } else { drawn.get(at + 1) } + && let Some(l) = doc.layer(next).filter(|l| !crate::doc_props_ui::is_background(&doc, l)) + && let Some(done) = crate::layer_row_ui::start_rename(ui.ctx(), next.0, &l.name) + { + actions.push(done); + } // ⌥-click the line between two layers: clip / release the upper one (#967). crate::clip_line_ui::show(ui, &doc, &mut actions); // A rename whose row is gone (deleted, filtered out, inside a closed group) ends, @@ -2754,6 +2764,11 @@ fn layer_row( } else if on_thumb || !row.primary { actions.push(("ui.maskTarget".into(), json!(false))); } + // ⌥-click the layer thumbnail: fit the layer on screen, as Photoshop does. + let m = ui.input(|i| i.modifiers); + if on_thumb && m.alt && !m.shift && !m.command { + actions.push(("view.fitLayersOnScreen".into(), Value::Null)); + } } // Double-click: the name renames in place (over the row's full height, not just the glyphs: // #651); the Background, which can't be renamed while it's locked, becomes a normal layer; an diff --git a/docs/ui-parity.md b/docs/ui-parity.md index d168db4d..3daee822 100644 --- a/docs/ui-parity.md +++ b/docs/ui-parity.md @@ -1,6 +1,6 @@ # UI parity: tools, handles, modifiers and feel -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-11 · **Change:** minor (⇧-dragged guides land on ruler ticks) · **Target:** Adobe Photoshop 2026 +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-11 · **Change:** minor (⇧-dragged guides land on ruler ticks; layer and selection keys) · **Target:** Adobe Photoshop 2026 How PhotoCraft's direct manipulation compares with Photoshop 2026 (27.11.0): the toolbox, the handles and modifier keys of each gesture, nudging, snapping, numeric precision, navigation, @@ -183,6 +183,7 @@ Triangle and Curvature Pen (minus legacy Rounded Rectangle and Targeted Adjustme | `.kys` import | done (`engine/src/kys.rs`) | | | Shortcut glyphs per platform | done (UI-217-19) | | | Brush size/hardness keys on non-US layouts | done (#3109): `[` `]` need AltGr on many layouts, so Photoshop uses other keys there (German: Ö / #, ⇧ for hardness). `layout_keys.rs` has a data table of such layouts (`LAYOUTS`, add rows to support one more) and a fallback for all others: the keys at the US `[` / `]` positions act as `[` / `]` when they don't type brackets. Off once a real bracket is typed; Edit › Keyboard Shortcuts overrides still apply | | +| Layer and selection keys: ⌘, toggles visibility, ⌘\ targets the mask, / locks transparency, ⌘⌥2 loads luminosity, ⌘⌥⌫ fills from history, Tab / ⇧Tab rename the next layer, ⌥-click a thumbnail fits the layer | done (2026-10-11) | | ## Panels and workspace @@ -215,3 +216,4 @@ Paragraph; the rest open as in-app floating windows. | 2026-10-11 | minor | Flick panning done: releasing a moving Hand drag (tool, Space or middle button) glides and decays, gated by Enable Flick Panning | | 2026-10-11 | minor | History snapshots: the camera button takes one, snapshot rows return to it as a new state, rename and delete it (#2966) | | 2026-10-11 | minor | ⇧-drag a guide out of a ruler lands on the nearest ruler tick (#3770) | +| 2026-10-11 | minor | Layer and selection keys from Photoshop's shortcut set: ⌘, toggles, ⌘\, /, ⌘⌥2, ⌘⌥⌫, Tab rename-next, ⌥-click thumbnail to fit | From edc1b1e77412decd51a5d61f295fe51677187b14 Mon Sep 17 00:00:00 2001 From: JGF <44821497+bommerts@users.noreply.github.com> Date: Mon, 12 Oct 2026 07:47:33 -0400 Subject: [PATCH 41/92] View: remember Extras, Show and Snap To across restarts (#3762) (#3787) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * View: remember Extras, Show and Snap To across restarts (#3762) View › Extras, the View › Show items (Pixel Grid, Grid, Guides, …) and the View › Snap To targets reset to their defaults on every launch. They are now saved in Preferences (`viewExtras`) as they change and restored at startup, as Photoshop keeps them between sessions. Only items that differ from their defaults are stored, so a default changed in a later release still reaches users who never touched it. A hand-edited file can't break them: unknown keys and non-boolean values keep their defaults. Co-Authored-By: Claude Opus 5.5 * View: rustfmt the view-extras restart test (#3762) Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 --- crates/engine/src/prefs.rs | 4 ++ crates/ui-egui/src/lib.rs | 2 + crates/ui-egui/src/prefs_ui.rs | 34 +++++++++++ crates/ui-egui/src/view_cmds.rs | 100 ++++++++++++++++++++++++++++++++ 4 files changed, 140 insertions(+) diff --git a/crates/engine/src/prefs.rs b/crates/engine/src/prefs.rs index 93a52d2d..c99c3cbb 100644 --- a/crates/engine/src/prefs.rs +++ b/crates/engine/src/prefs.rs @@ -994,6 +994,10 @@ pub struct Preferences { /// differ from their defaults, saved as the user changes them and restored at launch, as /// Photoshop remembers each tool's options between sessions. JSON owned by the shell. pub tool_options: Value, + /// View › Extras, the View › Show items (Pixel Grid, Grid, Guides, …) and the View › Snap To + /// targets that differ from their defaults, saved as the user toggles them and restored at + /// launch, as Photoshop keeps them between sessions (#3762). JSON owned by the shell. + pub view_extras: Value, /// File › Scripts › Script Events Manager: event → script bindings. pub script_events: crate::automate_cmds::ScriptEvents, } diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs index 7705e356..323d559a 100644 --- a/crates/ui-egui/src/lib.rs +++ b/crates/ui-egui/src/lib.rs @@ -1725,6 +1725,8 @@ impl eframe::App for PhotocraftApp { brush_picker::persist(self, &ctx); // Tool options are remembered between launches the same way (#2814). tool_memory::persist(self, &ctx); + // So are View › Extras, Show and Snap To (#3762). + view_cmds::persist(self, &ctx); self.automation_input = false; shape_stroke_ui::finish_frame(self, &ctx); native_menu::sync(self, &ctx); diff --git a/crates/ui-egui/src/prefs_ui.rs b/crates/ui-egui/src/prefs_ui.rs index 5b15e7bc..202944b5 100644 --- a/crates/ui-egui/src/prefs_ui.rs +++ b/crates/ui-egui/src/prefs_ui.rs @@ -218,6 +218,7 @@ pub fn load(app: &mut PhotocraftApp) { crate::brush_picker::restore(app); sync_rulers(app); crate::tool_memory::restore(app); + crate::view_cmds::restore(app); app.sync_recent(); app.prefs_rt.saved_rev = app.session.prefs.rev(); app.prefs_rt.saved_value = Some(app.session.prefs_value()); @@ -2649,6 +2650,39 @@ mod tests { } } + #[test] + fn view_show_items_survive_a_restart() { + let (mut app, store) = app_with_store(); + let ctx = egui::Context::default(); + tick(&mut app, &ctx); + // Untouched: nothing is stored, so later default changes still reach the user. + crate::view_cmds::persist(&mut app, &ctx); + tick(&mut app, &ctx); + assert!(stored(&store).get("viewExtras").is_none_or(Value::is_null)); + // The menu commands, as a user toggles them (#3762: Pixel Grid off). + for id in ["view.show.pixelGrid", "view.show.grid", "view.snapTo.layers", "view.extras"] { + crate::menus::invoke(&mut app, &ctx, id, json!({})).unwrap(); + } + crate::view_cmds::persist(&mut app, &ctx); + tick(&mut app, &ctx); + assert_eq!(stored(&store)["viewExtras"], json!({"extras": false, "grid": true, "show": {"pixelGrid": false}, "snapTo": {"layers": false}})); + // A restart gets them back. + let saved = store.lock().unwrap().clone().unwrap(); + let (mut app2, _) = app_with_saved(Some(saved)); + tick(&mut app2, &ctx); + let v = &app2.ui.view; + assert!(!v.extras && !v.show.pixel_grid && !v.snap_to.layers && app2.ui.extras.grid); + assert!(v.show.selection_edges && v.snap_to.guides && app2.ui.extras.guides, "the rest keep their defaults"); + // A hand-edited file: unknown keys and non-booleans keep the defaults, good ones still load. + for bad in [json!("junk"), json!({"extras": 0, "show": {"pixelGrid": "no", "mesh": true, "bogus": true}, "snapTo": [1]})] { + let (mut app3, _) = app_with_saved(Some(json!({"viewExtras": bad}).to_string())); + tick(&mut app3, &ctx); + let v = &app3.ui.view; + assert!(v.extras && v.show.pixel_grid && v.snap_to.layers, "{bad}"); + assert_eq!(v.show.mesh, bad.is_object()); + } + } + #[test] fn show_tooltips_preferences_turn_tooltips_off() { let (mut app, _) = app_with_store(); diff --git a/crates/ui-egui/src/view_cmds.rs b/crates/ui-egui/src/view_cmds.rs index f0404633..cb75e280 100644 --- a/crates/ui-egui/src/view_cmds.rs +++ b/crates/ui-egui/src/view_cmds.rs @@ -214,6 +214,106 @@ fn snap_slot<'a>(s: &'a mut SnapTo, key: &str) -> Option<&'a mut bool> { }) } +/// Every [`show_slot`] key. +const SHOW_KEYS: [&str; 13] = [ + "layerEdges", + "selectionEdges", + "targetPath", + "pixelGrid", + "smartGuides", + "brushPreview", + "slices", + "notes", + "mesh", + "editPins", + "count", + "canvasGuides", + "artboardGuides", +]; +/// Every [`snap_slot`] key. +const SNAP_KEYS: [&str; 5] = ["guides", "grid", "layers", "slices", "documentBounds"]; + +/// The flags of `now` that differ from `def`, by key (`None` when none do). +fn changed_flags(now: T, def: T, keys: &[&str], slot: impl for<'a> Fn(&'a mut T, &str) -> Option<&'a mut bool>) -> Option { + let (mut now, mut def) = (now, def); + let diff: Map = keys + .iter() + .filter_map(|k| { + let v = *slot(&mut now, k)?; + (Some(v) != slot(&mut def, k).copied()).then(|| ((*k).to_string(), Value::Bool(v))) + }) + .collect(); + (!diff.is_empty()).then_some(Value::Object(diff)) +} + +/// View › Extras, Show and Snap To as remembered across restarts (`Preferences::view_extras`): +/// only what differs from the defaults, so a default changed in a later release still reaches +/// users who never touched that item. `Null` when nothing differs. +fn remembered(app: &PhotocraftApp) -> Value { + let (v, e, def) = (&app.ui.view, &app.ui.extras, crate::state::Extras::default()); + let mut m = Map::new(); + if v.extras != ViewOptions::default().extras { + m.insert("extras".into(), Value::Bool(v.extras)); + } + // View › Show › Grid and Guides live in `UiState::extras` beside the rulers and snapping. + if e.grid != def.grid { + m.insert("grid".into(), Value::Bool(e.grid)); + } + if e.guides != def.guides { + m.insert("guides".into(), Value::Bool(e.guides)); + } + if let Some(show) = changed_flags(v.show, Show::default(), &SHOW_KEYS, show_slot) { + m.insert("show".into(), show); + } + if let Some(snap) = changed_flags(v.snap_to, SnapTo::default(), &SNAP_KEYS, snap_slot) { + m.insert("snapTo".into(), snap); + } + if m.is_empty() { Value::Null } else { Value::Object(m) } +} + +/// Remember View › Extras, Show and Snap To in the preferences once the user lets go of the +/// pointer (#3762). Cheap: a small JSON compare per frame. Run every frame, so items set by the +/// control channel or the Show Extras Options dialog are remembered too. +pub fn persist(app: &mut PhotocraftApp, ctx: &egui::Context) { + if ctx.input(|i| i.pointer.any_down()) { + return; + } + let now = remembered(app); + if app.session.prefs().view_extras != now { + app.session.prefs.edit(|p| p.view_extras = now); + } +} + +/// Restore the remembered View › Extras, Show and Snap To items at launch. A hand-edited file +/// can't break them: an unknown key or a value that isn't a boolean keeps its default. +pub fn restore(app: &mut PhotocraftApp) { + let saved = app.session.prefs().view_extras.clone(); + if !saved.is_null() && !saved.is_object() { + log::warn!("Preferences: the remembered View › Show items are not an object; using the defaults"); + return; + } + let flag = |k: &str| saved.get(k).and_then(Value::as_bool); + if let Some(on) = flag("extras") { + app.ui.view.extras = on; + } + if let Some(on) = flag("grid") { + app.ui.extras.grid = on; + } + if let Some(on) = flag("guides") { + app.ui.extras.guides = on; + } + for (k, v) in saved.get("show").and_then(Value::as_object).into_iter().flatten() { + if let (Some(slot), Some(on)) = (show_slot(&mut app.ui.view.show, k), v.as_bool()) { + *slot = on; + } + } + for (k, v) in saved.get("snapTo").and_then(Value::as_object).into_iter().flatten() { + if let (Some(slot), Some(on)) = (snap_slot(&mut app.ui.view.snap_to, k), v.as_bool()) { + *slot = on; + } + } +} + /// Window › : (panel, dock tab) for panels that live as tabs of a dock card. fn panel_tab(app: &PhotocraftApp, id: &str) -> Option<(&'static str, usize)> { let pro = app.ui.theme.is_pro(); From 224cebbd8ab104f1c94f7008a80ee14eddee0219 Mon Sep 17 00:00:00 2001 From: buivanvu94 <125793064+buivanvu94@users.noreply.github.com> Date: Mon, 12 Oct 2026 18:48:03 +0700 Subject: [PATCH 42/92] fix(automation): warn when text falls back from a missing font (#3391) (#3630) * fix(automation): warn when text falls back from a missing font (#3391) * cargo fmt Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Brandon Thomas Co-authored-by: Claude Opus 5.5 --- apps/photocraft-cli/src/lib.rs | 2 +- crates/automation/src/headless.rs | 7 ++- .../automation/tests/missing_font_warnings.rs | 57 +++++++++++++++++++ crates/engine/src/type_cmds.rs | 36 +++++++++++- crates/engine/src/type_extra_cmds.rs | 27 +++++++++ 5 files changed, 123 insertions(+), 6 deletions(-) create mode 100644 crates/automation/tests/missing_font_warnings.rs diff --git a/apps/photocraft-cli/src/lib.rs b/apps/photocraft-cli/src/lib.rs index 1743665d..560eaf71 100644 --- a/apps/photocraft-cli/src/lib.rs +++ b/apps/photocraft-cli/src/lib.rs @@ -240,7 +240,7 @@ fn convert(a: &Args, _out: &mut dyn Write, err: &mut dyn Write) -> R { let opts = export_opts(a)?; let o = files::open(Path::new(input)).map_err(|e| e.to_string())?; warn_all(err, &o.warnings); - warn_all(err, &missing_font_warnings(photocraft_engine::type_extra_cmds::missing_fonts(&o.document))); + warn_all(err, &photocraft_engine::type_extra_cmds::missing_font_warnings(&o.document)); let ws = files::save(&o.document, Path::new(output), a.get("--format"), &opts, None).map_err(|e| e.to_string())?; warn_all(err, &ws); Ok(()) diff --git a/crates/automation/src/headless.rs b/crates/automation/src/headless.rs index dc18afe2..cd92f584 100644 --- a/crates/automation/src/headless.rs +++ b/crates/automation/src/headless.rs @@ -96,13 +96,15 @@ impl Headless { st.source_read_only = o.source_read_only; } let d = &self.session.documents()[index]; + let mut warnings = o.warnings; + warnings.extend(photocraft_engine::type_extra_cmds::missing_font_warnings(&d.doc)); Ok(json!({ "index": index, "name": d.doc.name, "width": d.doc.size.width, "height": d.doc.size.height, "layers": d.doc.layer_count(), - "warnings": o.warnings, + "warnings": warnings, })) } @@ -240,7 +242,7 @@ impl Headless { } }; let target_text = target.to_str().ok_or_else(|| AutomationError::BadRequest("automation paths must be valid UTF-8".into()))?; - let warnings = match &self.filesystem { + let mut warnings = match &self.filesystem { Filesystem::Denied => return Err(AutomationError::BadRequest("automation filesystem access is not granted: write authority is absent".into())), Filesystem::TrustedLocal => { let writer = self.writers.entry(doc.id.0).or_default(); @@ -252,6 +254,7 @@ impl Headless { warnings } }; + warnings.extend(photocraft_engine::type_extra_cmds::missing_font_warnings(&doc)); // A layered document save (PSD, PSB, OpenRaster or .pcraft) is a full write, not a flattened copy: // record the current revision as saved so the session stops reporting `dirty`, and make // the file the document's path. A flat export (PNG, JPEG, …) is a copy and leaves both diff --git a/crates/automation/tests/missing_font_warnings.rs b/crates/automation/tests/missing_font_warnings.rs new file mode 100644 index 00000000..fe66e5c0 --- /dev/null +++ b/crates/automation/tests/missing_font_warnings.rs @@ -0,0 +1,57 @@ +//! #3391: `doc.save`, `doc.open`, and type commands emit warnings when text uses a missing font. + +use photocraft_automation::Headless; +use serde_json::json; + +fn tmp_dir() -> std::path::PathBuf { + let dir = std::env::temp_dir().join(format!( + "pc-font-warn-{}-{}", + std::process::id(), + std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos() + )); + std::fs::create_dir_all(&dir).unwrap(); + dir +} + +#[test] +fn missing_font_warnings_emitted_in_headless_and_type_commands() { + let dir = tmp_dir(); + let psd_path = dir.join("card.psd"); + let png_path = dir.join("card.png"); + + let mut h = Headless::trusted_local(); + h.handle("doc.new", json!({"width": 600, "height": 300, "background": "white"})).unwrap(); + + // 1. type.create with missing font + let created = h + .handle("engine.execute", json!({"command": "type.create", "params": {"x": 30, "y": 100, "text": "Headline", "font": "NoSuchFamily123", "size": 40}})) + .unwrap(); + assert_eq!(created["warnings"], json!(["font 'NoSuchFamily123' is not installed; text may render using a fallback face"])); + + // 2. doc.save card.psd + let saved_psd = h.handle("doc.save", json!({"path": psd_path.to_str().unwrap()})).unwrap(); + let warnings = saved_psd["warnings"].as_array().expect("warnings array in doc.save"); + assert!( + warnings.iter().any(|w| w == "font 'NoSuchFamily123' is not installed; text may render using a fallback face"), + "doc.save PSD warning: {saved_psd}" + ); + + // 3. doc.save card.png + let saved_png = h.handle("doc.save", json!({"path": png_path.to_str().unwrap()})).unwrap(); + let warnings = saved_png["warnings"].as_array().expect("warnings array in doc.save"); + assert!( + warnings.iter().any(|w| w == "font 'NoSuchFamily123' is not installed; text may render using a fallback face"), + "doc.save PNG warning: {saved_png}" + ); + + // 4. doc.close then doc.open + h.handle("doc.close", json!({})).unwrap(); + let opened = h.handle("doc.open", json!({"path": psd_path.to_str().unwrap()})).unwrap(); + let warnings = opened["warnings"].as_array().expect("warnings array in doc.open"); + assert!( + warnings.iter().any(|w| w.as_str().unwrap_or("").contains("is not installed; text may render using a fallback face")), + "doc.open warning: {opened}" + ); + + let _ = std::fs::remove_dir_all(dir); +} diff --git a/crates/engine/src/type_cmds.rs b/crates/engine/src/type_cmds.rs index e59ce925..4a4cb347 100644 --- a/crates/engine/src/type_cmds.rs +++ b/crates/engine/src/type_cmds.rs @@ -639,7 +639,8 @@ fn info(s: &Session, p: &Value) -> Result { .map(|ln| json!({ "start": char_at(text, ln.range.start), "end": char_at(text, ln.range.end), "baseline": ln.baseline, "x0": ln.x0, "x1": ln.x1, "ascent": ln.ascent, "descent": ln.descent })) .collect(); let bounds = t.cache.as_ref().map(|c| c.content_bounds()).map(|r| json!([r.x0, r.y0, r.x1, r.y1])); - Ok(json!({ + let warnings = crate::type_extra_cmds::missing_font_warnings_for_layer(t); + let mut out = json!({ "layer": id.0, "text": text, "shape": t.shape, @@ -652,7 +653,11 @@ fn info(s: &Session, p: &Value) -> Result { "lines": lines, "bounds": bounds, "pxPerPt": layout.px_per_pt, - })) + }); + if !warnings.is_empty() { + out["warnings"] = json!(warnings); + } + Ok(out) } /// A type layer (not yet rendered or added) from `type.create`'s params: text, point `x`/`y` or @@ -723,7 +728,14 @@ pub fn specs() -> Vec { Ok(id) })?; let bounds = s.active().and_then(|d| d.doc.layer(id)).and_then(|l| l.surface()).map(|c| c.content_bounds()); - Ok(json!({ "layer": id.0, "bounds": bounds.map(|r| [r.x0, r.y0, r.x1, r.y1]) })) + let mut out = json!({ "layer": id.0, "bounds": bounds.map(|r| [r.x0, r.y0, r.x1, r.y1]) }); + if let Some(LayerContent::Text(t)) = s.active().and_then(|d| d.doc.layer(id)).map(|l| &l.content) { + let warnings = crate::type_extra_cmds::missing_font_warnings_for_layer(t); + if !warnings.is_empty() { + out["warnings"] = json!(warnings); + } + } + Ok(out) }, }, CommandSpec { @@ -1582,4 +1594,22 @@ mod tests { assert!(s.active().unwrap().doc.layer(LayerId(id)).is_none()); } } + + #[test] + fn missing_font_emits_warning_in_create_set_style_and_edit() { + let mut s = session(); + let r = s.execute("type.create", json!({"x": 10, "y": 20, "text": "Hello", "font": "NoSuchFamily123"})).unwrap(); + assert_eq!(r["warnings"], json!(["font 'NoSuchFamily123' is not installed; text may render using a fallback face"])); + let id = r["layer"].as_u64().unwrap(); + let styled = s.execute("type.setStyle", json!({"layer": id, "font": "StillNoSuchFamily456"})).unwrap(); + assert_eq!(styled["warnings"], json!(["font 'StillNoSuchFamily456' is not installed; text may render using a fallback face"])); + let edited = s.execute("type.edit", json!({"layer": id, "runs": [{"start": 0, "end": 2, "font": "AnotherMissingFont789"}]})).unwrap(); + assert_eq!( + edited["warnings"], + json!([ + "font 'AnotherMissingFont789' is not installed; text may render using a fallback face", + "font 'StillNoSuchFamily456' is not installed; text may render using a fallback face" + ]) + ); + } } diff --git a/crates/engine/src/type_extra_cmds.rs b/crates/engine/src/type_extra_cmds.rs index 022146f1..e460a975 100644 --- a/crates/engine/src/type_extra_cmds.rs +++ b/crates/engine/src/type_extra_cmds.rs @@ -436,6 +436,33 @@ pub fn missing_fonts(doc: &Document) -> Vec { out } +/// Font families used by a type layer that the font database cannot supply. +pub fn missing_fonts_in_layer(t: &TextLayer) -> Vec { + let have = installed_families(); + let mut out: Vec = Vec::new(); + for r in t.char_runs() { + let f = r.style.font_family; + if !f.is_empty() && !have.contains(&f.to_lowercase()) && !out.contains(&f) { + out.push(f); + } + } + out +} + +/// Warnings for missing font families in `doc`. +pub fn missing_font_warnings(doc: &Document) -> Vec { + fonts_to_warnings(missing_fonts(doc)) +} + +/// Warnings for missing font families in `layer`. +pub fn missing_font_warnings_for_layer(t: &TextLayer) -> Vec { + fonts_to_warnings(missing_fonts_in_layer(t)) +} + +fn fonts_to_warnings(fonts: Vec) -> Vec { + fonts.into_iter().map(|font| format!("font '{font}' is not installed; text may render using a fallback face")).collect() +} + /// Replace missing families per `map` (missing → installed; unmapped ones → the default family). fn replace_fonts(s: &mut Session, map: &serde_json::Map, all: bool) -> Result { let d = s.active().ok_or(EngineError::NoDocument)?; From 56c5fd5797338cb88a93b9fc5d5c14619af1f077 Mon Sep 17 00:00:00 2001 From: MrCloudy2 <123890706+MrCloudy2@users.noreply.github.com> Date: Mon, 12 Oct 2026 13:48:14 +0200 Subject: [PATCH 43/92] fix(effects): Satin at distance 0 draws as 1 px, as Photoshop does (#3744) Photoshop 27.11 draws Satin Distance 0 as a 1 px offset (an edge band of 2/size), not as two copies that cancel out. PhotoCraft drew nothing. Measured on a #808080 square with a Linear contour at sizes 5, 10 and 20; the other 12 cases already matched within 1 level. Applied to the CPU and GPU paths and to the effect reach. Co-authored-by: Claude Opus 5.5 --- crates/compose/src/effects.rs | 32 ++++++++++++++++++++++++++++++-- crates/gpu/src/fx.rs | 2 +- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/crates/compose/src/effects.rs b/crates/compose/src/effects.rs index 915eb3dd..c594e5bd 100644 --- a/crates/compose/src/effects.rs +++ b/crates/compose/src/effects.rs @@ -43,7 +43,7 @@ pub fn margin(layer: &Layer) -> i32 { Effect::DropShadow(s) | Effect::InnerShadow(s) => s.distance + s.size, Effect::OuterGlow(g) | Effect::InnerGlow(g) => g.size, Effect::Stroke(s) => s.size, - Effect::Satin(s) => s.distance + s.size, + Effect::Satin(s) => satin_distance(s) + s.size, Effect::BevelEmboss(b) => b.size + b.soften, _ => 0.0, }; @@ -1689,8 +1689,14 @@ impl FxMaps { } } +/// The distance the two satin copies are offset by. Photoshop draws Distance 0 as 1 px (an +/// edge band of 2/size, measured in Photoshop 27.11), not as two copies cancelling out. +pub fn satin_distance(s: &photocraft_doc::effects::Satin) -> f32 { + s.distance.max(1.0) +} + fn satin_map(shape: &Map, s: &photocraft_doc::effects::Satin) -> Map { - let (dx, dy) = offset(s.angle, s.distance); + let (dx, dy) = offset(s.angle, satin_distance(s)); let mut a = shape.shifted(dx, dy, 0.0); let mut b = shape.shifted(-dx, -dy, 0.0); // Two box passes of the satin size (fitted: 0.2 % mean error on psd-tools layer_effects). @@ -3008,6 +3014,28 @@ mod tests { m } + #[test] + fn satin_at_distance_zero_matches_photoshop() { + // Photoshop 27.11, Satin black 100 %, angle 90°, Linear contour, distance 0, size 5 over a + // #808080 square: the rows from the top edge read 82, 102, 123, 128. + let s = photocraft_doc::effects::Satin { + common: photocraft_doc::FxCommon::new(BlendMode::Normal, 1.0), + color: photocraft_color::Color::BLACK, + angle: 90.0, + distance: 0.0, + size: 5.0, + contour: Contour::Linear, + anti_alias: false, + invert: false, + }; + let m = satin_map(&square_shape(60), &s); + for (row, gray) in [(5, 82.0), (7, 102.0), (9, 123.0), (11, 128.0), (30, 128.0)] { + let want = 1.0 - gray / 128.0; + let got = m.v[row * 60 + 30]; + assert!((got - want).abs() < 0.02, "row {row}: {got} vs {want}"); + } + } + fn shadow(noise: f32, origin: (i32, i32)) -> Map { let s = Shadow { common: photocraft_doc::FxCommon::new(BlendMode::Multiply, 1.0), diff --git a/crates/gpu/src/fx.rs b/crates/gpu/src/fx.rs index 13cea90a..10f92726 100644 --- a/crates/gpu/src/fx.rs +++ b/crates/gpu/src/fx.rs @@ -353,7 +353,7 @@ pub(crate) fn program_with(e: &Effect, light: &GlobalLight, vector_shape: bool, } Effect::Satin(s) => { // satin_map - let (dx, dy) = offset(s.angle, s.distance); + let (dx, dy) = offset(s.angle, photocraft_compose::effects::satin_distance(s)); let a = b.shift(In::Shape, dx, dy, 0.0, false); let a = b.conv(a, photocraft_compose::effects::tent_kernel(s.size)); let c = b.shift(In::Shape, -dx, -dy, 0.0, false); From b071929ecb9dd8c7fe474e1489dac3081205897d Mon Sep 17 00:00:00 2001 From: David Mann Date: Mon, 12 Oct 2026 13:48:24 +0200 Subject: [PATCH 44/92] Type: editing text keeps its ligatures and OpenType alternates (#3617) (#3747) Photoshop keeps Stylistic Sets, Contextual Alternates, Swash, Fractions, Ordinals, Titling and Stylistic Alternates and Ornaments only in a PSD's Txt2, not in EngineData. Import now reads them into the runs' font features, so the layout drawn while the type is edited keeps Photoshop's glyphs instead of falling back to the default ones. Co-authored-by: Claude Opus 5.5 (1M context) --- crates/text/src/psd.rs | 60 ++++++++++++++++++++++++++++++++++------ crates/text/src/tests.rs | 58 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 107 insertions(+), 11 deletions(-) diff --git a/crates/text/src/psd.rs b/crates/text/src/psd.rs index 2c0ca38a..b1359f31 100644 --- a/crates/text/src/psd.rs +++ b/crates/text/src/psd.rs @@ -140,9 +140,11 @@ pub fn parse_txt2(data: &[u8]) -> Option { ed::parse(&wrapped).ok().filter(|v| matches!(v, E::Dict(_))) } -/// Applies the automatic kerning modes that Photoshop keeps only in `Txt2` (EngineData writes -/// Optical and "0" alike as `AutoKerning true`) to `layer`, read from `tysh`. Only when the -/// layer's `TextIndex` entry still holds the layer's text (an edit elsewhere leaves `Txt2` +/// Applies what Photoshop keeps only in `Txt2` to `layer`, read from `tysh`: the automatic +/// kerning modes (EngineData writes Optical and "0" alike as `AutoKerning true`) and the +/// OpenType settings besides (discretionary) ligatures: stylistic sets, contextual alternates, +/// swashes and the rest ([`TXT2_FEATURES`]), which Photoshop leaves out of EngineData. Only when +/// the layer's `TextIndex` entry still holds the layer's text (an edit elsewhere leaves `Txt2` /// stale). /// /// Observed layout: `Txt2 /1` is the list of text objects; an object's `/0` is its text model @@ -168,11 +170,10 @@ pub fn apply_txt2(layer: &mut TextLayer, tysh: &[u8], txt2: &E) { let Some(style_runs) = model.path(&["6", "0"]).and_then(E::as_array) else { return; }; - let modes: Vec<(f64, Option)> = - style_runs.iter().map(|r| (r.get("1").and_then(E::as_f64).unwrap_or(0.0), r.path(&["0", "0", "6", "11"]).and_then(E::as_i64))).collect(); - let lens = utf16_to_byte_lengths(text, &modes.iter().map(|m| m.0).collect::>()); - // Auto-kern mode per byte segment, then split the model runs at segment boundaries. - let mut segs: Vec<(usize, Option)> = lens.into_iter().zip(modes.iter().map(|m| m.1)).collect(); + let styles: Vec<(f64, Option<&E>)> = style_runs.iter().map(|r| (r.get("1").and_then(E::as_f64).unwrap_or(0.0), r.path(&["0", "0", "6"]))).collect(); + let lens = utf16_to_byte_lengths(text, &styles.iter().map(|m| m.0).collect::>()); + // Txt2 style per byte segment, then split the model runs at segment boundaries. + let mut segs: Vec<(usize, Option<&E>)> = lens.into_iter().zip(styles.iter().map(|m| m.1)).collect(); segs.retain(|s| s.0 > 0); let runs = layer.char_runs(); let mut out: Vec = Vec::new(); @@ -187,14 +188,18 @@ pub fn apply_txt2(layer: &mut TextLayer, tysh: &[u8], txt2: &E) { } let piece_end = if at < seg_end { end.min(seg_end) } else { end }; let mut style = r.style.clone(); + let txt2_style = segs.get(si).and_then(|s| s.1).filter(|_| at < seg_end); // Txt2 has the exact mode (EngineData's reading also marks neighbours of manual // kerns manual, like Photoshop's legacy reader). - match segs.get(si).and_then(|s| s.1).filter(|_| at < seg_end) { + match txt2_style.and_then(|st| st.get("11")).and_then(E::as_i64) { Some(0) => style.kerning = Kerning::Off, Some(1) => style.kerning = Kerning::Metrics, Some(2) => style.kerning = Kerning::Optical, _ => {} } + if let Some(st) = txt2_style { + add_txt2_features(&mut style, st); + } let len = piece_end - at; match out.last_mut() { Some(last) if last.style == style => last.len += len, @@ -207,6 +212,43 @@ pub fn apply_txt2(layer: &mut TextLayer, tysh: &[u8], txt2: &E) { layer.sync_summary(); } +/// OpenType settings of a `Txt2` style that are on/off flags, by style key, as Photoshop +/// writes them (each turned on alone in the Character panel's OpenType settings and read back): +/// `/20` Contextual Alternates, `/23` Fractions, `/24` Ordinals, `/25` Swash, `/26` Titling +/// Alternates, `/28` Stylistic Alternates, `/29` Ornaments. (`/18` and `/19` are the standard and +/// discretionary ligatures, which EngineData carries too; `/27` is Arabic connection forms.) +pub const TXT2_FEATURES: [(&str, &str); 7] = [("20", "calt"), ("23", "frac"), ("24", "ordn"), ("25", "swsh"), ("26", "titl"), ("28", "salt"), ("29", "ornm")]; + +/// The `Txt2` style key holding the Stylistic Sets as a bit mask: bit n is set n + 1 +/// (`ss01`..`ss20`). +pub const TXT2_STYLISTIC_SETS: &str = "85"; + +/// Sets in `style` the OpenType features a `Txt2` style dictionary turns on ([`TXT2_FEATURES`] +/// and the Stylistic Sets mask). A feature the style already sets keeps its value. A flag that is +/// off changes nothing, except Contextual Alternates: shapers apply `calt` by default, Photoshop +/// only when it is on (its default is off), so off is written as `calt` 0. +fn add_txt2_features(style: &mut CharStyle, txt2_style: &E) { + let mut set = |tag: String, value: u16| { + if !style.features.iter().any(|f| f.tag == tag) { + style.features.push(photocraft_doc::text::FontFeature { tag, value }); + } + }; + for (key, tag) in TXT2_FEATURES { + match txt2_style.get(key).and_then(E::as_bool) { + Some(true) => set(tag.to_string(), 1), + Some(false) if tag == "calt" => set(tag.to_string(), 0), + _ => {} + } + } + // A mask beyond the 20 sets is not Photoshop's: ignore it. + let sets = txt2_style.get(TXT2_STYLISTIC_SETS).and_then(E::as_i64).filter(|m| (0..1 << 20).contains(m)).unwrap_or(0); + for n in 0..20 { + if sets & (1 << n) != 0 { + set(format!("ss{:02}", n + 1), 1); + } + } +} + /// Builds a [`TextLayer`] (model, text and transform; no cache, no `psd_raw`) from `TySh` data. pub fn text_layer_from_tysh(data: &[u8], dpi: f32) -> Option { let t = parse_tysh(data)?; diff --git a/crates/text/src/tests.rs b/crates/text/src/tests.rs index 75b775b7..b1a1949c 100644 --- a/crates/text/src/tests.rs +++ b/crates/text/src/tests.rs @@ -682,6 +682,11 @@ fn warp_bends_rendered_text_and_outlines() { /// `Txt2` as Photoshop writes it (a bare `/key value` sequence; text objects at `/1 /1`, style /// runs at `/0 /6 /0`, auto-kern mode at `/11`), for the layer text `text`. fn txt2_with_modes(text: &str, modes: &[(usize, i64)]) -> Vec { + txt2_with_styles(text, &modes.iter().map(|(len, m)| (*len, format!("/11 {m}"))).collect::>()) +} + +/// [`txt2_with_modes`] with each style run's keys given as EngineData text (`"/11 1 /85 2"`). +fn txt2_with_styles(text: &str, styles: &[(usize, String)]) -> Vec { let mut v = b"\n\n/98 << /0 14 >> /0 << >> /1 << /1 [ << /0 << /0 (\xfe\xff".to_vec(); for u in format!("{text}\r").encode_utf16() { let b = u.to_be_bytes(); @@ -693,8 +698,8 @@ fn txt2_with_modes(text: &str, modes: &[(usize, i64)]) -> Vec { } } v.extend_from_slice(b") /6 << /0 [ "); - for (len, m) in modes { - v.extend_from_slice(format!("<< /0 << /0 << /0 (\u{fe}\u{ff}) /6 << /0 0 /11 {m} >> >> >> /1 {len} >> ").as_bytes()); + for (len, keys) in styles { + v.extend_from_slice(format!("<< /0 << /0 << /0 (\u{fe}\u{ff}) /6 << /0 0 {keys} >> >> >> /1 {len} >> ").as_bytes()); } v.extend_from_slice(b"] >> >> >> ] >>"); v @@ -741,6 +746,55 @@ fn txt2_carries_optical_kerning() { assert!(l.char_runs().iter().all(|r| r.style.kerning == Kerning::Optical)); } +/// #3617: Photoshop keeps Stylistic Sets, Contextual Alternates, Swash and the other OpenType +/// settings besides (discretionary) ligatures only in `Txt2`. Import reads them, so the layout +/// our engine draws when the type is edited keeps Photoshop's glyphs instead of falling back to +/// the default ones. +#[test] +fn txt2_carries_opentype_features() { + let feats = |l: &TextLayer| l.char_runs().iter().map(|r| r.style.features.iter().map(|f| (f.tag.clone(), f.value)).collect::>()).collect::>(); + let f = |tag: &str, value: u16| (tag.to_string(), value); + // "Il->36" plus the engine's closing break: Stylistic Set 2 (mask 2), Contextual Alternates + // and Swash on "Il"; Contextual Alternates off (Photoshop's default), Stylistic Set 1 and + // Fractions on the rest. + let text = "Il->36"; + let plain = styled(text, CharStyle { font_family: "Inter".into(), ..Default::default() }); + let tysh = with_text_index(&crate::psd::build_tysh(&plain, 72.0, None), 0); + let styles = [(2, "/11 1 /18 true /19 false /20 true /25 true /85 2".to_string()), (5, "/11 1 /20 false /23 true /85 1".to_string())]; + let txt2 = crate::psd::parse_txt2(&txt2_with_styles(text, &styles)).unwrap(); + let mut back = crate::psd::text_layer_from_tysh(&tysh, 72.0).unwrap(); + assert_eq!(feats(&back), vec![Vec::<(String, u16)>::new()], "EngineData alone doesn't have them"); + crate::psd::apply_txt2(&mut back, &tysh, &txt2); + assert_eq!(feats(&back), vec![vec![f("calt", 1), f("swsh", 1), f("ss02", 1)], vec![f("calt", 0), f("frac", 1), f("ss01", 1)]]); + assert_eq!(back.char_runs().iter().map(|r| r.len).collect::>(), vec![2, 4]); + // What editing shows (our layout) has Photoshop's glyphs: Inter's `ss02` draws another I and + // l, `ss01` another 3 and 6, and `->` stays two glyphs without `calt` (with it, an arrow). + let mut e = TextEngine::new(); + let ids = |e: &mut TextEngine, t: &TextLayer| e.layout(t, 72.0).glyphs.iter().map(|g| g.id).collect::>(); + let with = |len: usize, tags: &[(&str, u16)]| TextRun { + len, + style: CharStyle { + features: tags.iter().map(|(tag, value)| FontFeature { tag: (*tag).into(), value: *value }).collect(), + ..back.char_runs()[0].style.clone() + }, + }; + let mut expected = back.clone(); + expected.runs = vec![with(2, &[("ss02", 1)]), with(4, &[("calt", 0), ("ss01", 1)])]; + let shown = ids(&mut e, &back); + assert_eq!(shown, ids(&mut e, &expected)); + let defaults = ids(&mut e, &crate::psd::text_layer_from_tysh(&tysh, 72.0).unwrap()); + assert_eq!((shown.len(), defaults.len()), (6, 5), "`->` is two glyphs, as in Photoshop, not an arrow"); + assert!(shown.first() != defaults.first() && shown.last() != defaults.last(), "{shown:?} vs {defaults:?}"); + // A feature the style already sets (from EngineData, read first) keeps its value; masks and + // flags of the wrong type, masks beyond the 20 sets and unknown keys change nothing. + let mut t = crate::psd::text_layer_from_tysh(&tysh, 72.0).unwrap(); + t.runs = vec![TextRun { len: text.len(), style: CharStyle { features: vec![FontFeature { tag: "ss01".into(), value: 0 }], ..Default::default() } }]; + let odd = + [(1, "/85 1".to_string()), (1, "/85 (x) /20 (x) /25 (true)".to_string()), (1, "/85 -1".to_string()), (4, "/85 99999999999 /999 true".to_string())]; + crate::psd::apply_txt2(&mut t, &tysh, &crate::psd::parse_txt2(&txt2_with_styles(text, &odd)).unwrap()); + assert_eq!(feats(&t), vec![vec![f("ss01", 0)]]); +} + /// A `Txt2` written by [`crate::psd::build_txt2`] (what PSD export writes for the type layers) /// restores every auto-kern mode on import (#1348: a new Optical layer used to reopen as /// Metrics, because EngineData's `AutoKerning true` covers both). From 81bff2aaa4267a2da9a4b6c85cdea451339628da Mon Sep 17 00:00:00 2001 From: David Mann Date: Mon, 12 Oct 2026 13:48:35 +0200 Subject: [PATCH 45/92] Brushes: Photoshop's texture Height/Subtract modes, Brightness and Contrast (#3340) (#3749) Imported brushes whose Texture uses Height or Linear Height at a low depth (common in Photoshop brush packs) painted nothing: the modes were modelled backwards (paint only on the brightest texels, more of it with more depth). Measured against Photoshop with single dabs over a 0..255 ramp pattern: - Height: paint reaches 12 x depth x coverage into the pattern and fills what lies below it (dark valleys first; a brighter pattern takes paint away, which is why the reporter had to flip Brightness's sign). Linear Height grades the shallow end by the pattern instead. - Subtract takes depth x pattern away (white removes the most paint); Color Dodge/Burn scale the pattern toward their neutral with depth. These now live in texture_combine; the Dual Brush keeps mask_combine. - Brightness shifts the pattern by value/255 (not value/150); positive Contrast steepens by 1/(1-c/100) after the shift, negative flattens by 1+c/100 before it. Texture::level is shared by the renderer and the Brush Settings swatch. - ABR import mapped textureContrast with /50 for both signs; positive values are now /100, matching the model and the Brush Settings field. Built-in Subtract presets get Invert so they look as before. Co-authored-by: Claude Opus 5.5 (1M context) --- crates/io/src/abr_map.rs | 4 +- crates/io/src/abr_map/tests.rs | 49 ++++++++++++- crates/paint/src/brush.rs | 17 ++++- crates/paint/src/brush_tests.rs | 104 ++++++++++++++++++++++++++- crates/paint/src/presets.rs | 6 +- crates/paint/src/render.rs | 43 +++++++++-- crates/ui-egui/src/brush_sections.rs | 7 +- 7 files changed, 212 insertions(+), 18 deletions(-) diff --git a/crates/io/src/abr_map.rs b/crates/io/src/abr_map.rs index 225869ea..6230e276 100644 --- a/crates/io/src/abr_map.rs +++ b/crates/io/src/abr_map.rs @@ -389,7 +389,9 @@ impl Mapper<'_> { t.invert = boolean(d, "InvT").unwrap_or(false); t.scale = pct(d, "textureScale").unwrap_or(1.0).clamp(0.01, 10.0); t.brightness = (num(d, "textureBrightness").unwrap_or(0.0) / 150.0).clamp(-1.0, 1.0) as f32; - t.contrast = (num(d, "textureContrast").unwrap_or(0.0) / 50.0).clamp(-1.0, 2.0) as f32; + // Photoshop's -50..100 onto the model's -1..1 (negative and positive scale apart). + let c = num(d, "textureContrast").unwrap_or(0.0); + t.contrast = (if c < 0.0 { c / 50.0 } else { c / 100.0 }).clamp(-1.0, 1.0) as f32; t.mode = mask_mode(enum_value(d, "textureBlendMode")).unwrap_or(MaskMode::Multiply); t.depth = pct(d, "textureDepth").unwrap_or(1.0).clamp(0.0, 1.0); let mut dj = self.dynamic(obj(d, "textureDepthDynamics")); diff --git a/crates/io/src/abr_map/tests.rs b/crates/io/src/abr_map/tests.rs index 9837f4ea..013f307f 100644 --- a/crates/io/src/abr_map/tests.rs +++ b/crates/io/src/abr_map/tests.rs @@ -153,7 +153,7 @@ fn v6_settings_map_onto_brush_sections() { assert_eq!((sc.count, sc.scatter.jitter, sc.scatter.control, sc.scatter.fade_steps, sc.count_jitter.jitter), (3, 2.5, Control::Fade, 40, 0.5)); let tx = &b.texture; assert!(tx.enabled && tx.each_tip && tx.invert); - assert_eq!((tx.scale, tx.brightness, tx.contrast, tx.mode, tx.depth), (1.5, -0.5, 0.5, MaskMode::ColorBurn, 0.6)); + assert_eq!((tx.scale, tx.brightness, tx.contrast, tx.mode, tx.depth), (1.5, -0.5, 0.25, MaskMode::ColorBurn, 0.6)); assert_eq!((tx.depth_jitter.jitter, tx.depth_jitter.minimum), (0.3, 0.2)); let Pattern::Tile(pt) = &tx.pattern else { panic!("embedded pattern expected, got {:?}", tx.pattern) }; assert_eq!((pt.width, pt.height, pt.data[3]), (4, 2, 65535)); @@ -330,3 +330,50 @@ fn sampled_tip_paints_the_brush_colour_never_black() { assert!(painted > 0, "the imported tip painted nothing"); assert!(painted < 64 * 64, "the tip covered everything - coverage was treated as solid colour"); } + +/// #3340: Photoshop's texture Contrast runs -50..100; the model maps -50..0 and 0..100 onto +/// -1..0 and 0..1 (as Brush Settings shows it), so +24 must not read back as +48. +#[test] +fn texture_contrast_maps_both_halves() { + for (c, want) in [(24, 0.24), (100, 1.0), (-30, -0.6), (-50, -1.0), (0, 0.0)] { + let preset = Descriptor::new("brushPreset") + .with("Nm ", t("C")) + .with("Brsh", Value::Descriptor(Descriptor::new("computedBrush").with("Dmtr", u(b"#Pxl", 20.0)))) + .with("useTexture", Value::Boolean(true)) + .with("textureContrast", Value::Integer(c)); + let bytes = write_v6(2, &[], &[], &[preset], false).unwrap(); + let imp = read_abr(&bytes, "Test").unwrap(); + let got = imp.presets[0].brush.texture.contrast; + assert!((got - want).abs() < 1e-6, "contrast {c}: {got}"); + } +} + +/// #3340: a Height-mode brush at a low depth with a darkened pattern (how Photoshop's own +/// "Pen" presets in the reported file are set up) imported but painted nothing. +#[test] +fn low_depth_height_texture_brush_paints() { + use photocraft_color::PixelFormat; + use photocraft_paint::StrokePoint; + use photocraft_paint::render::render_stroke; + use photocraft_raster::Surface; + + for mode in ["Hght", "linearHeight"] { + let preset = Descriptor::new("brushPreset") + .with("Nm ", t("Pen")) + .with("Brsh", Value::Descriptor(Descriptor::new("computedBrush").with("Dmtr", u(b"#Pxl", 20.0)).with("Hrdn", prc(100.0)).with("Spcn", prc(5.0)))) + .with("useTexture", Value::Boolean(true)) + .with("textureBlendMode", en("BlnM", mode)) + .with("textureDepth", prc(13.0)) + .with("textureBrightness", Value::Integer(-87)) + .with("textureContrast", Value::Integer(5)) + .with("Txtr", Value::Descriptor(Descriptor::new("Ptrn").with("Nm ", t("Grit")).with("Idnt", t("pat-uuid")))); + let bytes = write_v6(2, &[], &[grit_pattern()], &[preset], false).unwrap(); + let imp = read_abr(&bytes, "Test").unwrap(); + let b = imp.presets[0].brush.clone(); + let mut s = Surface::new(PixelFormat::RGBA32F); + render_stroke(&mut s, &b, &[StrokePoint::new(10.0, 20.0, 1.0), StrokePoint::new(50.0, 20.0, 1.0)], None, false, 1.0); + let covered = (12..48).filter(|&x| s.rgba(x, 20)[3] > 0.5).count(); + // 13 % depth reaches 1.55 pattern ranges: above the whole darkened Grit pattern. + assert_eq!(covered, 36, "{mode}: the stroke painted {covered} of 36 pixels"); + } +} diff --git a/crates/paint/src/brush.rs b/crates/paint/src/brush.rs index 25ebea5e..48e7f48d 100644 --- a/crates/paint/src/brush.rs +++ b/crates/paint/src/brush.rs @@ -270,7 +270,7 @@ pub struct Texture { pub scale: f32, /// -1..1 (Photoshop's -150..150 mapped to ±1). pub brightness: f32, - /// -1..1. + /// -1..1: Photoshop's -50..0 mapped to -1..0 and its 0..100 to 0..1. pub contrast: f32, /// Apply the texture to every dab (enables depth jitter) instead of once to the stroke. pub each_tip: bool, @@ -281,6 +281,21 @@ pub struct Texture { pub depth_jitter: Dynamic, } +impl Texture { + /// A pattern value (0..1) after Brightness, Contrast and Invert: the value the mode combines + /// with the brush. Measured against Photoshop (#3340): Brightness shifts the pattern by + /// `brightness / 255` (±150 moves it 150 levels of 255, not all the way to white or black); + /// positive Contrast steepens it around mid-grey by `1 / (1 − c/100)` after the shift (100 is + /// a threshold), negative Contrast flattens it by `1 + c/100` before the shift; Invert is last. + pub fn level(&self, v: f32) -> f32 { + let b = if self.brightness.is_finite() { self.brightness.clamp(-1.0, 1.0) * (150.0 / 255.0) } else { 0.0 }; + let c = if self.contrast.is_finite() { self.contrast.clamp(-1.0, 1.0) } else { 0.0 }; + let x = if c >= 0.0 { (v + b - 0.5) / (1.0 - c).max(1e-4) + 0.5 } else { (v - 0.5) * (1.0 + c / 2.0) + 0.5 + b }; + let x = if x.is_finite() { x.clamp(0.0, 1.0) } else { 0.5 }; + if self.invert { 1.0 - x } else { x } + } +} + impl Default for Texture { fn default() -> Self { Self { diff --git a/crates/paint/src/brush_tests.rs b/crates/paint/src/brush_tests.rs index a68f84f1..664aca9c 100644 --- a/crates/paint/src/brush_tests.rs +++ b/crates/paint/src/brush_tests.rs @@ -6,7 +6,7 @@ use photocraft_raster::Surface; use crate::brush::*; use crate::dynamics::{Smoother, smooth_points}; -use crate::render::{BrushContext, StrokeRenderer, mask_combine, render_stroke}; +use crate::render::{BrushContext, StrokeRenderer, mask_combine, render_stroke, texture_combine}; use crate::tile::GrayTile; use crate::{Dab, Stroke, StrokePoint, dabs}; @@ -525,7 +525,9 @@ fn texture_modulates_coverage() { b.texture.invert = false; b.texture.brightness = 1.0; let s = paint(&b, &line(20.0, 80.0, 30.0), 100, 60); - assert!(s.rgba(46, 30)[3] > 0.9); + // +150 lifts a black texel by 150 levels of 255, not to white (#3340). + let lifted = s.rgba(46, 30)[3]; + assert!((lifted - 150.0 / 255.0).abs() < 0.02, "{lifted}"); // All modes keep zero coverage at zero and stay in range. for m in [ MaskMode::Multiply, @@ -544,6 +546,12 @@ fn texture_modulates_coverage() { let v = mask_combine(m, 0.7, t, 0.8); assert!((0.0..=1.0).contains(&v), "{m:?}"); } + for t in [0.0, 0.3, 1.0] { + assert_eq!(texture_combine(m, 0.0, t, 1.0), 0.0, "{m:?}"); + let v = texture_combine(m, 0.7, t, 0.8); + assert!((0.0..=1.0).contains(&v), "{m:?}"); + } + assert!((0.0..=1.0).contains(&texture_combine(m, 0.7, f32::NAN, f32::INFINITY)), "{m:?}"); // Full-white texture never reduces multiply-like masks below the brush. assert!(mask_combine(m, 0.6, 1.0, 1.0) >= 0.6 - 1e-5 || matches!(m, MaskMode::Overlay), "{m:?}"); } @@ -555,6 +563,98 @@ fn texture_modulates_coverage() { assert!(d.iter().any(|x| x.depth < 0.6)); } +/// Texture Brightness and Contrast as Photoshop applies them, measured by stroking a 0..255 grey +/// ramp pattern in Multiply mode at 100 % depth (the stroke's opacity is then the pattern value): +/// (setting, ramp value, opacity read back), in levels of 255 (#3340). +#[test] +fn texture_brightness_and_contrast_match_photoshop() { + let level = |brightness: f32, contrast: f32, invert: bool, v: f32| { + // The model's ranges: brightness ±150 → ±1; contrast -50..0 → -1..0, 0..100 → 0..1. + let c = if contrast < 0.0 { contrast / 50.0 } else { contrast / 100.0 }; + let t = Texture { brightness: brightness / 150.0, contrast: c, invert, ..Default::default() }; + t.level(v / 255.0) * 255.0 + }; + for (b, c, inv, v, want) in [ + (87.0, 0.0, false, 8.0, 95.0), + (87.0, 0.0, false, 200.0, 255.0), + (-87.0, 0.0, false, 104.0, 17.0), + (150.0, 0.0, false, 8.0, 158.0), + (0.0, 50.0, false, 104.0, 81.0), + (0.0, 50.0, false, 136.0, 145.0), + (0.0, -50.0, false, 8.0, 67.0), + (0.0, -50.0, false, 248.0, 188.0), + (0.0, 100.0, false, 120.0, 0.0), + (0.0, 100.0, false, 136.0, 255.0), + // Positive contrast after the shift, negative contrast before it. + (40.0, 50.0, false, 104.0, 161.0), + (40.0, 50.0, false, 40.0, 33.0), + (-40.0, -30.0, false, 120.0, 82.0), + (-40.0, -30.0, false, 248.0, 172.0), + // Invert comes last. + (40.0, 0.0, true, 8.0, 207.0), + (0.0, 50.0, true, 72.0, 238.0), + ] { + let got = level(b, c, inv, v); + assert!((got - want).abs() <= 2.0, "brightness {b}, contrast {c}, invert {inv}, ramp {v}: {got} (Photoshop {want})"); + } +} + +/// The Texture modes that differ from the Dual Brush's, against single Photoshop dabs over a +/// 0..255 ramp: (mode, depth, brush coverage, ramp value, opacity read back), in levels of 255. +#[test] +fn texture_modes_match_photoshop() { + use MaskMode::*; + for (m, d, v, t, want) in [ + // Height: a low depth paints the dark valleys only, more depth fills the pattern. + (Height, 0.0, 255.0, 8.0, 0.0), + (Height, 0.01, 255.0, 8.0, 28.0), + (Height, 0.05, 255.0, 8.0, 148.0), + (Height, 0.05, 255.0, 136.0, 20.0), + (Height, 0.13, 255.0, 8.0, 255.0), + (Height, 0.13, 255.0, 152.0, 244.0), + (Height, 0.13, 255.0, 248.0, 148.0), + (Height, 0.13, 186.0, 88.0, 201.0), + (Height, 0.13, 142.0, 104.0, 116.0), + (Height, 0.25, 255.0, 248.0, 255.0), + // Linear Height: graded by the pattern while the reach stays below its top. + (LinearHeight, 0.01, 255.0, 152.0, 15.0), + (LinearHeight, 0.05, 255.0, 8.0, 151.0), + (LinearHeight, 0.05, 255.0, 152.0, 63.0), + (LinearHeight, 0.10, 255.0, 72.0, 240.0), + (LinearHeight, 0.13, 101.0, 120.0, 82.0), + (LinearHeight, 0.13, 142.0, 104.0, 130.0), + // Subtract: the light parts take paint away. + (Subtract, 1.0, 255.0, 8.0, 247.0), + (Subtract, 1.0, 255.0, 248.0, 7.0), + (Subtract, 0.5, 224.0, 72.0, 188.0), + // Color Burn / Color Dodge below full depth. + (ColorBurn, 0.5, 224.0, 72.0, 207.0), + (ColorDodge, 0.5, 99.0, 120.0, 130.0), + // Unchanged modes. + (Multiply, 0.13, 255.0, 8.0, 223.0), + (Darken, 0.5, 255.0, 8.0, 131.0), + ] { + let got = texture_combine(m, v / 255.0, t / 255.0, d) * 255.0; + assert!((got - want).abs() <= 3.0, "{m:?} depth {d}, coverage {v}, ramp {t}: {got} (Photoshop {want})"); + } +} + +/// #3340: an imported Height-mode brush at a low depth with a darkened pattern painted nothing. +#[test] +fn low_depth_height_texture_paints() { + let tile = GrayTile::from_fn(8, 8, |x, y| if (x + y) % 2 == 0 { 0.45 } else { 0.6 }); + for mode in [MaskMode::Height, MaskMode::LinearHeight] { + let b = BrushSettings { + size: 40.0, + texture: Texture { enabled: true, pattern: Pattern::Tile(tile.clone()), mode, depth: 0.13, brightness: -87.0 / 150.0, ..Default::default() }, + ..brush() + }; + let s = paint(&b, &line(20.0, 80.0, 30.0), 100, 60); + let a = s.rgba(50, 30)[3]; + assert!(a > 0.95, "{mode:?}: {a}"); + } +} + #[test] fn dual_brush_intersects() { // Dual tip: small dabs far apart → the stroke survives only where they land. diff --git a/crates/paint/src/presets.rs b/crates/paint/src/presets.rs index 62156518..cbba537e 100644 --- a/crates/paint/src/presets.rs +++ b/crates/paint/src/presets.rs @@ -107,7 +107,9 @@ fn dry_media(base: &BrushSettings) -> Vec { spacing: 0.12, shape_dynamics: ShapeDynamics { enabled: true, size: pressure_min(0.5), angle: Dynamic::controlled(Control::Direction), ..Default::default() }, transfer: transfer(pressure_min(0.3), Dynamic::default()), - texture: Texture { mode: MaskMode::Subtract, ..paper(5, 0.7) }, + // Subtract takes paint away where the pattern is light (#3340); inverting keeps + // these presets as they were designed, with the dark parts taking it away. + texture: Texture { mode: MaskMode::Subtract, invert: true, ..paper(5, 0.7) }, ..base.clone() }, ), @@ -129,6 +131,7 @@ fn dry_media(base: &BrushSettings) -> Vec { pattern: Pattern::Procedural { style: PatternStyle::Canvas, size: 64, seed: 2 }, depth: 0.55, mode: MaskMode::Subtract, + invert: true, ..Default::default() }, ..base.clone() @@ -379,6 +382,7 @@ fn special_effects(base: &BrushSettings) -> Vec { enabled: true, pattern: Pattern::Procedural { style: PatternStyle::Canvas, size: 64, seed: 1 }, mode: MaskMode::Subtract, + invert: true, depth: 0.7, ..Default::default() }, diff --git a/crates/paint/src/render.rs b/crates/paint/src/render.rs index a92b75fb..94ac63a7 100644 --- a/crates/paint/src/render.rs +++ b/crates/paint/src/render.rs @@ -108,6 +108,40 @@ pub fn mask_combine(mode: MaskMode, v: f32, t: f32, d: f32) -> f32 { r.clamp(0.0, 1.0) } +/// How far a Height-mode dab at full depth and coverage reaches into the pattern, in pattern +/// ranges (measured against Photoshop, #3340). +const HEIGHT_REACH: f32 = 12.0; + +/// Combine brush coverage `v` with a Texture pattern value `t` at `depth` (Brush Settings › +/// Texture). Where it differs from [`mask_combine`] (still used for the Dual Brush) it follows +/// Photoshop as measured with single dabs over a grey ramp (#3340): +/// - Subtract takes `depth × t` away, so a white pattern removes the most paint. +/// - Color Dodge and Color Burn move the pattern toward their neutral colour as depth falls. +/// - Height treats the pattern as a height field the brush presses into: the paint reaches +/// `12 × depth × v` and fills whatever lies below that, so a low depth paints only the dark +/// valleys, from about 17 % the whole pattern is under the paint, and a brighter pattern +/// takes paint away. +/// - Linear Height is Height, but where the reach stays below the top of the pattern the paint +/// fades with the pattern instead of being cut off. +pub fn texture_combine(mode: MaskMode, v: f32, t: f32, d: f32) -> f32 { + if v <= 0.0 { + return 0.0; + } + let r = match mode { + MaskMode::Subtract => v - d * t, + MaskMode::ColorDodge => v / (1.0 - d * t).max(1e-3), + MaskMode::ColorBurn => 1.0 - (1.0 - v) / (1.0 - d + d * t).max(1e-3), + // Photoshop steps the depth in 1/255ths here, which shows at the lowest depths. + MaskMode::Height => HEIGHT_REACH * (d * 255.0).round() / 255.0 * v - t, + MaskMode::LinearHeight => { + let reach = HEIGHT_REACH * (d * 255.0).round() / 255.0 * v; + if reach < 1.0 { reach * (1.0 - t) } else { reach - t } + } + _ => mask_combine(mode, v, t, d), + }; + if r.is_finite() { r.clamp(0.0, 1.0) } else { 0.0 } +} + /// A stroke-ready brush: the settings plus prepared tip mips and texture. #[derive(Clone, Debug)] pub struct BrushContext { @@ -129,11 +163,8 @@ fn prepare_pattern(b: &BrushSettings) -> Option> { _ => return None, }, }; - let (br, ct) = (t.brightness.clamp(-1.0, 1.0), t.contrast.clamp(-1.0, 1.0)); for v in &mut img.data { - let mut x = (*v - 0.5) * (1.0 + ct) + 0.5 + br; - x = x.clamp(0.0, 1.0); - *v = if t.invert { 1.0 - x } else { x }; + *v = t.level(*v); } Some(Arc::new(img)) } @@ -326,7 +357,7 @@ impl BrushContext { val += (hard - val) * 0.7; } if tex_tip { - val = mask_combine(b.texture.mode, val, self.texture_at(x, y), d.depth); + val = texture_combine(b.texture.mode, val, self.texture_at(x, y), d.depth); } if wet { val *= wet_factor(rn); @@ -366,7 +397,7 @@ impl BrushContext { m = mask_combine(b.dual_brush.mode, m, dv, 1.0); } if self.texture.is_some() && !b.texture.each_tip { - m = mask_combine(b.texture.mode, m, self.texture_at(x, y), b.texture.depth.clamp(0.0, 1.0)); + m = texture_combine(b.texture.mode, m, self.texture_at(x, y), b.texture.depth.clamp(0.0, 1.0)); } m } diff --git a/crates/ui-egui/src/brush_sections.rs b/crates/ui-egui/src/brush_sections.rs index 7fae63ff..16332e4d 100644 --- a/crates/ui-egui/src/brush_sections.rs +++ b/crates/ui-egui/src/brush_sections.rs @@ -395,14 +395,9 @@ fn pattern_swatch(ui: &mut egui::Ui, tx: &paint::Texture) { _ => paint::tile::PatternImage { width: 1, height: 1, data: vec![0.5] }, }, }; - let (br, ct) = (tx.brightness.clamp(-1.0, 1.0), tx.contrast.clamp(-1.0, 1.0)); let px: Vec = (0..n * n) .flat_map(|i| { - let v = img.sample_wrap((i % n) as f32, (i / n) as f32); - let mut x = ((v - 0.5) * (1.0 + ct) + 0.5 + br).clamp(0.0, 1.0); - if tx.invert { - x = 1.0 - x; - } + let x = tx.level(img.sample_wrap((i % n) as f32, (i / n) as f32)); let g = (x * 255.0).round() as u8; [g, g, g, 255] }) From e4e3f00f484a0aa345e551f59bf268e1983f1087 Mon Sep 17 00:00:00 2001 From: Dennis <34663561+Madcat71@users.noreply.github.com> Date: Mon, 12 Oct 2026 13:48:45 +0200 Subject: [PATCH 46/92] Camera raw colour fit: read a Sony Adobe RGB preview as Adobe RGB, not sRGB (#3760) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The per-file colour fit (`fit_preview_look`) converted the embedded JPEG to sRGB only when the JPEG carried an ICC profile, and otherwise read it as sRGB. A Sony body set to Adobe RGB writes no profile into its previews; it states the colour space only in the raw's EXIF (ColorSpace Uncalibrated with InteropIndex "R03", the DCF option file for Adobe RGB). The fit then targeted a desaturated, hue-shifted reference, and the developed raw came out that way. `photocraft_raw::embedded_preview_color_space` reads that EXIF (sRGB, Adobe RGB or unstated; never for a DNG, whose previews are the converter's), and `preview_profile` uses it when the preview has no ICC profile of its own. A preview's own profile still wins. LightCraft reads the same tags for the same reason (storytold/lightcraft#778). Measured on 19 private Sony ILCE-1M2 ARWs, all shot in Adobe RGB, against the camera's JPEG read as Adobe RGB (median CIE76 ΔE at 240 px): full-frame 400 mm shots against blue sky 5.6-7.0 → 1.5-2.4, their mean a* offset +4.3…+4.9 → +0.7…+1.1; every file improved, mean of the medians 4.9 → 2.2. Tests: `exif_colour_space_of_the_previews` (sRGB, Adobe RGB; R98, a missing interop IFD, other values, a DNG and junk are unstated) and `a_preview_without_a_profile_takes_the_raws_exif_colour_space` (fails without the EXIF fallback; the preview's own ICC profile wins). The hostile-input harness calls the new function. Co-authored-by: Claude Opus 5.5 --- crates/io/src/raw.rs | 56 ++++++++++++++++++++++++------ crates/raw/src/lib.rs | 2 +- crates/raw/src/preview.rs | 69 +++++++++++++++++++++++++++++++++++++ crates/raw/src/tiff.rs | 4 +++ crates/raw/tests/hostile.rs | 1 + 5 files changed, 120 insertions(+), 12 deletions(-) diff --git a/crates/io/src/raw.rs b/crates/io/src/raw.rs index 6ff2f590..7e1f9164 100644 --- a/crates/io/src/raw.rs +++ b/crates/io/src/raw.rs @@ -14,7 +14,7 @@ use std::sync::Arc; use photocraft_cms::{Builtin, Intent, Profile, Transform}; use photocraft_codecs::{self as codecs, ChannelLayout, Format, Image, SampleType}; -use photocraft_raw::{CameraLook, DevelopOptions, Limits, RawError, Reference, Sensor, WhiteBalance}; +use photocraft_raw::{CameraLook, DevelopOptions, Limits, PreviewColorSpace, RawError, Reference, Sensor, WhiteBalance}; use crate::flat::image_to_document; use crate::{ImportResult, IoError}; @@ -133,10 +133,23 @@ pub fn import_raw(name: &str, bytes: &[u8]) -> Result { /// the fit grid is at most `PROXY_EDGE` cells and wants about two pixels per cell). const FIT_PREVIEW_EDGE: u32 = 2 * photocraft_raw::PROXY_EDGE as u32; +/// The colour space of a raw's decoded preview when it is not sRGB: its own ICC profile, else the +/// one the raw's EXIF states (a Sony body set to Adobe RGB writes no profile into the JPEG). +/// `None` means sRGB. +fn preview_profile(raw: &[u8], icc: Option<&[u8]>) -> Result>, String> { + let src = match icc { + Some(icc) => Cow::Owned(Profile::parse(icc).map_err(|e| format!("the preview's ICC profile does not parse: {e}"))?), + None if photocraft_raw::embedded_preview_color_space(raw) == Some(PreviewColorSpace::AdobeRgb) => Cow::Borrowed(Builtin::AdobeRgbCompat.profile()), + None => return Ok(None), + }; + Ok((!src.same_colors(Builtin::Srgb.profile())).then_some(src)) +} + /// Fits the colour of a decoded raw to the camera's embedded JPEG (see /// [`photocraft_raw::fit_look`]): picks the smallest preview at least /// `FIT_PREVIEW_EDGE` pixels long (else the largest), decodes it, turns it upright and -/// converts it to sRGB when it carries another ICC profile. `Err` says why there is no fit. +/// converts it to sRGB when it is in another colour space ([`preview_profile`]). `Err` says +/// why there is no fit. pub fn fit_preview_look(raw: &[u8], sensor: &Sensor, opts: &DevelopOptions) -> Result { let previews = photocraft_raw::embedded_previews(raw); let long = |p: &photocraft_raw::Preview| p.width.max(p.height); @@ -152,15 +165,11 @@ pub fn fit_preview_look(raw: &[u8], sensor: &Sensor, opts: &DevelopOptions) -> R } let (w, h) = img.dimensions(); let mut rgb: Cow<[u8]> = Cow::Borrowed(img.data()); - if let Some(icc) = img.icc.as_deref() { - let srgb = Builtin::Srgb.profile(); - let src = Profile::parse(icc).map_err(|e| format!("the preview's ICC profile does not parse: {e}"))?; - if !src.same_colors(srgb) { - let t = Transform::new(&src, srgb, Intent::RelativeColorimetric, false).map_err(|e| e.to_string())?; - let mut out = vec![0u8; rgb.len()]; - t.convert_u8(&rgb, 3, &mut out, 3, false); - rgb = Cow::Owned(out); - } + if let Some(src) = preview_profile(raw, img.icc.as_deref())? { + let t = Transform::new(&src, Builtin::Srgb.profile(), Intent::RelativeColorimetric, false).map_err(|e| e.to_string())?; + let mut out = vec![0u8; rgb.len()]; + t.convert_u8(&rgb, 3, &mut out, 3, false); + rgb = Cow::Owned(out); } photocraft_raw::fit_look(sensor, opts, &Reference { width: w, height: h, rgb: &rgb }).map_err(|e| e.to_string()) } @@ -223,4 +232,29 @@ mod tests { assert_eq!(camera_name(None, Some("X")), "X"); assert_eq!(camera_name(Some("Panasonic"), Some("DC-G9")), "Panasonic DC-G9"); } + + /// A Sony body set to Adobe RGB says so only in the raw's EXIF (ColorSpace Uncalibrated, InteropIndex "R03"): + /// its preview, which has no ICC profile, is read as Adobe RGB for the colour fit, not as sRGB. + #[test] + fn a_preview_without_a_profile_takes_the_raws_exif_colour_space() { + use photocraft_raw::testgen::{TiffBuilder, Val}; + let raw = |color_space: u16, index: &str| { + let mut t = TiffBuilder::default(); + let interop = t.ifd(vec![(0x0001, Val::Ascii(index.into()))]); + let exif = t.ifd(vec![(0xA001, Val::Short(vec![color_space])), (0xA005, Val::Ifds(vec![interop]))]); + t.chain = vec![t.ifd(vec![(271, Val::Ascii("SONY".into())), (34665, Val::Ifds(vec![exif]))])]; + t.build() + }; + let adobe = raw(0xFFFF, "R03"); + let srgb = raw(1, "R98"); + assert!(preview_profile(&adobe, None).unwrap().unwrap().same_colors(Builtin::AdobeRgbCompat.profile())); + assert!(preview_profile(&srgb, None).unwrap().is_none()); + assert!(preview_profile(b"not a raw", None).unwrap().is_none(), "unstated: sRGB"); + // the preview's own profile wins over the raw's EXIF + let srgb_icc = Builtin::Srgb.profile().to_bytes().to_vec(); + assert!(preview_profile(&adobe, Some(srgb_icc.as_slice())).unwrap().is_none()); + let p3_icc = Builtin::DisplayP3.profile().to_bytes().to_vec(); + assert!(preview_profile(&srgb, Some(p3_icc.as_slice())).unwrap().unwrap().same_colors(Builtin::DisplayP3.profile())); + assert!(preview_profile(&adobe, Some(b"not an ICC profile")).is_err()); + } } diff --git a/crates/raw/src/lib.rs b/crates/raw/src/lib.rs index b9f4f1c6..9a702f2d 100644 --- a/crates/raw/src/lib.rs +++ b/crates/raw/src/lib.rs @@ -74,7 +74,7 @@ pub use crate::develop::{DevelopOptions, Developed, RawInfo, WhiteBalance, devel pub use crate::error::RawError; pub use crate::look::{CameraLook, LookRejected, PROXY_EDGE, Reference, ToneCurve, fit_look}; pub use crate::opcodes::GainMap; -pub use crate::preview::{Preview, embedded_preview, embedded_previews}; +pub use crate::preview::{Preview, PreviewColorSpace, embedded_preview, embedded_preview_color_space, embedded_previews}; pub use crate::sensor::{BlackLevels, Cfa, Rect, Sensor}; use crate::tiff::{Tiff, tag}; diff --git a/crates/raw/src/preview.rs b/crates/raw/src/preview.rs index 40077060..ec0c041f 100644 --- a/crates/raw/src/preview.rs +++ b/crates/raw/src/preview.rs @@ -97,3 +97,72 @@ pub fn embedded_previews(bytes: &[u8]) -> Vec> { }); found } + +/// The colour space a raw file states for its embedded previews, which carry no ICC profile of their own. +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum PreviewColorSpace { + Srgb, + AdobeRgb, +} + +/// The colour space the raw's EXIF gives for the camera's JPEG rendering, for a preview that declares none itself: +/// ColorSpace (0xA001) 1 = sRGB, or Uncalibrated (0xFFFF) with the Interoperability IFD's InteropIndex "R03", the +/// DCF option file for Adobe RGB (as a Sony body set to Adobe RGB writes; Exif and DCF specifications). `None` when +/// the file doesn't say, and for a DNG, whose EXIF describes the original capture while its previews are the +/// converter's. A preview's own ICC profile takes precedence over this. +pub fn embedded_preview_color_space(bytes: &[u8]) -> Option { + let t = Tiff::new(bytes)?; + let ifd0 = t.ifd_at(t.first_ifd, 0)?; + if ifd0.has(tag::DNG_VERSION) { + return None; + } + let exif = t.ifd_at(t.tag_uint(&ifd0, tag::EXIF_IFD)? as usize, 0)?; + match t.tag_uint(&exif, tag::COLOR_SPACE)? { + 1 => Some(PreviewColorSpace::Srgb), + 0xFFFF => { + let interop = t.ifd_at(t.tag_uint(&exif, tag::INTEROP_IFD)? as usize, 0)?; + t.raw(interop.get(tag::INTEROP_INDEX)?)?.starts_with(b"R03").then_some(PreviewColorSpace::AdobeRgb) + } + _ => None, + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::testgen::{TiffBuilder, Val}; + + /// A raw-like TIFF whose EXIF IFD has `color_space` and, when given, an Interoperability IFD with `index`. + fn raw_with(color_space: Option, index: Option<&str>, dng: bool) -> Vec { + let mut t = TiffBuilder::default(); + let mut exif = Vec::new(); + if let Some(cs) = color_space { + exif.push((tag::COLOR_SPACE, Val::Short(vec![cs]))); + } + if let Some(index) = index { + let interop = t.ifd(vec![(tag::INTEROP_INDEX, Val::Ascii(index.into()))]); + exif.push((tag::INTEROP_IFD, Val::Ifds(vec![interop]))); + } + let exif = t.ifd(exif); + let mut ifd0 = vec![(tag::MAKE, Val::Ascii("SONY".into())), (tag::EXIF_IFD, Val::Ifds(vec![exif]))]; + if dng { + ifd0.push((tag::DNG_VERSION, Val::Byte(vec![1, 6, 0, 0]))); + } + t.chain = vec![t.ifd(ifd0)]; + t.build() + } + + #[test] + fn exif_colour_space_of_the_previews() { + assert_eq!(embedded_preview_color_space(&raw_with(Some(1), Some("R98"), false)), Some(PreviewColorSpace::Srgb)); + assert_eq!(embedded_preview_color_space(&raw_with(Some(0xFFFF), Some("R03"), false)), Some(PreviewColorSpace::AdobeRgb)); + for (cs, index) in [(Some(0xFFFF), Some("R98")), (Some(0xFFFF), None), (Some(2), Some("R03")), (None, Some("R03"))] { + assert_eq!(embedded_preview_color_space(&raw_with(cs, index, false)), None, "{cs:?} {index:?}"); + } + // a DNG's previews are the converter's, whatever the capture was + assert_eq!(embedded_preview_color_space(&raw_with(Some(0xFFFF), Some("R03"), true)), None); + for junk in [&b""[..], b"II*\0", b"II*\0\x08\0\0\0\xff\xff", b"not a tiff at all"] { + assert_eq!(embedded_preview_color_space(junk), None); + } + } +} diff --git a/crates/raw/src/tiff.rs b/crates/raw/src/tiff.rs index 17b9b8af..671ab11f 100644 --- a/crates/raw/src/tiff.rs +++ b/crates/raw/src/tiff.rs @@ -36,6 +36,10 @@ pub(crate) mod tag { pub const EXIF_IFD: u16 = 34665; pub const EXIF_CFA_PATTERN: u16 = 41730; pub const MAKER_NOTE: u16 = 37500; + pub const COLOR_SPACE: u16 = 40961; + pub const INTEROP_IFD: u16 = 40965; + /// In the Interoperability IFD. + pub const INTEROP_INDEX: u16 = 1; pub const DNG_VERSION: u16 = 50706; pub const UNIQUE_CAMERA_MODEL: u16 = 50708; pub const CFA_PLANE_COLOR: u16 = 50710; diff --git a/crates/raw/tests/hostile.rs b/crates/raw/tests/hostile.rs index dabe9ffe..4b91f2f1 100644 --- a/crates/raw/tests/hostile.rs +++ b/crates/raw/tests/hostile.rs @@ -88,6 +88,7 @@ fn exercise(b: &[u8]) { let _ = identify(b); let _ = embedded_preview(b); let _ = embedded_previews(b); + let _ = embedded_preview_color_space(b); let opts = DevelopOptions { limits: Limits { max_alloc: 64 << 20, ..Limits::default() }, ..Default::default() }; if let Ok(s) = decode(b, &opts.limits) { for m in [Demosaic::Bilinear, Demosaic::Ahd] { From e35671ffa9d99b107aa471f75c875619c6e54fba Mon Sep 17 00:00:00 2001 From: Unemars <62496697+Unemars@users.noreply.github.com> Date: Mon, 12 Oct 2026 13:48:55 +0200 Subject: [PATCH 47/92] Shadows/Highlights: Photoshop's, measured (#3765) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Image › Adjustments › Shadows/Highlights follows Photoshop 25.4, measured as a black box: per-channel screen curves (1 - (1 - v)^q blended over q = 1, 2, 4, 8), the Tone mask as a Beta distribution function of an 8-bit neighbourhood brightness, an edge-aware (guided bilateral) neighbourhood, the luma of the result with the colour differences scaled by Color, and the Midtone S-curve. Co-authored-by: Claude Opus 5.5 (1M context) --- crates/algo/src/tone.rs | 131 +------ crates/algo/src/tone/shadows_highlights.rs | 423 +++++++++++++++++++++ 2 files changed, 427 insertions(+), 127 deletions(-) create mode 100644 crates/algo/src/tone/shadows_highlights.rs diff --git a/crates/algo/src/tone.rs b/crates/algo/src/tone.rs index 2050d813..8592b3dd 100644 --- a/crates/algo/src/tone.rs +++ b/crates/algo/src/tone.rs @@ -4,7 +4,8 @@ //! All work on straight (non-premultiplied) RGBA buffers in 0..=1, row-major `w × h`, so callers //! convert any colour model / bit depth to RGBA first (as `Image › Adjustments` does for the //! per-pixel adjustments). Formulas are documented approximations of Photoshop's behaviour, -//! derived from its manual and observation, not from its implementation. +//! derived from its manual and observation, not from its implementation; Shadows/Highlights is +//! measured on Photoshop (see [`shadows_highlights`]). use photocraft_color::convert::{lab_to_srgb, srgb_to_lab}; use serde::{Deserialize, Serialize}; @@ -17,18 +18,6 @@ fn luma(c: [f32; 3]) -> f32 { 0.299 * c[0] + 0.587 * c[1] + 0.114 * c[2] } -fn smoothstep(e0: f32, e1: f32, x: f32) -> f32 { - let t = ((x - e0) / (e1 - e0)).clamp(0.0, 1.0); - t * t * (3.0 - 2.0 * t) -} - -/// Blurred luminance (Gaussian, `radius` px ≈ 2σ like Photoshop's radius fields). -fn blurred_luma(px: &[[f32; 4]], w: usize, h: usize, radius: f32) -> Vec { - let mut l: Vec = px.iter().map(|p| luma([p[0], p[1], p[2]])).collect(); - gauss_blur_n(&mut l, w, h, 1, radius.max(0.0) / 2.0); - l -} - /// Image › Adjustments › Shadows/Highlights parameters (Photoshop's dialog, percentages as 0..=100). #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] pub struct ShadowsHighlights { @@ -64,95 +53,8 @@ impl Default for ShadowsHighlights { } } -/// Local tone mapping: a blurred-luminance mask selects shadows (dark neighbourhoods, up to the -/// tonal width) and highlights; shadows are lifted and highlights pulled down by a gain that -/// preserves hue, then saturation is corrected where the gain moved tones, midtone contrast is -/// applied, and the result is stretched by the clip percentages. -pub fn shadows_highlights(px: &mut [[f32; 4]], w: usize, h: usize, p: &ShadowsHighlights) { - if px.is_empty() { - return; - } - let ls = blurred_luma(px, w, h, p.shadow_radius); - let lh = if (p.highlight_radius - p.shadow_radius).abs() < 1e-3 { ls.clone() } else { blurred_luma(px, w, h, p.highlight_radius) }; - let (sa, ha) = (p.shadow_amount / 100.0, p.highlight_amount / 100.0); - let (st, ht) = ((p.shadow_tone / 100.0).max(0.01), (p.highlight_tone / 100.0).max(0.01)); - let color = p.color / 100.0; - let mid = p.midtone / 100.0; - par_rows(px, w, 1, |y, pxrow| { - for (x, q) in pxrow.iter_mut().enumerate() { - let i = y * w + x; - if q[3] <= 0.0 { - continue; - } - let c = [q[0], q[1], q[2]]; - // Mask weights: 1 in deep shadows (resp. bright highlights), fading out at the tonal width. - let ms = 1.0 - smoothstep(0.0, st, ls[i]); - let mh = smoothstep(1.0 - ht, 1.0, lh[i]); - let mut out = c; - if sa > 0.0 && ms > 0.0 { - // Lift: a gamma-like curve on the pixel, stronger for darker neighbourhoods. - let g = 1.0 / (1.0 + 2.0 * sa * ms); - out = out.map(|v| v.max(0.0).powf(g)); - } - if ha > 0.0 && mh > 0.0 { - let g = 1.0 / (1.0 + 2.0 * ha * mh); - out = out.map(|v| 1.0 - (1.0 - v.min(1.0)).powf(g)); - } - if mid != 0.0 { - let k = 1.0 + mid * (1.0 - ms - mh).clamp(0.0, 1.0); - out = out.map(|v| (v - 0.5) * k + 0.5); - } - let changed = (ms * sa + mh * ha).min(1.0); - if color != 0.0 && changed > 0.0 { - let l1 = luma(out); - let s = 1.0 + color * changed; - out = out.map(|v| l1 + (v - l1) * s); - } - q[0] = out[0].clamp(0.0, 1.0); - q[1] = out[1].clamp(0.0, 1.0); - q[2] = out[2].clamp(0.0, 1.0); - } - }); - clip_stretch(px, p.black_clip, p.white_clip); -} - -/// Stretches levels so `black`% of pixels clip to 0 and `white`% to 1 (luminance histogram). -fn clip_stretch(px: &mut [[f32; 4]], black: f32, white: f32) { - if black <= 0.0 && white <= 0.0 { - return; - } - let mut hist = [0u32; 1024]; - let mut n = 0u32; - for q in px.iter().filter(|q| q[3] > 0.0) { - hist[((luma([q[0], q[1], q[2]]).clamp(0.0, 1.0)) * 1023.0).round() as usize] += 1; - n += 1; - } - if n == 0 { - return; - } - let find = |pct: f32, rev: bool| -> f32 { - let target = (pct.clamp(0.0, 50.0) / 100.0 * n as f32) as u32; - let mut acc = 0; - for k in 0..1024 { - let i = if rev { 1023 - k } else { k }; - acc += hist[i]; - if acc > target { - return i as f32 / 1023.0; - } - } - if rev { 0.0 } else { 1.0 } - }; - let lo = find(black, false); - let hi = find(white, true); - if hi - lo < 1e-3 { - return; - } - for q in px.iter_mut().filter(|q| q[3] > 0.0) { - for v in &mut q[..3] { - *v = ((*v - lo) / (hi - lo)).clamp(0.0, 1.0); - } - } -} +mod shadows_highlights; +pub use shadows_highlights::shadows_highlights; /// Image › Adjustments › Replace Color: Color Range-style selection (fuzziness in 0..=200 levels) /// around `color`, then a hue (±180°), saturation and lightness (±100) shift weighted by it. @@ -378,31 +280,6 @@ mod tests { .collect() } - #[test] - fn shadows_lift_dark_pixels_more_than_bright() { - let mut px = ramp(32, 8); - let orig = px.clone(); - shadows_highlights(&mut px, 32, 8, &ShadowsHighlights { black_clip: 0.0, white_clip: 0.0, ..Default::default() }); - let gain = |i: usize| luma([px[i][0], px[i][1], px[i][2]]) - luma([orig[i][0], orig[i][1], orig[i][2]]); - assert!(gain(3) > 0.02, "{}", gain(3)); - assert!(gain(3) > gain(30), "{} {}", gain(3), gain(30)); - // Zero amounts and no clipping: identity. - let mut px2 = orig.clone(); - let id = ShadowsHighlights { shadow_amount: 0.0, highlight_amount: 0.0, color: 0.0, black_clip: 0.0, white_clip: 0.0, ..Default::default() }; - shadows_highlights(&mut px2, 32, 8, &id); - assert_eq!(px2, orig); - } - - #[test] - fn highlights_darken_bright_pixels() { - let mut px = ramp(32, 8); - let orig = px.clone(); - let p = ShadowsHighlights { shadow_amount: 0.0, highlight_amount: 80.0, black_clip: 0.0, white_clip: 0.0, ..Default::default() }; - shadows_highlights(&mut px, 32, 8, &p); - assert!(px[30][0] < orig[30][0]); - assert!((px[1][0] - orig[1][0]).abs() < 1e-6); - } - #[test] fn replace_color_only_touches_matching_pixels() { let mut px = vec![[1.0, 0.0, 0.0, 1.0], [0.0, 0.0, 1.0, 1.0]]; diff --git a/crates/algo/src/tone/shadows_highlights.rs b/crates/algo/src/tone/shadows_highlights.rs new file mode 100644 index 00000000..0b5feaee --- /dev/null +++ b/crates/algo/src/tone/shadows_highlights.rs @@ -0,0 +1,423 @@ +//! Image › Adjustments › Shadows/Highlights, as Photoshop 25.4 does it. +//! +//! Measured on Photoshop as a black box (synthetic 16-bit images through the adjustment, results +//! read back exactly); no Photoshop code was read. The pieces: +//! +//! - **Neighbourhood brightness.** Per pixel, the mean of its brightest channel and its Rec. 601 +//! luma. Its neighbourhood value is an edge-aware average: a Gaussian of σ = 1.14 · Radius whose +//! weights fall linearly with the difference from the pixel's own (lightly blurred) brightness, +//! so pixels across a strong edge count less and halos stay small. It is quantised to 8 bits. +//! - **Tonal mask.** Tone sets which neighbourhoods are treated: shadows take the complement of a +//! Beta distribution function of the neighbourhood brightness, from Beta(1.95, 23) at Tone 0 to +//! 1 − L at Tone 95 and over; highlights take the same of 1 − L. +//! - **Curve.** Amount sets a curve that screens the image with itself: 1 − (1 − v)^q, blended +//! between q = 1, 2, 4 and 8 by a strength s = 3 at 100, 2 at 50 and 1 near 15. Shadows lift each +//! channel by mask × (curve − v); highlights darken with the mirrored curve. +//! - **Colour.** Only the luma of that result is kept: the pixel's own colour differences are +//! added back, scaled by the Color slider (by exp(h · ΔY / max Y) for positive values, by +//! 1 + h · ΔY / max Y for negative ones) and shortened where they would leave the gamut. +//! - **Midtone** is a global S-curve on the luma, k · (Y − ½) · (4Y(1 − Y))^p. + +use crate::fxutil::gauss_blur_n; +use crate::photo_util::par_rows; + +use super::ShadowsHighlights; + +const W: [f32; 3] = [0.299, 0.587, 0.114]; + +fn luma(c: [f32; 3]) -> f32 { + W[0] * c[0] + W[1] * c[1] + W[2] * c[2] +} + +/// Neighbourhood σ per pixel of Radius. +const SPATIAL: f32 = 1.1424; +/// σ of the blur of the pixel's own brightness the edge weights compare with. +const GUIDE: f32 = 1.3559; +/// Brightness difference at which a neighbour's weight reaches zero. +const RANGE: f32 = 1.0152; +/// Brightness levels of the piecewise-linear edge-aware average. +const LEVELS: usize = 17; + +/// Edge-aware neighbourhood brightness of `lum` (`w × h`) for Photoshop's Radius. +fn neighbourhood(lum: &[f32], w: usize, h: usize, radius: f32) -> Vec { + let mut guide = lum.to_vec(); + gauss_blur_n(&mut guide, w, h, 1, GUIDE); + let sigma = SPATIAL * radius; + if sigma < 0.3 { + return guide; + } + // The average at each of a few brightness levels, interpolated at the pixel's own level + // (Durand and Dorsey, "Fast bilateral filtering", 2002). The averages are smooth, so they are + // taken on a grid `d` times coarser, with σ ≥ 4 cells there. + let d = ((sigma / 4.0).floor() as usize).max(1); + let (rw, rh) = (w.div_ceil(d), h.div_ceil(d)); + let cells = rw * rh; + let step = 1.0 / (LEVELS - 1) as f32; + let mut avg = vec![0.0f32; LEVELS * cells]; + let mut buf = vec![0.0f32; 2 * cells]; + for (k, out) in avg.chunks_exact_mut(cells).enumerate() { + let g = k as f32 * step; + buf.fill(0.0); + for (i, &l) in lum.iter().enumerate() { + let wgt = (1.0 - (l - g).abs() / RANGE).max(0.0); + let c = 2 * ((i / w) / d * rw + (i % w) / d); + buf[c] += wgt * l; + buf[c + 1] += wgt; + } + gauss_blur_n(&mut buf, rw, rh, 2, sigma / d as f32); + for (o, b) in out.iter_mut().zip(buf.as_chunks::<2>().0) { + *o = if b[1] > 1e-6 { b[0] / b[1] } else { g }; + } + } + let mut out = vec![0.0f32; lum.len()]; + par_rows(&mut out, w, 1, |y, row| { + let fy = ((y as f32 + 0.5) / d as f32 - 0.5).clamp(0.0, (rh - 1) as f32); + let (y0, ty) = (fy.floor() as usize, fy.fract()); + let y1 = (y0 + 1).min(rh - 1); + for (x, o) in row.iter_mut().enumerate() { + let fx = ((x as f32 + 0.5) / d as f32 - 0.5).clamp(0.0, (rw - 1) as f32); + let (x0, tx) = (fx.floor() as usize, fx.fract()); + let x1 = (x0 + 1).min(rw - 1); + let at = |k: usize| { + let a = &avg[k * cells..(k + 1) * cells]; + let top = a[y0 * rw + x0] + (a[y0 * rw + x1] - a[y0 * rw + x0]) * tx; + let bot = a[y1 * rw + x0] + (a[y1 * rw + x1] - a[y1 * rw + x0]) * tx; + top + (bot - top) * ty + }; + let t = (guide[y * w + x].clamp(0.0, 1.0) / step).min((LEVELS - 1) as f32 - 1e-4); + let k = t.floor() as usize; + let f = t - k as f32; + *o = at(k) * (1.0 - f) + at(k + 1) * f; + } + }); + out +} + +/// Beta(α, β) parameters of the tonal mask for Tone 0, 5, …, 95 (fitted to Photoshop's masks +/// within 2/255). +const MASK_BETA: [(f32, f32); 20] = [ + (1.9468, 22.9366), + (1.7770, 18.3471), + (1.6403, 14.7559), + (1.5270, 11.9346), + (1.4269, 9.6467), + (1.3470, 7.8430), + (1.2807, 6.4038), + (1.2240, 5.2384), + (1.1772, 4.2967), + (1.1373, 3.5350), + (1.1021, 2.9109), + (1.0755, 2.4186), + (1.0508, 2.0189), + (1.0307, 1.7034), + (1.0140, 1.4583), + (1.0015, 1.2758), + (1.0, 1.1403), + (1.0, 1.0510), + (1.0, 1.0002), + (1.0, 1.0), +]; + +/// The tonal mask for `tone` (0..=100) at the 256 neighbourhood levels: 1 − I_L(α, β). +fn tonal_mask(tone: f32) -> [f32; 256] { + let t = (tone.clamp(0.0, 95.0)) / 5.0; + let i = (t.floor() as usize).min(MASK_BETA.len() - 2); + let f = t - i as f32; + let (a0, b0) = MASK_BETA[i]; + let (a1, b1) = MASK_BETA[i + 1]; + let (a, b) = ((a0 + (a1 - a0) * f) as f64, (b0 + (b1 - b0) * f) as f64); + // Midpoint sums of the Beta density, 16 per level. + const SUB: usize = 16; + let n = 255 * SUB; + let dens = |x: f64| ((a - 1.0) * x.ln() + (b - 1.0) * (1.0 - x).ln()).exp(); + let mut cum = vec![0.0f64; 256]; + let mut acc = 0.0; + for j in 0..n { + acc += dens((j as f64 + 0.5) / n as f64); + if (j + 1) % SUB == 0 { + cum[(j + 1) / SUB] = acc; + } + } + let total = acc.max(f64::MIN_POSITIVE); + std::array::from_fn(|k| (1.0 - cum[k] / total) as f32) +} + +/// Curve strength for Amount `a` (0..=100): 0 at 0, 1 near 15, 2 at 50, 3 at 100. +fn strength(a: f32) -> f32 { + let u = (a.clamp(0.0, 100.0) / 100.0).powf(0.6216); + if u <= 0.3 { u / 0.3 } else { (1.0 + 20.0 * u) / 7.0 } +} + +/// The full-strength curve of strength `s`: 1 − (1 − v)^q between q = 2^⌊s⌋ and 2^(⌊s⌋+1). +fn lift(s: f32, v: f32) -> f32 { + let n = (s.floor() as i32).clamp(0, 2); + let t = (s - n as f32).clamp(0.0, 1.0); + let c = (1.0 - v).clamp(0.0, 1.0); + let lo = c.powi(1 << n); + let hi = lo * lo; + 1.0 - ((1.0 - t) * lo + t * hi) +} + +/// Linear interpolation in a table of `(x, y)` sorted by `x`. +fn interp(table: &[(f32, f32)], x: f32) -> f32 { + let Some(&(x0, y0)) = table.first() else { return 0.0 }; + if x <= x0 { + return y0; + } + for p in table.windows(2) { + let ((xa, ya), (xb, yb)) = (p[0], p[1]); + if x <= xb { + return ya + (yb - ya) * (x - xa) / (xb - xa); + } + } + table.last().map_or(0.0, |p| p.1) +} + +/// Color: the h of the colour-difference gain for positive values (exp(h · F))… +const COLOR_UP: [(f32, f32); 12] = [ + (0.0, 0.0), + (1.0, 0.1566), + (2.0, 0.2271), + (5.0, 0.3776), + (10.0, 0.5653), + (20.0, 0.8669), + (30.0, 1.1299), + (40.0, 1.3748), + (50.0, 1.6093), + (60.0, 1.8375), + (75.0, 2.1721), + (100.0, 2.7193), +]; +/// … and for negative values (1 + h · F), by −Color. +const COLOR_DOWN: [(f32, f32); 9] = + [(0.0, 0.0), (1.0, -0.0145), (5.0, -0.0709), (10.0, -0.1373), (20.0, -0.2570), (30.0, -0.3612), (50.0, -0.5312), (75.0, -0.6866), (100.0, -0.7968)]; + +/// Midtone: (value, k, p) of k · (Y − ½) · (4Y(1 − Y))^p. +const MIDTONE: [(f32, f32, f32); 11] = [ + (-100.0, -0.6955, 2.267), + (-75.0, -0.5873, 2.362), + (-50.0, -0.4429, 2.492), + (-25.0, -0.2514, 2.667), + (-10.0, -0.1088, 2.803), + (0.0, 0.0, 2.9), + (10.0, 0.1206, 3.016), + (25.0, 0.3262, 3.216), + (50.0, 0.7423, 3.625), + (75.0, 1.2635, 4.160), + (100.0, 1.9032, 4.850), +]; + +fn midtone(m: f32, y: f32) -> f32 { + if m == 0.0 { + return y; + } + let ks: Vec<(f32, f32)> = MIDTONE.iter().map(|r| (r.0, r.1)).collect(); + let ps: Vec<(f32, f32)> = MIDTONE.iter().map(|r| (r.0, r.2)).collect(); + let (k, p) = (interp(&ks, m), interp(&ps, m)); + (y + k * (y - 0.5) * (4.0 * y * (1.0 - y)).max(0.0).powf(p)).clamp(0.0, 1.0) +} + +fn level(v: f32) -> usize { + (v.clamp(0.0, 1.0) * 255.0).round() as usize +} + +/// Image › Adjustments › Shadows/Highlights on straight RGBA `w × h`. +pub fn shadows_highlights(px: &mut [[f32; 4]], w: usize, h: usize, p: &ShadowsHighlights) { + if px.is_empty() || px.len() != w * h { + return; + } + let (sa, ha) = (p.shadow_amount, p.highlight_amount); + let lum: Vec = px.iter().map(|q| (q[0].max(q[1]).max(q[2]) + luma([q[0], q[1], q[2]])) / 2.0).collect(); + let ls = (sa > 0.0).then(|| neighbourhood(&lum, w, h, p.shadow_radius)); + let lh = (ha > 0.0).then(|| match &ls { + Some(l) if (p.highlight_radius - p.shadow_radius).abs() < 1e-3 => l.clone(), + _ => neighbourhood(&lum, w, h, p.highlight_radius), + }); + let (ms, mh) = (tonal_mask(p.shadow_tone), tonal_mask(p.highlight_tone)); + let (ss, hs) = (strength(sa), strength(ha)); + // The new luma of every pixel. + let mut y2 = vec![0.0f32; px.len()]; + par_rows(&mut y2, w, 1, |y, row| { + for (x, out) in row.iter_mut().enumerate() { + let i = y * w + x; + let q = px[i]; + let mut adj = [q[0], q[1], q[2]]; + if let Some(l) = &ls { + let m = ms[level(l[i])]; + for v in &mut adj { + *v += m * (lift(ss, *v) - *v); + } + } + if let Some(l) = &lh { + let m = mh[255 - level(l[i])]; + for (v, &o) in adj.iter_mut().zip(&q[..3]) { + *v -= m * (lift(hs, 1.0 - o) - (1.0 - o)); + } + } + *out = midtone(p.midtone, luma(adj).clamp(0.0, 1.0)); + } + }); + clip_levels(&mut y2, px, p.black_clip, p.white_clip); + let gain = |f: f32| { + if p.color >= 0.0 { (interp(&COLOR_UP, p.color) * f).exp() } else { 1.0 + interp(&COLOR_DOWN, -p.color) * f } + }; + par_rows(px, w, 1, |y, row| { + for (x, q) in row.iter_mut().enumerate() { + if q[3] <= 0.0 { + continue; + } + let y1 = luma([q[0], q[1], q[2]]); + let yn = y2[y * w + x]; + let f = (yn - y1).abs() / yn.max(y1).max(1e-6); + let g = gain(f); + let d = [(q[0] - y1) * g, (q[1] - y1) * g, (q[2] - y1) * g]; + // Shorten the colour difference where it would leave 0..=1. + let mut k = 1.0f32; + for v in d { + if v > 1e-9 { + k = k.min((1.0 - yn) / v); + } else if v < -1e-9 { + k = k.min(yn / -v); + } + } + let k = k.clamp(0.0, 1.0); + for c in 0..3 { + q[c] = (yn + k * d[c]).clamp(0.0, 1.0); + } + } + }); +} + +/// Black and White Clip: stretches the new luma so `black`% of pixels reach 0 and `white`% reach 1. +fn clip_levels(y2: &mut [f32], px: &[[f32; 4]], black: f32, white: f32) { + if black <= 0.0 && white <= 0.0 { + return; + } + let mut hist = vec![0u32; 4096]; + let mut n = 0u32; + for (&y, q) in y2.iter().zip(px) { + if q[3] > 0.0 { + hist[(y.clamp(0.0, 1.0) * 4095.0).round() as usize] += 1; + n += 1; + } + } + if n == 0 { + return; + } + let find = |pct: f32, rev: bool| -> f32 { + let target = (pct.clamp(0.0, 50.0) / 100.0 * n as f32) as u32; + let mut acc = 0; + for k in 0..4096 { + let i = if rev { 4095 - k } else { k }; + acc += hist[i]; + if acc > target { + return i as f32 / 4095.0; + } + } + if rev { 0.0 } else { 1.0 } + }; + let (lo, hi) = (if black > 0.0 { find(black, false) } else { 0.0 }, if white > 0.0 { find(white, true) } else { 1.0 }); + if hi - lo < 1e-3 { + return; + } + for y in y2.iter_mut() { + *y = ((*y - lo) / (hi - lo)).clamp(0.0, 1.0); + } +} + +#[cfg(test)] +mod tests { + use super::*; + + /// A flat `w × h` grey or colour image with one different pixel in the middle; returns that + /// pixel after Shadows/Highlights. + fn probe(bg: [f32; 3], px: [f32; 3], p: &ShadowsHighlights) -> [f32; 3] { + let (w, h) = (121, 121); + let mut img = vec![[bg[0], bg[1], bg[2], 1.0]; w * h]; + img[60 * w + 60] = [px[0], px[1], px[2], 1.0]; + shadows_highlights(&mut img, w, h, p); + let q = img[60 * w + 60]; + [q[0], q[1], q[2]] + } + + fn levels(v: [i32; 3]) -> [f32; 3] { + v.map(|c| c as f32 / 32768.0) + } + + fn off(a: [f32; 3], b: [f32; 3]) -> f32 { + a.iter().zip(b).map(|(x, y)| (x - y).abs() * 255.0).fold(0.0, f32::max) + } + + /// Photoshop 25.4's results (16-bit levels of 32768) for grey pixels lifted by the default + /// Shadows (35 %, Tone 50 %, Radius 30 px; Color 0), in black surroundings and in grey 0.5. + #[test] + fn grey_matches_photoshop() { + let p = ShadowsHighlights { color: 0.0, black_clip: 0.0, white_clip: 0.0, ..Default::default() }; + for (bg, want) in [(0.0, [11389, 19422, 28451, 31931]), (0.5, [5211, 9909, 18229, 25700])] { + for (v, w) in [0.125f32, 0.25, 0.5, 0.749969].into_iter().zip(want) { + let got = probe([bg; 3], [v; 3], &p); + assert!(off(got, levels([w; 3])) < 2.0, "bg {bg} v {v}: {} vs {}", got[0] * 32768.0, w); + } + } + } + + /// Colour pixels keep their colour differences, scaled by Color (+20 here; Amount 35 %, + /// Radius 10 px), in black, 0.15 and 0.3 grey surroundings: Photoshop's results. + #[test] + fn colour_matches_photoshop() { + let p = ShadowsHighlights { shadow_radius: 10.0, black_clip: 0.0, white_clip: 0.0, ..Default::default() }; + for (bg, px, want) in [ + (0.0, [3277, 1638, 0], [8235, 5202, 2170]), + (0.0, [8192, 6554, 4915], [19350, 16514, 13676]), + (4915.0 / 32768.0, [4915, 3277, 1638], [10124, 7424, 4723]), + (9830.0 / 32768.0, [11469, 9830, 8192], [16540, 14376, 12214]), + ] { + let got = probe([bg; 3], levels(px), &p); + assert!(off(got, levels(want)) < 2.0, "{px:?} on {bg}: {:?} vs {want:?}", got.map(|c| (c * 32768.0).round())); + } + } + + /// Across a strong edge the neighbourhood barely leaks (Amount 100 %, Tone 100 %, Radius + /// 10 px; 0.1 | 0.9): Photoshop's results 8, 2 and 1 pixels either side. + #[test] + fn edge_matches_photoshop() { + let (w, h) = (200, 24); + let (a, b) = (3277.0 / 32768.0, 29491.0 / 32768.0); + let mut img: Vec<[f32; 4]> = (0..w * h).map(|i| if i % w < 100 { [a, a, a, 1.0] } else { [b, b, b, 1.0] }).collect(); + let p = ShadowsHighlights { + shadow_amount: 100.0, + shadow_tone: 100.0, + shadow_radius: 10.0, + color: 0.0, + black_clip: 0.0, + white_clip: 0.0, + ..Default::default() + }; + shadows_highlights(&mut img, w, h, &p); + let row = &img[12 * w..13 * w]; + for (x, want) in [(92, 16370), (98, 14439), (99, 12146), (100, 30891), (101, 30403), (102, 30146), (108, 29979)] { + let got = row[x][0] * 32768.0; + assert!((got - want as f32).abs() / 32768.0 * 255.0 < 6.0, "x {x}: {got} vs {want}"); + } + } + + #[test] + fn strength_and_curve_follow_photoshop() { + assert!((strength(50.0) - 2.0).abs() < 2e-3 && (strength(100.0) - 3.0).abs() < 1e-4); + assert!((strength(15.0) - 1.02).abs() < 0.01 && (strength(1.0) - 0.19).abs() < 0.01); + // Amount 50 is the image screened with itself twice: 1 − (1 − v)^4. + for v in [0.1f32, 0.3, 0.6] { + assert!((lift(2.0, v) - (1.0 - (1.0 - v).powi(4))).abs() < 1e-6); + } + } + + #[test] + fn tonal_mask_spans_photoshop_tones() { + let m95 = tonal_mask(95.0); + assert!((m95[128] - (1.0 - 128.0 / 255.0)).abs() < 1e-3, "{}", m95[128]); + assert_eq!(tonal_mask(100.0), m95); + // Tone 0 still reaches about 7 % into the levels (Photoshop: half at level 18). + let m0 = tonal_mask(0.0); + assert!(m0[0] > 0.999 && (m0[18] - 0.5).abs() < 0.03 && m0[60] < 0.02, "{} {}", m0[18], m0[60]); + } +} From 836fd52089f5de988accba94e929f288a7313438 Mon Sep 17 00:00:00 2001 From: MrCloudy2 <123890706+MrCloudy2@users.noreply.github.com> Date: Mon, 12 Oct 2026 13:49:05 +0200 Subject: [PATCH 48/92] fix(adjust): Black & White tints like the Color blend mode, as Photoshop does (#3780) Photoshop's Black & White tint keeps the grey's luminosity and takes the tint's hue and saturation (SetLum + ClipColor, luma 0.30/0.59/0.11), the same as the Color blend mode. PhotoCraft mixed half the grey with twice the grey times the tint, up to 141 levels off. Measured in Photoshop 27.11 on 9 cases (4 tint colours over a grey ramp and hue sweeps): all within 3 levels now. Corpus: photoshop adjustments/rgb8 and rgb16 black-white-tint go from 69 levels max / 77 % bad pixels to 1-3 / <=0.5 %. CPU and GPU paths. Co-authored-by: Claude Opus 5.5 --- crates/compose/src/adjust.rs | 29 ++++++++++++++++++++++++++++- crates/gpu/src/compose.wgsl | 2 +- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/crates/compose/src/adjust.rs b/crates/compose/src/adjust.rs index 357d8ac0..f4e6bede 100644 --- a/crates/compose/src/adjust.rs +++ b/crates/compose/src/adjust.rs @@ -188,7 +188,9 @@ pub fn apply_depth(adj: &Adjustment, buf: &mut Buffer, transfer: Transfer, depth Adjustment::BlackWhite { weights, tint } => map_rgb(buf, |c| { let g = black_white_gray(c, weights); match tint { - Some(t) => std::array::from_fn(|i| (g * t[i] * 2.0).clamp(0.0, 1.0) * 0.5 + g * 0.5), + // Photoshop tints like the Color blend mode: the tint's hue and saturation at the + // grey's luminosity (SetLum + ClipColor), measured in Photoshop 27.11. + Some(t) => photocraft_color::blend::set_lum(*t, g).map(|v| v.clamp(0.0, 1.0)), None => [g; 3], } }), @@ -1294,6 +1296,31 @@ mod tone_tests { assert!(black_white_gray([1.0, 0.0, 0.0], &w) > black_white_gray([1.0, 0.0, 0.0], &d)); } + /// Photoshop 27.11, measured: Black & White (default weights) with Tint over greys. The tint + /// is blended like the Color blend mode: its hue and saturation at the grey's luminosity. + #[test] + fn black_white_tint_matches_photoshop() { + let weights = [40.0, 60.0, 40.0, 60.0, 20.0, 80.0]; + let measured: [([u8; 3], u8, [u8; 3]); 6] = [ + ([255, 0, 0], 24, [81, 1, 1]), + ([255, 0, 0], 120, [255, 64, 64]), + ([255, 0, 0], 240, [255, 235, 235]), + ([0xe1, 0xd3, 0xb3], 120, [133, 119, 87]), + ([0xe1, 0xd3, 0xb3], 24, [33, 24, 1]), + ([0x40, 0x20, 0x10], 120, [144, 112, 96]), + ]; + for (tint, grey, want) in measured { + let tint = Some(tint.map(|v| v as f32 / 255.0)); + let mut b = Buffer { rect: Rect::new(0, 0, 1, 1), px: vec![[grey as f32 / 255.0; 4]] }; + b.px[0][3] = 1.0; + apply(&Adjustment::BlackWhite { weights, tint }, &mut b); + for (i, w) in want.iter().enumerate() { + let got = b.px[0][i] * 255.0; + assert!((got - *w as f32).abs() <= 2.5, "tint {tint:?} grey {grey} channel {i}: {got} vs {w}"); + } + } + } + #[test] fn gradient_map_dither_stays_close() { let stops = vec![(0.0, [0.0; 3]), (1.0, [1.0; 3])]; diff --git a/crates/gpu/src/compose.wgsl b/crates/gpu/src/compose.wgsl index 5a3a6fe5..790b2175 100644 --- a/crates/gpu/src/compose.wgsl +++ b/crates/gpu/src/compose.wgsl @@ -686,7 +686,7 @@ fn adjust(c: vec3) -> vec3 { if (c.b <= c.r && c.b <= c.g) { secondary = 1; } else if (c.r <= c.g) { secondary = 3; } let g = clamp(mn + (mid - mn) * w[secondary] / 100.0 + (mx - mid) * w[primary] / 100.0, 0.0, 1.0); if (p1.z > 0.5) { - return clamp(g * p2.rgb * 2.0, vec3(0.0), vec3(1.0)) * 0.5 + g * 0.5; + return clamp(set_lum(p2.rgb, g, 1.0), vec3(0.0), vec3(1.0)); // Color blend of the tint } return vec3(g); } From c5da1a0d5f2cc215d986d1b014bb250c96dacfd5 Mon Sep 17 00:00:00 2001 From: MrCloudy2 <123890706+MrCloudy2@users.noreply.github.com> Date: Mon, 12 Oct 2026 13:49:16 +0200 Subject: [PATCH 49/92] Hue/Saturation: Photoshop's saturation curve, lightness order and Colorize lightness (#3781) * fix(adjust): Hue/Saturation saturation, lightness order and Colorize as in Photoshop Measured in Photoshop 27.11: - Raising Saturation divides it by (1 - s): +50 doubles it. PhotoCraft multiplied by (1 + s), up to 26 levels off. - Master Lightness applies first; hue and saturation then work on the result. Fixes the corpus file adjustments/rgb8/hue-saturation (Hue +40, Saturation +25, Lightness -10): 17 levels / 11.8 % bad -> 2 / 0 %. - Colorize builds the colour at the lightened lightness, so black with Lightness +30 is a 30 % lightness colour, not grey (was 78 off). - A colour range's positive Lightness lightens towards the pixel's brightest channel, not towards white (Blues +50 was 71 off). All 18 Hue/Saturation probe cases are within 4 levels. Corpus: the Colorize files go to 1-3 levels (psd-tools huesaturation_colorize_rgb 120 -> 3). CPU and GPU paths. Co-Authored-By: Claude Opus 5.5 * fix(adjust): a range's negative Lightness darkens towards the darkest channel Measured in Photoshop 27.11 (Blues -50 / -100, Reds -50): (102, 128, 204) at Blues -50 becomes (102, 115, 154), towards the pixel's darkest channel, not towards black. Mirrors the positive rule (towards the brightest). Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 --- crates/compose/src/adjust.rs | 85 ++++++++++++++++++++++++++++++------ crates/gpu/src/compose.wgsl | 34 ++++++++++----- 2 files changed, 94 insertions(+), 25 deletions(-) diff --git a/crates/compose/src/adjust.rs b/crates/compose/src/adjust.rs index f4e6bede..a39f3307 100644 --- a/crates/compose/src/adjust.rs +++ b/crates/compose/src/adjust.rs @@ -163,7 +163,8 @@ pub fn apply_depth(adj: &Adjustment, buf: &mut Buffer, transfer: Transfer, depth } None => (0.0, 0.0, 0.0), }; - hue_saturation(c, *hue + dh, (*saturation / 100.0 + ds).clamp(-1.0, 1.0), (*lightness / 100.0 + dl).clamp(-1.0, 1.0), *colorize) + let out = hue_saturation(c, *hue + dh, (*saturation / 100.0 + ds).clamp(-1.0, 1.0), (*lightness / 100.0).clamp(-1.0, 1.0), *colorize); + range_lightness(out, dl) }) } Adjustment::Vibrance { vibrance, saturation } => { @@ -428,21 +429,32 @@ pub fn hue_range_tables(ranges: &[HueRange; 6]) -> [Vec; 3] { /// Colorize sets the hue and saturation instead of shifting them; at 0% it leaves only the /// lightness, as in Photoshop (#2326). Ticking Colorize in the dialog starts saturation at 25%. pub fn hue_saturation(c: [f32; 3], hue: f32, s: f32, l: f32, colorize: bool) -> [f32; 3] { - let (mut hh, mut ss, ll) = rgb_to_hsl(c); + let lighten = |v: f32| if l > 0.0 { v + (1.0 - v) * l } else { v * (1.0 + l) }; if colorize { - hh = hue.rem_euclid(360.0) / 360.0; - ss = s.abs().min(1.0); - } else { - hh = (hh + hue / 360.0).rem_euclid(1.0); - ss = (ss * (1.0 + s)).clamp(0.0, 1.0); + // Colorize builds the colour at the lightened (or darkened) lightness, so black with + // Lightness +30 becomes a 30 % lightness colour, not grey (measured in Photoshop 27.11). + let (_, _, ll) = rgb_to_hsl(c); + return hsl_to_rgb(hue.rem_euclid(360.0) / 360.0, s.abs().min(1.0), lighten(ll)); } - let mut rgb = hsl_to_rgb(hh, ss, ll); - if l > 0.0 { - rgb = rgb.map(|v| v + (1.0 - v) * l); - } else if l < 0.0 { - rgb = rgb.map(|v| v * (1.0 + l)); - } - rgb + // Photoshop applies Lightness first, then rotates the hue and scales the saturation of the + // result: Hue +40, Saturation +25, Lightness -10 turns (240, 160, 30) into (173, 243, 0), not + // (168, 230, 14) (Photoshop 27.11 corpus file adjustments/rgb8/hue-saturation). + let (hh, ss, ll) = rgb_to_hsl(c.map(lighten)); + let hh = (hh + hue / 360.0).rem_euclid(1.0); + // Raising saturation divides by 1 - s, lowering it multiplies by 1 + s: +50 % doubles it + // (measured in Photoshop 27.11); +100 % saturates any colour that has some. + let ss = if s > 0.0 { ss / (1.0 - s).max(1.0 / 512.0) } else { ss * (1.0 + s) }.clamp(0.0, 1.0); + hsl_to_rgb(hh, ss, ll) +} + +/// A colour range's Lightness, applied after the master edits. It moves each channel towards the +/// pixel's brightest channel when raised and towards its darkest when lowered, not towards white +/// or black: Blues +50 turns (0, 29, 115) into (57, 71, 115), Blues -50 turns (102, 128, 204) into +/// (102, 115, 153) (measured in Photoshop 27.11). +pub fn range_lightness(c: [f32; 3], l: f32) -> [f32; 3] { + let l = l.clamp(-1.0, 1.0); + let target = if l > 0.0 { c[0].max(c[1]).max(c[2]) } else { c[0].min(c[1]).min(c[2]) }; + c.map(|v| v + (target - v) * l.abs()) } /// Black & White grey value. Each colour is the sum of a grey part (its smallest channel), a @@ -1285,6 +1297,51 @@ mod tone_tests { } } + /// Photoshop 27.11, measured: Hue/Saturation raising saturation, and Colorize with Lightness. + #[test] + fn hue_saturation_matches_photoshop() { + // (input, hue, saturation, lightness, colorize, Photoshop's output) + type Case = ([u8; 3], f32, f32, f32, bool, [u8; 3]); + let measured: [Case; 8] = [ + ([204, 102, 102], 0.0, 50.0, 0.0, false, [254, 51, 51]), + ([204, 159, 102], 0.0, 50.0, 0.0, false, [254, 164, 51]), + ([204, 102, 102], 0.0, -50.0, 0.0, false, [178, 127, 127]), + ([0, 0, 0], 120.0, 100.0, 30.0, true, [0, 152, 0]), + ([28, 28, 28], 120.0, 100.0, 30.0, true, [0, 192, 0]), + ([160, 160, 160], 30.0, 25.0, -40.0, true, [120, 96, 73]), + ([252, 252, 252], 30.0, 25.0, -40.0, true, [177, 151, 126]), + ([255, 143, 0], 30.0, 25.0, -40.0, true, [95, 76, 58]), + ]; + for (input, hue, saturation, lightness, colorize, want) in measured { + let a = Adjustment::HueSaturation { hue, saturation, lightness, colorize, ranges: HueRange::defaults() }; + let c = input.map(|v| v as f32 / 255.0); + let mut b = Buffer { rect: Rect::new(0, 0, 1, 1), px: vec![[c[0], c[1], c[2], 1.0]] }; + apply(&a, &mut b); + for (i, w) in want.iter().enumerate() { + let got = b.px[0][i] * 255.0; + assert!((got - *w as f32).abs() <= 2.0, "{input:?} h{hue} s{saturation} l{lightness} colorize {colorize}, channel {i}: {got} vs {w}"); + } + } + } + + /// Photoshop 27.11, measured: a range's Lightness (Blues ±50) moves towards the brightest or darkest channel. + #[test] + fn range_lightness_matches_photoshop() { + let measured = [ + ([0u8, 29, 115], 0.5, [57u8, 71, 115]), + ([0, 64, 255], 0.5, [125, 157, 255]), + ([102, 128, 204], 0.5, [152, 165, 204]), + ([102, 128, 204], -0.5, [102, 115, 154]), + ([0, 18, 115], -0.5, [0, 9, 58]), + ]; + for (input, l, want) in measured { + let got = range_lightness(input.map(|v| v as f32 / 255.0), l); + for i in 0..3 { + assert!((got[i] * 255.0 - want[i] as f32).abs() <= 2.5, "{input:?} channel {i}: {} vs {}", got[i] * 255.0, want[i]); + } + } + } + #[test] fn black_white_weights() { let d = [40.0, 60.0, 40.0, 60.0, 20.0, 80.0]; diff --git a/crates/gpu/src/compose.wgsl b/crates/gpu/src/compose.wgsl index 790b2175..bf535b08 100644 --- a/crates/gpu/src/compose.wgsl +++ b/crates/gpu/src/compose.wgsl @@ -633,19 +633,31 @@ fn adjust(c: vec3) -> vec3 { dl = lut(2, hsl.x) * chroma; } let sat = clamp(p0.y + ds, -1.0, 1.0); - let light = clamp(p0.z + dl, -1.0, 1.0); + let light = clamp(p0.z, -1.0, 1.0); if (p0.w > 0.5) { - hh = rem_euclid(p0.x, 360.0) / 360.0; - ss = min(abs(sat), 1.0); - } else { - hh = rem_euclid(hsl.x + (p0.x + dh) / 360.0, 1.0); - ss = clamp(hsl.y * (1.0 + sat), 0.0, 1.0); + // compose::adjust::hue_saturation: Colorize at the lightened / darkened lightness. + var ll = hsl.z * (1.0 + light); + if (light > 0.0) { ll = hsl.z + (1.0 - hsl.z) * light; } + return hsl_to_rgb(rem_euclid(p0.x, 360.0) / 360.0, min(abs(sat), 1.0), ll); } - var rgb = hsl_to_rgb(hh, ss, hsl.z); - if (light > 0.0) { - rgb = rgb + (1.0 - rgb) * light; - } else if (light < 0.0) { - rgb = rgb * (1.0 + light); + // Lightness first, then hue and saturation of the result. + var lc = c * (1.0 + light); + if (light > 0.0) { lc = c + (1.0 - c) * light; } + let lh = rgb_to_hsl(lc); + hh = rem_euclid(lh.x + (p0.x + dh) / 360.0, 1.0); + // Raising saturation divides by 1 - s; lowering it multiplies by 1 + s. + if (sat > 0.0) { + ss = clamp(lh.y / max(1.0 - sat, 1.0 / 512.0), 0.0, 1.0); + } else { + ss = clamp(lh.y * (1.0 + sat), 0.0, 1.0); + } + var rgb = hsl_to_rgb(hh, ss, lh.z); + // compose::adjust::range_lightness: towards the brightest channel when raised, the darkest when lowered. + let rl = clamp(dl, -1.0, 1.0); + if (rl > 0.0) { + rgb = rgb + (vec3(max(rgb.r, max(rgb.g, rgb.b))) - rgb) * rl; + } else if (rl < 0.0) { + rgb = rgb + (vec3(min(rgb.r, min(rgb.g, rgb.b))) - rgb) * -rl; } return rgb; } From 2aa1f8d2c6a5cdf421b07409be1ac7518de34d2d Mon Sep 17 00:00:00 2001 From: Scott C Hughes <1591011+dottedt@users.noreply.github.com> Date: Mon, 12 Oct 2026 06:49:26 -0500 Subject: [PATCH 50/92] feat(engine): add history.undo and history.redo aliases (#3675) (#3786) A `history.*` namespace exists (history.deleteState, history.newDocument) but not history.undo, so a client or agent guessing `history.undo` gets a hard `unknown command`. Register history.undo and history.redo as aliases of edit.undo and edit.redo, with no menu entry and no shortcut; the Edit menu items keep Cmd+Z / Cmd+Shift+Z. Tests: cargo test -p photocraft-engine --lib history_cmds; cargo test -p photocraft-engine --test panic_hunt -- --ignored; cargo xtask parity. --- crates/engine/src/history_cmds.rs | 41 +++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/crates/engine/src/history_cmds.rs b/crates/engine/src/history_cmds.rs index bb9cb343..cc18df58 100644 --- a/crates/engine/src/history_cmds.rs +++ b/crates/engine/src/history_cmds.rs @@ -199,8 +199,39 @@ fn has_doc(s: &Session) -> std::result::Result<(), String> { s.active().map(|_| ()).ok_or_else(|| "no document open".into()) } +/// `history.undo` / `history.redo` enable predicates, matching `edit.undo` / `edit.redo`. +fn can_undo(s: &Session) -> std::result::Result<(), String> { + s.active().filter(|d| d.history.can_undo()).map(|_| ()).ok_or_else(|| "nothing to undo".into()) +} + +fn can_redo(s: &Session) -> std::result::Result<(), String> { + s.active().filter(|d| d.history.can_redo()).map(|_| ()).ok_or_else(|| "nothing to redo".into()) +} + pub fn specs() -> Vec { vec![ + // `history.*` aliases of Edit › Undo / Redo, so a client reaching for the History namespace + // finds them (`edit.undo` / `edit.redo` remain the menu items and own the shortcuts, #3675). + CommandSpec { + id: "history.undo", + label: "Undo", + menu: &[], + shortcut: None, + params: "{} (the same action as `edit.undo`)", + enabled: can_undo, + run: |s, _| Ok(json!(s.undo())), + journal: false, + }, + CommandSpec { + id: "history.redo", + label: "Redo", + menu: &[], + shortcut: None, + params: "{} (the same action as `edit.redo`)", + enabled: can_redo, + run: |s, _| Ok(json!(s.redo())), + journal: false, + }, CommandSpec { id: "history.deleteState", label: "Delete State", @@ -282,6 +313,16 @@ mod tests { s.active().unwrap().history.entries() } + #[test] + fn history_undo_and_redo_alias_edit_undo_and_redo() { + let mut s = session(); + let n = s.active().unwrap().history.past_len(); + s.execute("history.undo", json!({})).unwrap(); + assert_eq!(s.active().unwrap().history.past_len(), n - 1, "history.undo steps back like edit.undo"); + s.execute("history.redo", json!({})).unwrap(); + assert_eq!(s.active().unwrap().history.past_len(), n, "history.redo steps forward like edit.redo"); + } + #[test] fn delete_current_state_steps_back_and_drops_it() { let mut s = session(); From 6037ade5ed3e65b582179a1fe56eb165fd5ca56d Mon Sep 17 00:00:00 2001 From: jonathanwxh-cell Date: Mon, 12 Oct 2026 20:32:15 +0800 Subject: [PATCH 51/92] Fix straight-path anchor insertion at the hit position (#3856) Co-authored-by: jonathnwxh <258340642+jonathanwxh-cell@users.noreply.github.com> Co-authored-by: Codex --- contributors/people.toml | 4 ++++ crates/vector/src/edit.rs | 28 ++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/contributors/people.toml b/contributors/people.toml index 37220e0e..53bd154a 100644 --- a/contributors/people.toml +++ b/contributors/people.toml @@ -17,6 +17,10 @@ # To remove your names, delete your entry (or set fields empty) in a PR. The next # contributors.py run, and the next build, drop them. +[people.jonathanwxh-cell] +display_name = "jonathnwxh" +sync_github_name = false + [people.Skyfuller1303] display_name = "Skyfuller" sync_github_name = true diff --git a/crates/vector/src/edit.rs b/crates/vector/src/edit.rs index b0846382..ea99cff2 100644 --- a/crates/vector/src/edit.rs +++ b/crates/vector/src/edit.rs @@ -184,7 +184,9 @@ pub fn add_anchor(path: &mut Path, knot: [usize; 2], t: f64) -> Result<[usize; 2 let a = *knot_mut(path, knot)?; let b = *knot_mut(path, end)?; let new = if retracted(&a, Handle::Out) && retracted(&b, Handle::In) { - let p = lerp(a.anchor, b.anchor, t); + // Hit testing and hover feedback use the cubic parameter, which is not linear even + // when both handles are retracted. Keep the inserted corner at that same point. + let p = eval(&[a.anchor, a.out_ctrl, b.in_ctrl, b.anchor], t); Knot::corner(p.x, p.y) } else { let (p01, p12, p23) = (lerp(a.anchor, a.out_ctrl, t), lerp(a.out_ctrl, b.in_ctrl, t), lerp(b.in_ctrl, b.anchor, t)); @@ -453,6 +455,28 @@ mod tests { } } + #[test] + fn adding_to_a_straight_segment_uses_the_hit_position() { + for (points, closed) in [ + (vec![(0.0, 0.0), (100.0, 0.0)], false), + (vec![(0.0, 0.0), (0.0, 100.0)], false), + (vec![(0.0, 0.0), (100.0, 100.0)], false), + (vec![(0.0, 0.0), (100.0, 0.0), (100.0, 100.0)], true), + ] { + for t in [0.25, 0.75] { + let sp = if closed { Subpath::polygon(&points) } else { Subpath::polyline(&points) }; + let mut p = Path::new(vec![sp]); + let segment = if closed { 2 } else { 0 }; + let clicked = eval(&p.subpaths[0].segments()[segment], t); + let Some(Hit::Segment(knot, hit_t)) = hit(&p, clicked, 1.0, &[]) else { panic!("expected a segment hit at {clicked:?}") }; + let added = add_anchor(&mut p, knot, hit_t).unwrap(); + let inserted = at(&p, added[0], added[1]); + assert!(dist(inserted.anchor, clicked) < 1e-9, "t={t}: inserted {:?}, clicked {clicked:?}", inserted.anchor); + assert_eq!(inserted, Knot::corner(clicked.x, clicked.y), "straight segments retain retracted handles"); + } + } + } + #[test] fn adding_to_a_straight_segment_makes_a_corner_on_the_line() { let mut p = tri(); @@ -460,7 +484,7 @@ mod tests { assert_eq!(add_anchor(&mut p, [0, 2], 0.5).unwrap(), [0, 3]); assert_eq!(at(&p, 0, 3), Knot::corner(25.0, 40.0)); assert_eq!(add_anchor(&mut p, [0, 0], 0.25).unwrap(), [0, 1]); - assert_eq!(at(&p, 0, 1), Knot::corner(25.0, 0.0)); + assert_eq!(at(&p, 0, 1), Knot::corner(15.625, 0.0)); assert_eq!(p.subpaths[0].knots.len(), 5); assert!(p.subpaths[0].closed); } From bacc886a6d41b14ee68f83de9f4a855b56bb8820 Mon Sep 17 00:00:00 2001 From: jonathanwxh-cell Date: Mon, 12 Oct 2026 20:32:45 +0800 Subject: [PATCH 52/92] Preserve signed HDR colors during surface transforms (#3857) Co-authored-by: jonathnwxh <258340642+jonathanwxh-cell@users.noreply.github.com> Co-authored-by: Codex --- crates/algo/src/transform.rs | 41 +++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/crates/algo/src/transform.rs b/crates/algo/src/transform.rs index e684f87b..1480ec2b 100644 --- a/crates/algo/src/transform.rs +++ b/crates/algo/src/transform.rs @@ -368,7 +368,8 @@ fn warp(src: &Surface, src_rect: Rect, h: &Homography, interp: Interp, clip: Opt any = true; let o = ((y - t.y0) as usize * w + (x - t.x0) as usize) * n; for c in 0..a { - outp[o + c] = (acc[c] / al).clamp(0.0, 1.0) as f32; + // Integer storage clips on write; float colours retain their signed/HDR range. + outp[o + c] = (acc[c] / al) as f32; } outp[o + a] = al as f32; } @@ -482,6 +483,44 @@ mod tests { } } + #[test] + fn translation_preserves_colour_range_at_every_depth() { + use photocraft_color::{ColorMode, SampleType}; + + let h = Homography([1.0, 0.0, 7.0, 0.0, 1.0, -3.0, 0.0, 0.0, 1.0]); + for sample in SampleType::ALL { + for mode in [ColorMode::Rgb, ColorMode::Grayscale] { + for alpha in [false, true] { + let mut s = Surface::new(PixelFormat::new(mode, sample, alpha)); + let mut pixel = if mode == ColorMode::Rgb { vec![2.0, -0.25, 0.5] } else { vec![2.0] }; + if alpha { + pixel.push(0.5); + } + s.fill_rect(Rect::new(4, 4, 8, 8), &pixel); + let mut expected = s.pixel(5, 5); + if !alpha { + expected.push(1.0); + } + for interp in [Interp::Nearest, Interp::Bilinear, Interp::Bicubic] { + let out = warp_surface(&s, s.content_bounds(), &h, interp).unwrap(); + assert_eq!(out.pixel(12, 2), expected, "{sample:?}/{mode:?}/alpha={alpha}/{interp:?}"); + assert_eq!(out.pixel(0, 0).last(), Some(&0.0)); + } + } + } + } + } + + #[test] + fn bilinear_translation_interpolates_signed_hdr_colours() { + let mut s = Surface::new(PixelFormat::RGBA32F); + s.write_pixel(0, 0, &[2.0, -0.5, 0.25, 0.5]); + s.write_pixel(1, 0, &[4.0, -0.25, 0.75, 0.5]); + let h = Homography([1.0, 0.0, 0.5, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0]); + let out = warp_surface(&s, s.content_bounds(), &h, Interp::Bilinear).unwrap(); + assert_eq!(out.pixel(1, 0), vec![3.0, -0.375, 0.5, 0.5]); + } + #[test] fn scale_doubles_size_and_rotation_keeps_area() { let mut s = rgba(); From 6231325aeadb430868f73020c5699cc176e0cfc0 Mon Sep 17 00:00:00 2001 From: David Mann Date: Mon, 12 Oct 2026 14:33:28 +0200 Subject: [PATCH 53/92] Brushes: drag a brush folder into another folder (#2014) (#3851) Photoshop's Brushes panel nests folders by dragging one onto another; ours could only reorder a folder among its siblings. - brush.presets.moveGroup takes `into: {group?, folder?}`: the group or nested folder (with everything in it, presets in order) moves inside that folder of that group (`folder` [] = directly in the group), or with no `group` out to the top level as a group of its own. `before` names a sibling folder (or top-level group) there to land before. Moving a folder into itself or one of its own folders, a name clash at the destination, a result deeper than MAX_FOLDER_DEPTH, the ungrouped presets, `index` with `into`, and bad shapes are errors that leave the library unchanged. The preset store follows the move (a group moved into another one loses its group file; a folder moved out gets one). - Brushes panel and Brush Preset picker: a group or folder header dropped on another header goes inside it; on the header's upper third it lands before that folder, reordering siblings or moving a nested folder next to it (out to the top level before a group). Every drop is one moveGroup command (`folder_drop` maps the drop). Co-authored-by: Claude Opus 5.5 (1M context) --- crates/engine/src/brush_preset_cmds.rs | 193 +++++++++++++++++++++++- crates/engine/src/preset_store/tests.rs | 34 +++++ crates/ui-egui/src/brush_panel_tests.rs | 84 +++++++++++ crates/ui-egui/src/brushes_tab.rs | 94 +++++++++--- 4 files changed, 382 insertions(+), 23 deletions(-) diff --git a/crates/engine/src/brush_preset_cmds.rs b/crates/engine/src/brush_preset_cmds.rs index 614127f2..03b28143 100644 --- a/crates/engine/src/brush_preset_cmds.rs +++ b/crates/engine/src/brush_preset_cmds.rs @@ -4,7 +4,9 @@ //! Groups are the panel's top-level folders ([`BrushPreset::group`]); a group can hold nested //! folders ([`BrushPreset::folder`], a path inside the group, e.g. the folders of an imported //! `.abr` file). The group commands take an optional `folder` path to act on a nested folder -//! instead of the whole group. A folder exists while a preset is in it (or below it). +//! instead of the whole group, and `moveGroup` can move a group or folder `into` another folder +//! or group, or out to the top level (dragging a folder onto a folder in Photoshop's panel). A +//! folder exists while a preset is in it (or below it). //! //! The library order is the panel order: groups appear in order of their first preset, and a //! group's folders and presets in order of their first preset too. Every @@ -247,9 +249,116 @@ fn move_folder(s: &mut Session, p: &Value, g: String, f: Vec, cmd: &str) Ok(json!({ "group": g, "folder": f, "index": at })) } +/// Where `into` puts a folder: `Some(None)` = the top level (it becomes a group), `Some(Some((group, +/// folder)))` = inside that folder of that group (`[]`: directly in the group). `None` without `into`. +type Dest = Option<(String, Vec)>; + +fn into_param(s: &Session, p: &Value, cmd: &str) -> Result> { + let into = match p.get("into") { + None | Some(Value::Null) => return Ok(None), + Some(v @ Value::Object(_)) => v, + Some(_) => return Err(bad(cmd, "`into` must be an object {group?, folder?}")), + }; + let Some(g) = group_param(into, "group", cmd)? else { + if folder_param(into, cmd)?.is_some_and(|f| !f.is_empty()) { + return Err(bad(cmd, "`into.folder` needs `into.group`")); + } + return Ok(Some(None)); + }; + group_block(s, &g, cmd)?; + let f = folder_param(into, cmd)?.unwrap_or_default(); + if !s.tools.presets.iter().any(|x| in_folder(x, &g, &f)) { + return Err(bad(cmd, format!("no folder `{}` in brush preset group `{g}`", f.join("/")))); + } + Ok(Some(Some((g, f)))) +} + +/// Move folder `f` of group `g` (the whole group when `f` is empty) into `dest`, keeping its +/// content and the order of its presets: Photoshop's drag of a folder onto another folder. It +/// lands at the end of the destination, or before the sibling folder (group at the top level) +/// named by `before`. +fn move_into(s: &mut Session, p: &Value, g: String, f: Vec, dest: Dest, cmd: &str) -> Result { + if p.get("index").is_some_and(|v| !v.is_null()) { + return Err(bad(cmd, "`index` can't be combined with `into` (use `before`)")); + } + let leaf = match f.last() { + Some(l) => l.clone(), + None if g.is_empty() => return Err(bad(cmd, "the ungrouped presets are not a folder that can be moved")), + None => g.clone(), + }; + let moving = |x: &BrushPreset| in_folder(x, &g, &f); + let rest_of = |x: &BrushPreset| x.folder.get(f.len()..).unwrap_or_default().to_vec(); + let before = match p.get("before") { + None | Some(Value::Null) => None, + Some(Value::String(b)) => Some(b.trim().to_string()), + Some(_) => return Err(bad(cmd, "`before` must be a folder name")), + }; + // The destination's own folders and groups, without the one being moved. + let others: Vec = s.tools.presets.iter().filter(|x| !moving(x)).cloned().collect(); + let (new_group, new_prefix, siblings) = match &dest { + None => { + if f.is_empty() { + return Err(bad(cmd, "`into`: the group is already at the top level")); + } + (leaf.clone(), Vec::new(), group_order(&others)) + } + Some((dg, df)) => { + if *dg == g && df.starts_with(&f) { + return Err(bad(cmd, "`into` names the folder being moved or one of its own folders")); + } + let mut prefix = df.clone(); + prefix.push(leaf.clone()); + (dg.clone(), prefix, subfolder_order(&others, dg, df)) + } + }; + if siblings.contains(&leaf) { + return Err(bad(cmd, format!("a folder named `{leaf}` already exists there"))); + } + if let Some(b) = &before + && !siblings.contains(b) + { + return Err(bad(cmd, format!("`before`: no folder named `{b}` there"))); + } + let deepest = s.tools.presets.iter().filter(|x| moving(x)).map(|x| new_prefix.len() + rest_of(x).len()).max().unwrap_or(0); + if deepest > MAX_FOLDER_DEPTH { + return Err(bad(cmd, format!("folders can be nested at most {MAX_FOLDER_DEPTH} deep"))); + } + let lib = std::mem::take(&mut s.tools.presets); + let (mut block, mut rest): (Vec, Vec) = lib.into_iter().partition(|x| in_folder(x, &g, &f)); + for x in &mut block { + let tail = rest_of(x); + x.group.clone_from(&new_group); + x.folder = new_prefix.iter().cloned().chain(tail).collect(); + x.builtin = false; + } + let pos = match (&dest, &before) { + (None, Some(b)) => rest.iter().position(|x| x.group == *b), + (None, None) => None, + (Some((dg, df)), Some(b)) => { + let sib: Vec = df.iter().cloned().chain(std::iter::once(b.clone())).collect(); + rest.iter().position(|x| in_folder(x, dg, &sib)) + } + (Some((dg, df)), None) => rest.iter().rposition(|x| in_folder(x, dg, df)).map(|k| k + 1), + }; + let tail = rest.split_off(pos.unwrap_or(rest.len()).min(rest.len())); + rest.extend(block); + rest.extend(tail); + s.tools.presets = rest; + s.brush_presets_changed(); + let folder = new_prefix.get(..new_prefix.len().saturating_sub(1)).unwrap_or_default(); + let at = match &dest { + None => group_order(&s.tools.presets).iter().position(|x| *x == new_group), + Some(_) => subfolder_order(&s.tools.presets, &new_group, folder).iter().position(|x| *x == leaf), + }; + Ok(json!({ "group": new_group, "folder": new_prefix, "index": at.unwrap_or(0) })) +} + fn move_group(s: &mut Session, p: &Value) -> Result { let cmd = "brush.presets.moveGroup"; let (g, f) = target_folder(s, p, cmd)?; + if let Some(dest) = into_param(s, p, cmd)? { + return move_into(s, p, g, f, dest, cmd); + } if !f.is_empty() { return move_folder(s, p, g, f, cmd); } @@ -348,7 +457,7 @@ pub fn specs() -> Vec { spec!( "brush.presets.moveGroup", "Move Brush Group", - r##"{"group":string,"folder":[name]? (move this nested folder among its sibling folders instead),"before":group? (or sibling folder name) | "index":n? (group or sibling folder position)=end} → {group, folder?, index}"##, + r##"{"group":string,"folder":[name]? (move this nested folder instead),"into":{"group":string?,"folder":[name]?}? (move it inside that folder of that group, [] = directly in the group; no group = out to the top level as a group of its own; the folder keeps its content),"before":group? (or sibling folder name, in its new place with `into`) | "index":n? (group or sibling folder position, without `into`)=end} → {group, folder?, index}"##, move_group ), spec!( @@ -572,4 +681,84 @@ mod tests { assert_eq!(s.tools.presets, before); s.execute("brush.presets.moveGroup", json!({"group": "Set", "folder": ["Ink", "Fine"], "index": u64::MAX})).unwrap(); } + + fn paths(s: &Session) -> Vec { + s.tools.presets.iter().filter(|x| !x.builtin).map(|x| format!("{}:{}:{}", x.group, x.folder.join("/"), x.name)).collect() + } + + /// `with_folders` plus group "Other" holding O1, and folder Box (B1) in it. + fn with_two_groups() -> Session { + let mut s = with_folders(); + for (n, f) in [("O1", &[][..]), ("B1", &["Box"][..])] { + let folder = f.iter().map(|x| x.to_string()).collect(); + s.tools.presets.push(BrushPreset { name: n.into(), brush: Default::default(), builtin: false, group: "Other".into(), folder }); + } + s + } + + #[test] + fn folders_move_into_folders_and_groups() { + let mut s = with_two_groups(); + // A nested folder into a sibling folder: its subtree follows, order kept. + let r = s.execute("brush.presets.moveGroup", json!({"group": "Set", "folder": ["Dry"], "into": {"group": "Set", "folder": ["Ink", "Fine"]}})).unwrap(); + assert_eq!(r, json!({"group": "Set", "folder": ["Ink", "Fine", "Dry"], "index": 0})); + assert_eq!(folder_of(&s, "D1"), ["Ink", "Fine", "Dry"]); + // Into another group, before one of its folders. + let r = s.execute("brush.presets.moveGroup", json!({"group": "Set", "folder": ["Ink"], "into": {"group": "Other"}, "before": "Box"})).unwrap(); + assert_eq!(r["folder"], json!(["Ink"])); + assert_eq!(paths(&s), ["Set::S0", "Other::O1", "Other:Ink:I1", "Other:Ink/Fine:F1", "Other:Ink/Fine/Dry:D1", "Other:Ink:I2", "Other:Box:B1"]); + // Out to the top level: the folder becomes a group of its own. + let r = s.execute("brush.presets.moveGroup", json!({"group": "Other", "folder": ["Ink", "Fine"], "into": {}})).unwrap(); + assert_eq!(r["group"], "Fine"); + assert_eq!(folder_of(&s, "D1"), ["Dry"]); + assert_eq!(photocraft_paint::presets::find(&s.tools.presets, "F1").unwrap().group, "Fine"); + // A whole group into another group's folder. + s.execute("brush.presets.moveGroup", json!({"group": "Fine", "into": {"group": "Set"}})).unwrap(); + assert!(names(&s, "Fine").is_empty()); + assert_eq!(folder_of(&s, "D1"), ["Fine", "Dry"]); + assert_eq!(subfolder_order(&s.tools.presets, "Set", &[]), ["Fine"]); + } + + #[test] + fn bad_moves_into_folders_fail_without_changes() { + let mut s = with_two_groups(); + // A chain 31 deep under Set/Deep. + let deep: Vec = std::iter::once("Deep".to_string()).chain((0..30).map(|i| format!("d{i}"))).collect(); + s.tools.presets.push(BrushPreset { name: "Z".into(), brush: Default::default(), builtin: false, group: "Set".into(), folder: deep.clone() }); + s.tools.presets.push(BrushPreset { name: "Y".into(), brush: Default::default(), builtin: false, group: "Other".into(), folder: vec!["Dry".into()] }); + let before = s.tools.presets.clone(); + let deep_json = json!(deep); + for p in [ + // Into itself or its own descendant. + json!({"group": "Set", "folder": ["Ink"], "into": {"group": "Set", "folder": ["Ink"]}}), + json!({"group": "Set", "folder": ["Ink"], "into": {"group": "Set", "folder": ["Ink", "Fine"]}}), + json!({"group": "Set", "into": {"group": "Set", "folder": ["Dry"]}}), + json!({"group": "Set", "into": {"group": "Set"}}), + // A group already at the top level; the ungrouped presets. + json!({"group": "Set", "into": {}}), + // A name clash at the destination. + json!({"group": "Set", "folder": ["Dry"], "into": {"group": "Other"}}), + json!({"group": "Other", "folder": ["Box"], "into": {"group": "Set", "folder": ["Ink"]}, "before": "Nope"}), + json!({"group": "Set", "folder": ["Dry"], "into": {"group": "Set", "folder": ["Ink"]}, "index": 0}), + // Missing destinations and bad shapes. + json!({"group": "Set", "folder": ["Dry"], "into": {"group": "Nope"}}), + json!({"group": "Set", "folder": ["Dry"], "into": {"group": "Other", "folder": ["Nope"]}}), + json!({"group": "Set", "folder": ["Dry"], "into": {"folder": ["Box"]}}), + json!({"group": "Set", "folder": ["Dry"], "into": "Other"}), + json!({"group": "Set", "folder": ["Dry"], "into": {"group": 5}}), + json!({"group": "Set", "folder": ["Dry"], "into": {"group": "Other"}, "before": 3}), + // Deeper than MAX_FOLDER_DEPTH once moved (Ink/Fine is 2 deep: 2 + 31 > 32). + json!({"group": "Set", "folder": ["Deep"], "into": {"group": "Set", "folder": ["Ink", "Fine"]}}), + json!({"group": "Set", "folder": ["Ink"], "into": {"group": "Set", "folder": deep_json}}), + ] { + assert!(s.execute("brush.presets.moveGroup", p.clone()).is_err(), "{p}"); + } + assert_eq!(s.tools.presets, before); + // Ink/Fine into Set itself: a clash with nothing, so it moves up a level. + s.execute("brush.presets.moveGroup", json!({"group": "Set", "folder": ["Ink", "Fine"], "into": {"group": "Set"}})).unwrap(); + assert_eq!(folder_of(&s, "F1"), ["Fine"]); + // An ungrouped preset's group can't move. + s.tools.presets.push(BrushPreset { name: "U".into(), brush: Default::default(), builtin: false, group: String::new(), folder: Vec::new() }); + assert!(s.execute("brush.presets.moveGroup", json!({"group": "", "into": {"group": "Set"}})).is_err()); + } } diff --git a/crates/engine/src/preset_store/tests.rs b/crates/engine/src/preset_store/tests.rs index b7f17586..513bc56c 100644 --- a/crates/engine/src/preset_store/tests.rs +++ b/crates/engine/src/preset_store/tests.rs @@ -624,6 +624,40 @@ fn imported_abr_folders_persist_and_old_stores_load_flat() { assert!(photocraft_paint::presets::find(&d.tools.presets, "Blank").unwrap().folder.is_empty()); } +/// Moving a group into another group's folder rewrites the target group's file and removes the +/// moved group's; moving a folder out to the top level makes a group file for it (#2014). +#[test] +fn folders_moved_into_other_folders_persist() { + let dir = TempDir::new("folder-into"); + let (mut s, _) = session(&dir); + let set = abr_with_folders(&[("Kit Loose", &[]), ("Kit Pen", &["Inks"]), ("Kit Nib", &["Inks", "Fine"])]); + let other = abr_with_folders(&[("Pack Chalk", &["Dry"])]); + s.execute("brush.presets.importAbr", json!({"data": photocraft_paint::tile::b64_encode(&set), "group": "Kit"})).unwrap(); + s.execute("brush.presets.importAbr", json!({"data": photocraft_paint::tile::b64_encode(&other), "group": "Pack"})).unwrap(); + let group_files = |d: &TempDir| -> Vec { d.files().into_iter().filter(|f| f.ends_with(".pcbrushes")).collect() }; + let mut both = vec![group_file_name("Kit"), group_file_name("Pack")]; + both.sort(); + assert_eq!(group_files(&dir), both); + s.execute("brush.presets.moveGroup", json!({"group": "Pack", "into": {"group": "Kit", "folder": ["Inks"]}})).unwrap(); + assert_eq!(group_files(&dir), [group_file_name("Kit")]); + let (t, w) = session(&dir); + assert!(w.is_empty(), "{w:?}"); + assert_eq!(user(&t), user(&s)); + let folder = |s: &Session, n: &str| { + let p = photocraft_paint::presets::find(&s.tools.presets, n).unwrap(); + format!("{}:{}", p.group, p.folder.join("/")) + }; + assert_eq!(folder(&t, "Pack Chalk"), "Kit:Inks/Pack/Dry"); + // Out to the top level: a group (and file) of its own. + s.execute("brush.presets.moveGroup", json!({"group": "Kit", "folder": ["Inks", "Pack"], "into": {}})).unwrap(); + let mut both = vec![group_file_name("Kit"), group_file_name("Pack")]; + both.sort(); + assert_eq!(group_files(&dir), both); + let (t, _) = session(&dir); + assert_eq!(folder(&t, "Pack Chalk"), "Pack:Dry"); + assert_eq!(folder(&t, "Kit Nib"), "Kit:Inks/Fine"); +} + #[test] fn a_group_file_that_failed_to_load_is_not_overwritten() { // e.g. written by a newer PhotoCraft: skipped on load, so a save must not replace it. diff --git a/crates/ui-egui/src/brush_panel_tests.rs b/crates/ui-egui/src/brush_panel_tests.rs index c61b48c1..7d5a51e4 100644 --- a/crates/ui-egui/src/brush_panel_tests.rs +++ b/crates/ui-egui/src/brush_panel_tests.rs @@ -635,6 +635,90 @@ fn folder_actions_become_folder_commands() { assert_eq!(last_journal(&app).unwrap(), ("brush.presets.moveGroup".to_string(), json!({ "group": "Kit", "folder": ["Dry"], "before": "Inks" }))); } +/// Dragging a folder or group header onto another header (#2014): the upper edge places it +/// before, the rest puts it inside; the action runs `brush.presets.moveGroup` with `into`. +#[test] +fn folder_drops_map_to_move_commands() { + use crate::brushes_tab::{Action, apply, folder_drop}; + let v = |p: &[&str]| p.iter().map(|s| s.to_string()).collect::>(); + // Into: a folder onto another folder, a group onto a group. + assert_eq!( + folder_drop("Kit", &v(&["Dry"]), "Kit", &v(&["Inks"]), false), + Some(Action::MoveInto { group: "Kit".into(), folder: v(&["Dry"]), into: Some(("Kit".into(), v(&["Inks"]))), before: None }) + ); + assert_eq!( + folder_drop("Pack", &[], "Kit", &v(&["Inks"]), false), + Some(Action::MoveInto { group: "Pack".into(), folder: vec![], into: Some(("Kit".into(), v(&["Inks"]))), before: None }) + ); + // Onto itself, into its own folder, or into the folder it is already in: nothing. + assert_eq!(folder_drop("Kit", &v(&["Inks"]), "Kit", &v(&["Inks"]), false), None); + assert_eq!(folder_drop("Kit", &v(&["Inks"]), "Kit", &v(&["Inks", "Fine"]), true), None); + assert_eq!(folder_drop("Kit", &[], "Kit", &v(&["Inks"]), false), None); + assert_eq!(folder_drop("Kit", &v(&["Inks", "Fine"]), "Kit", &v(&["Inks"]), false), None); + // Upper edge: siblings reorder; a nested folder before a group goes to the top level; a + // folder before a folder elsewhere moves next to it. + assert_eq!( + folder_drop("Kit", &v(&["Dry"]), "Kit", &v(&["Inks"]), true), + Some(Action::MoveGroup { group: "Kit".into(), folder: v(&["Dry"]), before: Some("Inks".into()) }) + ); + assert_eq!(folder_drop("Pack", &[], "Kit", &[], true), Some(Action::MoveGroup { group: "Pack".into(), folder: vec![], before: Some("Kit".into()) })); + assert_eq!( + folder_drop("Kit", &v(&["Inks", "Fine"]), "Pack", &[], true), + Some(Action::MoveInto { group: "Kit".into(), folder: v(&["Inks", "Fine"]), into: None, before: Some("Pack".into()) }) + ); + assert_eq!( + folder_drop("Kit", &v(&["Inks", "Fine"]), "Pack", &v(&["Box"]), true), + Some(Action::MoveInto { group: "Kit".into(), folder: v(&["Inks", "Fine"]), into: Some(("Pack".into(), vec![])), before: Some("Box".into()) }) + ); + + let mut app = app(); + for p in [kit("Kit Pen", &["Inks"]), kit("Kit Nib", &["Inks", "Fine"]), kit("Kit Chalk", &["Dry"])] { + app.session.tools.presets.push(p); + } + let into = folder_drop("Kit", &v(&["Dry"]), "Kit", &v(&["Inks", "Fine"]), false).unwrap(); + apply(&mut app, vec![into]); + assert_eq!(paint::presets::find(&app.session.tools.presets, "Kit Chalk").unwrap().folder, ["Inks", "Fine", "Dry"]); + assert_eq!( + last_journal(&app).unwrap(), + ("brush.presets.moveGroup".to_string(), json!({ "group": "Kit", "folder": ["Dry"], "into": {"group": "Kit", "folder": ["Inks", "Fine"]} })) + ); + // Out to the top level, before a group. + let out = folder_drop("Kit", &v(&["Inks", "Fine"]), "Kit", &[], true).unwrap(); + apply(&mut app, vec![out]); + let chalk = paint::presets::find(&app.session.tools.presets, "Kit Chalk").unwrap(); + assert_eq!((chalk.group.as_str(), chalk.folder.clone()), ("Fine", v(&["Dry"]))); + let order = photocraft_engine::brush_preset_cmds::group_order(&app.session.tools.presets); + assert!(order.iter().position(|g| g == "Fine") < order.iter().position(|g| g == "Kit")); +} + +/// A folder header dragged onto another folder's header in the Brushes panel goes inside it. +#[test] +fn dragging_a_folder_header_onto_another_moves_it_inside() { + use egui_kittest::kittest::Queryable; + let mut h = harness(1, 0); + let builtin_groups: Vec = grouped_presets(&h.state().session.tools.presets).into_iter().map(|(g, _)| g).collect(); + h.state_mut().ui.brushes_panel.collapsed = builtin_groups; + for p in [kit("Kit Pen", &["Test Inks"]), kit("Kit Chalk", &["Test Dry"])] { + h.state_mut().session.tools.presets.push(p); + } + h.run_steps(3); + let from = h.get_by_label("Test Dry").rect().center(); + let to = h.get_by_label("Test Inks").rect(); + let to = egui::pos2(to.center().x, to.top() + to.height() * 0.7); + h.hover_at(from); + h.run(); + h.drag_at(from); + h.run(); + for k in 1..=6 { + h.hover_at(from + (to - from) * (k as f32 / 6.0)); + h.run(); + } + h.drop_at(to); + h.run_steps(3); + assert_eq!(paint::presets::find(&h.state().session.tools.presets, "Kit Chalk").unwrap().folder, ["Test Inks", "Test Dry"]); + assert_eq!(last_journal(h.state()).unwrap().0, "brush.presets.moveGroup"); +} + /// A fresh session with the Brush tool: shortcuts, the options bar and the Brush Settings window, /// in the default theme (#258). fn app_harness() -> Harness<'static, PhotocraftApp> { diff --git a/crates/ui-egui/src/brushes_tab.rs b/crates/ui-egui/src/brushes_tab.rs index b6d96f6b..31c1161b 100644 --- a/crates/ui-egui/src/brushes_tab.rs +++ b/crates/ui-egui/src/brushes_tab.rs @@ -2,9 +2,10 @@ //! preview, name) or a grid of tips, with a size slider and a search field. //! //! Presets and groups are organised like Photoshop's panel: drag a preset within its group or -//! into another group or folder (onto a preset, or onto a header to append), drag a group's -//! header to reorder groups (a nested folder's header to reorder it among its sibling folders), -//! and right-click for Rename and Delete. Groups hold nested folders ([`BrushPreset::folder`], +//! into another group or folder (onto a preset, or onto a header to append), drag a group's or +//! folder's header onto another header to put it inside that folder (or onto the header's upper +//! edge to place it before, which reorders siblings and moves a folder out to the top level), and +//! right-click for Rename and Delete. Groups hold nested folders ([`BrushPreset::folder`], //! e.g. an imported `.abr` file's own folders), drawn indented under their group and opened or //! closed like groups. Every change is a `brush.presets.*` command, so it is journaled, drivable, //! and persisted by the preset store. @@ -59,6 +60,15 @@ pub enum Action { folder: Vec, before: Option, }, + /// Move a group (`folder` empty) or nested folder into another folder: `into` is (group, + /// folder path, `[]` = directly in the group), or `None` for the top level (it becomes a + /// group). `before` is a folder (or top-level group) there to land before. + MoveInto { + group: String, + folder: Vec, + into: Option<(String, Vec)>, + before: Option, + }, /// View only: show the rename bar for a preset or group ([`preset_list`] applies it). BeginRename(Renaming), /// Commit a rename typed in the rename bar. @@ -238,6 +248,20 @@ pub fn apply(app: &mut PhotocraftApp, acts: Vec) { } run_or_status(app, "brush.presets.moveGroup", p); } + Action::MoveInto { group, folder, into, before } => { + let into = match into { + Some((g, f)) => json!({ "group": g, "folder": f }), + None => json!({}), + }; + let mut p = json!({ "group": group, "into": into }); + if !folder.is_empty() { + p["folder"] = json!(folder); + } + if let Some(b) = before { + p["before"] = json!(b); + } + run_or_status(app, "brush.presets.moveGroup", p); + } Action::Rename(r) => { let text = r.text.trim().to_string(); let old = r.folder.last().unwrap_or(&r.name); @@ -582,9 +606,41 @@ fn preset_card( /// Indent of one nested folder level. const FOLDER_INDENT: f32 = 16.0; -/// A group's or nested folder's header: chevron, folder, name, count. Click toggles; drag -/// reorders groups (a folder among its sibling folders); a preset dropped here moves to the end of -/// the group or folder. `key` is the group key, `folder` the nested folder's path (empty for the +/// What dropping the group or folder (`src_group`, `src_folder`; a group when `src_folder` is +/// empty) on the header of (`group`, `folder`) does, as in Photoshop's Brushes panel: on the +/// header's upper edge (`edge`) it lands before that folder, next to it (reordering when they are +/// siblings); anywhere else it goes into that folder. `None` when the drop does nothing: onto +/// itself, into one of its own folders, or into the folder it is already in. +pub fn folder_drop(src_group: &str, src_folder: &[String], group: &str, folder: &[String], edge: bool) -> Option { + if src_group == group && folder.starts_with(src_folder) { + return None; + } + let src = (src_group.to_string(), src_folder.to_vec()); + if !edge { + let parent = src_folder.split_last().map(|(_, p)| p); + if src_group == group && parent == Some(folder) { + return None; + } + return Some(Action::MoveInto { group: src.0, folder: src.1, into: Some((group.to_string(), folder.to_vec())), before: None }); + } + match folder.split_last() { + // Before a top-level group: groups reorder; a nested folder moves out to the top level. + None if src_folder.is_empty() => Some(Action::MoveGroup { group: src.0, folder: src.1, before: Some(group.to_string()) }), + None => Some(Action::MoveInto { group: src.0, folder: src.1, into: None, before: Some(group.to_string()) }), + Some((leaf, parent)) => { + let sibling = src_group == group && src_folder.split_last().map(|(_, p)| p) == Some(parent); + if sibling { + Some(Action::MoveGroup { group: src.0, folder: src.1, before: Some(leaf.clone()) }) + } else { + Some(Action::MoveInto { group: src.0, folder: src.1, into: Some((group.to_string(), parent.to_vec())), before: Some(leaf.clone()) }) + } + } + } +} + +/// A group's or nested folder's header: chevron, folder, name, count. Click toggles; a group or +/// folder dragged here lands before it (its upper edge) or goes into it ([`folder_drop`]); a +/// preset dropped here moves to the end of the group or folder. `key` is the group key, `folder` the nested folder's path (empty for the /// group), `label` the group's panel label. fn group_header(ui: &mut egui::Ui, label: &str, key: &str, folder: &[String], open: bool, count: usize, acts: &mut Vec) { let t = Tokens::get(ui.ctx()); @@ -616,31 +672,27 @@ fn group_header(ui: &mut egui::Ui, label: &str, key: &str, folder: &[String], op [] => BrushDrag::Group(key.to_string()), f => BrushDrag::Folder { group: key.to_string(), folder: f.to_vec() }, }; - // A folder moves among its siblings: same group, same parent, not itself. - let sibling = |g: &str, f: &[String]| { - g == key && !folder.is_empty() && f.len() == folder.len() && f != folder && f.split_last().map(|x| x.1) == folder.split_last().map(|x| x.1) - }; resp.dnd_set_drag_payload(me); + // The upper third of the header places a dragged folder before this one; the rest drops it in. + let edge = ui.ctx().pointer_interact_pos().is_some_and(|p| p.y < r.top() + r.height() / 3.0); + let folder_action = |d: &BrushDrag| match d { + BrushDrag::Group(g) => folder_drop(g, &[], key, folder, edge), + BrushDrag::Folder { group, folder: f } => folder_drop(group, f, key, folder, edge), + BrushDrag::Preset(_) => None, + }; if let Some(d) = resp.dnd_hover_payload::() { - match &*d { - BrushDrag::Group(g) if folder.is_empty() && g != key => widgets::drop_line(ui, r, false, false, &t), - BrushDrag::Folder { group, folder: f } if sibling(group, f) => widgets::drop_line(ui, r, false, false, &t), - BrushDrag::Preset(_) => { + match (&*d, folder_action(&d)) { + (BrushDrag::Preset(_), _) | (_, Some(Action::MoveInto { before: None, .. })) => { ui.painter().rect_stroke(r, t.radius_sm, Stroke::new(1.5, t.accent), egui::StrokeKind::Inside); } + (_, Some(_)) => widgets::drop_line(ui, r, false, false, &t), _ => {} } } if let Some(d) = resp.dnd_release_payload::() { match &*d { - BrushDrag::Group(g) if folder.is_empty() && g != key => { - acts.push(Action::MoveGroup { group: g.clone(), folder: Vec::new(), before: Some(key.to_string()) }) - } - BrushDrag::Folder { group, folder: f } if sibling(group, f) => { - acts.push(Action::MoveGroup { group: group.clone(), folder: f.clone(), before: Some(shown.to_string()) }) - } BrushDrag::Preset(n) => acts.push(Action::Move { name: n.clone(), group: key.to_string(), folder: Some(folder.to_vec()), index: None }), - _ => {} + other => acts.extend(folder_action(other)), } } if resp.clicked() { From 25c0ec78d5748d3f22de2628f9f5e0d63bc43587 Mon Sep 17 00:00:00 2001 From: Fabio Lussi Date: Mon, 12 Oct 2026 14:33:50 +0200 Subject: [PATCH 54/92] Keep CMYK ink values when flattening and merging (#3855) Flatten Image, Merge Visible and Merge Down now composite a CMYK stack of plain Normal raster layers in its ink values, so a lone Background flattens bit-exact and 16-bit depth is kept. Stacks that still need the RGB compositor separate back through the document's own CMYK profile instead of the built-in one, and Merge Down's scratch document keeps the profile. Fixes #3778 Co-authored-by: Fabio Lussi <198260595+itrycodinganditsbad@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 --- crates/compose/src/lib.rs | 27 +++- crates/compose/src/native.rs | 101 ++++++++++++++ crates/engine/src/commands.rs | 2 +- crates/engine/src/flatten_cmyk_tests.rs | 169 ++++++++++++++++++++++++ crates/engine/src/pixels.rs | 37 ++---- 5 files changed, 305 insertions(+), 31 deletions(-) create mode 100644 crates/compose/src/native.rs create mode 100644 crates/engine/src/flatten_cmyk_tests.rs diff --git a/crates/compose/src/lib.rs b/crates/compose/src/lib.rs index 01087f49..c059d9c8 100644 --- a/crates/compose/src/lib.rs +++ b/crates/compose/src/lib.rs @@ -24,6 +24,7 @@ pub mod fill_layout; pub mod gradient_fill; pub mod masks; pub mod multichannel; +pub mod native; pub mod pattern; pub mod proxy; pub mod psblend; @@ -232,20 +233,38 @@ pub fn band_rows_for(width: u32, requested: i32) -> i32 { /// The document's composite as a pixel surface in `fmt` (straight RGBA converted to its model /// and depth), optionally flattened over an opaque `background`; rendered and written in bands, /// so no full-size float composite is held. Tiles equal to the default pixel are pruned. +/// A CMYK document of plain Normal layers is composited in its ink values instead +/// ([`native::flatten_cmyk`]), so flattening doesn't round-trip its pixels through RGB (#3778). pub fn flatten_to_surface(doc: &Document, fmt: photocraft_color::PixelFormat, background: Option<[f32; 3]>) -> Surface { + composite_to_surface(doc, doc.bounds(), fmt, background) +} + +/// [`flatten_to_surface`] over `rect` only (the rest of the surface stays empty). +pub fn composite_to_surface(doc: &Document, rect: Rect, fmt: photocraft_color::PixelFormat, background: Option<[f32; 3]>) -> Surface { + let paper = background.is_some_and(|bg| bg == [1.0; 3]); + if (background.is_none() || paper) + && let Some(s) = native::flatten_cmyk(doc, rect, fmt, paper) + { + return s; + } let mut s = Surface::new(fmt); let n = fmt.channels(); let mut data = Vec::new(); - let _ = render_bands(doc, doc.bounds(), 0, |band| -> Result<(), ()> { + // The composite separates back to CMYK through the document's own profile, the one its + // pixels were read through. + let cmyk = cmyk_space(doc); + let _ = render_bands(doc, rect, 0, |band| -> Result<(), ()> { let band = match background { Some(bg) => band.over_background(bg), None => band, }; data.clear(); data.resize(band.px.len() * n, 0.0); - for (p, out) in band.px.iter().zip(data.chunks_exact_mut(n)) { - photocraft_raster::from_rgba_into(&fmt, *p, out); - } + photocraft_color::convert::with_cmyk_space(cmyk.as_ref(), || { + for (p, out) in band.px.iter().zip(data.chunks_exact_mut(n)) { + photocraft_raster::from_rgba_into(&fmt, *p, out); + } + }); s.write_region(band.rect, &data); Ok(()) }); diff --git a/crates/compose/src/native.rs b/crates/compose/src/native.rs new file mode 100644 index 00000000..9eafd18c --- /dev/null +++ b/crates/compose/src/native.rs @@ -0,0 +1,101 @@ +//! Mode-native flattening of plain CMYK layer stacks (#3778). +//! +//! The compositor works in display RGB, so flattening a CMYK document through it reads every ink +//! value through the profile and separates it again: even a lone Background comes back with +//! different ink. When every visible layer is a plain raster layer in Normal mode (no masks, +//! effects, clipping or advanced blending), the composite needs no colour conversion at all: +//! Normal mixes ink values linearly, as Photoshop does in CMYK, so it is worked out on the stored +//! values and an opaque layer keeps them exactly. + +use photocraft_color::blend::BlendMode; +use photocraft_color::{ColorMode, PixelFormat}; +use photocraft_doc::{Document, Layer, LayerContent}; +use photocraft_geom::Rect; +use photocraft_raster::Surface; + +/// Process channels of a CMYK pixel. +const INKS: usize = 4; + +/// A layer the native path can composite: a visible raster layer the compositor would only blend +/// Normally at its opacity. +fn plain(layer: &Layer) -> Option<&Surface> { + let LayerContent::Raster(s) = &layer.content else { return None }; + let simple = layer.blend == BlendMode::Normal + && !layer.clipped + && layer.mask.as_ref().is_none_or(|m| !m.enabled) + && layer.vector_mask.as_ref().is_none_or(|v| !v.enabled) + && !crate::effects::has_effects(layer) + && layer.excluded_channels == 0 + && layer.blend_if.is_default() + && layer.advanced.is_default() + && layer.video.is_none() + && s.format().mode == ColorMode::Cmyk; + simple.then_some(s) +} + +/// The composite of `doc` over `rect` in `fmt`, worked out in ink values, or `None` when the +/// document isn't CMYK or a visible layer needs the full compositor (see the module docs). +/// `paper` flattens onto white paper (no ink) and makes the result opaque. +pub fn flatten_cmyk(doc: &Document, rect: Rect, fmt: PixelFormat, paper: bool) -> Option { + if doc.mode != ColorMode::Cmyk || fmt.mode != ColorMode::Cmyk || doc.layers.iter().any(|l| l.clipped) { + return None; + } + let mut stack = Vec::new(); + for layer in doc.layers.iter().filter(|l| l.visible) { + let alpha = (layer.opacity * layer.fill_opacity).clamp(0.0, 1.0); + stack.push((plain(layer)?, alpha)); + } + let mut out = Surface::new(fmt); + if rect.is_empty() { + return Some(out); + } + let n = fmt.channels(); + let w = rect.width() as usize; + let rows = crate::band_rows_for(rect.width(), 0); + let (mut acc, mut src, mut data) = (Vec::new(), Vec::new(), Vec::new()); + let mut y = rect.y0; + while y < rect.y1 { + let band = Rect::new(rect.x0, y, rect.x1, y.saturating_add(rows).min(rect.y1)); + // Straight C, M, Y, K, alpha per pixel, starting transparent. + acc.clear(); + acc.resize(w * band.height() as usize, [0.0f32; INKS + 1]); + for &(surf, opacity) in &stack { + if opacity <= 0.0 || (surf.content_bounds().intersect(&band).is_empty() && surf.default_pixel().iter().all(|v| *v == 0.0)) { + continue; + } + let sf = surf.format(); + let sn = sf.channels(); + surf.read_region_into(band, &mut src); + for (d, s) in acc.iter_mut().zip(src.chunks_exact(sn)) { + let sa = if sf.alpha { s[INKS] } else { 1.0 } * opacity; + if sa <= 0.0 { + continue; + } + let oa = sa + d[INKS] * (1.0 - sa); + let keep = d[INKS] * (1.0 - sa); + for c in 0..INKS { + // An opaque pixel replaces what is below exactly (no rounding through the mix). + d[c] = if sa >= 1.0 { s[c] } else { (s[c] * sa + d[c] * keep) / oa }; + } + d[INKS] = oa; + } + } + data.clear(); + data.resize(acc.len() * n, 0.0); + for (p, o) in acc.iter().zip(data.chunks_exact_mut(n)) { + // White paper carries no ink, so flattening onto it scales the ink by coverage. + let a = p[INKS]; + let k = if paper && a < 1.0 { a } else { 1.0 }; + for c in 0..INKS { + o[c] = p[c] * k; + } + if fmt.alpha { + o[INKS] = if paper { 1.0 } else { a }; + } + } + out.write_region(band, &data); + y = band.y1; + } + out.prune(); + Some(out) +} diff --git a/crates/engine/src/commands.rs b/crates/engine/src/commands.rs index 48caf85b..a47bde9f 100644 --- a/crates/engine/src/commands.rs +++ b/crates/engine/src/commands.rs @@ -774,7 +774,7 @@ fn build() -> Vec { below.push(idx - 1); let lower = doc.layer_at(&below).ok_or(EngineError::NoLayer(id))?.clone(); let upper = doc.layer(id).ok_or(EngineError::NoLayer(id))?.clone(); - let merged = pixels::merge_down(doc.bounds(), &lower, &upper, doc.pixel_format()); + let merged = pixels::merge_down(doc, &lower, &upper); doc.remove(id); *doc.layer_at_mut(&below).ok_or(EngineError::NoLayer(lower.id))? = merged; *active = Some(lower.id); diff --git a/crates/engine/src/flatten_cmyk_tests.rs b/crates/engine/src/flatten_cmyk_tests.rs new file mode 100644 index 00000000..4fd187ce --- /dev/null +++ b/crates/engine/src/flatten_cmyk_tests.rs @@ -0,0 +1,169 @@ +//! #3778: Flatten Image, Merge Visible and Merge Down keep a CMYK document's ink values instead +//! of round-tripping them through RGB. + +use photocraft_cms::synth::{CmykParams, cmyk_profile}; +use photocraft_color::{ColorMode, PixelFormat, SampleType}; +use photocraft_doc::{Document, Layer, LayerContent, Size}; +use photocraft_geom::Rect; +use photocraft_raster::Surface; +use serde_json::json; + +use crate::Session; + +const W: i32 = 16; +const H: i32 = 8; + +fn canvas() -> Rect { + Rect::new(0, 0, W, H) +} + +/// Ink values that vary per pixel and per channel, away from the 8-bit grid. +fn ink(x: i32, y: i32) -> [f32; 4] { + let f = |k: i32| ((x * 7 + y * 13 + k * 29) % 97) as f32 / 96.0 * 0.9 + 0.0371; + [f(0), f(1), f(2), f(3)] +} + +/// A 16-bit CMYK document tagged with a synthetic profile (not the built-in coated CMYK), holding +/// just an opaque Background of varied ink. +fn cmyk_doc() -> Document { + let mut d = Document::new("cmyk", Size::new(W as u32, H as u32), ColorMode::Cmyk, SampleType::U16); + let profile = + cmyk_profile(&CmykParams { description: "Flatten Test CMYK".into(), tvi: [0.26, 0.26, 0.26, 0.3], grid_a2b: 5, grid_b2a: 9, ..Default::default() }); + d.icc_profile = Some(profile.to_bytes()); + let mut bg = Surface::new(PixelFormat::new(ColorMode::Cmyk, SampleType::U16, false)); + for y in 0..H { + for x in 0..W { + bg.write_pixel(x, y, &ink(x, y)); + } + } + let mut layer = Layer::new("Background", LayerContent::Raster(bg)); + layer.locks.transparency = true; + layer.locks.position = true; + d.layers.push(layer); + d +} + +/// A layer above the Background: solid ink on the left half, half-transparent ink on a strip, +/// nothing on the rest. +fn upper_layer() -> Layer { + let mut s = Surface::new(PixelFormat::new(ColorMode::Cmyk, SampleType::U16, true)); + s.fill_rect(Rect::new(0, 0, W / 2, H), &[0.8123, 0.1234, 0.4567, 0.0789, 1.0]); + s.fill_rect(Rect::new(W / 2, 0, W / 2 + 2, H), &[0.25, 0.5, 0.75, 0.1, 0.5]); + Layer::new("Layer 1", LayerContent::Raster(s)) +} + +fn session(doc: Document) -> Session { + let mut s = Session::new(); + s.add_document(doc, None); + s +} + +/// The bottom layer's ink values (C, M, Y, K per pixel, without any alpha channel). +fn pixels(s: &Session) -> Vec { + let surf = s.active().unwrap().doc.layers[0].surface().unwrap(); + let n = surf.channels(); + surf.read_region(canvas()).chunks_exact(n).flat_map(|p| p[..4].to_vec()).collect() +} + +fn bottom_format(s: &Session) -> PixelFormat { + s.active().unwrap().doc.layers[0].surface().unwrap().format() +} + +#[test] +fn flattening_a_lone_cmyk_background_keeps_its_pixels() { + let doc = cmyk_doc(); + let before = doc.layers[0].surface().unwrap().read_region(canvas()); + let mut s = session(doc); + s.execute("layer.flattenImage", json!({})).unwrap(); + let fmt = bottom_format(&s); + assert_eq!((fmt.mode, fmt.sample), (ColorMode::Cmyk, SampleType::U16), "16-bit CMYK stays 16-bit CMYK"); + let moved = pixels(&s).iter().zip(&before).filter(|(a, b)| a != b).count(); + assert_eq!(moved, 0, "a single Background must flatten to the same ink values"); +} + +/// What a Normal 100 % layer over the Background gives, worked out in ink values: the solid part +/// replaces the ink, the half-transparent strip mixes half and half, the rest shows the Background. +fn expected_two_layers() -> Vec { + let mut out = Vec::new(); + for y in 0..H { + for x in 0..W { + let below = ink(x, y); + let px = if x < W / 2 { + [0.8123, 0.1234, 0.4567, 0.0789] + } else if x < W / 2 + 2 { + let top = [0.25, 0.5, 0.75, 0.1]; + [0, 1, 2, 3].map(|c| top[c] * 0.5 + below[c] * 0.5) + } else { + below + }; + out.extend_from_slice(&px); + } + } + out +} + +fn assert_close(got: &[f32], want: &[f32], what: &str) { + assert_eq!(got.len(), want.len(), "{what}: pixel count"); + // One 16-bit code (the stored value is quantised to 1/65535). + let worst = got.iter().zip(want).map(|(a, b)| (a - b).abs()).fold(0.0f32, f32::max); + assert!(worst <= 1.0 / 65535.0 + 1e-6, "{what}: ink values moved by up to {worst}"); +} + +#[test] +fn flattening_normal_cmyk_layers_composites_in_ink_values() { + let mut doc = cmyk_doc(); + doc.layers.push(upper_layer()); + let mut s = session(doc); + s.execute("layer.flattenImage", json!({})).unwrap(); + assert_eq!(s.active().unwrap().doc.layers.len(), 1); + assert_eq!(bottom_format(&s).sample, SampleType::U16); + assert_close(&pixels(&s), &expected_two_layers(), "Flatten Image"); +} + +#[test] +fn merge_visible_and_merge_down_keep_cmyk_ink_values() { + for cmd in ["layer.mergeVisible", "layer.mergeDown"] { + let mut doc = cmyk_doc(); + let upper = upper_layer(); + let id = upper.id; + doc.layers.push(upper); + let mut s = session(doc); + s.execute(cmd, json!({"layer": id.0})).unwrap(); + assert_eq!(s.active().unwrap().doc.layers.len(), 1, "{cmd}"); + assert_eq!(bottom_format(&s).sample, SampleType::U16, "{cmd}"); + assert_close(&pixels(&s), &expected_two_layers(), cmd); + } +} + +/// A stack the ink-value path can't take (a Multiply layer) still goes through the compositor, +/// but separates back through the document's profile, the one it read the ink through, so the +/// round trip lands near the original ink instead of on the built-in profile's separation. +#[test] +fn compositor_flatten_separates_through_the_documents_profile() { + let mut doc = cmyk_doc(); + // Light inks, inside the printable gamut, so a separation can give them back. + let bg = doc.layers[0].surface_mut().unwrap(); + for y in 0..H { + for x in 0..W { + bg.write_pixel(x, y, &ink(x, y).map(|v| v * 0.4)); + } + } + let before = doc.layers[0].surface().unwrap().read_region(canvas()); + let mut empty = Layer::new("Layer 1", LayerContent::Raster(Surface::new(PixelFormat::new(ColorMode::Cmyk, SampleType::U16, true)))); + empty.blend = photocraft_color::blend::BlendMode::Multiply; + doc.layers.push(empty); + let mut s = session(doc); + s.execute("layer.flattenImage", json!({})).unwrap(); + // Compare what the inks print as (a CMYK colour has many separations): RGB through the profile. + let d = &s.active().unwrap().doc; + let space = photocraft_compose::cmyk_space(d); + let shown = |v: &[f32]| -> Vec<[f32; 3]> { + photocraft_color::convert::with_cmyk_space(space.as_ref(), || v.as_chunks::<4>().0.iter().map(|p| photocraft_color::convert::cmyk_to_rgb(*p)).collect()) + }; + let (a, b) = (shown(&pixels(&s)), shown(&before)); + let diffs: Vec = a.iter().zip(&b).flat_map(|(p, q)| (0..3).map(move |c| (p[c] - q[c]).abs())).collect(); + let mean = diffs.iter().sum::() / diffs.len() as f32; + // The synthetic profile's small tables don't round-trip exactly; the built-in profile's + // separation lands about 0.08 off on average. + assert!(mean < 0.03, "flattening shifted the printed colour by {mean} on average"); +} diff --git a/crates/engine/src/pixels.rs b/crates/engine/src/pixels.rs index 2ba5b5dc..b19a1b27 100644 --- a/crates/engine/src/pixels.rs +++ b/crates/engine/src/pixels.rs @@ -21,32 +21,11 @@ pub fn composite_layers(solo: &Document, format: photocraft_color::PixelFormat, .reduce(|a, b| a.union(&b)) .unwrap_or(Rect::EMPTY) .intersect(&canvas); - let mut surface = Surface::new(format); if area.is_empty() { - return surface; + return Surface::new(format); } - - let channels = format.channels(); - let mut data = Vec::new(); - let _ = photocraft_compose::render_bands(solo, area, 0, |mut band| -> Result<(), ()> { - if let Some(color) = background { - for pixel in &mut band.px { - let alpha = pixel[3]; - for channel in 0..3 { - pixel[channel] = pixel[channel] * alpha + color[channel] * (1.0 - alpha); - } - pixel[3] = 1.0; - } - } - data.resize(band.px.len() * channels, 0.0); - for (pixel, encoded) in band.px.iter().zip(data.chunks_exact_mut(channels)) { - photocraft_raster::from_rgba_into(&format, *pixel, encoded); - } - surface.write_region(band.rect, &data); - Ok(()) - }); - surface.prune(); - surface + // Also keeps a plain CMYK stack in its ink values (#3778). + photocraft_compose::composite_to_surface(solo, area, format, background) } /// Apply an adjustment destructively to a surface, weighted by an optional selection. @@ -77,6 +56,9 @@ pub fn adjust_surface(s: &mut Surface, adj: &Adjustment, selection: Option<&Surf s.put_tiles(done); } +#[cfg(test)] +#[path = "flatten_cmyk_tests.rs"] +mod flatten_cmyk_tests; #[cfg(test)] #[path = "pixels_tests.rs"] mod tests; @@ -296,9 +278,12 @@ pub fn remap_surface(s: &Surface, map: impl Fn(i32, i32) -> (i32, i32)) -> Surfa } /// Merge `upper` onto `lower` producing a raster layer (Layer → Merge Down). -pub fn merge_down(doc_bounds: Rect, lower: &Layer, upper: &Layer, format: photocraft_color::PixelFormat) -> Layer { +pub fn merge_down(doc: &Document, lower: &Layer, upper: &Layer) -> Layer { + let format = doc.pixel_format(); let stack = vec![lower.clone(), upper.clone()]; - let mut tmp = Document::new("merge", doc_bounds.size(), format.mode, format.sample); + let mut tmp = Document::new("merge", doc.size, format.mode, format.sample); + // The pair is read (and a CMYK one separated again) through the document's own profile. + tmp.icc_profile = doc.icc_profile.clone(); tmp.layers = stack; let s = composite_layers(&tmp, format, None); let mut merged = Layer::new(lower.name.clone(), LayerContent::Raster(s)); From b0554b8178dfbe8b1c7121bb89d8c0b2873bc97a Mon Sep 17 00:00:00 2001 From: Reynold Hu Date: Mon, 12 Oct 2026 20:34:22 +0800 Subject: [PATCH 55/92] Type: wire missingGlyphProtection (script fallback toggle) (#3863) * text: missing glyph protection can turn the script fallback stack off (#1909) * engine: apply type.missingGlyphProtection to the live text engine * docs: scorecard, settings that do nothing 30 -> 29 of 154 --- crates/engine/src/prefs.rs | 17 ++++++++++++++--- crates/text/src/fonts.rs | 18 +++++++++++++++++- crates/text/src/tests.rs | 19 +++++++++++++++++++ docs/scorecard.md | 6 +++--- 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/crates/engine/src/prefs.rs b/crates/engine/src/prefs.rs index c99c3cbb..208cee01 100644 --- a/crates/engine/src/prefs.rs +++ b/crates/engine/src/prefs.rs @@ -869,6 +869,15 @@ impl Default for TypePrefs { } } +impl TypePrefs { + /// Preferences ▸ Type ▸ Missing Glyph Protection: with it on (the default, as in Photoshop), + /// glyphs the chosen face lacks fall back through the coverage fonts (#1909). The text engine + /// applies this in `Session::apply_prefs`. + pub fn missing_glyph_protection(&self) -> bool { + self.missing_glyph_protection + } +} + #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(default, rename_all = "camelCase")] pub struct EnhancedControls { @@ -1049,7 +1058,6 @@ pub const HIDDEN_UNTIL_IMPLEMENTED: &[&str] = &[ "plugIns.showExtensionPanels", "plugIns.allowScriptsToConnect", "plugIns.generatorEnabled", - "type.missingGlyphProtection", "type.textEngine", "type.recentFonts", "enhancedControls.scrubbySliderAcceleration", @@ -1484,8 +1492,8 @@ impl Session { r } - /// Push engine-relevant preferences into live state: every document's history limit and - /// the layer-effect cache budget. + /// Push engine-relevant preferences into live state: every document's history limit, the + /// layer-effect cache budget and the text engine's missing-glyph protection. pub fn apply_prefs(&mut self) { let n = self.prefs().performance.history_states.max(1) as usize; let bytes = self.prefs().performance.history_budget_bytes(); @@ -1496,6 +1504,9 @@ impl Session { st.history.trim(&st.doc); } photocraft_compose::set_effect_cache_budget(budget << 20); + if let Ok(mut engine) = photocraft_text::shared().lock() { + engine.fonts.set_missing_glyph_protection(self.prefs().type_.missing_glyph_protection()); + } crate::plugin_cmds::sync_prefs(self); } diff --git a/crates/text/src/fonts.rs b/crates/text/src/fonts.rs index 1d728f14..21fc1a92 100644 --- a/crates/text/src/fonts.rs +++ b/crates/text/src/fonts.rs @@ -140,6 +140,9 @@ pub struct FontDb { /// PostScript name → (family, weight, italic), filled lazily. ps_cache: HashMap>, fallbacks: Vec, + /// Preferences ▸ Type ▸ Missing Glyph Protection: route glyphs the chosen face lacks through + /// [`Self::fallback_stack`] (#1909). Off, only the default family shapes the text. + missing_glyph_protection: bool, face_cache: HashMap>, face_aliases: HashMap<(String, usize), String>, } @@ -159,6 +162,7 @@ impl FontDb { system_loaded: false, ps_cache: HashMap::new(), fallbacks: Vec::new(), + missing_glyph_protection: true, face_cache: HashMap::new(), face_aliases: HashMap::new(), }; @@ -272,8 +276,20 @@ impl FontDb { } /// Families available after the requested one (bundled default + installed coverage fonts). + /// With missing glyph protection off (Preferences ▸ Type), only the default family shapes. pub(crate) fn fallback_stack(&self) -> impl Iterator { - std::iter::once(DEFAULT_FAMILY).chain(self.fallbacks.iter().map(String::as_str)) + let fallbacks = self.missing_glyph_protection.then_some(self.fallbacks.iter().map(String::as_str)); + std::iter::once(DEFAULT_FAMILY).chain(fallbacks.into_iter().flatten()) + } + + /// Preferences ▸ Type ▸ Missing Glyph Protection, applied by the engine's `apply_prefs`. + pub fn set_missing_glyph_protection(&mut self, on: bool) { + self.missing_glyph_protection = on; + } + + /// Is missing glyph protection on? + pub fn missing_glyph_protection(&self) -> bool { + self.missing_glyph_protection } /// All family names, sorted. diff --git a/crates/text/src/tests.rs b/crates/text/src/tests.rs index b1a1949c..dc8df9e5 100644 --- a/crates/text/src/tests.rs +++ b/crates/text/src/tests.rs @@ -1580,6 +1580,25 @@ fn a_served_script_fallback_joins_the_fallback_stack_once_it_arrives() { assert!(db.fallback_stack().any(|f| f == "Cairo"), "{:?}", db.fallback_stack().collect::>()); } +/// Preferences ▸ Type ▸ Missing Glyph Protection: off, only the default family is in the +/// fallback stack, so a face without the glyph shows the missing-glyph box instead of a +/// fallback's glyph (#1909). +#[test] +fn missing_glyph_protection_can_turn_the_fallback_stack_off() { + let Some(cairo) = crate::CRAFT_FONTS.iter().find(|f| f.family == "Cairo") else { + eprintln!("skipping: built without craft-fonts (set CRAFT_FONTS_DIR to a craft-fonts checkout)"); + return; + }; + let mut db = fonts::FontDb::new(); + db.register_font_data(cairo.bytes.to_vec()); + assert!(db.missing_glyph_protection(), "on by default, as in Photoshop"); + assert!(db.fallback_stack().any(|f| f == "Cairo")); + db.set_missing_glyph_protection(false); + assert_eq!(db.fallback_stack().collect::>(), [fonts::DEFAULT_FAMILY], "only the default family remains"); + db.set_missing_glyph_protection(true); + assert!(db.fallback_stack().any(|f| f == "Cairo"), "turning it back on restores the coverage fonts"); +} + #[test] fn translate_tysh_moves_only_the_translation() { let mut t = point("Hello!", 26.0); diff --git a/docs/scorecard.md b/docs/scorecard.md index 80cb52fa..01296e37 100644 --- a/docs/scorecard.md +++ b/docs/scorecard.md @@ -9,7 +9,7 @@ Generated by `cargo xtask scorecard` from `perf/budgets.toml`, `perf/baseline.js | [Performance](#performance) | 3 | 22 | 22 | 56 scenarios: 3 within budget, 22 over budget or failing, 9 tracked only, 17 not run, 5 not measurable yet (baseline 2026-10-05) | | [File compatibility](#file-compatibility) | 6 | 13 | 8 | io corpus: oracle ≥ 146/170, round trip ≥ 169/170; psd-tools corpus: oracle ≥ 236/309, round trip ≥ 308/309; photoshop oracles: oracle ≥ 133/256, round trip ≥ 258/256 | | [Tools](#tools) | 28 | 14 | 1 | | -| [Workspace and UI](#workspace-and-ui) | 13 | 5 | 5 | settings that do nothing: 30 of 155 (target 0) | +| [Workspace and UI](#workspace-and-ui) | 13 | 5 | 5 | settings that do nothing: 29 of 155 (target 0) | | [Type](#type) | 4 | 2 | 3 | | | [Automation](#automation) | 4 | 2 | 5 | 631 of 631 menu items live (100.0%) | | [Reliability](#reliability) | 5 | 2 | 0 | never-crash lints on 28 of 28 crates; panic_hunt present | @@ -176,9 +176,9 @@ Corpus floors (`crates/io/tests/corpus.rs`): the enforced minimums; the corpus t ## Workspace and UI -**Settings that do nothing: 30 of 155** (target 0, #204). Counted by the prefs audit (`xtask/src/scorecard.rs`): a `Preferences` field counts as read when code outside the prefs model (`prefs.rs` except its `impl Session` blocks; tests excluded; the schema-driven dialog never names a field) accesses `section.field`, or `.section` and `.field` in the same file, or calls a section method that reads `self.field`. It is a heuristic lower bound: a generic name can look read when it isn't. +**Settings that do nothing: 29 of 155** (target 0, #204). Counted by the prefs audit (`xtask/src/scorecard.rs`): a `Preferences` field counts as read when code outside the prefs model (`prefs.rs` except its `impl Session` blocks; tests excluded; the schema-driven dialog never names a field) accesses `section.field`, or `.section` and `.field` in the same file, or calls a section method that reads `self.field`. It is a heuristic lower bound: a generic name can look read when it isn't. -Unread: `general.color_picker`, `general.animated_zoom`, `general.zoom_resizes_windows`, `workspace.auto_collapse_icon_panels`, `workspace.auto_show_hidden_panels`, `workspace.enable_floating_document_window_docking`, `workspace.enable_narrow_options_bar`, `file_handling.save_in_background`, `file_handling.maximize_psd_compatibility`, `performance.cache_levels`, `performance.legacy_compositing`, `scratch_disks.disks`, `units_and_rulers.column_width`, `units_and_rulers.gutter`, `plug_ins.show_extension_panels`, `plug_ins.allow_scripts_to_connect`, `plug_ins.generator_enabled`, `type_.missing_glyph_protection`, `type_.text_engine`, `type_.recent_fonts`, `enhanced_controls.scrubby_slider_acceleration`, `enhanced_controls.touch_gestures`, `raw_defaults.color_space`, `raw_defaults.bit_depth`, `raw_defaults.resolution`, `raw_defaults.sharpen_for`, `raw_defaults.open_as_smart_object`, `raw_defaults.apply_auto_tone`, `integrations.allow_agent_control`, `integrations.control_port`. +Unread: `general.color_picker`, `general.animated_zoom`, `general.zoom_resizes_windows`, `workspace.auto_collapse_icon_panels`, `workspace.auto_show_hidden_panels`, `workspace.enable_floating_document_window_docking`, `workspace.enable_narrow_options_bar`, `file_handling.save_in_background`, `file_handling.maximize_psd_compatibility`, `performance.cache_levels`, `performance.legacy_compositing`, `scratch_disks.disks`, `units_and_rulers.column_width`, `units_and_rulers.gutter`, `plug_ins.show_extension_panels`, `plug_ins.allow_scripts_to_connect`, `plug_ins.generator_enabled`, `type_.text_engine`, `type_.recent_fonts`, `enhanced_controls.scrubby_slider_acceleration`, `enhanced_controls.touch_gestures`, `raw_defaults.color_space`, `raw_defaults.bit_depth`, `raw_defaults.resolution`, `raw_defaults.sharpen_for`, `raw_defaults.open_as_smart_object`, `raw_defaults.apply_auto_tone`, `integrations.allow_agent_control`, `integrations.control_port`. | Id | Target | Status | Issue | Note | |---|---|---|---|---| From fc02c91ffbab6639187d78a6cf107e98907fff4f Mon Sep 17 00:00:00 2001 From: Fabio Lussi Date: Mon, 12 Oct 2026 14:43:41 +0200 Subject: [PATCH 56/92] io: read version 3 Photo Filter colour as XYZ, not Lab (#3790) Photoshop CS2 writes `phfl` version 3 with "4 bytes each for XYZ color". The parser read those values as Lab x100, so real files (L = 241.91) fell back to Unsupported. Read them as D50 XYZ with 1.0 = 32768 (the ICC 16-bit PCSXYZ encoding; the scale is inferred from a real file, the spec does not give it). Writing stays version 2 RGB. Fixes #3777 Co-authored-by: Fabio Lussi <198260595+itrycodinganditsbad@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 --- crates/io/src/adjust_map.rs | 85 +++++++++++++++++++++++++------------ crates/io/src/psd_export.rs | 30 +++++++++++++ 2 files changed, 88 insertions(+), 27 deletions(-) diff --git a/crates/io/src/adjust_map.rs b/crates/io/src/adjust_map.rs index 2489b669..d7ebad09 100644 --- a/crates/io/src/adjust_map.rs +++ b/crates/io/src/adjust_map.rs @@ -506,8 +506,16 @@ fn parse_black_white(d: &[u8]) -> Option { } /// `phfl` (Adobe spec, "Photo Filter"): version (2 or 3); version 2 has a colour structure -/// (colour space + four u16), version 3 three i32 holding the Lab colour ×100 (as documented by -/// ag-psd, MIT); then density (u32 percent) and preserve luminosity (1 byte). +/// (colour space + four u16), version 3 "4 bytes each for XYZ color"; then density (u32 percent) +/// and preserve luminosity (1 byte). +/// +/// The spec gives no scale for the XYZ values. They are read as D50 XYZ (the ICC PCS) with +/// 1.0 = 32768, the ICC 16-bit PCSXYZ encoding. That is inferred, not documented: the +/// Photoshop CS2 file in #3777 holds (24191, 25002, 3827), a bright warm yellow at this scale, +/// and rendering it against Photoshop's export fit best between 30000 and 32768 (1.0 = 65536, +/// a dull olive, was clearly worse). +const PHFL_XYZ_ONE: f32 = 32768.0; + fn parse_photo_filter(d: &[u8]) -> Option { let (color, at) = match be16(d, 0)? { 2 => { @@ -519,11 +527,13 @@ fn parse_photo_filter(d: &[u8]) -> Option { (crate::channel_map::decode_color(space, c).to_rgb(), 12) } 3 => { - let lab = [be32(d, 2)? as i32, be32(d, 6)? as i32, be32(d, 10)? as i32].map(|v| v as f32 / 100.0); - if !(0.0..=100.0).contains(&lab[0]) || lab[1].abs() > 128.0 || lab[2].abs() > 128.0 { + let xyz = [be32(d, 2)?, be32(d, 6)?, be32(d, 10)?].map(|v| v as f32 / PHFL_XYZ_ONE); + // Real colours stay below about 1.0; anything past 2.0 is not an XYZ colour. + if xyz.iter().any(|v| *v > 2.0) { return None; } - (photocraft_color::convert::lab_to_srgb(lab), 14) + let lin = photocraft_color::convert::mat3_mul(&photocraft_color::convert::XYZ_D50_TO_SRGB, xyz); + (lin.map(|v| photocraft_color::convert::linear_to_srgb(v.clamp(0.0, 1.0))), 14) } _ => return None, }; @@ -1075,15 +1085,17 @@ mod tests { assert!(matches!(parse(b"mixr", &ours[0].1, None, Channels::Cmyk), Adjustment::ChannelMixer { .. })); assert!(matches!(parse(b"mixr", &ours[0].1, None, Channels::Other), Adjustment::ChannelMixer { .. })); assert!(matches!(parse(b"mixr", &[0, 1, 0, 0, 0, 100], None, Channels::Rgb), Adjustment::Unsupported { .. })); - // Photo Filter: unknown version, HSB colour space, out-of-range version-3 Lab, truncated. + // Photo Filter: unknown version, HSB colour space, out-of-range version-3 XYZ, truncated. assert!(matches!(parse(b"phfl", &[0, 4, 0, 0], None, Channels::Rgb), Adjustment::Unsupported { .. })); assert!(matches!(parse(b"phfl", &[0, 2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 1], None, Channels::Rgb), Adjustment::Unsupported { .. })); - let mut lab = vec![0, 3]; - for x in [20000i32, 0, 0] { - lab.extend(x.to_be_bytes()); + for bad in [[200_000u32, 0, 0], [0, u32::MAX, 0]] { + let mut xyz = vec![0, 3]; + for x in bad { + xyz.extend(x.to_be_bytes()); + } + xyz.extend([0, 0, 0, 25, 1]); + assert!(matches!(parse(b"phfl", &xyz, None, Channels::Rgb), Adjustment::Unsupported { .. })); } - lab.extend([0, 0, 0, 25, 1]); - assert!(matches!(parse(b"phfl", &lab, None, Channels::Rgb), Adjustment::Unsupported { .. })); assert!(matches!(parse(b"phfl", &[0, 2, 0, 0, 0, 0], None, Channels::Rgb), Adjustment::Unsupported { .. })); // Arbitrary bytes never panic, whatever the key. for key in ADJUSTMENT_KEYS { @@ -1156,25 +1168,44 @@ mod tests { let Adjustment::PhotoFilter { color, density, preserve_luminosity: false } = parse(b"phfl", &lab, None, Channels::Rgb) else { panic!() }; assert!(color.iter().all(|c| (c - 0.466).abs() < 0.01), "{color:?}"); assert_eq!(density, 0.25); - // Version 3: Lab ×100 as i32 (L 100, a 0, b 0 = white), density 100 %. - let mut v3 = vec![0, 3]; - for x in [10000i32, 0, 0] { - v3.extend(x.to_be_bytes()); - } - v3.extend(100u32.to_be_bytes()); - v3.push(1); + // Version 3: D50 XYZ, 1.0 = 32768. The ICC sRGB white point (D50) is white. + let v3 = phfl_v3([31595, 32768, 27040], 100, true); let Adjustment::PhotoFilter { color, density, preserve_luminosity: true } = parse(b"phfl", &v3, None, Channels::Rgb) else { panic!() }; - assert!(color.iter().all(|c| (c - 1.0).abs() < 0.01), "{color:?}"); + assert!(color.iter().all(|c| (c - 1.0).abs() < 0.005), "{color:?}"); assert_eq!(density, 1.0); - // A negative a* (green) in version 3. - let mut green = vec![0, 3]; - for x in [5000i32, -6000, 0] { - green.extend(x.to_be_bytes()); + // Photoshop's Warming Filter (85) preset, sRGB #EC8A00, is D50 XYZ (15193, 12086, 1192). + let Adjustment::PhotoFilter { color, density, preserve_luminosity: false } = + parse(b"phfl", &phfl_v3([15193, 12086, 1192], 25, false), None, Channels::Rgb) + else { + panic!() + }; + let expected = [0xecu8, 0x8a, 0x00].map(|v| f32::from(v) / 255.0); + assert!(color.iter().zip(expected).all(|(got, want)| (got - want).abs() < 1.5 / 255.0), "{color:?}"); + assert_eq!(density, 0.25); + // The block from #3777 (Photoshop CS2): a warm yellow, density 63 %, preserve luminosity. + let issue = [0, 3, 0, 0, 0x5e, 0x7f, 0, 0, 0x61, 0xaa, 0, 0, 0x0e, 0xf3, 0, 0, 0, 0x3f, 1, 0]; + let Adjustment::PhotoFilter { color, density, preserve_luminosity: true } = parse(b"phfl", &issue, None, Channels::Rgb) else { panic!() }; + assert!(color[0] > color[1] && color[1] > color[2] && color[1] > 0.8 && color[2] < 0.3, "{color:?}"); + assert_eq!(density, 0.63); + // The 19-byte form (no trailing pad) parses the same. + assert_eq!(parse(b"phfl", &issue[..19], None, Channels::Rgb), parse(b"phfl", &issue, None, Channels::Rgb)); + // Version 3 is read, never written: an edited filter is saved as version 2 and keeps its colour. + let a = parse(b"phfl", &issue, None, Channels::Rgb); + let w = write(&a); + assert_eq!(&w[0].1[..2], &[0, 2]); + let Adjustment::PhotoFilter { color: back, .. } = parse(b"phfl", &w[0].1, None, Channels::Rgb) else { panic!() }; + assert!(back.iter().zip(color).all(|(b, c)| (b - c).abs() <= 1.0 / 65535.0)); + } + + /// A version 3 Photo Filter block: version, three u32 XYZ components, density, flag, pad. + fn phfl_v3(xyz: [u32; 3], density: u32, preserve_luminosity: bool) -> Vec { + let mut d = vec![0, 3]; + for x in xyz { + d.extend(x.to_be_bytes()); } - green.extend(30u32.to_be_bytes()); - green.push(0); - let Adjustment::PhotoFilter { color, .. } = parse(b"phfl", &green, None, Channels::Rgb) else { panic!() }; - assert!(color[1] > color[0] && color[1] > color[2], "{color:?}"); + d.extend(density.to_be_bytes()); + d.extend([u8::from(preserve_luminosity), 0]); + d } #[test] diff --git a/crates/io/src/psd_export.rs b/crates/io/src/psd_export.rs index 3d8d637e..4c7463a3 100644 --- a/crates/io/src/psd_export.rs +++ b/crates/io/src/psd_export.rs @@ -1727,6 +1727,36 @@ mod tests { assert_phfl(&PsdFile::from_bytes(&repaired_bytes).unwrap()); } + #[test] + fn photo_filter_version_3_is_kept_until_edited() { + // The #3777 block (Photoshop CS2, XYZ colour): saved back byte-exact while unchanged. + let v3 = vec![0, 3, 0, 0, 0x5e, 0x7f, 0, 0, 0x61, 0xaa, 0, 0, 0x0e, 0xf3, 0, 0, 0, 0x3f, 1, 0]; + let adjustment = crate::adjust_map::parse(b"phfl", &v3, None, crate::adjust_map::Channels::Rgb); + let photocraft_doc::Adjustment::PhotoFilter { color, .. } = adjustment else { panic!("{adjustment:?}") }; + let mut doc = + Document::with_background("Photo Filter v3", photocraft_geom::Size::new(8, 8), ColorMode::Rgb, SampleType::U8, photocraft_doc::Color::WHITE); + let mut layer = Layer::new("Photo Filter 1", LayerContent::Adjustment(adjustment.clone())); + layer.psd_blocks = vec![(*b"phfl", std::sync::Arc::new(v3.clone()))]; + doc.layers.push(layer); + let phfl = |doc: &Document| { + let file = PsdFile::from_bytes(&document_to_psd(doc).to_bytes().unwrap()).unwrap(); + let records = &file.layer_info.as_ref().unwrap().layers; + records.iter().flat_map(|r| r.blocks.iter()).find(|b| b.key == *b"phfl").map(|b| b.data.clone()).expect("Photo Filter adjustment data") + }; + assert_eq!(phfl(&doc), v3); + // Once edited it is written as version 2 (RGB), and the colour survives. + let edited = photocraft_doc::Adjustment::PhotoFilter { color, density: 0.5, preserve_luminosity: true }; + if let Some(l) = doc.layers.last_mut() { + l.content = LayerContent::Adjustment(edited.clone()); + } + let saved = phfl(&doc); + assert_eq!(&saved[..2], &[0, 2]); + let reread = crate::adjust_map::parse(b"phfl", &saved, None, crate::adjust_map::Channels::Rgb); + let photocraft_doc::Adjustment::PhotoFilter { color: back, density, .. } = reread else { panic!("{reread:?}") }; + assert!(back.iter().zip(color).all(|(b, c)| (b - c).abs() <= 1.0 / 65535.0), "{back:?} vs {color:?}"); + assert_eq!(density, 0.5); + } + #[test] fn size_limit_boundary_keeps_limit_and_switches_above_it() { assert!(!exceeds_psd_size_limit(Some(PSD_MAX_FILE_SIZE))); From dcc9f86aa5826af846deb67d99f9fac002e3dcdc Mon Sep 17 00:00:00 2001 From: Reynold Hu Date: Mon, 12 Oct 2026 20:43:48 +0800 Subject: [PATCH 57/92] Workspace: wire Enable Narrow Options Bar (#204) (#3870) * engine: expose workspace.enableNarrowOptionsBar through a Workspace helper * ui: the options bar honors the narrow options bar preference * docs: scorecard, settings that do nothing 30 -> 29 of 154 --- crates/engine/src/prefs.rs | 9 +++++++- crates/ui-egui/src/panels.rs | 42 +++++++++++++++++++++++++++++++++++- docs/scorecard.md | 6 +++--- 3 files changed, 52 insertions(+), 5 deletions(-) diff --git a/crates/engine/src/prefs.rs b/crates/engine/src/prefs.rs index 208cee01..beef58c9 100644 --- a/crates/engine/src/prefs.rs +++ b/crates/engine/src/prefs.rs @@ -341,6 +341,14 @@ impl Default for Workspace { } } +impl Workspace { + /// Preferences ▸ Workspace ▸ Enable Narrow Options Bar: the options bar drops to its compact + /// height, as in Photoshop, so the document gets more room (see `panels::options_bar`). + pub fn narrow_options_bar(&self) -> bool { + self.enable_narrow_options_bar + } +} + #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(default, rename_all = "camelCase")] pub struct Tools { @@ -1046,7 +1054,6 @@ pub const HIDDEN_UNTIL_IMPLEMENTED: &[&str] = &[ "workspace.autoCollapseIconPanels", "workspace.autoShowHiddenPanels", "workspace.enableFloatingDocumentWindowDocking", - "workspace.enableNarrowOptionsBar", "fileHandling.saveInBackground", "fileHandling.maximizePsdCompatibility", "performance.cacheLevels", diff --git a/crates/ui-egui/src/panels.rs b/crates/ui-egui/src/panels.rs index d908af7a..0f6a1b83 100644 --- a/crates/ui-egui/src/panels.rs +++ b/crates/ui-egui/src/panels.rs @@ -852,10 +852,22 @@ fn reveal_focused_control(ui: &egui::Ui) { // ----------------------------------------------------------------------------- options bar +/// Options bar height: Preferences ▸ Workspace ▸ Enable Narrow Options Bar trims it, as in +/// Photoshop, leaving the document more room. +fn options_bar_height(pro: bool, narrow: bool) -> f32 { + match (pro, narrow) { + (true, false) => 36.0, + (true, true) => 30.0, + (false, false) => 42.0, + (false, true) => 34.0, + } +} + pub fn options_bar(app: &mut PhotocraftApp, ui: &mut egui::Ui) { let t = Tokens::get(ui.ctx()); + let narrow = app.session.prefs().workspace.narrow_options_bar(); egui::Panel::top("options_bar") - .exact_size(if t.pro { 36.0 } else { 42.0 }) + .exact_size(options_bar_height(t.pro, narrow)) .frame(egui::Frame::NONE.fill(t.chrome).inner_margin(egui::Margin::symmetric(10, 0))) .show(ui, |ui| { ui.style_mut().spacing.scroll = egui::style::ScrollStyle { bar_width: 4.0, ..egui::style::ScrollStyle::floating() }; @@ -5556,6 +5568,34 @@ mod compact_visual_regressions { } } + #[test] + fn the_narrow_options_bar_preference_shortens_the_bar() { + assert_eq!(options_bar_height(true, false), 36.0); + assert_eq!(options_bar_height(true, true), 30.0); + assert_eq!(options_bar_height(false, false), 42.0); + assert_eq!(options_bar_height(false, true), 34.0); + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + crate::theme::apply(&ctx, crate::theme::ThemeKind::ALL[0]); + let mut app = PhotocraftApp::new(photocraft_engine::Session::new(), Default::default()); + let screen = Rect::from_min_size(egui::Pos2::ZERO, vec2(1600.0, 900.0)); + let run = |app: &mut PhotocraftApp| { + let mut top = 0.0; + let mut out = ctx.run_ui(input_at_scale(screen, 1.0), |ui| { + options_bar(app, ui); + top = ui.available_rect_before_wrap().top(); + }); + out.textures_delta.clear(); + top + }; + let normal = run(&mut app); + assert_eq!(normal, options_bar_height(Tokens::get(&ctx).pro, false)); + app.session.execute("prefs.set", json!({"path": "workspace.enableNarrowOptionsBar", "value": true})).unwrap(); + let narrow = run(&mut app); + assert_eq!(narrow, options_bar_height(Tokens::get(&ctx).pro, true)); + assert!(narrow < normal, "narrow {narrow} must trim the bar under {normal}"); + } + #[test] fn narrow_tool_options_can_scroll_to_the_last_control() { for kind in crate::theme::ThemeKind::ALL { diff --git a/docs/scorecard.md b/docs/scorecard.md index 01296e37..fb430469 100644 --- a/docs/scorecard.md +++ b/docs/scorecard.md @@ -9,7 +9,7 @@ Generated by `cargo xtask scorecard` from `perf/budgets.toml`, `perf/baseline.js | [Performance](#performance) | 3 | 22 | 22 | 56 scenarios: 3 within budget, 22 over budget or failing, 9 tracked only, 17 not run, 5 not measurable yet (baseline 2026-10-05) | | [File compatibility](#file-compatibility) | 6 | 13 | 8 | io corpus: oracle ≥ 146/170, round trip ≥ 169/170; psd-tools corpus: oracle ≥ 236/309, round trip ≥ 308/309; photoshop oracles: oracle ≥ 133/256, round trip ≥ 258/256 | | [Tools](#tools) | 28 | 14 | 1 | | -| [Workspace and UI](#workspace-and-ui) | 13 | 5 | 5 | settings that do nothing: 29 of 155 (target 0) | +| [Workspace and UI](#workspace-and-ui) | 13 | 5 | 5 | settings that do nothing: 28 of 156 (target 0) | | [Type](#type) | 4 | 2 | 3 | | | [Automation](#automation) | 4 | 2 | 5 | 631 of 631 menu items live (100.0%) | | [Reliability](#reliability) | 5 | 2 | 0 | never-crash lints on 28 of 28 crates; panic_hunt present | @@ -176,9 +176,9 @@ Corpus floors (`crates/io/tests/corpus.rs`): the enforced minimums; the corpus t ## Workspace and UI -**Settings that do nothing: 29 of 155** (target 0, #204). Counted by the prefs audit (`xtask/src/scorecard.rs`): a `Preferences` field counts as read when code outside the prefs model (`prefs.rs` except its `impl Session` blocks; tests excluded; the schema-driven dialog never names a field) accesses `section.field`, or `.section` and `.field` in the same file, or calls a section method that reads `self.field`. It is a heuristic lower bound: a generic name can look read when it isn't. +**Settings that do nothing: 28 of 156** (target 0, #204). Counted by the prefs audit (`xtask/src/scorecard.rs`): a `Preferences` field counts as read when code outside the prefs model (`prefs.rs` except its `impl Session` blocks; tests excluded; the schema-driven dialog never names a field) accesses `section.field`, or `.section` and `.field` in the same file, or calls a section method that reads `self.field`. It is a heuristic lower bound: a generic name can look read when it isn't. -Unread: `general.color_picker`, `general.animated_zoom`, `general.zoom_resizes_windows`, `workspace.auto_collapse_icon_panels`, `workspace.auto_show_hidden_panels`, `workspace.enable_floating_document_window_docking`, `workspace.enable_narrow_options_bar`, `file_handling.save_in_background`, `file_handling.maximize_psd_compatibility`, `performance.cache_levels`, `performance.legacy_compositing`, `scratch_disks.disks`, `units_and_rulers.column_width`, `units_and_rulers.gutter`, `plug_ins.show_extension_panels`, `plug_ins.allow_scripts_to_connect`, `plug_ins.generator_enabled`, `type_.text_engine`, `type_.recent_fonts`, `enhanced_controls.scrubby_slider_acceleration`, `enhanced_controls.touch_gestures`, `raw_defaults.color_space`, `raw_defaults.bit_depth`, `raw_defaults.resolution`, `raw_defaults.sharpen_for`, `raw_defaults.open_as_smart_object`, `raw_defaults.apply_auto_tone`, `integrations.allow_agent_control`, `integrations.control_port`. +Unread: `general.color_picker`, `general.animated_zoom`, `general.zoom_resizes_windows`, `workspace.auto_collapse_icon_panels`, `workspace.auto_show_hidden_panels`, `workspace.enable_floating_document_window_docking`, `file_handling.save_in_background`, `file_handling.maximize_psd_compatibility`, `performance.cache_levels`, `performance.legacy_compositing`, `scratch_disks.disks`, `units_and_rulers.column_width`, `units_and_rulers.gutter`, `plug_ins.show_extension_panels`, `plug_ins.allow_scripts_to_connect`, `plug_ins.generator_enabled`, `type_.text_engine`, `type_.recent_fonts`, `enhanced_controls.scrubby_slider_acceleration`, `enhanced_controls.touch_gestures`, `raw_defaults.color_space`, `raw_defaults.bit_depth`, `raw_defaults.resolution`, `raw_defaults.sharpen_for`, `raw_defaults.open_as_smart_object`, `raw_defaults.apply_auto_tone`, `integrations.allow_agent_control`, `integrations.control_port`. | Id | Target | Status | Issue | Note | |---|---|---|---|---| From 7890b277a0ae0679afbf31489ca5cd423a5fe3f7 Mon Sep 17 00:00:00 2001 From: MrCloudy2 <123890706+MrCloudy2@users.noreply.github.com> Date: Mon, 12 Oct 2026 14:45:09 +0200 Subject: [PATCH 58/92] fix(adjust): absolute Selective Color scales by the room the ink has (#3793) Photoshop's absolute mode scales each range's ink change by how much the ink can still move: adding ink by min(1, 2 x (1 - ink)), removing it by min(1, 2 x ink). PhotoCraft added the full percentage and clipped, so Neutrals Cyan +50 darkened a grey 64 to 0 instead of 32. Measured in Photoshop 27.11 over every range x ink at +-50 (72 cases): all within 1 level now (8 of 72 within 3 before). CPU and GPU paths. Co-authored-by: Claude Opus 5.5 --- crates/compose/src/adjust.rs | 43 +++++++++++++++++++++++++++++++----- crates/gpu/src/compose.wgsl | 7 +++++- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/crates/compose/src/adjust.rs b/crates/compose/src/adjust.rs index a39f3307..cc96e697 100644 --- a/crates/compose/src/adjust.rs +++ b/crates/compose/src/adjust.rs @@ -606,10 +606,12 @@ pub fn selective_color_weights(c: [f32; 3]) -> [f32; 9] { ] } -/// Photoshop Selective Color (approximation): each range shifts the cyan, magenta and yellow ink -/// (1 − R, G, B) by its percentage, plus its black percentage on every ink, weighted by how much -/// the colour belongs to the range. Relative mode scales the shift by the ink already present -/// (so it can't tint pure white); absolute adds it outright. +/// Photoshop Selective Color: each range shifts the cyan, magenta and yellow ink (1 − R, G, B) by +/// its percentage, plus its black percentage on every ink, weighted by how much the colour belongs +/// to the range. Relative mode scales the shift by the ink already present (so it can't tint pure +/// white). Absolute mode scales it by the room the ink has: adding ink by min(1, 2 × (1 − ink)), +/// removing it by min(1, 2 × ink), so Neutrals Cyan +50 darkens red 64 by 32, not 64 (all 72 +/// absolute range × ink cases within 1 level of Photoshop 27.11). pub fn selective_color(c: [f32; 3], relative: bool, adj: &[[f32; 4]; 9]) -> [f32; 3] { let w = selective_color_weights(c); let mut delta = [0.0f32; 3]; @@ -620,7 +622,14 @@ pub fn selective_color(c: [f32; 3], relative: bool, adj: &[[f32; 4]; 9]) -> [f32 let a = adj[r].map(|v| v / 100.0); for i in 0..3 { let ink = 1.0 - c[i]; - let d = if relative { (a[i] + a[3]) * ink } else { a[i] + a[3] }; + let d = a[i] + a[3]; + let d = if relative { + d * ink + } else if d > 0.0 { + d * (2.0 * (1.0 - ink)).min(1.0) + } else { + d * (2.0 * ink).min(1.0) + }; delta[i] += d * wr; } } @@ -1042,6 +1051,30 @@ mod lookup_tests { } } + /// Photoshop 27.11, measured: absolute Selective Color on greys (red channel after one range's + /// cyan change). + #[test] + fn absolute_selective_color_matches_photoshop() { + // (range index, cyan %, grey, Photoshop's red) + let measured = [ + (7, 50.0, 64u8, 32u8), + (7, 50.0, 192, 129), + (7, -50.0, 192, 223), + (7, -50.0, 64, 128), + (6, -50.0, 192, 224), + (6, -50.0, 240, 253), + (8, 50.0, 64, 32), + (8, 50.0, 16, 2), + ]; + for (range, cyan, grey, want) in measured { + let mut adj = [[0.0f32; 4]; 9]; + adj[range][0] = cyan; + let g = grey as f32 / 255.0; + let got = selective_color([g; 3], false, &adj)[0] * 255.0; + assert!((got - want as f32).abs() <= 1.5, "range {range} cyan {cyan} grey {grey}: {got} vs {want}"); + } + } + #[test] fn selective_color_zero_is_identity_and_ranges_are_local() { let zero = [[0.0f32; 4]; 9]; diff --git a/crates/gpu/src/compose.wgsl b/crates/gpu/src/compose.wgsl index bf535b08..edfe140b 100644 --- a/crates/gpu/src/compose.wgsl +++ b/crates/gpu/src/compose.wgsl @@ -527,7 +527,12 @@ fn color_lookup(c: vec3, n: i32, tetra: bool) -> vec3 { fn selective_row(r: i32, w: f32, c: vec3, relative: bool) -> vec3 { let k = lut_at(r * 4 + 3) / 100.0; var d = vec3(lut_at(r * 4), lut_at(r * 4 + 1), lut_at(r * 4 + 2)) / 100.0 + k; - if (relative) { d = d * (1.0 - c); } + if (relative) { + d = d * (1.0 - c); + } else { + // Absolute: scaled by the room the ink has (adding: 2 × (1 − ink), removing: 2 × ink, capped at 1). + d = d * select(min(2.0 * (1.0 - c), vec3(1.0)), min(2.0 * c, vec3(1.0)), d > vec3(0.0)); + } return select(vec3(0.0), d * w, w > 0.0); } From 8af15cf72a95eac97261b2fc7c3277269dd039ef Mon Sep 17 00:00:00 2001 From: Desayuno64 <66540128+Desayuno64@users.noreply.github.com> Date: Mon, 12 Oct 2026 09:45:25 -0300 Subject: [PATCH 59/92] Shift Edge moves by a fraction of a pixel so the slider does not snap. (#3800) 100% is still max(radius, 4) pixels. Amounts between whole pixels blend the two neighbouring morphs. --- crates/algo/src/matting.rs | 56 ++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/crates/algo/src/matting.rs b/crates/algo/src/matting.rs index a9dcac98..e40b6870 100644 --- a/crates/algo/src/matting.rs +++ b/crates/algo/src/matting.rs @@ -35,7 +35,8 @@ pub struct RefineParams { pub feather: f32, /// 0–100. pub contrast: f32, - /// −100–100 (% of `max(radius, 4 px)`). + /// −100–100. 100% moves the edge by `max(radius, 4)` pixels. Values between whole + /// pixels blend the two neighbouring shifts, so the slider does not jump. pub shift_edge: f32, } @@ -59,8 +60,18 @@ impl RefineParams { fn feather_sigma(&self) -> f32 { self.feather.max(0.0) / 2.0 } + /// Signed shift in pixels, fractional. 100% is `max(radius, 4)` px, clamped to ±64. + fn shift_amount(&self) -> f32 { + let px = self.shift_edge.clamp(-100.0, 100.0) / 100.0 * self.radius.max(4.0); + if px.is_finite() { px.clamp(-64.0, 64.0) } else { 0.0 } + } + /// How many pixels the mask can move: the farther of the two integer radii a fractional + /// shift blends. Whole-pixel amounts stay exact (`ceil(4) == 4`). fn shift_px(&self) -> i32 { - (self.shift_edge.clamp(-100.0, 100.0) / 100.0 * self.radius.max(4.0)).round().clamp(-64.0, 64.0) as i32 + let px = self.shift_amount(); + let reach = px.abs().ceil(); + let signed = if px.is_sign_negative() { -reach } else { reach }; + if signed.is_finite() { signed as i32 } else { 0 } } fn uses_image(&self) -> bool { self.radius > 0.0 @@ -370,13 +381,38 @@ where *v = ((*v - 0.5) * gain + 0.5).clamp(0.0, 1.0); } } - let d = p.shift_px(); - if d != 0 { - a = morphology(&a, w, h, d.unsigned_abs() as usize, d > 0); + let amount = p.shift_amount(); + if amount.abs() >= 1.0e-4 { + a = shift_mask(&a, w, h, amount, morphology); } a } +/// Grow or shrink `src` by a fractional pixel distance. Whole pixels use one morphology; +/// the remainder blends that result with the next pixel, so 0.3 px is not the same step as 1 px. +fn shift_mask(src: &[f32], w: usize, h: usize, amount: f32, morphology: F) -> Vec +where + F: Fn(&[f32], usize, usize, usize, bool) -> Vec + Copy, +{ + let mag = amount.abs(); + if !mag.is_finite() || mag < 1.0e-4 { + return src.to_vec(); + } + let grow = amount > 0.0; + let whole = mag.floor() as usize; + let frac = mag - whole as f32; + if frac < 1.0e-4 { + return morphology(src, w, h, whole, grow); + } + let lo = if whole == 0 { src.to_vec() } else { morphology(src, w, h, whole, grow) }; + let hi = morphology(src, w, h, whole + 1, grow); + let n = w.saturating_mul(h); + if lo.len() < n || hi.len() < n || lo.len() != hi.len() { + return hi; + } + lo.into_iter().zip(hi).map(|(a, b)| a + (b - a) * frac).collect() +} + /// Refines a selection mask. `mask(r)` returns coverage over `r` (row-major); `content` bounds /// its non-zero pixels; the result is clipped to `canvas`. `sampler` supplies the guide image /// (only read when `radius > 0`). Returns `None` when nothing remains selected. @@ -720,6 +756,16 @@ mod tests { let shrunk = refine_buffer(None, &m, w, h, &RefineParams { shift_edge: -50.0, ..Default::default() }); assert_eq!(shrunk[5 * w + 27], 1.0); assert_eq!(shrunk[5 * w + 28], 0.0); + // Radius 0 scales 100% to 4 px, so 12.5% is half a pixel and 25% is one pixel. + // The pixel just outside a hard edge fades in instead of snapping on. + let half = refine_buffer(None, &m, w, h, &RefineParams { shift_edge: 12.5, ..Default::default() }); + let one = refine_buffer(None, &m, w, h, &RefineParams { shift_edge: 25.0, ..Default::default() }); + assert_eq!(m[5 * w + 30], 0.0); + assert!((half[5 * w + 30] - 0.5).abs() < 0.02, "half pixel {}", half[5 * w + 30]); + assert_eq!(one[5 * w + 30], 1.0); + assert_eq!(half[5 * w + 31], 0.0, "the blend must not jump a second pixel"); + let pulled = refine_buffer(None, &m, w, h, &RefineParams { shift_edge: -12.5, ..Default::default() }); + assert!((pulled[5 * w + 29] - 0.5).abs() < 0.02, "half-pixel contract {}", pulled[5 * w + 29]); let sm = refine_buffer(None, &m, w, h, &RefineParams { smooth: 50.0, ..Default::default() }); assert!(sm[5 * w + 10] == 1.0 && sm[5 * w + 50] == 0.0); } From 04d2874e380d949981bc78d5d73589420b894222 Mon Sep 17 00:00:00 2001 From: MrCloudy2 <123890706+MrCloudy2@users.noreply.github.com> Date: Mon, 12 Oct 2026 14:45:48 +0200 Subject: [PATCH 60/92] fix(image): 32 Bits/Channel holds linear light, as in Photoshop (#3792) PhotoCraft treats 32-bit documents as linear light (Transfer::for_document, Exposure, Photo Filter, PSD import), but Image > Mode > 32 Bits/Channel only rescaled the samples, so a converted 8-bit grey 128 stayed 0.502. Photoshop stores 0.2159 (measured in Photoshop 27.11: 32-bit float TIFF of an sRGB chart, every sample = the sRGB-to-linear value). The conversion now decodes colour samples through the document's tone curve after widening to 32 bits, and encodes them before narrowing (so no linear value is quantised to 8 or 16 bits). Alpha, masks and alpha channels keep their values. RGB and Grayscale only (the 32-bit modes). With it, Photoshop's 32-bit results match exactly for the conversion itself, Levels, Black & White (default), Brightness/Contrast and Colorize (were 40-80 levels off in sRGB terms). Adds Surface::map_color (colour samples only, including the default pixel) and makes Transfer::decode/encode public. Co-authored-by: Claude Opus 5.5 --- crates/compose/src/adjust.rs | 6 ++++-- crates/engine/src/image_cmds.rs | 38 +++++++++++++++++++++++++++++++++ crates/raster/src/lib.rs | 25 ++++++++++++++++++++++ 3 files changed, 67 insertions(+), 2 deletions(-) diff --git a/crates/compose/src/adjust.rs b/crates/compose/src/adjust.rs index cc96e697..edba4882 100644 --- a/crates/compose/src/adjust.rs +++ b/crates/compose/src/adjust.rs @@ -45,14 +45,16 @@ impl Transfer { t => t, } } - fn decode(self, v: f32) -> f32 { + /// Tone-encoded value → linear light. + pub fn decode(self, v: f32) -> f32 { match self { Transfer::Srgb => photocraft_color::convert::srgb_to_linear(v.max(0.0)), Transfer::Gamma(1.0) => v.max(0.0), Transfer::Gamma(g) => v.max(0.0).powf(g), } } - fn encode(self, v: f32) -> f32 { + /// Linear light → tone-encoded value. + pub fn encode(self, v: f32) -> f32 { match self { Transfer::Srgb => photocraft_color::convert::linear_to_srgb(v.max(0.0)), Transfer::Gamma(1.0) => v.max(0.0), diff --git a/crates/engine/src/image_cmds.rs b/crates/engine/src/image_cmds.rs index 9ccca87a..84474d57 100644 --- a/crates/engine/src/image_cmds.rs +++ b/crates/engine/src/image_cmds.rs @@ -650,7 +650,20 @@ fn convert_depth(s: &mut Session, depth: SampleType) -> Result { return Ok(Value::Null); } s.edit("Bit Depth", |doc, _| { + // 32-bit documents hold linear light (as Photoshop's do: grey 128 becomes 0.2159, measured + // in Photoshop 27.11), so the colour samples cross the document's tone curve when the + // depth crosses 32 bits: decoded after widening, encoded before narrowing (so no linear + // value is quantised to 8 or 16 bits). Masks, alpha and channels are not colour. + let crosses = (current == SampleType::F32) != (depth == SampleType::F32) && matches!(doc.mode, ColorMode::Rgb | ColorMode::Grayscale); + let to_linear = depth == SampleType::F32; + let transfer = photocraft_compose::adjust::Transfer::for_document(doc.mode, if to_linear { current } else { depth }); + if crosses && !to_linear { + for_each_surface(&mut doc.layers, false, &mut |surf, _| surf.map_color(|v| transfer.encode(v).clamp(0.0, 1.0))); + } convert_layers_depth(&mut doc.layers, depth); + if crosses && to_linear { + for_each_surface(&mut doc.layers, false, &mut |surf, _| surf.map_color(|v| transfer.decode(v))); + } for ch in doc.channels.iter_mut().chain(doc.quick_mask.as_mut()) { let f = ch.surface.format().with_sample(depth); ch.surface = ch.surface.convert(f); @@ -1337,6 +1350,31 @@ mod tests { assert_eq!(doc(&s).size, Size::new(10, 10)); } + #[test] + fn thirty_two_bit_holds_linear_light() { + // Photoshop 27.11: an 8-bit sRGB grey 128 becomes 0.2159 in 32 bits (and 32 → 0.0144), + // and comes back unchanged; alpha keeps its value. + let mut s = Session::new(); + s.execute("file.new", json!({"width": 4, "height": 1, "background": "white"})).unwrap(); + s.execute("layer.new.layer", json!({})).unwrap(); + s.edit("paint", |doc, active| { + let l = doc.layer_mut(active.unwrap()).unwrap(); + l.surface_mut().unwrap().fill_rect(Rect::new(0, 0, 2, 1), &[128.0 / 255.0, 32.0 / 255.0, 1.0, 0.5]); + Ok(()) + }) + .unwrap(); + s.execute("image.mode.bits32", json!({})).unwrap(); + let px = doc(&s).layers[1].surface().unwrap().pixel(0, 0); + for (got, want) in px.iter().zip([0.2159, 0.0144, 1.0, 128.0 / 255.0]) { + assert!((got - want).abs() < 2e-4, "{px:?}"); + } + s.execute("image.mode.bits8", json!({})).unwrap(); + let px = doc(&s).layers[1].surface().unwrap().pixel(0, 0); + for (got, want) in px.iter().zip([128.0 / 255.0, 32.0 / 255.0, 1.0, 128.0 / 255.0]) { + assert!((got - want).abs() < 0.6 / 255.0, "{px:?}"); + } + } + #[test] fn mode_and_depth_conversions() { let mut s = session(); diff --git a/crates/raster/src/lib.rs b/crates/raster/src/lib.rs index c80dce82..dbb6c0a1 100644 --- a/crates/raster/src/lib.rs +++ b/crates/raster/src/lib.rs @@ -732,6 +732,31 @@ impl Surface { out } + /// Applies `f` to every colour sample (not alpha), including the default pixel: a tone-curve + /// change such as linearising when a document becomes 32-bit. + pub fn map_color(&mut self, f: impl Fn(f32) -> f32) { + let format = self.format; + let color = format.mode.color_channels(); + let n = format.channels(); + let mut dp = decode_pixel(&format, &self.default_pixel); + for v in dp.iter_mut().take(color) { + *v = f(*v); + } + encode_pixel(&format, &dp, &mut self.default_pixel); + let coords: Vec = self.tiles.keys().copied().collect(); + let px_count = (TILE_SIZE * TILE_SIZE) as usize; + for c in coords { + let tile = self.tile_mut(c); + for i in 0..px_count { + for k in 0..color { + let at = i * n + k; + let v = read_sample(&tile.data, format.sample, at); + write_sample(&mut tile.data, format.sample, at, f(v)); + } + } + } + } + /// Convert to another pixel format (depth and/or model; colour models via [`convert_pixel`]). pub fn convert(&self, to: PixelFormat) -> Surface { let mut out = Surface::with_default(to, &convert_pixel(&self.format, &to, &self.default_pixel())); From 3cc0d48410b00d21da06a9f9b391d52a79f6a938 Mon Sep 17 00:00:00 2001 From: Scott C Hughes <1591011+dottedt@users.noreply.github.com> Date: Mon, 12 Oct 2026 07:46:04 -0500 Subject: [PATCH 61/92] fix(engine): Flatten All Layer Effects keeps layer and vector masks (#3804) (#3835) Flatten All Layer Effects baked the layer (including its masks) into the pixels and then cleared mask and vector_mask, destroying unrelated mask pixels and their enabled/disabled state permanently after save. Bake the effect visuals with the masks left off the render and keep the original mask and vector_mask objects, so each mask still applies once to the baked raster and the command stays a visual no-op. Tests: cargo test -p photocraft-engine --lib file_cmds; cargo test -p photocraft-engine --lib; cargo clippy -p photocraft-engine --all-targets (with the two pre-existing lints allowed); cargo test -p photocraft-engine --test panic_hunt -- --ignored --- crates/engine/src/file_cmds.rs | 18 +++-- crates/engine/src/file_cmds/tests.rs | 112 +++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 6 deletions(-) diff --git a/crates/engine/src/file_cmds.rs b/crates/engine/src/file_cmds.rs index d1754733..5aa2441a 100644 --- a/crates/engine/src/file_cmds.rs +++ b/crates/engine/src/file_cmds.rs @@ -1035,8 +1035,10 @@ fn has_live_effects(l: &Layer) -> bool { l.effects.enabled && l.effects.items.iter().any(|e| e.enabled()) } -/// The layer rendered alone (keeping what `keep` says), as a surface in `fmt`. -fn bake(l: &Layer, canvas: Rect, fmt: PixelFormat, keep_effects: bool) -> Surface { +/// The layer rendered alone (keeping what `keep` says), as a surface in `fmt`. With `apply_mask` +/// off the layer's pixel and vector masks are left out of the render, so a caller that keeps them +/// live on the baked raster does not mask the pixels twice. +fn bake(l: &Layer, canvas: Rect, fmt: PixelFormat, keep_effects: bool, apply_mask: bool) -> Surface { let mut tmp = l.clone(); tmp.opacity = 1.0; tmp.blend = photocraft_color::BlendMode::Normal; @@ -1046,6 +1048,10 @@ fn bake(l: &Layer, canvas: Rect, fmt: PixelFormat, keep_effects: bool) -> Surfac tmp.effects.items.clear(); tmp.fill_opacity = 1.0; } + if !apply_mask { + tmp.mask = None; + tmp.vector_mask = None; + } // Render over the union of the canvas and the content so off-canvas pixels survive. let area = l.surface().map_or(canvas, |s| s.content_bounds().union(&canvas)); let area = if keep_effects { area.inflate(256) } else { area }; @@ -1066,12 +1072,12 @@ fn flatten_all_effects(s: &mut Session) -> Result { if !has_live_effects(l) || matches!(l.content, LayerContent::Group(_) | LayerContent::Adjustment(_)) { continue; } - let px = bake(l, canvas, fmt, true); + // The pixel and vector masks stay on the layer (baking must not destroy them), so the + // pixels are baked without them and each mask then applies once to the baked raster. + let px = bake(l, canvas, fmt, true, false); let l = doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?; l.content = LayerContent::Raster(px); l.effects = Default::default(); - l.mask = None; - l.vector_mask = None; l.fill_opacity = 1.0; l.fill_cache = None; l.psd_blocks.retain(|(k, _)| !matches!(k, b"TySh" | b"SoLd" | b"PlLd" | b"SoLE" | b"vmsk" | b"vsms" | b"vogk" | b"vscg" | b"vstk")); @@ -1099,7 +1105,7 @@ fn flatten_all_masks(s: &mut Session) -> Result { skipped += 1; continue; } - let px = bake(l, canvas, fmt, false); + let px = bake(l, canvas, fmt, false, true); let l = doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?; l.content = LayerContent::Raster(px); l.mask = None; diff --git a/crates/engine/src/file_cmds/tests.rs b/crates/engine/src/file_cmds/tests.rs index f301d4c9..a4100a13 100644 --- a/crates/engine/src/file_cmds/tests.rs +++ b/crates/engine/src/file_cmds/tests.rs @@ -554,6 +554,118 @@ fn flatten_all_layer_effects_and_masks() { } } +/// Flatten All Layer Effects must bake the effect visuals without destroying the layer's masks: +/// an enabled raster mask and a vector mask on one layer, a disabled raster mask on another +/// (#3804). The command is a visual no-op; the masks (pixels and state) survive, including a +/// `.pcraft` round trip. +#[test] +fn flatten_all_layer_effects_keeps_masks() { + for depth in [8, 16, 32] { + let mut s = session(40, 40, depth); + // Layer 1: a red square with a green colour overlay, an enabled raster mask revealing + // x < 20 and a vector mask revealing x 15..30. + s.execute("layer.new.layer", json!({})).unwrap(); + s.execute("select.rect", json!({"x": 10, "y": 10, "width": 20, "height": 20})).unwrap(); + s.execute("edit.fill", json!({"color": "#ff0000"})).unwrap(); + s.execute("select.deselect", json!({})).unwrap(); + let id1 = s.active().unwrap().active_layer.unwrap(); + s.edit("fx", |doc, _| { + let l = doc.layer_mut(id1).unwrap(); + l.effects.enabled = true; + l.effects.items.push(photocraft_doc::Effect::ColorOverlay { + common: photocraft_doc::effects::FxCommon::new(photocraft_color::BlendMode::Normal, 1.0), + color: photocraft_color::Color::rgb(0.0, 1.0, 0.0), + }); + l.vector_mask = Some(photocraft_doc::VectorMask::new(photocraft_doc::Path::new(vec![photocraft_doc::Subpath::polygon(&[ + (15.0, 15.0), + (30.0, 15.0), + (30.0, 30.0), + (15.0, 30.0), + ])]))); + Ok(()) + }) + .unwrap(); + s.execute("select.rect", json!({"x": 0, "y": 0, "width": 20, "height": 40})).unwrap(); + s.execute("layer.layerMask.revealSelection", json!({})).unwrap(); + s.execute("select.deselect", json!({})).unwrap(); + // Layer 2: a red square at the bottom-right with the same overlay and a *disabled* mask. + s.execute("layer.new.layer", json!({})).unwrap(); + s.execute("select.rect", json!({"x": 30, "y": 30, "width": 8, "height": 8})).unwrap(); + s.execute("edit.fill", json!({"color": "#ff0000"})).unwrap(); + s.execute("select.deselect", json!({})).unwrap(); + let id2 = s.active().unwrap().active_layer.unwrap(); + s.edit("fx", |doc, _| { + let l = doc.layer_mut(id2).unwrap(); + l.effects.enabled = true; + l.effects.items.push(photocraft_doc::Effect::ColorOverlay { + common: photocraft_doc::effects::FxCommon::new(photocraft_color::BlendMode::Normal, 1.0), + color: photocraft_color::Color::rgb(0.0, 1.0, 0.0), + }); + Ok(()) + }) + .unwrap(); + s.execute("select.rect", json!({"x": 34, "y": 34, "width": 2, "height": 2})).unwrap(); + s.execute("layer.layerMask.revealSelection", json!({})).unwrap(); + s.execute("select.deselect", json!({})).unwrap(); + s.edit("disable", |doc, _| { + if let Some(m) = doc.layer_mut(id2).and_then(|l| l.mask.as_mut()) { + m.enabled = false; + } + Ok(()) + }) + .unwrap(); + let m1 = doc(&s).layer(id1).unwrap().mask.clone(); + let v1 = doc(&s).layer(id1).unwrap().vector_mask.clone(); + let m2 = doc(&s).layer(id2).unwrap().mask.clone(); + assert_eq!(m1.as_ref().map(|m| m.enabled), Some(true), "layer 1 raster mask is enabled"); + assert!(v1.as_ref().is_some_and(|v| v.enabled), "layer 1 vector mask is enabled"); + assert_eq!(m2.as_ref().map(|m| m.enabled), Some(false), "layer 2 raster mask is disabled"); + let before = [ + composite(&s, 17, 15), // layer 1: inside both masks + composite(&s, 22, 15), // layer 1: raster mask hides + composite(&s, 12, 15), // layer 1: vector mask hides + composite(&s, 34, 34), // layer 2: the disabled mask does not hide + ]; + assert!(before[0][1] > 0.99 && before[0][0] < 0.01, "overlay renders green: {:?}", before[0]); + // The white background shows where a mask hides the layer. + assert!(before[1][0] > 0.99 && before[1][1] > 0.99, "the raster mask hides: {:?}", before[1]); + assert!(before[2][0] > 0.99 && before[2][1] > 0.99, "the vector mask hides: {:?}", before[2]); + assert!(before[3][1] > 0.99, "the disabled mask does not hide"); + let r = s.execute("file.scripts.flattenAllLayerEffects", json!({})).unwrap(); + assert_eq!(r["flattened"], 2); + { + let d = doc(&s); + assert_eq!(d.layer(id1).unwrap().mask, m1, "layer 1 raster mask survives"); + assert_eq!(d.layer(id1).unwrap().vector_mask, v1, "layer 1 vector mask survives"); + assert_eq!(d.layer(id2).unwrap().mask, m2, "the disabled mask survives"); + } + let after = [composite(&s, 17, 15), composite(&s, 22, 15), composite(&s, 12, 15), composite(&s, 34, 34)]; + for (a, b) in after.iter().zip(&before) { + for k in 0..4 { + assert!((a[k] - b[k]).abs() < 0.01, "flattening is a visual no-op: {after:?} vs {before:?}"); + } + } + // One history step: undo restores the effects, redo re-flattens, and the masks stay. + assert!(s.undo()); + assert!(!doc(&s).layer(id1).unwrap().effects.items.is_empty()); + assert_eq!(doc(&s).layer(id1).unwrap().mask, m1); + assert!(s.redo()); + assert_eq!(doc(&s).layer(id1).unwrap().mask, m1); + assert_eq!(doc(&s).layer(id1).unwrap().vector_mask, v1); + assert_eq!(doc(&s).layer(id2).unwrap().mask, m2); + // The masks survive a `.pcraft` save and reopen. + let dir = tmp("flatten-effects-masks"); + let path = join(&dir, "masks.pcraft"); + save_doc(doc(&s), &path, None).unwrap(); + let bytes = std::fs::read(&path).unwrap(); + let mut s2 = Session::new(); + open_bytes_as(&mut s2, "masks.pcraft", &bytes, None, None).unwrap(); + let layers: Vec<_> = doc(&s2).walk().into_iter().map(|(_, _, l)| l).collect(); + assert!(layers.iter().any(|l| l.mask == m1 && l.vector_mask == v1), "the raster and vector masks survive .pcraft"); + assert!(layers.iter().any(|l| l.mask == m2), "the disabled mask survives .pcraft"); + } +} + #[test] fn layers_to_files_writes_each_visible_layer() { let dir = tmp("layers"); From 9ff6c57e0335f87f5d2b97e3ff3e8a47b4aa28fc Mon Sep 17 00:00:00 2001 From: Jakub <47925045+JameEnder@users.noreply.github.com> Date: Mon, 12 Oct 2026 14:46:16 +0200 Subject: [PATCH 62/92] GPU composite: submit every 1000 copies and render passes, not only between page cells (#3844) The compositor submitted only between 2048x2048 page cells, so one cell of a deep stack recorded every pass into a single command buffer: 700 full-size layers make 1403 render passes, and wgpu-core opens two hal command buffers per pass. Metal allows 4096 command buffers per queue, so a few thousand passes in one cell can lose the device. run_cell now counts copies and render passes and, when a refresh may submit in between, submits the batch after FLUSH_OPS (1000) of them, waiting for the previous batch as the page-cell flush does. Chunk textures, uniforms and bind groups outlive the submit and the queue keeps the order, so a chunk continues in the next command buffer. A device lost in such a submit ends the refresh with an error instead of recording more work. Not measurably slower on Vulkan (RTX 3090): perf_scenarios rows are within noise. Test: many_layers_submit_inside_one_chunk (700 noise layers on a 64x48 document) needs flushes > 0 inside one chunk and matches the CPU composite; main records all 1403 passes without a flush. --- crates/gpu/src/lib.rs | 86 ++++++++++++++++++++++++++++---------- crates/gpu/tests/parity.rs | 19 +++++++++ 2 files changed, 83 insertions(+), 22 deletions(-) diff --git a/crates/gpu/src/lib.rs b/crates/gpu/src/lib.rs index 2efd7f6a..854db1b9 100644 --- a/crates/gpu/src/lib.rs +++ b/crates/gpu/src/lib.rs @@ -82,6 +82,12 @@ const FLUSH_BYTES: u64 = 512 << 20; /// command buffer holding a whole huge refresh can run for seconds, long enough for the OS to /// reset the GPU. const FLUSH_WORK: u64 = 1 << 30; +/// Copies and render passes [`Compositor::render`] records before submitting. wgpu opens up to +/// two backend command buffers for each (a render pass and its barrier pre-pass), and Metal +/// treats more than 4096 outstanding ones as a lost device: a refresh of a document with a few +/// hundred layers reached that inside a single page cell (P12, "pc_compose_uniforms is +/// invalid"), where the work and byte limits above never trigger. +const FLUSH_OPS: u32 = 1000; /// A finished chunk: straight-alpha RGBA32F pixels of `rect` (document coordinates) at the /// texture's origin. @@ -422,6 +428,8 @@ pub struct Compositor { stamp: u64, /// Bytes staged by uploads since the last submit. staged: u64, + /// Copies and render passes recorded since the last submit. + recorded: u32, acc_format: wgpu::TextureFormat, /// Whether the effect-map pipelines could be built (else documents with layer effects are /// [`Unsupported`] and use the CPU compositor). @@ -617,6 +625,7 @@ impl Compositor { frame: 0, stamp: 0, staged: 0, + recorded: 0, acc_format, effect_maps: map_error.is_none(), cmyk: 0, @@ -907,6 +916,7 @@ impl Compositor { self.frame += 1; self.stamp += 1; self.staged = 0; + self.recorded = 0; // Only render owns submission. A caller may discard encode's command buffer, so it // cannot establish (or consume) a checkpoint whose GPU copy might never execute. @@ -937,9 +947,7 @@ impl Compositor { } let flush_bytes = FLUSH_BYTES.min(self.memory_budget() / 8).max(16 << 20); stats.cells = cells.len(); - // The previous intermediate submit (waited for before the next is queued; the web has - // no blocking wait and relies on the browser's own scheduling). - #[cfg(not(target_arch = "wasm32"))] + // The previous intermediate submit (see `submit_batch`). let mut last_submit: Option = None; // Work recorded and bytes evicted since the last submit. let (mut work, mut freed) = (0u64, 0u64); @@ -958,29 +966,19 @@ impl Compositor { let chunks = grid_rects(part, self.chunk); stats.chunks += chunks.len(); work += part.width() as u64 * part.height() as u64 * plan.passes.len() as u64; - self.run_cell(device, queue, encoder, doc.id, &plan, &paged, cell, &fr, &chunks, checkpoint, &mut stats, sink); + let mut batch = flush.then_some(&mut last_submit); + self.run_cell(device, queue, encoder, doc.id, &plan, &paged, cell, &fr, &chunks, checkpoint, &mut stats, sink, &mut batch); + // The device was lost in a submit inside the cell: issue no more work. + if let Some(f) = self.fault() { + return Err(Unsupported(f.to_string())); + } let (evicted, bytes) = self.evict(); stats.evicted += evicted; freed += bytes; - if flush && (self.staged >= flush_bytes || work >= FLUSH_WORK || freed >= flush_bytes) { - // Submit what's recorded, and wait for the previous submit, so at most two - // batches of uploads and evicted pages are in flight. - let done = std::mem::replace(encoder, device.create_command_encoder(&wgpu::CommandEncoderDescriptor { label: Some("pc_compose") })); - let index = queue.submit([done.finish()]); - #[cfg(not(target_arch = "wasm32"))] - if let Some(prev) = last_submit.replace(index) { - match &self.health { - Some(h) => { - h.wait(device, Some(prev)); - } - None => { - let _ = device.poll(wgpu::PollType::Wait { submission_index: Some(prev), timeout: None }); - } - } - } - #[cfg(target_arch = "wasm32")] - let _ = index; + if flush && (self.staged >= flush_bytes || work >= FLUSH_WORK || freed >= flush_bytes || self.recorded >= FLUSH_OPS) { + submit_batch(device, queue, encoder, self.health.as_ref(), &mut last_submit); self.staged = 0; + self.recorded = 0; work = 0; freed = 0; stats.flushes += 1; @@ -1135,6 +1133,8 @@ impl Compositor { checkpoint: Option, stats: &mut Stats, sink: &mut dyn FnMut(&mut wgpu::CommandEncoder, ChunkOut<'_>), + // The previous intermediate submit, when this refresh may submit in between. + batch: &mut Option<&mut Option>, ) { if chunks.is_empty() { return; @@ -1220,6 +1220,19 @@ impl Compositor { if i < resume { continue; } + // Chunk textures, uniforms and bind groups outlive the submit, and the queue + // keeps the order, so a chunk may continue in the next command buffer. + if self.recorded >= FLUSH_OPS + && let Some(last) = batch.as_deref_mut() + { + submit_batch(device, queue, encoder, self.health.as_ref(), last); + self.staged = 0; + self.recorded = 0; + stats.flushes += 1; + if self.fault().is_some() { + return; + } + } if resume == 0 && let Some(cp) = checkpoint.filter(|cp| cp.pass_end == i) && let Some((src, _)) = self.pool.get(cp.slot as usize) @@ -1257,10 +1270,12 @@ impl Compositor { }, wgpu::Extent3d { width: scissor.width(), height: scissor.height(), depth_or_array_layers: 1 }, ); + self.recorded += 1; continue; } _ => {} } + self.recorded += 1; let target = &self.pool[p.dst as usize].1; let clear = p.kernel == Kernel::Clear; let mut pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { @@ -1778,6 +1793,33 @@ fn write_tile(queue: &wgpu::Queue, r: &Resident, c: TileCoord, bytes: &[u8]) { ); } +/// Submit what `encoder` recorded and continue in a fresh one, then wait for the previous +/// intermediate submit (`last`), so at most two batches of uploads and evicted pages are in +/// flight. The web has no blocking wait and relies on the browser's own scheduling. +fn submit_batch( + device: &wgpu::Device, + queue: &wgpu::Queue, + encoder: &mut wgpu::CommandEncoder, + health: Option<&DeviceHealth>, + last: &mut Option, +) { + let done = std::mem::replace(encoder, device.create_command_encoder(&wgpu::CommandEncoderDescriptor { label: Some("pc_compose") })); + let prev = last.replace(queue.submit([done.finish()])); + #[cfg(not(target_arch = "wasm32"))] + if let Some(prev) = prev { + match health { + Some(h) => { + h.wait(device, Some(prev)); + } + None => { + let _ = device.poll(wgpu::PollType::Wait { submission_index: Some(prev), timeout: None }); + } + } + } + #[cfg(target_arch = "wasm32")] + let _ = (prev, health); +} + /// Distinct tiles converted per parallel batch: bounds the converted bytes held at once (64 tiles /// of a 16-bit page are 32 MiB). const CONVERT_BATCH: usize = 64; diff --git a/crates/gpu/tests/parity.rs b/crates/gpu/tests/parity.rs index fca32a02..1bdd597a 100644 --- a/crates/gpu/tests/parity.rs +++ b/crates/gpu/tests/parity.rs @@ -1061,6 +1061,25 @@ fn small_layers_composite_over_their_bounds() { check(&mut g, &big, "small layers across chunks"); } +#[test] +fn many_layers_submit_inside_one_chunk() { + // P12: a refresh recorded every pass of a page cell into one command buffer, and with a few + // hundred layers Metal ran out of command buffers (device lost, "pc_compose_uniforms is + // invalid"). 700 layers need well over 1000 passes in the document's only chunk. + let Some(mut g) = gpu() else { return }; + let mut d = base_doc(64, 48); + let modes: Vec = BlendMode::layer_modes().collect(); + for (i, mode) in modes.iter().copied().cycle().take(700).enumerate() { + let mut l = noise_layer("l", PixelFormat::RGBA8, Rect::from_xywh(0, 0, 64, 48), 500 + i as u32, 0.0); + l.blend = mode; + l.opacity = 0.9; + d.layers.push(l); + } + let stats = diff_rect(&mut g, &d, d.bounds(), "700 layers").unwrap_or_else(|e| panic!("{e}")); + assert_eq!(stats.chunks, 1); + assert!(stats.flushes > 0, "{stats:?}"); +} + fn blob(name: &str, fmt: PixelFormat, cx: f32, cy: f32, r: f32, color: [f32; 3]) -> Layer { let mut l = Layer::raster(name, fmt); let rect = Rect::new((cx - r - 12.0) as i32, (cy - r - 4.0) as i32, (cx + r + 14.0) as i32, (cy + r + 4.0) as i32); From 3e428e7302f556ad8e6e48bca51dff1091a63254 Mon Sep 17 00:00:00 2001 From: Jakub <47925045+JameEnder@users.noreply.github.com> Date: Mon, 12 Oct 2026 14:46:28 +0200 Subject: [PATCH 63/92] perf(gpu): a duplicated layer's texture starts as a GPU copy of its source's (#3848) A duplicate shares its source's tiles (Arc), but its resident texture was new, so the compositor converted and uploaded every tile again: duplicating a 20 MP photo layer uploaded 330 tiles. When a new resident's surface shares tiles with another resident of the same role, region, texel kind, format and default pixel, its texture now starts as a copy of that one (Stats.tiles_shared counts the tiles taken) and the usual per-tile pass fixes up whatever differs. Layer textures gain COPY_SRC. The copy is recorded in the frame's encoder, after whatever brought the donor up to date this frame. Queued writes land before the encoder runs, so both textures are marked `ordered` and their writes go through the encoder from then on; otherwise a write to either in the same refresh would be overwritten by the copy or leak into it. A resident whose region only moved still keeps its own texels (keep_overlap) first. Duplicating a 20 MP photo layer in perf_scenarios: 25.1 -> 6.3 ms, 330 tile uploads -> 0 (RTX 3090, Vulkan). Paste is unchanged: the pasted layer has new tiles. Test: duplicates_copy_their_source_texture covers a plain duplicate (no uploads), a duplicate and its source each painted with one tile in the same refresh, and a duplicate missing a tile, all against the CPU composite. Without the `ordered` routing the second case is off by 167.6/255. --- crates/gpu/src/lib.rs | 106 +++++++++++++++++++++++++++---------- crates/gpu/tests/parity.rs | 36 +++++++++++++ 2 files changed, 115 insertions(+), 27 deletions(-) diff --git a/crates/gpu/src/lib.rs b/crates/gpu/src/lib.rs index 854db1b9..992e26dc 100644 --- a/crates/gpu/src/lib.rs +++ b/crates/gpu/src/lib.rs @@ -105,6 +105,9 @@ pub struct Stats { pub slots: u32, pub tiles_uploaded: usize, pub bytes_uploaded: usize, + /// Tiles a new layer texture took from another layer's texture by a GPU copy (a duplicate + /// shares its source's tiles) instead of uploading them. + pub tiles_shared: usize, /// Effect layers whose shape was (re)rendered, fully or partially. pub fx_shapes: usize, /// Effect map programs run (one per effect whose maps were rebuilt). @@ -193,6 +196,10 @@ struct Resident { stamp: u64, /// CMYK profile the texels were converted with (`CmykSpace::id`, 0 = built-in / not CMYK). cmyk: u64, + /// Its texels were copied to or from another layer texture by the encoder, so every write + /// to it goes through the encoder too: a queued write lands before the encoder runs, and + /// would be overwritten by the copy, or leak into it. + ordered: bool, } impl Resident { @@ -1353,37 +1360,80 @@ impl Compositor { }); let view = texture.create_view(&Default::default()); let default_nonzero = default_pixel.iter().any(|v| *v != 0.0); - let mut r = - Resident { texture, view, region, kind, format, tiles: HashMap::new(), default_nonzero, default_bits, doc, last_used: 0, stamp: 0, cmyk }; + let mut r = Resident { + texture, + view, + region, + kind, + format, + tiles: HashMap::new(), + default_nonzero, + default_bits: default_bits.clone(), + doc, + last_used: 0, + stamp: 0, + cmyk, + ordered: false, + }; // Only the region moved (painting past a layer's tiles grows it): keep the texels the // old texture already holds instead of converting and uploading every tile again. let kept = self.residents.remove(&key).map_or(Rect::EMPTY, |old| keep_overlap(device, queue, &old, &mut r)); - // A new texture starts zeroed: write the tiles that are present, and the default pixel - // where they are missing if it isn't zero. Coordinates sharing a tile (a solid fill, - // the default) take one upload and GPU copies (#1774). Kept tiles are brought up to - // date below, like those of a resident that didn't move. - let mut present = Vec::new(); - let mut missing = Vec::new(); - for c in region.tiles().filter(|c| !kept.contains_rect(&c.rect())) { - match surface.tile(c) { - Some(t) => present.push((c, t.clone())), - None if default_nonzero => missing.push(c), - None => {} + // A new layer whose tiles another resident already holds (a duplicate shares its + // source's tiles) starts as a GPU copy of that texture. Duplicating a 20 MP photo + // converted and uploaded every tile again. + let shares = + |o: &Resident| region.tiles().filter(|c| surface.tile(*c).is_some_and(|t| o.tiles.get(c).is_some_and(|ot| Arc::ptr_eq(ot, t)))).count(); + let donor = self + .residents + .iter() + .filter(|(k, o)| k.1 == key.1 && o.region == region && o.kind == kind && o.format == format && o.cmyk == cmyk && o.default_bits == default_bits) + .map(|(k, o)| (shares(o), *k)) + .filter(|(n, _)| *n > 0) + .max_by_key(|(n, _)| *n); + if kept.is_empty() + && let Some((n, o)) = donor.and_then(|(n, k)| Some((n, self.residents.get_mut(&k)?))) + { + // Recorded in the frame's encoder, after the writes and copies that brought the + // donor up to date ([`keep_overlap`]'s own submission would run before those). + o.ordered = true; + encoder.copy_texture_to_texture( + o.texture.as_image_copy(), + r.texture.as_image_copy(), + wgpu::Extent3d { width: region.width(), height: region.height(), depth_or_array_layers: 1 }, + ); + r.tiles = o.tiles.clone(); + r.ordered = true; + stats.tiles_shared += n; + } else { + // A new texture starts zeroed: write the tiles that are present, and the default + // pixel where they are missing if it isn't zero. Coordinates sharing a tile (a + // solid fill, the default) take one upload and GPU copies (#1774). Kept tiles are + // brought up to date below, like those of a resident that didn't move. + let mut present = Vec::new(); + let mut missing = Vec::new(); + for c in region.tiles().filter(|c| !kept.contains_rect(&c.rect())) { + match surface.tile(c) { + Some(t) => present.push((c, t.clone())), + None if default_nonzero => missing.push(c), + None => {} + } } - } - if !missing.is_empty() { - let bytes = convert_tile(surface, None, kind, TileCoord::new(0, 0)); - self.staged += put_tiles(device, queue, encoder, &r, &missing, &bytes); - } - let staged = &mut self.staged; - convert_tiles(surface, present, kind, |t, cs, bytes| { - *staged += put_tiles(device, queue, encoder, &r, cs, bytes); - for &c in cs { - stats.tiles_uploaded += 1; - stats.bytes_uploaded += bytes.len(); - r.tiles.insert(c, t.clone()); + if !missing.is_empty() { + let bytes = convert_tile(surface, None, kind, TileCoord::new(0, 0)); + self.staged += put_tiles(device, queue, encoder, &r, &missing, &bytes); } - }); + let staged = &mut self.staged; + convert_tiles(surface, present, kind, |t, cs, bytes| { + *staged += put_tiles(device, queue, encoder, &r, cs, bytes); + for &c in cs { + stats.tiles_uploaded += 1; + stats.bytes_uploaded += bytes.len(); + r.tiles.insert(c, t.clone()); + } + }); + } + // Tiles the donor held that this surface doesn't, or holds differently, are fixed up + // by the pass over the region below. self.residents.insert(key, r); } // Present: inserted above when it was missing or stale. @@ -1829,7 +1879,9 @@ const CONVERT_BATCH: usize = 64; /// a scratch tile and GPU copies from it: writing each one from the CPU sent 387 MB per refresh /// of a filled 50 MP 16-bit page (#1774). fn put_tiles(device: &wgpu::Device, queue: &wgpu::Queue, encoder: &mut wgpu::CommandEncoder, r: &Resident, cs: &[TileCoord], bytes: &[u8]) -> u64 { - if let [c] = cs { + if let [c] = cs + && !r.ordered + { write_tile(queue, r, *c, bytes); return bytes.len() as u64; } diff --git a/crates/gpu/tests/parity.rs b/crates/gpu/tests/parity.rs index 1bdd597a..47837a8b 100644 --- a/crates/gpu/tests/parity.rs +++ b/crates/gpu/tests/parity.rs @@ -900,6 +900,42 @@ fn incremental_updates_follow_the_document() { check(&mut g, &d, "opacity"); } +/// A duplicate shares its source's tiles: its texture is a GPU copy of the source's, not an +/// upload. Tiles written afterwards, to the copy or to the source in the same refresh, must not be +/// lost to the copy or leak through it (queued writes land before the encoder's copy). +#[test] +fn duplicates_copy_their_source_texture() { + let Some(mut g) = gpu() else { return }; + let mut d = base_doc(600, 300); + let mut src = noise_layer("src", PixelFormat::RGBA8, Rect::new(0, 0, 600, 300), 71, 0.0); + src.opacity = 0.7; + d.layers.push(src); + check(&mut g, &d, "source"); + // A duplicate with no other change: nothing uploads. + let mut dup = d.layers[1].duplicate(); + dup.blend = BlendMode::Difference; + d.layers.push(dup); + let stats = diff_rect(&mut g, &d, d.bounds(), "duplicate").unwrap_or_else(|e| panic!("{e}")); + assert_eq!(stats.tiles_uploaded, 0, "{stats:?}"); + assert!(stats.tiles_shared > 0, "{stats:?}"); + // Another duplicate, then one tile painted on it and one on its source, in the same refresh. + let mut dup2 = d.layers[1].duplicate(); + dup2.blend = BlendMode::Screen; + dup2.surface_mut().unwrap().fill_rect(Rect::new(10, 10, 20, 20), &[1.0, 0.0, 0.0, 1.0]); + d.layers.push(dup2); + d.layers[1].surface_mut().unwrap().fill_rect(Rect::new(300, 100, 310, 110), &[0.0, 0.0, 1.0, 1.0]); + check(&mut g, &d, "duplicate and source painted"); + // And a tile removed from a duplicate: it reads as transparent again. + let mut dup3 = d.layers[1].duplicate(); + *dup3.surface_mut().unwrap() = { + let mut s = photocraft_raster::Surface::new(PixelFormat::RGBA8); + s.put_tiles(d.layers[1].surface().unwrap().tiles().skip(1).map(|(c, t)| (*c, t.clone()))); + s + }; + d.layers.push(dup3); + check(&mut g, &d, "duplicate missing a tile"); +} + /// #2422: a mask whose default pixel changes without touching its tiles (Invert on a sparse mask) /// must re-upload the absent tiles between its stored ones, not keep the old default on the GPU. #[test] From 05c4cd685eac3cc8dc58e68169649bb72f5fa101 Mon Sep 17 00:00:00 2001 From: Jakub <47925045+JameEnder@users.noreply.github.com> Date: Mon, 12 Oct 2026 14:46:53 +0200 Subject: [PATCH 64/92] perf: the Navigator redraws only the area an edit changed (#3845) With the Navigator open, every edit re-rendered the whole document into a new thumbnail on the UI thread: a full-resolution CPU composite, 303 ms after an opacity change and 486 ms after a brush stroke on a 20 MP layered document. The navigator cache now records the document revision of its image. When the document is exactly one edit ahead, with the same preview key, a bounded last_damage and the same thumbnail size, only the damage (grown by the layers' effect reach) is rendered with render_reduced_damage and written into the texture with set_partial; an edit with empty damage (a rename, a selection, a new empty layer) costs nothing. Anything else renders the whole thumbnail as before. compose gains thumbnail_size, which thumbnail_buffer now uses, so both paths agree on the size. On the 20 MP document: 303 -> 36 ms after an opacity change, 486 -> 171 ms after a stroke (RTX 3090 machine; the navigator renders on the CPU). Test: navigator_damage_updates_match_a_full_thumbnail patches a thumbnail after a translate, an opacity change, a stroke, a blend mode change and a new layer on a document with a drop shadow, and compares it with a full thumbnail; it fails without the effect-reach inflation. --- crates/compose/src/lib.rs | 12 ++++-- crates/ui-egui/src/canvas.rs | 79 ++++++++++++++++++++++++++++++++---- 2 files changed, 80 insertions(+), 11 deletions(-) diff --git a/crates/compose/src/lib.rs b/crates/compose/src/lib.rs index c059d9c8..08dcdeaf 100644 --- a/crates/compose/src/lib.rs +++ b/crates/compose/src/lib.rs @@ -313,13 +313,19 @@ pub fn thumbnail(doc: &Document, max_side: u32) -> Rgba8Image { thumbnail_buffer(doc, max_side).to_rgba8() } +/// Width and height of [`thumbnail`]`(doc, max_side)`. +pub fn thumbnail_size(doc: &Document, max_side: u32) -> (u32, u32) { + let b = doc.bounds(); + let longest = b.width().max(b.height()).max(1); + let scale = (max_side as f32 / longest as f32).min(1.0); + (((b.width() as f32 * scale).round() as u32).max(1), ((b.height() as f32 * scale).round() as u32).max(1)) +} + /// [`thumbnail`] as straight-alpha floats (for callers that colour-convert it first). pub fn thumbnail_buffer(doc: &Document, max_side: u32) -> Buffer { let b = doc.bounds(); let longest = b.width().max(b.height()).max(1); - let scale = (max_side as f32 / longest as f32).min(1.0); - let w = ((b.width() as f32 * scale).round() as u32).max(1); - let h = ((b.height() as f32 * scale).round() as u32).max(1); + let (w, h) = thumbnail_size(doc, max_side); let k = longest / max_side.max(1).saturating_mul(2); if k >= 2 && doc.size.area() > PROXY_THUMBNAIL_PIXELS && proxy::proxy_faithful(doc) { render_reduced(&proxy::proxy_document(doc, k), w, h) diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index c9e4c6ce..bd3b64f3 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -1080,7 +1080,8 @@ pub(crate) fn display_doc(app: &mut PhotocraftApp, idx: usize) -> (std::sync::Ar /// Longest side of the Navigator panel's image (about twice the panel's width, for HiDPI). pub const NAVIGATOR_SIDE: u32 = 512; -pub(crate) type NavigatorCache = (std::sync::Weak, u64, egui::TextureHandle); +/// The navigator image of a document: its snapshot, preview key and revision, and the texture. +pub(crate) type NavigatorCache = (std::sync::Weak, u64, u64, egui::TextureHandle); /// How long adjustment-dialog settings must stay unchanged before the navigator shows them. const NAVIGATOR_SETTLE_MS: f64 = 200.0; @@ -1099,25 +1100,26 @@ pub fn navigator_texture(app: &mut PhotocraftApp, ctx: &egui::Context, idx: usiz return ensure_texture(app, ctx, idx, app.session.color.main_display).map(|(t, _)| t); } // Keyed by the document snapshot, not its revision: selecting a layer changes no pixels. - let (snapshot, id) = app.session.documents().get(idx).map(|st| (std::sync::Arc::downgrade(&st.doc), st.doc.id))?; + let (snapshot, id, revision, last_damage) = + app.session.documents().get(idx).map(|st| (std::sync::Arc::downgrade(&st.doc), st.doc.id, st.revision, st.last_damage))?; let (doc, preview_key) = display_doc(app, idx); let (display, display_key) = canvas_display(app, &doc, None); let preview_key = preview_key ^ display_key; let cached = app.navigator_textures.get(&id).cloned(); - if let Some((r, p, t)) = &cached + if let Some((r, p, _, t)) = &cached && r.ptr_eq(&snapshot) && *p == preview_key { return Some(t.id()); } - if let Some((_, _, t)) = &cached + if let Some((_, _, _, t)) = &cached && navigator_waits_for_drag(app, idx) { return Some(t.id()); } // While an adjustment dialog's settings are changing, the navigator keeps its image and // catches up once they settle (a thumbnail composite per change would cost more than the canvas). - if let Some((r, _, t)) = &cached + if let Some((r, _, _, t)) = &cached && r.ptr_eq(&snapshot) && crate::adjust_preview::settling(app, NAVIGATOR_SETTLE_MS) { @@ -1125,16 +1127,38 @@ pub fn navigator_texture(app: &mut PhotocraftApp, ctx: &egui::Context, idx: usiz return Some(t.id()); } let t0 = crate::gpu_canvas::now_ms(); + // One edit since the cached image, with the area it changed: update just that part (nothing + // for a rename, a selection or a new empty layer). A thumbnail composite of the whole + // document on every edit cost a full-resolution CPU composite on the UI thread. + let size = photocraft_compose::thumbnail_size(&doc, NAVIGATOR_SIDE); + if let Some((_, p, rev, t)) = &cached + && *p == preview_key + && rev.checked_add(1) == Some(revision) + && let Some(d) = last_damage + && t.size() == [size.0 as usize, size.1 as usize] + { + let mut t = t.clone(); + if !d.is_empty() { + let buf = photocraft_compose::render_reduced_damage(&doc, size.0, size.1, d.inflate(effect_reach(&doc.layers))); + let r = buf.rect; + if !r.is_empty() { + t.set_partial([r.x0 as usize, r.y0 as usize], display_image(display.as_deref(), &buf), TextureOptions::LINEAR); + } + } + app.perf.span("navigator", crate::gpu_canvas::now_ms() - t0); + app.navigator_textures.insert(id, (snapshot, preview_key, revision, t.clone())); + return Some(t.id()); + } let image = display_image(display.as_deref(), &photocraft_compose::thumbnail_buffer(&doc, NAVIGATOR_SIDE)); let tex = match cached { - Some((_, _, mut t)) => { + Some((_, _, _, mut t)) => { t.set(image, TextureOptions::LINEAR); t } None => ctx.load_texture(format!("navigator-{}", id.0), image, TextureOptions::LINEAR), }; app.perf.span("navigator", crate::gpu_canvas::now_ms() - t0); - app.navigator_textures.insert(id, (snapshot, preview_key, tex.clone())); + app.navigator_textures.insert(id, (snapshot, preview_key, revision, tex.clone())); Some(tex.id()) } @@ -5499,7 +5523,7 @@ mod tests { // The same handle ownership as navigator_texture, without requiring a GPU adapter. let tex = ctx.load_texture("navigator-test", egui::ColorImage::filled([64, 64], egui::Color32::WHITE), TextureOptions::LINEAR); let nav = tex.id(); - app.navigator_textures.insert(first.id, (std::sync::Arc::downgrade(&first), 0, tex)); + app.navigator_textures.insert(first.id, (std::sync::Arc::downgrade(&first), 0, 0, tex)); app.run("file.new", json!({"width":32,"height":32})).unwrap(); let other = app.session.active().unwrap().doc.id; let b = ensure_texture(&mut app, &ctx, 1, Some(1)).unwrap().0; @@ -5591,6 +5615,45 @@ mod tests { assert_eq!(texture_key(canvas_display(&app, &doc, Some(1)).0.as_deref()), texture_key(canvas_display(&app, &doc, Some(4)).0.as_deref())); } + /// The navigator's update after an edit (its image with the edit's damage, grown by the + /// effect reach, rendered over it) equals a new thumbnail of the edited document. + #[test] + fn navigator_damage_updates_match_a_full_thumbnail() { + use photocraft_compose::{render_reduced_damage, thumbnail_buffer, thumbnail_size}; + let mut app = PhotocraftApp::new(photocraft_engine::Session::new(), Default::default()); + app.run("file.new", json!({"width": 1500, "height": 900, "background": "white"})).unwrap(); + app.run("layer.new.layer", json!({})).unwrap(); + app.run("select.rect", json!({"x": 200, "y": 150, "width": 300, "height": 200})).unwrap(); + app.run("edit.fill", json!({"color": "#3070a0"})).unwrap(); + app.run("select.deselect", json!({})).unwrap(); + app.run("layer.layerStyle.dropShadow", json!({"distance": 30, "size": 20})).unwrap(); + let steps = [ + ("layer.translate", json!({"dx": 37, "dy": -11})), + ("layer.setProps", json!({"opacity": 0.4})), + ("paint.stroke", json!({"points": [[700, 500], [900, 520]], "size": 25})), + ("layer.setProps", json!({"blend": "Multiply"})), + ("layer.new.layer", json!({})), + ]; + for (id, p) in steps { + let before = app.session.active().unwrap().doc.clone(); + app.run(id, p).unwrap(); + let st = app.session.active().unwrap(); + let d = st.last_damage.unwrap_or_else(|| panic!("{id}: a bounded damage")); + let (w, h) = thumbnail_size(&st.doc, NAVIGATOR_SIDE); + let mut shown = thumbnail_buffer(&before, NAVIGATOR_SIDE); + assert_eq!((shown.rect.width(), shown.rect.height()), (w, h)); + if !d.is_empty() { + let patch = render_reduced_damage(&st.doc, w, h, d.inflate(effect_reach(&st.doc.layers))); + let r = patch.rect; + for y in 0..r.height() as usize { + let at = (r.y0 as usize + y) * w as usize + r.x0 as usize; + shown.px[at..at + r.width() as usize].copy_from_slice(&patch.px[y * r.width() as usize..][..r.width() as usize]); + } + } + assert!(shown.px == thumbnail_buffer(&st.doc, NAVIGATOR_SIDE).px, "{id}: the updated navigator differs from a new thumbnail"); + } + } + #[test] fn tab_context_uses_clicked_document_and_existing_close_commands() { let items = tab_context_items(2, 3, true); From 286ff7353340ea7b2f83d632f8fc223edc6cee4e Mon Sep 17 00:00:00 2001 From: Jakub <47925045+JameEnder@users.noreply.github.com> Date: Mon, 12 Oct 2026 14:47:05 +0200 Subject: [PATCH 65/92] perf: edits, undo and redo recomposite only where added or removed layers draw (#3847) Session::edit reported damage only for edits that changed no pixels (same_pixels) and left every other edit to recomposite the whole document unless the command reported its own damage. Duplicate and paste do (#2883, #2901), but Fill, Invert, filters, Delete Layer and the undo/redo of a duplicate, a paste or a delete all recomposited everything. - Session::edit now reports step_damage(before, after), the same bound undo and redo use. - step_damage bounds layers only one side has in both directions, so a removed layer counts where it drew like an added one; the bounded_additions flag and insert_damage go, and added_bounds becomes one_sided_bounds. A layer that is (or was) the clipping base of clipped layers above it, an adjustment, a video layer or one excluding channels still recomposites everything (#3090). - The subject-mask cache is dropped only when the step can have changed pixels. perf_scenarios on the layered 20 MP document, edits on a 1 MP layer (p50, RTX 3090, Vulkan): delete layer 9.1 -> 1.4 ms, undo a duplicate 9.3 -> 1.6 ms, fill a 500 px square 17.4 -> 5.5 ms, Invert 16.7 -> 9.2 ms. Duplicate and paste are unchanged (already bounded). Tests: duplicate_paste_and_delete_report_where_the_layer_draws checks that each step, its undo and its redo report the same bounded damage and that no pixel outside it changes. new_layers_that_change_clipping_recomposite_everything (renamed) now expects bounded damage for a painted or empty new layer and None for a new clipping base or an adjustment; deleting and restoring a layer reports its bounds. --- .../engine/src/layer_mask_props_cmds/tests.rs | 6 +- crates/engine/src/layer_multi_cmds.rs | 155 ++++++++++++------ crates/engine/src/lib.rs | 15 +- 3 files changed, 115 insertions(+), 61 deletions(-) diff --git a/crates/engine/src/layer_mask_props_cmds/tests.rs b/crates/engine/src/layer_mask_props_cmds/tests.rs index b183b1f8..cd32de15 100644 --- a/crates/engine/src/layer_mask_props_cmds/tests.rs +++ b/crates/engine/src/layer_mask_props_cmds/tests.rs @@ -44,7 +44,11 @@ fn edits_preserve_mask_pixels_and_layer_at_all_depths_with_undo_redo() { assert_eq!(*s.active().unwrap().doc, expected, "only density and feather change"); assert_eq!(s.active().unwrap().active_layer, Some(background)); assert_eq!(s.active().unwrap().history.entries().len(), count + 1); - assert!(s.active().unwrap().last_damage.is_none(), "properties invalidate the composite"); + // Properties invalidate the composite as far as their undo would (the masked layer is + // empty here; the adjustment reaches everything). + let damage = s.active().unwrap().last_damage; + assert_eq!(damage, crate::layer_multi_cmds::step_damage(&before, &s.active().unwrap().doc)); + assert_eq!(damage.is_none(), adjustment); s.execute("edit.undo", json!({})).unwrap(); assert_eq!(*s.active().unwrap().doc, *before); s.execute("edit.redo", json!({})).unwrap(); diff --git a/crates/engine/src/layer_multi_cmds.rs b/crates/engine/src/layer_multi_cmds.rs index f0bf4a50..2d51dfdf 100644 --- a/crates/engine/src/layer_multi_cmds.rs +++ b/crates/engine/src/layer_multi_cmds.rs @@ -667,35 +667,31 @@ pub fn same_pixels(a: &Document, b: &Document) -> bool { } /// Pixels a single history step can have changed between `a` and `b` (the documents on either -/// side of an undo or redo): the union of the change bounds of every layer whose pixels -/// differ, so undoing a local edit recomposites only that area instead of the whole canvas. -/// `None` (composite everything, as before) when the step touched anything the layer walk -/// cannot bound: document-level fields the compositor reads (canvas size, mode, depth, -/// profile, global light, patterns, channels, palettes), the layer structure (order, -/// additions, removals, kind changes; adding or removing a layer that draws nothing, see -/// [`inert_at`], is no change), layer properties that reach outside their own bounds -/// (clipping, excluded channels — what `layer.setProps` already reports as unbounded), and -/// video layers. -pub fn step_damage(a: &Document, b: &Document) -> Option { - damage_between(a, b, false) -} - -/// [`step_damage`] for an edit from `before` to `after` that may also have added layers which -/// change pixels only within their own bounds (see [`added_bounds`]), as Duplicate Layer does: -/// each contributes its change bounds instead of making the whole canvas recomposite. Inserting a -/// copy of a 12 MP layer used to recomposite every layer of the document (#2883, P8/P9 in +/// side of an edit, its undo or its redo): the union of the change bounds of every layer whose +/// pixels differ, so a local edit recomposites only that area instead of the whole canvas. A +/// layer only one side has (a duplicate, a paste, a deleted layer) counts where it draws (see +/// [`one_sided_bounds`]); one that draws nothing ([`inert_at`]) changes nothing. `None` +/// (composite everything) when the step touched anything the layer walk cannot bound: +/// document-level fields the compositor reads (canvas size, mode, depth, profile, global light, +/// patterns, channels, palettes), layer order and kind changes, layers added or removed that +/// reach outside their own bounds, layer properties that do (clipping, excluded channels — +/// what `layer.setProps` already reports as unbounded), and video layers. Inserting a copy of a +/// 12 MP layer used to recomposite every layer of the document (#2883, P8/P9 in /// `perf/budgets.toml`). -pub(crate) fn insert_damage(before: &Document, after: &Document) -> Option { - damage_between(before, after, true) -} - -fn damage_between(a: &Document, b: &Document, bounded_additions: bool) -> Option { +pub fn step_damage(a: &Document, b: &Document) -> Option { if !doc_pixels_equal(a, b) { return None; } - fn walk(xs: &[Layer], ys: &[Layer], a: &Document, b: &Document, added: bool, out: &mut Rect) -> bool { - // Pair the layers by id, stepping over layers only one side has when they draw nothing - // (a new empty layer or group, #1771): adding or deleting one changes no pixels. + fn walk(xs: &[Layer], ys: &[Layer], a: &Document, b: &Document, out: &mut Rect) -> bool { + // Pair the layers by id, stepping over layers only one side has: one that draws nothing + // changes no pixels (a new empty layer or group, #1771), any other only where it draws. + let one_sided = |layers: &[Layer], k: usize, canvas: Rect, out: &mut Rect| { + let Some(r) = one_sided_bounds(layers, k, canvas) else { return false }; + if !r.is_empty() { + *out = if out.is_empty() { r } else { out.union(&r) }; + } + true + }; let (mut i, mut j) = (0, 0); loop { let (x, y) = match (xs.get(i), ys.get(j)) { @@ -705,19 +701,25 @@ fn damage_between(a: &Document, b: &Document, bounded_additions: bool) -> Option j += 1; continue; } - _ if added && ys.get(j).is_some_and(|y| xs.iter().all(|x| x.id != y.id)) => { - // A layer only `b` has: bounded when it is self-contained. - let Some(r) = added_bounds(ys, j, b.bounds()) else { return false }; - if !r.is_empty() { - *out = if out.is_empty() { r } else { out.union(&r) }; - } - j += 1; - continue; - } _ if inert_at(xs, i) => { i += 1; continue; } + (_, Some(y)) if xs.iter().all(|x| x.id != y.id) => { + if !one_sided(ys, j, b.bounds(), out) { + return false; + } + j += 1; + continue; + } + (Some(x), _) if ys.iter().all(|y| y.id != x.id) => { + if !one_sided(xs, i, a.bounds(), out) { + return false; + } + i += 1; + continue; + } + // Both sides have the layer, in another order. _ => return false, }; i += 1; @@ -739,7 +741,7 @@ fn damage_between(a: &Document, b: &Document, bounded_additions: bool) -> Option } match (x.children(), y.children()) { (Some(xc), Some(yc)) => { - if !walk(xc, yc, a, b, added, out) { + if !walk(xc, yc, a, b, out) { return false; } } @@ -749,15 +751,15 @@ fn damage_between(a: &Document, b: &Document, bounded_additions: bool) -> Option } } let mut out = Rect::EMPTY; - if walk(&a.layers, &b.layers, a, b, bounded_additions, &mut out) { Some(out) } else { None } + if walk(&a.layers, &b.layers, a, b, &mut out) { Some(out) } else { None } } -/// The pixels adding `layers[k]` can change, when that is bounded: its change bounds +/// The pixels adding or removing `layers[k]` can change, when that is bounded: its change bounds /// (`photocraft_compose::change_bounds`: not for an adjustment, or a pass-through group holding -/// one), provided it doesn't become the clipping base of clipped layers above it, and neither it -/// nor anything inside it is a video layer or excludes channels (both reach outside the layer's -/// bounds, see [`step_damage`]). -fn added_bounds(layers: &[Layer], k: usize, canvas: Rect) -> Option { +/// one), provided it isn't the clipping base of clipped layers above it (they would change base), +/// and neither it nor anything inside it is a video layer or excludes channels (both reach +/// outside the layer's bounds, see [`step_damage`]). +fn one_sided_bounds(layers: &[Layer], k: usize, canvas: Rect) -> Option { fn contained(l: &Layer, depth: usize) -> bool { depth < 256 && l.video.is_none() && l.excluded_channels == 0 && l.children().is_none_or(|c| c.iter().all(|c| contained(c, depth + 1))) } @@ -804,11 +806,12 @@ pub(crate) fn note_inert_insert(s: &mut Session, id: LayerId) { } } -/// Report the pixels an edit from `before` that added layers changed ([`insert_damage`]), so -/// the canvas recomposites only where the new layers draw instead of the whole document. +/// Report the pixels an edit from `before` that added layers changed ([`step_damage`]), for +/// commands made of more than one edit, so the canvas recomposites only where the new layers +/// draw instead of the whole document. pub(crate) fn note_insert(s: &mut Session, before: &Document) { let Some(st) = s.active_mut() else { return }; - st.last_damage = insert_damage(before, &st.doc); + st.last_damage = step_damage(before, &st.doc); } /// Content bounds used by Align/Distribute: the layer's pixels (type and shape layers use their @@ -1588,7 +1591,7 @@ mod tests { } #[test] - fn new_layers_that_change_pixels_still_recomposite_everything() { + fn new_layers_that_change_clipping_recomposite_everything() { let mut s = session(8); let base = rect_layer(&mut s, Rect::new(10, 10, 20, 20)); let clipped = rect_layer(&mut s, Rect::new(0, 0, 100, 80)); @@ -1612,21 +1615,33 @@ mod tests { assert_eq!(step_damage(&before, &split), None); assert_eq!(step_damage(&split, &before), None); s.execute("edit.undo", json!({})).unwrap(); - // A step that adds a layer with pixels (Layer via Copy, paste…) is not inert either. + // A step that adds a layer with pixels (Layer via Copy, paste…) changes where it draws. let before = doc(&s).clone(); let mut after = before.clone(); let mut l = Layer::raster("painted", after.pixel_format()); l.surface_mut().unwrap().fill_rect(Rect::new(1, 1, 2, 2), &[0.0, 1.0, 0.0, 1.0]); after.insert_above(None, l); - assert_eq!(step_damage(&before, &after), None); - assert_eq!(step_damage(&after, &before), None); - // Nor, conservatively, an empty layer in another blend mode. + assert_eq!(step_damage(&before, &after), Some(Rect::new(1, 1, 2, 2))); + assert_eq!(step_damage(&after, &before), Some(Rect::new(1, 1, 2, 2))); + // Unless it becomes the base of clipped layers above it. + let mut based = before.clone(); + let mut l = Layer::raster("base", based.pixel_format()); + l.surface_mut().unwrap().fill_rect(Rect::new(1, 1, 2, 2), &[0.0, 1.0, 0.0, 1.0]); + let under = based.layers.iter().position(|l| l.id == clipped).unwrap(); + based.layers.insert(under, l); + assert_eq!(step_damage(&before, &based), None); + assert_eq!(step_damage(&based, &before), None); + // An adjustment reaches every pixel below it. + let mut adjusted = before.clone(); + adjusted.insert_above(None, Layer::new("inv", LayerContent::Adjustment(photocraft_doc::Adjustment::Invert))); + assert_eq!(step_damage(&before, &adjusted), None); + assert_eq!(step_damage(&adjusted, &before), None); + // Empty layers draw nothing, in any blend mode. let mut styled = before.clone(); let mut l = Layer::raster("styled", styled.pixel_format()); l.blend = photocraft_doc::BlendMode::Multiply; styled.insert_above(None, l); - assert_eq!(step_damage(&before, &styled), None); - // An empty layer in Normal mode is. + assert_eq!(step_damage(&before, &styled), Some(Rect::EMPTY)); let mut plain = before.clone(); plain.insert_above(None, Layer::raster("plain", plain.pixel_format())); assert_eq!(step_damage(&before, &plain), Some(Rect::EMPTY)); @@ -1669,6 +1684,40 @@ mod tests { } } + /// The composite of `after` equals `before`'s outside `damage`. + fn unchanged_outside(before: &Document, after: &Document, damage: Rect) -> bool { + let (x, y) = (photocraft_compose::render(before, before.bounds()), photocraft_compose::render(after, after.bounds())); + let w = before.bounds().width() as i32; + x.px.iter().zip(&y.px).enumerate().all(|(i, (p, q))| p == q || damage.contains(i as i32 % w, i as i32 / w)) + } + + /// Duplicate, paste and delete, and their undo and redo, recomposite only where the layer + /// draws; undoing a duplicate used to recomposite the whole document. + #[test] + fn duplicate_paste_and_delete_report_where_the_layer_draws() { + let mut s = session(8); + let a = rect_layer(&mut s, Rect::new(10, 10, 20, 20)); + let full = doc(&s).bounds(); + let step = |s: &mut Session, id: &str, p: serde_json::Value| { + let before = doc(s).clone(); + s.execute(id, p).unwrap(); + let d = damage(s).unwrap_or_else(|| panic!("{id}: unbounded damage")); + assert!(d.width() < full.width(), "{id}: {d:?}"); + assert!(unchanged_outside(&before, doc(s), d), "{id}: pixels changed outside {d:?}"); + s.execute("edit.undo", json!({})).unwrap(); + assert_eq!(damage(s), Some(d), "undo {id}"); + s.execute("edit.redo", json!({})).unwrap(); + assert_eq!(damage(s), Some(d), "redo {id}"); + }; + step(&mut s, "layer.duplicate", json!({"layer": a.0})); + s.execute("layer.select", json!({"layer": a.0})).unwrap(); + s.execute("select.rect", json!({"x": 12, "y": 12, "width": 4, "height": 4})).unwrap(); + s.execute("edit.copy", json!({})).unwrap(); + s.execute("select.deselect", json!({})).unwrap(); + step(&mut s, "edit.paste", json!({})); + step(&mut s, "layer.delete", json!({"layer": a.0})); + } + #[test] fn the_move_preview_matches_the_move() { let mut s = session(8); @@ -2205,12 +2254,12 @@ mod tests { assert_ne!(doc(&s).size, photocraft_doc::Size::new(100, 80)); s.undo(); assert_eq!(damage(&s), None, "a size change recomposites the whole canvas"); - // A structural change (a layer removed and restored) neither. + // A layer removed and restored changes only where it draws. let b = rect_layer(&mut s, Rect::new(0, 0, 5, 5)); select_all(&mut s, &[b]); s.execute("layer.delete", json!({})).unwrap(); s.undo(); - assert_eq!(damage(&s), None); + assert_eq!(damage(&s), Some(Rect::new(0, 0, 5, 5))); } #[test] diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs index 21f3c8ad..c9cb7255 100644 --- a/crates/engine/src/lib.rs +++ b/crates/engine/src/lib.rs @@ -644,11 +644,12 @@ impl Session { st.color_samplers.retain(|p| bounds.contains(p[0].floor() as i32, p[1].floor() as i32)); samplers_removed = n - st.color_samplers.len(); } - // An edit that changes no pixels (a selection, guides, a layer's name) leaves the canvas - // as it is; anything else recomposites the whole document unless the command reports - // its own damage after this. A new lasso selection on a large document used to cost a - // full recomposite (seconds on the CPU path, #1773). - let unchanged = layer_multi_cmds::same_pixels(&before, &st.doc); + // The pixels the edit can have changed, as its undo would report them: nothing for a + // selection, guides or a layer's name (a new lasso selection used to recomposite a large + // document, seconds on the CPU path, #1773), a new or deleted layer's bounds (a + // duplicate or a paste), and everything when that can't be bounded. A command may still + // report its own, tighter damage after this. + let damage = layer_multi_cmds::step_damage(&before, &st.doc); let key = self.coalesce_request.clone(); let st = self.active_mut().ok_or(EngineError::NoDocument)?; let layers = st.layer_target(); @@ -661,9 +662,9 @@ impl Session { } st.coalesce = key; st.revision += 1; - st.last_damage = unchanged.then_some(photocraft_geom::Rect::EMPTY); + st.last_damage = damage; self.samplers_removed += samplers_removed; - if !unchanged { + if damage.is_none_or(|d| !d.is_empty()) { // Free the mask early; a stale entry would only miss (it is keyed by pixels). self.subject_cache = Default::default(); } From de22bca76005262a669f2e2da76a542b0806fb06 Mon Sep 17 00:00:00 2001 From: Diego Chagas Date: Mon, 12 Oct 2026 09:51:56 -0300 Subject: [PATCH 66/92] Remove tool: Create a new layer, and Remove after each stroke off (#1750) (#3808) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit paint.remove takes several strokes at once (`strokes`) and fills them as one job and one undo step, so the fill sees every hole together; and `newLayer` writes the fill to a new layer above the target, only where the hole is, leaving the target as it was (with Sample All Layers it fills from the composite). The options bar shows Photoshop's three options; with Remove after each stroke off, strokes collect as a tint on the canvas until Enter or the ✓ applies them and Esc or ⊘ drops them. Strokes are dropped when the tool or document changes under them. --- crates/engine/src/retouch_cmds.rs | 2 +- crates/engine/src/retouch_cmds/remove.rs | 108 ++++++++++++-- crates/engine/src/retouch_cmds/tests.rs | 60 ++++++++ crates/ui-egui/src/canvas.rs | 2 + crates/ui-egui/src/i18n/cs.tsv | 3 + crates/ui-egui/src/i18n/de.tsv | 3 + crates/ui-egui/src/i18n/el.tsv | 3 + crates/ui-egui/src/i18n/es.tsv | 3 + crates/ui-egui/src/i18n/fr.tsv | 3 + crates/ui-egui/src/i18n/id.tsv | 3 + crates/ui-egui/src/i18n/it.tsv | 3 + crates/ui-egui/src/i18n/ja.tsv | 3 + crates/ui-egui/src/i18n/ko.tsv | 3 + crates/ui-egui/src/i18n/nl.tsv | 3 + crates/ui-egui/src/i18n/pl.tsv | 3 + crates/ui-egui/src/i18n/pt-br.tsv | 3 + crates/ui-egui/src/i18n/ru.tsv | 3 + crates/ui-egui/src/i18n/uk.tsv | 3 + crates/ui-egui/src/i18n/vi.tsv | 3 + crates/ui-egui/src/i18n/zh-hans.tsv | 3 + crates/ui-egui/src/i18n/zh-hant.tsv | 3 + crates/ui-egui/src/lib.rs | 8 ++ crates/ui-egui/src/retouch_ui.rs | 175 ++++++++++++++++++++++- crates/ui-egui/src/shortcuts.rs | 11 ++ crates/ui-egui/src/state.rs | 7 + docs/scorecard.md | 2 +- docs/target-app-parity.md | 5 +- scorecard/tools.toml | 2 +- 28 files changed, 414 insertions(+), 19 deletions(-) diff --git a/crates/engine/src/retouch_cmds.rs b/crates/engine/src/retouch_cmds.rs index 9923f7a3..833e2db6 100644 --- a/crates/engine/src/retouch_cmds.rs +++ b/crates/engine/src/retouch_cmds.rs @@ -1170,7 +1170,7 @@ pub fn specs() -> Vec { menu: &[], shortcut: None, params: brush_params!( - r#","closeLoops":bool=true (a stroke around an object removes what it encloses),"sampleAllLayers":bool=false → {"damage"} (a background job)"# + r#","strokes":[[[x,y,pressure?],…],…]? (several strokes removed together, as one job and one undo step; else "points"),"closeLoops":bool=true (a stroke around an object removes what it encloses),"sampleAllLayers":bool=false,"newLayer":bool=false (the fill goes to a new layer above the target, which stays as it was) → {"damage","layer"?} (a background job)"# ), enabled: has_pixel_layer, run: remove::remove, diff --git a/crates/engine/src/retouch_cmds/remove.rs b/crates/engine/src/retouch_cmds/remove.rs index 889cd2c1..4e256fb7 100644 --- a/crates/engine/src/retouch_cmds/remove.rs +++ b/crates/engine/src/retouch_cmds/remove.rs @@ -7,10 +7,17 @@ //! selection, when there is one, limits what changes. Large holes take seconds, so the command //! runs as a background job (#210): with progress, cancellable, and the document unchanged until //! it applies, in one undo step. +//! +//! Several strokes can go in one removal (`strokes`): Photoshop's *Remove after each stroke* +//! off, where the strokes collect and are applied together, so the fill sees every hole at once +//! instead of sampling from an area the next stroke is about to remove. With `newLayer` the fill +//! lands on a new layer above the target, only where the hole is, and the target stays as it was +//! (Photoshop's *Create a new layer*; with Sample All Layers it fills from the composite). use super::content_aware_move::{Target, replace}; use super::patch::coverage; use super::*; +use photocraft_doc::Layer; const CMD: &str = "paint.remove"; @@ -38,11 +45,14 @@ fn sampling_margin(area: Rect) -> i32 { /// What a removal does, checked before any work starts. struct Plan { id: Option, - stroke: Stroke, - /// Where the fill samples from: the stroke plus a margin, on the canvas. + /// One stroke (`points`), or several applied together (`strokes`). + strokes: Vec, + /// Where the fill samples from: the strokes plus a margin, on the canvas. window: Rect, close_loops: bool, all_layers: bool, + /// The fill goes to a new layer above the target instead of into it. + new_layer: bool, } /// The stroke's bounding box (points ± the brush radius), before any coverage is rendered. @@ -56,11 +66,37 @@ fn stroke_bounds(stroke: &Stroke) -> Rect { Rect::new((x0 - r).floor() as i32, (y0 - r).floor() as i32, (x1 + r).ceil() as i32, (y1 + r).ceil() as i32) } +/// The strokes of the request: `strokes` (several, each a list of points, sharing the brush +/// and the target) or the one in `points`. +fn parse_strokes(s: &Session, p: &Value) -> Result<(Vec, Option)> { + let Some(list) = p.get("strokes") else { + let (stroke, id) = parse_brush(s, p, CMD)?; + return Ok((vec![stroke], id)); + }; + let list = list.as_array().ok_or_else(|| bad(CMD, "`strokes` is a list of point lists"))?; + if list.is_empty() { + return Err(bad(CMD, "`strokes` is empty")); + } + let mut strokes = Vec::with_capacity(list.len()); + let mut id = None; + for points in list { + let mut one = p.clone(); + if let Some(o) = one.as_object_mut() { + o.remove("strokes"); + o.insert("points".into(), points.clone()); + } + let (stroke, layer) = parse_brush(s, &one, CMD)?; + strokes.push(stroke); + id = layer; + } + Ok((strokes, id)) +} + fn plan(s: &Session, p: &Value) -> Result { - let (stroke, id) = parse_brush(s, p, CMD)?; + let (strokes, id) = parse_strokes(s, p)?; let d = s.active().ok_or(EngineError::NoDocument)?; let canvas = d.doc.bounds(); - let bounds = stroke_bounds(&stroke); + let bounds = strokes.iter().map(stroke_bounds).reduce(|a, b| a.union(&b)).ok_or_else(|| bad(CMD, "`strokes` is empty"))?; let pixels = u64::from(bounds.width()) * u64::from(bounds.height()); if pixels > MAX_PIXELS { return Err(bad(CMD, format!("the stroke is too large to remove ({pixels} pixels, at most {MAX_PIXELS})"))); @@ -72,23 +108,27 @@ fn plan(s: &Session, p: &Value) -> Result { let window = area.inflate(sampling_margin(area).min(MAX_MARGIN)).intersect(&canvas); let close_loops = flag(p, "closeLoops", true); let all_layers = flag(p, "sampleAllLayers", false) && targets_pixels(p); - Ok(Plan { id, stroke, window, close_loops, all_layers }) + // A mask or channel has no "above": the fill goes where the stroke went. + let new_layer = flag(p, "newLayer", false) && targets_pixels(p); + Ok(Plan { id, strokes, window, close_loops, all_layers, new_layer }) } -/// The hole over the plan's window: the stroke's footprint, its enclosed areas and a margin, +/// The hole over the plan's window: the strokes' footprints, their enclosed areas and a margin, /// limited to the selection. Empty when nothing would change. fn hole(plan: &Plan, sel: Option<&Surface>) -> Vec { let win = plan.window; let (w, h) = (win.width() as usize, win.height() as usize); - let (bounds, cov) = stroke_coverage(&plan.stroke); let mut m = vec![false; w * h]; - let bw = bounds.width() as usize; - for (i, c) in cov.iter().enumerate() { - let (x, y) = (bounds.x0 + (i % bw.max(1)) as i32, bounds.y0 + (i / bw.max(1)) as i32); - if *c > 0.0 && win.contains(x, y) { - let j = (y - win.y0) as usize * w + (x - win.x0) as usize; - if let Some(v) = m.get_mut(j) { - *v = true; + for stroke in &plan.strokes { + let (bounds, cov) = stroke_coverage(stroke); + let bw = bounds.width() as usize; + for (i, c) in cov.iter().enumerate() { + let (x, y) = (bounds.x0 + (i % bw.max(1)) as i32, bounds.y0 + (i / bw.max(1)) as i32); + if *c > 0.0 && win.contains(x, y) { + let j = (y - win.y0) as usize * w + (x - win.x0) as usize; + if let Some(v) = m.get_mut(j) { + *v = true; + } } } } @@ -135,6 +175,34 @@ fn run_remove(doc: &mut Document, plan: &Plan, p: &Value, ctx: &crate::jobs::Job Ok(Some((Region { rect: win, ch: img.ch, data }, hole))) } +/// The fill on a new layer above `id`: the hole's pixels (opaque where the source had no alpha), +/// transparent elsewhere. Returns the damage and the new layer. +fn fill_to_new_layer(doc: &mut Document, id: Option, out: &Region, hole: &[bool]) -> Result<(Rect, LayerId)> { + let base = doc.pixel_format(); + let fmt = PixelFormat::new(base.mode, base.sample, true); + let n = fmt.channels(); + let colours = n.saturating_sub(1); + if out.ch != n && out.ch != colours { + return Err(EngineError::Other("internal error: the fill's channels don't match the document".into())); + } + let mut data = vec![0.0f32; hole.len().saturating_mul(n)]; + for ((dst, src), m) in data.chunks_exact_mut(n).zip(out.data.chunks_exact(out.ch)).zip(hole) { + if !*m { + continue; + } + for (d, s) in dst.iter_mut().zip(src.iter().take(colours)) { + *d = *s; + } + if let Some(a) = dst.last_mut() { + *a = if out.ch == n { src.last().copied().unwrap_or(1.0) } else { 1.0 }; + } + } + let mut l = Layer::raster(doc.next_layer_name("Layer"), fmt); + crate::pixels_mut(&mut l)?.write_region(out.rect, &data); + let nid = doc.insert_above(id, l); + Ok((out.rect, nid)) +} + pub(super) fn remove(s: &mut Session, p: &Value) -> Result { let plan = plan(s, p)?; let label = "Remove"; @@ -142,6 +210,7 @@ pub(super) fn remove(s: &mut Session, p: &Value) -> Result { let doc = d.doc.clone(); let p = p.clone(); let id = plan.id; + let new_layer = plan.new_layer; crate::jobs::run( s, label, @@ -156,6 +225,17 @@ pub(super) fn remove(s: &mut Session, p: &Value) -> Result { }, move |s, filled| { let Some((out, hole)) = filled else { return Ok(json!({"changed": false})) }; + if new_layer { + let (damage, nid) = s.edit(label, |doc, active| { + let r = fill_to_new_layer(doc, id, &out, &hole)?; + *active = Some(r.1); + Ok(r) + })?; + if let Some(st) = s.active_mut() { + st.last_damage = Some(damage); + } + return Ok(json!({ "damage": damage_json(damage), "layer": nid.0 })); + } let damage = s.edit(label, |doc, _| replace(doc, Target { id, all_layers: false }, &p, &out, &hole))?; if let Some(st) = s.active_mut() { st.last_damage = Some(damage); diff --git a/crates/engine/src/retouch_cmds/tests.rs b/crates/engine/src/retouch_cmds/tests.rs index 7104c69a..a0fac91b 100644 --- a/crates/engine/src/retouch_cmds/tests.rs +++ b/crates/engine/src/retouch_cmds/tests.rs @@ -1580,3 +1580,63 @@ fn spot_healing_keeps_film_grain_through_overlapping_strokes() { } } } + +#[test] +fn remove_several_strokes_apply_as_one_job_and_one_undo_step() { + let mut s = square_session(8, "rgb"); + let bg = rgba(&s, 10, 10); + let past = s.active().unwrap().history.past_len(); + // Each stroke covers half of the square; together they remove it. + let r = s.execute("paint.remove", json!({"strokes": [[[38, 30], [45, 30]], [[47, 30], [54, 30]]], "size": 16})).unwrap(); + assert!(r["damage"].is_array(), "{r}"); + for (x, y) in [(41, 30), (46, 30), (51, 30)] { + assert!(near(rgba(&s, x, y), bg, 0.03), "({x}, {y}): {:?} vs {bg:?}", rgba(&s, x, y)); + } + assert_eq!(s.active().unwrap().history.past_len(), past + 1, "one undo step for both strokes"); + for p in [ + json!({"strokes": [], "size": 16}), + json!({"strokes": "x", "size": 16}), + json!({"strokes": [[]], "size": 16}), + json!({"strokes": [[[1, 1]], "x"], "size": 16}), + ] { + assert!(s.execute("paint.remove", p).is_err()); + } +} + +#[test] +fn remove_to_a_new_layer_leaves_the_target_untouched() { + let mut s = square_session(8, "rgb"); + let target = s.active().unwrap().active_layer.unwrap(); + let bg = rgba(&s, 10, 10); + let square = rgba(&s, 46, 30); + let past = s.active().unwrap().history.past_len(); + let r = s.execute("paint.remove", json!({"points": [[38, 30], [54, 30]], "size": 16, "newLayer": true})).unwrap(); + let nid = LayerId(r["layer"].as_u64().expect("the new layer's id")); + let d = s.active().unwrap(); + assert_eq!(d.active_layer, Some(nid), "the new layer is active"); + assert_ne!(nid, target); + let order: Vec = d.doc.walk().into_iter().map(|(_, _, l)| l.id).collect(); + assert_eq!(order, vec![target, nid], "the new layer sits above the target"); + assert_eq!(d.doc.layer(nid).unwrap().name, "Layer 1"); + // The target keeps its pixels; the new layer carries the fill inside the hole only. + let old = d.doc.layer(target).unwrap().surface().unwrap(); + assert!(near(old.rgba(46, 30), square, 0.001)); + let new = d.doc.layer(nid).unwrap().surface().unwrap(); + assert!(near(new.rgba(46, 30), bg, 0.03), "{:?}", new.rgba(46, 30)); + assert_eq!(new.rgba(10, 10)[3], 0.0, "transparent away from the hole"); + assert_eq!(d.history.past_len(), past + 1); + s.execute("edit.undo", json!({})).unwrap(); + let d = s.active().unwrap(); + assert!(d.doc.layer(nid).is_none(), "undo removes the layer"); + assert_eq!(d.active_layer, Some(target)); + // On an empty layer with Sample All Layers, the composite is what gets filled, onto a new layer. + s.execute("layer.new.layer", json!({})).unwrap(); + let empty = s.active().unwrap().active_layer.unwrap(); + let r = s.execute("paint.remove", json!({"points": [[38, 30], [54, 30]], "size": 16, "sampleAllLayers": true, "newLayer": true})).unwrap(); + let nid = LayerId(r["layer"].as_u64().unwrap()); + let d = s.active().unwrap(); + let order: Vec = d.doc.walk().into_iter().map(|(_, _, l)| l.id).collect(); + assert_eq!(order, vec![target, empty, nid]); + assert!(near(d.doc.layer(nid).unwrap().surface().unwrap().rgba(46, 30), bg, 0.03)); + assert!(near(d.doc.layer(target).unwrap().surface().unwrap().rgba(46, 30), square, 0.001)); +} diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index bd3b64f3..804744d3 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -4251,6 +4251,8 @@ fn draw_smoothing_string(painter: &egui::Painter, xf: &ViewXform, (brush, pointe fn draw_drag_preview(app: &mut PhotocraftApp, painter: &egui::Painter, xf: &ViewXform) { draw_tool_state(app, painter, xf, painter.ctx().input(|i| i.pointer.hover_pos())); + // Remove strokes waiting for ↩ stay tinted between drags. + crate::retouch_ui::draw_remove_pending(app, painter, xf); let Some(d) = &app.drag else { app.trail = None; return; diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index bb7f34d1..0b74504d 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -3661,3 +3661,6 @@ navigator Zoom Zvětšení Light Blue Světle modrá Light Red Světle červená Medium Blue Středně modrá + Remove after each stroke Odstranit po každém tahu + Apply the removal ({key}) Použít odstranění ({key}) + Strokes to remove: {n} (Enter applies, Esc cancels) Tahy k odstranění: {n} (Enter použije, Esc zruší) diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index 6836a381..604dcb43 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -2687,3 +2687,6 @@ curves Smooth Glätten Light Red Hellrot Medium Blue Mittelblau Light Gray Hellgrau + Remove after each stroke Nach jedem Strich entfernen + Apply the removal ({key}) Entfernen anwenden ({key}) + Strokes to remove: {n} (Enter applies, Esc cancels) Striche zum Entfernen: {n} (Eingabe wendet an, Esc bricht ab) diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index e994a26b..17677731 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -3745,3 +3745,6 @@ curves Smooth Εξομάλυνση Light Red Ανοιχτό κόκκινο Medium Blue Μεσαίο μπλε Light Gray Ανοιχτό γκρι + Remove after each stroke Αφαίρεση μετά από κάθε πινελιά + Apply the removal ({key}) Εφαρμογή της αφαίρεσης ({key}) + Strokes to remove: {n} (Enter applies, Esc cancels) Πινελιές προς αφαίρεση: {n} (Enter εφαρμόζει, Esc ακυρώνει) diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index f9cfe73f..7ad6d980 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -2728,3 +2728,6 @@ curves Smooth Suavizar Light Red Rojo claro Medium Blue Azul medio Light Gray Gris claro + Remove after each stroke Eliminar después de cada trazo + Apply the removal ({key}) Aplicar la eliminación ({key}) + Strokes to remove: {n} (Enter applies, Esc cancels) Trazos por eliminar: {n} (Intro aplica, Esc cancela) diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index 90c075c4..7863936b 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -3048,3 +3048,6 @@ curves Smooth Lisser Light Red Rouge clair Medium Blue Bleu moyen Light Gray Gris clair + Remove after each stroke Supprimer après chaque trait + Apply the removal ({key}) Appliquer la suppression ({key}) + Strokes to remove: {n} (Enter applies, Esc cancels) Traits à supprimer : {n} (Entrée applique, Échap annule) diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv index 4ef02d9e..74bd4462 100644 --- a/crates/ui-egui/src/i18n/id.tsv +++ b/crates/ui-egui/src/i18n/id.tsv @@ -3035,3 +3035,6 @@ curves Smooth Haluskan Light Red Merah Terang Medium Blue Biru Sedang Light Gray Abu-abu Muda + Remove after each stroke Hapus setelah setiap goresan + Apply the removal ({key}) Terapkan penghapusan ({key}) + Strokes to remove: {n} (Enter applies, Esc cancels) Goresan untuk dihapus: {n} (Enter menerapkan, Esc membatalkan) diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index ad8dc89f..3d2a0efb 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -4011,3 +4011,6 @@ navigator Zoom Zoom {index} of {total} {index} di {total} {shortcut} assigned. {shortcut} assegnata. {shortcut} is already in use by {commands} and will be removed from it when you click OK. {shortcut} è già usata da {commands} e verrà rimossa quando fai clic su OK. + Remove after each stroke Rimuovi dopo ogni tratto + Apply the removal ({key}) Applica la rimozione ({key}) + Strokes to remove: {n} (Enter applies, Esc cancels) Tratti da rimuovere: {n} (Invio applica, Esc annulla) diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index 4cc90fa0..2196441a 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -3657,3 +3657,6 @@ curves Smooth スムーズ Light Red ライトレッド Medium Blue ミディアムブルー Light Gray ライトグレー + Remove after each stroke ストロークごとに削除 + Apply the removal ({key}) 削除を適用 ({key}) + Strokes to remove: {n} (Enter applies, Esc cancels) 削除するストローク: {n}（Enter で適用、Esc で取り消し） diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index 62495a8d..9476f0da 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -3217,3 +3217,6 @@ curves Smooth 매끄럽게 Light Red 연한 빨강 Medium Blue 중간 파랑 Light Gray 연한 회색 + Remove after each stroke 획마다 제거 + Apply the removal ({key}) 제거 적용 ({key}) + Strokes to remove: {n} (Enter applies, Esc cancels) 제거할 획: {n} (Enter 적용, Esc 취소) diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index c0abbe55..fda481dc 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -3807,3 +3807,6 @@ curves Smooth Vloeiend maken Light Red Lichtrood Medium Blue Middelblauw Light Gray Lichtgrijs + Remove after each stroke Verwijderen na elke streek + Apply the removal ({key}) Verwijdering toepassen ({key}) + Strokes to remove: {n} (Enter applies, Esc cancels) Streken om te verwijderen: {n} (Enter past toe, Esc annuleert) diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index 557b193e..ed63d439 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -3644,3 +3644,6 @@ curves Smooth Wygładź Light Red Jasnoczerwony Medium Blue Średnioniebieski Light Gray Jasnoszary + Remove after each stroke Usuwaj po każdym pociągnięciu + Apply the removal ({key}) Zastosuj usuwanie ({key}) + Strokes to remove: {n} (Enter applies, Esc cancels) Pociągnięcia do usunięcia: {n} (Enter stosuje, Esc anuluje) diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index b7aea50b..a4242dc8 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -3837,3 +3837,6 @@ layerLabel No Color Sem cor Light Red Vermelho-claro Medium Blue Azul médio Light Gray Cinza-claro + Remove after each stroke Remover após cada traço + Apply the removal ({key}) Aplicar a remoção ({key}) + Strokes to remove: {n} (Enter applies, Esc cancels) Traços a remover: {n} (Enter aplica, Esc cancela) diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index 75d3dd8a..ead84742 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -2992,3 +2992,6 @@ curves Smooth Сгладить Light Red Светло-красный Medium Blue Средне-синий Light Gray Светло-серый + Remove after each stroke Удалять после каждого штриха + Apply the removal ({key}) Применить удаление ({key}) + Strokes to remove: {n} (Enter applies, Esc cancels) Штрихов к удалению: {n} (Enter применяет, Esc отменяет) diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index ffaaca59..7f59884e 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -3745,3 +3745,6 @@ curves Smooth Згладити Light Red Світло-червоний Medium Blue Середньо-синій Light Gray Світло-сірий + Remove after each stroke Видаляти після кожного штриха + Apply the removal ({key}) Застосувати видалення ({key}) + Strokes to remove: {n} (Enter applies, Esc cancels) Штрихів для видалення: {n} (Enter застосовує, Esc скасовує) diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index 6fb20b3d..c05376c1 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -3531,3 +3531,6 @@ curves Smooth Làm mượt Stroke Path… Đi nét đường dẫn… Apply mask to layer before removing? Áp dụng mặt nạ vào lớp trước khi xóa? Delete the vector mask? Xóa mặt nạ vectơ? + Remove after each stroke Xóa sau mỗi nét vẽ + Apply the removal ({key}) Áp dụng việc xóa ({key}) + Strokes to remove: {n} (Enter applies, Esc cancels) Nét vẽ cần xóa: {n} (Enter áp dụng, Esc hủy) diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index 187f63e1..08f00a0f 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -2652,3 +2652,6 @@ curves Smooth 平滑 Light Red 浅红色 Medium Blue 中蓝色 Light Gray 浅灰色 + Remove after each stroke 每次描边后移除 + Apply the removal ({key}) 应用移除 ({key}) + Strokes to remove: {n} (Enter applies, Esc cancels) 待移除的描边：{n}（Enter 应用，Esc 取消） diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index 3e0f8902..f2bcab85 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -2637,3 +2637,6 @@ curves Smooth 平滑 Light Red 淺紅色 Medium Blue 中藍色 Light Gray 淺灰色 + Remove after each stroke 每次描邊後移除 + Apply the removal ({key}) 套用移除 ({key}) + Strokes to remove: {n} (Enter applies, Esc cancels) 待移除的描邊：{n}（Enter 套用，Esc 取消） diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs index 323d559a..1ba0bce8 100644 --- a/crates/ui-egui/src/lib.rs +++ b/crates/ui-egui/src/lib.rs @@ -484,6 +484,11 @@ pub struct PhotocraftApp { committed_stroke: Option, /// Footprint trail of a retouching drag (see `stroke_trail`). trail: Option, + /// Remove tool strokes waiting to be applied together (Remove after each stroke off), the + /// document they belong to, and their tint on the canvas (`retouch_ui`). + pub(crate) remove_pending: Vec>, + pub(crate) remove_pending_doc: Option, + pub(crate) remove_trail: Option, /// The open menus' items, reused between frames (`menus::ItemCache`). pub(crate) menu_cache: Option, /// Move tool drag shown live (`move_ui`). @@ -709,6 +714,9 @@ impl PhotocraftApp { live_stroke: None, committed_stroke: None, trail: None, + remove_pending: Vec::new(), + remove_pending_doc: None, + remove_trail: None, menu_cache: None, move_preview: None, move_hover: None, diff --git a/crates/ui-egui/src/retouch_ui.rs b/crates/ui-egui/src/retouch_ui.rs index 37168ab4..a9e1241e 100644 --- a/crates/ui-egui/src/retouch_ui.rs +++ b/crates/ui-egui/src/retouch_ui.rs @@ -84,7 +84,13 @@ pub fn finish_stroke(app: &mut PhotocraftApp, tool: Tool, points: &[[f64; 3]], m let pts = json!(points); let (cmd, mut p): (&str, Value) = match tool { Tool::SpotHealing => ("paint.spotHealing", json!({"type": o.spot_type, "sampleAllLayers": o.sample_all_layers})), - Tool::Remove => ("paint.remove", json!({"sampleAllLayers": o.sample_all_layers})), + Tool::Remove => { + if !o.remove_after_each_stroke { + remove_pending_add(app, points); + return true; + } + ("paint.remove", remove_params(&o)) + } Tool::MixerBrush => ("paint.mixerBrush", json!({})), Tool::ColorReplacement => ("paint.colorReplacement", color_replacement_params(app)), Tool::PatternStamp => { @@ -154,6 +160,87 @@ pub fn finish_stroke(app: &mut PhotocraftApp, tool: Tool, points: &[[f64; 3]], m true } +/// `paint.remove` params from the options bar (without the strokes). +fn remove_params(o: &crate::state::ToolOptions) -> Value { + json!({"sampleAllLayers": o.sample_all_layers, "newLayer": o.remove_new_layer}) +} + +/// Remove after each stroke off: a finished stroke waits with the others, tinted on the canvas, +/// until ↩ or the options bar's ✓ applies them all as one removal (Esc or ⊘ drops them). +pub fn remove_pending_add(app: &mut PhotocraftApp, points: &[[f64; 3]]) { + let Some(st) = app.session.active() else { return }; + let (doc, size) = (st.doc.id, [st.doc.size.width, st.doc.size.height]); + if app.remove_pending_doc != Some(doc) { + app.remove_pending.clear(); + app.remove_trail = None; + app.remove_pending_doc = Some(doc); + } + let diameter = app.session.tools.brush.size; + app.remove_trail.get_or_insert_with(|| crate::stroke_trail::Trail::new(size)).feed(points, diameter); + app.remove_pending.push(points.to_vec()); + app.ui.status = crate::i18n::fmt(tl!("Strokes to remove: {n} (Enter applies, Esc cancels)"), &[("n", &app.remove_pending.len().to_string())]); + app.ui.status_error = false; +} + +/// Apply the waiting strokes as one removal (one job, one undo step). False when none wait. +pub fn remove_pending_commit(app: &mut PhotocraftApp) -> bool { + if app.remove_pending.is_empty() { + return false; + } + let strokes = std::mem::take(&mut app.remove_pending); + app.remove_trail = None; + app.remove_pending_doc = None; + let mut p = remove_params(&app.ui.tool_options); + p["strokes"] = json!(strokes); + p["target"] = crate::canvas::paint_target(app); + app.ui.status.clear(); + if let Err(e) = app.run("paint.remove", p) { + app.ui.status = e; + app.ui.status_error = true; + } + true +} + +/// Drop the waiting strokes. False when none wait. +pub fn remove_pending_cancel(app: &mut PhotocraftApp) -> bool { + if app.remove_pending.is_empty() { + return false; + } + app.remove_pending.clear(); + app.remove_trail = None; + app.remove_pending_doc = None; + app.ui.status.clear(); + app.ui.status_error = false; + true +} + +/// Whether Remove strokes are still waiting: they are dropped when the tool or the document +/// changed under them (checked every frame). +pub fn remove_pending_live(app: &mut PhotocraftApp) -> bool { + if app.remove_pending.is_empty() { + return false; + } + let doc = app.session.active().map(|st| st.doc.id); + if app.ui.tool == Tool::Remove && doc.is_some() && app.remove_pending_doc == doc { + return true; + } + remove_pending_cancel(app); + false +} + +/// The tint of the waiting Remove strokes, drawn every frame. +pub fn draw_remove_pending(app: &mut PhotocraftApp, painter: &egui::Painter, xf: &ViewXform) { + if !remove_pending_live(app) { + return; + } + let Some(bounds) = app.session.active().map(|st| st.doc.bounds()) else { return }; + let doc_rect = xf.doc_rect(bounds); + let col = Tokens::get(painter.ctx()).danger.gamma_multiply(0.45); + if let Some(trail) = app.remove_trail.as_mut() { + trail.draw(painter, doc_rect, xf.flip, col); + } +} + /// Patch Tool and Content-Aware Move Tool: a drag that starts inside the selection (without ⇧ or /// ⌥) drags the selection; any other drag draws a lasso selection. pub fn patch_drags_selection(app: &PhotocraftApp, at: [f64; 2], mods: egui::Modifiers) -> bool { @@ -356,7 +443,23 @@ pub fn options_bar(app: &mut PhotocraftApp, ui: &mut egui::Ui, tool: Tool) -> bo crate::widgets::checkbox(ui, &mut o.sample_all_layers, tl!("Sample All Layers")); } Tool::Remove => { + // Photoshop's options bar: Sample All Layers, Create a new layer, Remove after each + // stroke; with strokes waiting, ✓ applies them and ⊘ drops them. crate::widgets::checkbox(ui, &mut o.sample_all_layers, tl!("Sample All Layers")); + crate::widgets::checkbox(ui, &mut o.remove_new_layer, tl!("Create a new layer")); + crate::widgets::checkbox(ui, &mut o.remove_after_each_stroke, tl!("Remove after each stroke")); + if !app.remove_pending.is_empty() { + ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + if crate::widgets::primary_button(ui, "✓", 32.0) + .on_hover_text(crate::i18n::fmt(tl!("Apply the removal ({key})"), &[("key", &crate::shortcuts::pretty("Enter"))])) + .clicked() + { + remove_pending_commit(app); + } else if crate::widgets::secondary_button(ui, "⊘", 32.0).on_hover_text(tl!("Cancel (Esc)")).clicked() { + remove_pending_cancel(app); + } + }); + } } Tool::Patch => { // Photoshop's options bar: Patch: Normal (Source / Destination) or Content-Aware @@ -955,6 +1058,76 @@ mod tests { assert!(px.iter().zip(bg).all(|(a, b)| (a - b).abs() < 0.02), "{px:?} vs {bg:?}"); } + #[test] + fn remove_after_each_stroke_off_collects_strokes_until_enter_or_escape() { + let mut app = app(); + app.run("paint.pencil", json!({"points": [[0, 30], [100, 30]], "size": 200, "color": "#808080"})).unwrap(); + app.run("paint.pencil", json!({"points": [[30, 20], [30, 40]], "size": 4, "color": "#000000"})).unwrap(); + app.ui.tool = Tool::Remove; + app.ui.tool_options.remove_after_each_stroke = false; + let m = egui::Modifiers::NONE; + let journal = app.session.journal.len(); + for x in [28.0, 32.0] { + tool_event(&mut app, ToolEvent::Down { x, y: 18.0, pressure: 1.0 }, m); + tool_event(&mut app, ToolEvent::Move { x, y: 42.0, pressure: 1.0 }, m); + tool_event(&mut app, ToolEvent::Up { x, y: 42.0 }, m); + } + // Nothing ran yet: the strokes wait, tinted, and the status says so. + assert_eq!(app.session.journal.len(), journal, "no command before Enter"); + assert_eq!(app.remove_pending.len(), 2); + assert!(app.remove_trail.is_some()); + assert!(app.ui.status.contains("2") && !app.ui.status_error, "{}", app.ui.status); + // Esc drops them. + assert!(remove_pending_cancel(&mut app)); + assert!(app.remove_pending.is_empty() && app.remove_trail.is_none()); + assert!(!remove_pending_cancel(&mut app)); + // Collected again, Enter applies them as one `paint.remove` with both strokes. + for x in [28.0, 32.0] { + tool_event(&mut app, ToolEvent::Down { x, y: 18.0, pressure: 1.0 }, m); + tool_event(&mut app, ToolEvent::Up { x, y: 42.0 }, m); + } + let bg = active(&app).surface().unwrap().rgba(70, 30); + assert!(remove_pending_commit(&mut app)); + assert!(!app.ui.status_error, "{}", app.ui.status); + let (id, p) = app.session.journal.last().cloned().expect("a journaled command"); + assert_eq!(id, "paint.remove"); + assert_eq!(p["strokes"].as_array().map(Vec::len), Some(2)); + assert!(p.get("points").is_none()); + assert!(app.remove_pending.is_empty()); + let px = active(&app).surface().unwrap().rgba(30, 30); + assert!(px.iter().zip(bg).all(|(a, b)| (a - b).abs() < 0.02), "{px:?} vs {bg:?}"); + assert!(!remove_pending_commit(&mut app), "nothing left to apply"); + } + + #[test] + fn remove_strokes_waiting_are_dropped_when_the_tool_changes() { + let mut app = app(); + app.ui.tool = Tool::Remove; + app.ui.tool_options.remove_after_each_stroke = false; + remove_pending_add(&mut app, &[[10.0, 10.0, 1.0], [20.0, 10.0, 1.0]]); + assert_eq!(app.remove_pending.len(), 1); + assert!(remove_pending_live(&mut app)); + app.ui.tool = Tool::SpotHealing; + assert!(!remove_pending_live(&mut app)); + assert!(app.remove_pending.is_empty(), "the strokes belong to the Remove tool"); + } + + #[test] + fn create_a_new_layer_sends_new_layer_to_the_command() { + let mut app = app(); + app.run("paint.pencil", json!({"points": [[0, 30], [100, 30]], "size": 200, "color": "#808080"})).unwrap(); + app.ui.tool = Tool::Remove; + app.ui.tool_options.remove_new_layer = true; + let layers = app.session.active().unwrap().doc.walk().len(); + let m = egui::Modifiers::NONE; + tool_event(&mut app, ToolEvent::Down { x: 30.0, y: 18.0, pressure: 1.0 }, m); + tool_event(&mut app, ToolEvent::Up { x: 30.0, y: 42.0 }, m); + assert!(!app.ui.status_error, "{}", app.ui.status); + let (id, p) = app.session.journal.last().cloned().unwrap(); + assert_eq!((id.as_str(), p["newLayer"].as_bool()), ("paint.remove", Some(true))); + assert_eq!(app.session.active().unwrap().doc.walk().len(), layers + 1, "the fill went to a new layer"); + } + #[test] fn red_eye_is_in_the_j_flyout() { let j = [Tool::Remove, Tool::SpotHealing, Tool::Healing, Tool::Patch, Tool::ContentAwareMove, Tool::RedEye]; diff --git a/crates/ui-egui/src/shortcuts.rs b/crates/ui-egui/src/shortcuts.rs index 00280102..511265e1 100644 --- a/crates/ui-egui/src/shortcuts.rs +++ b/crates/ui-egui/src/shortcuts.rs @@ -481,6 +481,17 @@ pub fn handle(app: &mut PhotocraftApp, ctx: &egui::Context) { // brush keys [ ] ⇧[ ⇧] (`tools.decreaseBrushSize`…) are commands, dispatched above with any // Keyboard Shortcuts override. let pressed = |k: Key| ctx.input_mut(|i| i.consume_key(Modifiers::NONE, k)); + // Remove tool with strokes waiting (Remove after each stroke off): ↩ applies them, Esc drops them. + if !app.remove_pending.is_empty() { + if pressed(Key::Enter) { + crate::retouch_ui::remove_pending_commit(app); + return; + } + if pressed(Key::Escape) { + crate::retouch_ui::remove_pending_cancel(app); + return; + } + } // Enter / Escape commit or cancel in-progress tool state (polygonal lasso, crop). if crate::lasso_ui::active(app) { let mods = ctx.input(|i| i.modifiers); diff --git a/crates/ui-egui/src/state.rs b/crates/ui-egui/src/state.rs index 3b7b02d8..ee348d98 100644 --- a/crates/ui-egui/src/state.rs +++ b/crates/ui-egui/src/state.rs @@ -508,6 +508,11 @@ pub struct ToolOptions { pub contiguous: bool, pub anti_alias: bool, pub sample_all_layers: bool, + /// Remove tool: the fill goes to a new layer above the target (Photoshop's Create a new layer). + pub remove_new_layer: bool, + /// Remove tool: each stroke is filled when released (Photoshop's default). Off, the strokes + /// collect as a tint on the canvas and ↩ applies them together (Esc drops them). + pub remove_after_each_stroke: bool, pub feather: f32, /// linear | radial | angle | reflected | diamond pub gradient_style: String, @@ -744,6 +749,8 @@ impl Default for ToolOptions { contiguous: true, anti_alias: true, sample_all_layers: false, + remove_new_layer: false, + remove_after_each_stroke: true, feather: 0.0, gradient_style: "linear".into(), gradient_reverse: false, diff --git a/docs/scorecard.md b/docs/scorecard.md index fb430469..46f62ffd 100644 --- a/docs/scorecard.md +++ b/docs/scorecard.md @@ -171,7 +171,7 @@ Corpus floors (`crates/io/tests/corpus.rs`): the enforced minimums; the corpus t | TOOL-214-22 | Crop gear menu: Show Cropped Area (H), Enable Crop Shield with Match Canvas / custom colour, opacity and Auto Adjust Opacity | done | [#1919](https://github.com/storytold/photocraft/issues/1919) | crop_shield.rs: fill() resolves the shield (canvas.rs paints it around upright and turned frames), gear popup in the options bar, H ahead of the Hand key in shortcuts.rs, Custom… opens the Color Picker; ToolOptions crop_shield, ui.set cropShield. Use Classic Mode / Auto Center Preview: TOOL-214-23 | | TOOL-214-23 | Crop: Photoshop's default mode (the image turns and moves behind an upright box, Auto Center Preview keeps a resized box's centre in place and centres a drawn one) and Use Classic Mode (P) in the gear menu | done | [#1919](https://github.com/storytold/photocraft/issues/1919) | crop_mode.rs: the crop model (crop_rect + crop_angle) and image.crop are shared by both modes; default mode sets the view's rotation to -crop_angle while the tool shows a frame (picking the tool, in either mode, turns a Rotate View turn upright about the view centre, not restored after Enter/Esc or by P; Classic Mode keeps the camera upright with the frame drawn turned; as Photoshop 25.1), pivoting so the box stays put, moves view and frame together for drags inside and arrow keys, keeps a resized box's centre in place live (Auto Center Preview; a drawn box is centred on release, a moved one never), readout = the image's turn; gear menu order and Classic Mode greying as Photoshop 25.1; CropShield classic_mode / auto_center_preview (ui.set cropShield), P ahead of the Pen key | | TOOL-1053-1 | Shape stroke controls: solid/dashed/dotted, custom dash/gap/offset, caps, joins, alignment, miter limit and opacity | done | [#1053](https://github.com/storytold/photocraft/issues/1053) | shape_stroke_ui.rs: shared staged editor, renderer samples, cached Properties canvas preview; existing shape.create/edit/info; serde tool defaults, ui.set shapeStroke; pcraft and vstk style round trips. Gradient fill UI and saved stroke libraries remain open; Line retains filled-bar geometry | -| TOOL-213-19 | Remove tool: paint over an object (or circle it) and it is filled from its surroundings | partial | [#213](https://github.com/storytold/photocraft/issues/213) | paint.remove (retouch_cmds/remove.rs, background job) + Tool::Remove in the J flyout; loops close over what they enclose; fill by non-local patch completion with texture features, onion-peel start, best-patch copy and gradient-domain seam hiding (algo/nonlocal.rs, Newson et al. IPOL 2017); sparse holes in tiles (algo/remove.rs). remove_quality on 20 holes in public-domain photos: the fill keeps 0.89 of the texture it replaces (0.54 with Content-Aware Fill's completion), edge gradient 1.03 of the original's; remove_bench 24 MP: 100 px ring 120 ms, 1000 px ring 2.5 s, 3000 px line 1.7 s. Missing: generative AI mode, Remove after each stroke off, live preview of the result | +| TOOL-213-19 | Remove tool: paint over an object (or circle it) and it is filled from its surroundings | partial | [#213](https://github.com/storytold/photocraft/issues/213) | paint.remove (retouch_cmds/remove.rs, background job) + Tool::Remove in the J flyout; loops close over what they enclose; fill by non-local patch completion with texture features, onion-peel start, best-patch copy and gradient-domain seam hiding (algo/nonlocal.rs, Newson et al. IPOL 2017); sparse holes in tiles (algo/remove.rs). remove_quality on 20 holes in public-domain photos: the fill keeps 0.89 of the texture it replaces (0.54 with Content-Aware Fill's completion), edge gradient 1.03 of the original's; remove_bench 24 MP: 100 px ring 120 ms, 1000 px ring 2.5 s, 3000 px line 1.7 s. Options bar: Sample All Layers, Create a new layer (the fill on a new layer above, `newLayer`), Remove after each stroke off (strokes collect as a tint and ↩ applies them as one `strokes` job, Esc drops them). Missing: generative AI mode, live preview of the result | | TOOL-1045-1 | Color Replacement tool on the toolbar | done | [#1045](https://github.com/storytold/photocraft/issues/1045) | Tool::ColorReplacement in the Brush (B) flyout after the Mixer Brush; Mode/Sampling/Limits/Tolerance/Anti-alias options drive paint.colorReplacement with the foreground colour; live preview (LiveDab with the stroke's finishing dab), one History step; color_replacement_tests.rs | ## Workspace and UI diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 472a0f7c..ae64d0c9 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -481,7 +481,10 @@ best-patch copy and gradient-domain seam hiding. On 20 holes in public-domain ph original's texture (Wexler/PatchMatch completion as Content-Aware Fill uses it: 0.54). On a 24 MP document a 100 px ring takes 120 ms and a 1000 px ring 2.5 s (`remove_bench`). It is not generative: large objects over complex structure fill less convincingly than Photoshop's AI mode -(#41). +(#41). 2026-10-12: the options bar has Photoshop's three options: Sample All Layers, Create a new +layer (the fill lands on a new layer above the target, `paint.remove` `newLayer`) and Remove after +each stroke; off, the strokes collect as a tint and ↩ (or ✓) applies them together as one job and +one undo step (`strokes`), Esc (or ⊘) drops them (#1750). 2026-10-08: the tools update above is checked against the current toolbar groups in [`panels.rs`](../crates/ui-egui/src/panels.rs), the Pencil and tool-cycle tests in diff --git a/scorecard/tools.toml b/scorecard/tools.toml index ec9bc2a7..3f22fa90 100644 --- a/scorecard/tools.toml +++ b/scorecard/tools.toml @@ -297,7 +297,7 @@ id = "TOOL-213-19" target = "Remove tool: paint over an object (or circle it) and it is filled from its surroundings" status = "partial" issue = 213 -note = "paint.remove (retouch_cmds/remove.rs, background job) + Tool::Remove in the J flyout; loops close over what they enclose; fill by non-local patch completion with texture features, onion-peel start, best-patch copy and gradient-domain seam hiding (algo/nonlocal.rs, Newson et al. IPOL 2017); sparse holes in tiles (algo/remove.rs). remove_quality on 20 holes in public-domain photos: the fill keeps 0.89 of the texture it replaces (0.54 with Content-Aware Fill's completion), edge gradient 1.03 of the original's; remove_bench 24 MP: 100 px ring 120 ms, 1000 px ring 2.5 s, 3000 px line 1.7 s. Missing: generative AI mode, Remove after each stroke off, live preview of the result" +note = "paint.remove (retouch_cmds/remove.rs, background job) + Tool::Remove in the J flyout; loops close over what they enclose; fill by non-local patch completion with texture features, onion-peel start, best-patch copy and gradient-domain seam hiding (algo/nonlocal.rs, Newson et al. IPOL 2017); sparse holes in tiles (algo/remove.rs). remove_quality on 20 holes in public-domain photos: the fill keeps 0.89 of the texture it replaces (0.54 with Content-Aware Fill's completion), edge gradient 1.03 of the original's; remove_bench 24 MP: 100 px ring 120 ms, 1000 px ring 2.5 s, 3000 px line 1.7 s. Options bar: Sample All Layers, Create a new layer (the fill on a new layer above, `newLayer`), Remove after each stroke off (strokes collect as a tint and ↩ applies them as one `strokes` job, Esc drops them). Missing: generative AI mode, live preview of the result" [[item]] id = "TOOL-1045-1" From 6c7328b7093a39d35e6b2e7421baf7dcd3679072 Mon Sep 17 00:00:00 2001 From: Reynold Hu Date: Mon, 12 Oct 2026 20:52:32 +0800 Subject: [PATCH 67/92] Workspace: wire Auto-Collapse Iconic Panels (#204) (#3880) * ui: a panel expanded from its collapsed strip auto-collapses on an outside click * ui: test the Auto-Collapse Iconic Panels peek open and outside close * engine: show Auto-Collapse Iconic Panels in Preferences, it is wired * docs: scorecard, settings that do nothing 30 -> 29 of 154 --------- Co-authored-by: Brandon Thomas Co-authored-by: Claude Opus 5.5 --- crates/engine/src/prefs.rs | 1 - crates/ui-egui/src/dock.rs | 41 ++++++++++++++++++++++++++++++++ crates/ui-egui/src/dock_tests.rs | 37 ++++++++++++++++++++++++++++ docs/scorecard.md | 6 ++--- 4 files changed, 81 insertions(+), 4 deletions(-) diff --git a/crates/engine/src/prefs.rs b/crates/engine/src/prefs.rs index beef58c9..cffc39bc 100644 --- a/crates/engine/src/prefs.rs +++ b/crates/engine/src/prefs.rs @@ -1051,7 +1051,6 @@ pub const HIDDEN_UNTIL_IMPLEMENTED: &[&str] = &[ "general.colorPicker", "general.animatedZoom", "general.zoomResizesWindows", - "workspace.autoCollapseIconPanels", "workspace.autoShowHiddenPanels", "workspace.enableFloatingDocumentWindowDocking", "fileHandling.saveInBackground", diff --git a/crates/ui-egui/src/dock.rs b/crates/ui-egui/src/dock.rs index 089fb6cd..6115e06a 100644 --- a/crates/ui-egui/src/dock.rs +++ b/crates/ui-egui/src/dock.rs @@ -424,6 +424,26 @@ fn rects_id() -> egui::Id { egui::Id::new("dock-group-rects") } +/// The group expanded from its collapsed tab strip (see [`show`]), if any: with Preferences ▸ +/// Workspace ▸ Auto-Collapse Iconic Panels on, the first click outside it collapses it again. +fn peek_id() -> egui::Id { + egui::Id::new("dock-peek") +} + +fn auto_collapse_peek(app: &mut PhotocraftApp, ctx: &egui::Context) { + let Some(g) = ctx.data(|d| d.get_temp::>(peek_id())).flatten() else { return }; + let Some(p) = ctx.input(|i| i.pointer.any_pressed().then(|| i.pointer.press_origin()).flatten()) else { + return; + }; + let inside = last_rects(ctx).into_iter().find(|(x, _)| *x == g).is_some_and(|(_, r)| r.contains(p)); + if !inside { + app.ui.dock.set_collapsed(g, true); + ctx.data_mut(|d| { + d.insert_temp(peek_id(), None::); + }); + } +} + /// A group's tab strip as drawn last frame (screen points), for tests and automation. #[derive(Clone, Debug, PartialEq)] pub struct StripRects { @@ -451,6 +471,14 @@ fn strips_id() -> egui::Id { /// group's tab content. pub fn show(app: &mut PhotocraftApp, ui: &mut egui::Ui, shown: &[Group], mut body: impl FnMut(&mut PhotocraftApp, &mut egui::Ui, Group, usize)) { let t = Tokens::get(ui.ctx()); + let auto_collapse = app.session.prefs().workspace.auto_collapse_icon_panels; + if auto_collapse { + auto_collapse_peek(app, ui.ctx()); + } else { + ui.ctx().data_mut(|d| { + d.insert_temp(peek_id(), None::); + }); + } let strip = if t.pro { 28.0 } else { 40.0 }; let order: Vec = app.ui.dock.order().into_iter().filter(|g| shown.contains(g)).collect(); let area = ui.available_rect_before_wrap(); @@ -458,6 +486,7 @@ pub fn show(app: &mut PhotocraftApp, ui: &mut egui::Ui, shown: &[Group], mut bod let locked = app.session.prefs().workspace_locked; let rects = rects_after_layout(&heights, area); let mut actions: Vec = Vec::new(); + let mut peek_after: Option = None; let mut tab_drops: Vec<(Group, usize, Pos2)> = Vec::new(); let mut dragging: Option = None; let mut strips: Vec = Vec::with_capacity(rects.len()); @@ -525,6 +554,11 @@ pub fn show(app: &mut PhotocraftApp, ui: &mut egui::Ui, shown: &[Group], mut bod } if resp.strip.double_clicked() || resp.tab_double_clicked || (collapsed && resp.tab_clicked) { actions.push(Action::ToggleCollapse(g)); + // A single click on a collapsed strip's tab expands the group as a peek: the next + // click outside closes it again, with Auto-Collapse Iconic Panels on. + if collapsed && resp.tab_clicked && !resp.tab_double_clicked && auto_collapse { + peek_after = Some(g); + } } // The strip uses visible indices; reorder in original ones. if !locked @@ -663,6 +697,13 @@ pub fn show(app: &mut PhotocraftApp, ui: &mut egui::Ui, shown: &[Group], mut bod } } } + if let Some(g) = peek_after + && !app.ui.dock.is_collapsed(g) + { + ui.ctx().data_mut(|d| { + d.insert_temp(peek_id(), Some(g)); + }); + } for (panel, anchor, before) in panel_moves { let params = if before { json!({"panel":panel,"anchor":anchor,"before":anchor}) } else { json!({"panel":panel,"anchor":anchor}) }; if let Err(error) = app.run("window.panel.move", params) { diff --git a/crates/ui-egui/src/dock_tests.rs b/crates/ui-egui/src/dock_tests.rs index b5ade1d5..beb6b913 100644 --- a/crates/ui-egui/src/dock_tests.rs +++ b/crates/ui-egui/src/dock_tests.rs @@ -350,6 +350,43 @@ fn a_single_tab_click_expands_a_collapsed_panel() { } } +/// Auto-Collapse Iconic Panels: a group expanded by clicking a tab on its collapsed strip +/// closes again when the next click lands outside it; with the preference off it stays open. +#[test] +fn auto_collapse_icon_panels_closes_a_peeked_panel_on_an_outside_click() { + for auto in [true, false] { + let (mut app, _, _) = app_with_layers(); + app.session.prefs.edit(|p| p.workspace.auto_collapse_icon_panels = auto); + app.ui.dock.set_collapsed(Group::Color, true); + let mut h = harness(app, vec2(1200.0, 800.0), ThemeKind::ProMedium); + let collapsed_height = rect_of(&h, Group::Color).height(); + let tab = last_strips(&h.ctx).iter().find(|s| s.group == Group::Color).unwrap().tabs[0].1.center(); + h.event(egui::Event::PointerMoved(tab)); + h.run_steps(1); + h.event(egui::Event::PointerButton { pos: tab, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE }); + h.step(); + h.event(egui::Event::PointerButton { pos: tab, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE }); + h.run_steps(3); + assert!(!h.state().ui.dock.is_collapsed(Group::Color), "auto={auto}: the tab click expands the panel"); + let rect = rect_of(&h, Group::Color); + // A click inside the panel leaves it open; one outside (the canvas) closes it again. + for p in [rect.center(), Pos2::new(rect.left() / 2.0, rect.center().y)] { + h.event(egui::Event::PointerMoved(p)); + h.run_steps(1); + h.event(egui::Event::PointerButton { pos: p, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE }); + h.step(); + h.event(egui::Event::PointerButton { pos: p, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE }); + h.run_steps(3); + } + assert_eq!(h.state().ui.dock.is_collapsed(Group::Color), auto, "auto={auto}: outside closes it when enabled"); + if auto { + assert_eq!(rect_of(&h, Group::Color).height(), collapsed_height); + } else { + assert!(rect_of(&h, Group::Color).height() > collapsed_height); + } + } +} + #[test] fn double_clicking_a_tab_collapses_and_dragging_a_strip_reorders() { let (app, _, _) = app_with_layers(); diff --git a/docs/scorecard.md b/docs/scorecard.md index 46f62ffd..78a08645 100644 --- a/docs/scorecard.md +++ b/docs/scorecard.md @@ -9,7 +9,7 @@ Generated by `cargo xtask scorecard` from `perf/budgets.toml`, `perf/baseline.js | [Performance](#performance) | 3 | 22 | 22 | 56 scenarios: 3 within budget, 22 over budget or failing, 9 tracked only, 17 not run, 5 not measurable yet (baseline 2026-10-05) | | [File compatibility](#file-compatibility) | 6 | 13 | 8 | io corpus: oracle ≥ 146/170, round trip ≥ 169/170; psd-tools corpus: oracle ≥ 236/309, round trip ≥ 308/309; photoshop oracles: oracle ≥ 133/256, round trip ≥ 258/256 | | [Tools](#tools) | 28 | 14 | 1 | | -| [Workspace and UI](#workspace-and-ui) | 13 | 5 | 5 | settings that do nothing: 28 of 156 (target 0) | +| [Workspace and UI](#workspace-and-ui) | 13 | 5 | 5 | settings that do nothing: 27 of 156 (target 0) | | [Type](#type) | 4 | 2 | 3 | | | [Automation](#automation) | 4 | 2 | 5 | 631 of 631 menu items live (100.0%) | | [Reliability](#reliability) | 5 | 2 | 0 | never-crash lints on 28 of 28 crates; panic_hunt present | @@ -176,9 +176,9 @@ Corpus floors (`crates/io/tests/corpus.rs`): the enforced minimums; the corpus t ## Workspace and UI -**Settings that do nothing: 28 of 156** (target 0, #204). Counted by the prefs audit (`xtask/src/scorecard.rs`): a `Preferences` field counts as read when code outside the prefs model (`prefs.rs` except its `impl Session` blocks; tests excluded; the schema-driven dialog never names a field) accesses `section.field`, or `.section` and `.field` in the same file, or calls a section method that reads `self.field`. It is a heuristic lower bound: a generic name can look read when it isn't. +**Settings that do nothing: 27 of 156** (target 0, #204). Counted by the prefs audit (`xtask/src/scorecard.rs`): a `Preferences` field counts as read when code outside the prefs model (`prefs.rs` except its `impl Session` blocks; tests excluded; the schema-driven dialog never names a field) accesses `section.field`, or `.section` and `.field` in the same file, or calls a section method that reads `self.field`. It is a heuristic lower bound: a generic name can look read when it isn't. -Unread: `general.color_picker`, `general.animated_zoom`, `general.zoom_resizes_windows`, `workspace.auto_collapse_icon_panels`, `workspace.auto_show_hidden_panels`, `workspace.enable_floating_document_window_docking`, `file_handling.save_in_background`, `file_handling.maximize_psd_compatibility`, `performance.cache_levels`, `performance.legacy_compositing`, `scratch_disks.disks`, `units_and_rulers.column_width`, `units_and_rulers.gutter`, `plug_ins.show_extension_panels`, `plug_ins.allow_scripts_to_connect`, `plug_ins.generator_enabled`, `type_.text_engine`, `type_.recent_fonts`, `enhanced_controls.scrubby_slider_acceleration`, `enhanced_controls.touch_gestures`, `raw_defaults.color_space`, `raw_defaults.bit_depth`, `raw_defaults.resolution`, `raw_defaults.sharpen_for`, `raw_defaults.open_as_smart_object`, `raw_defaults.apply_auto_tone`, `integrations.allow_agent_control`, `integrations.control_port`. +Unread: `general.color_picker`, `general.animated_zoom`, `general.zoom_resizes_windows`, `workspace.auto_show_hidden_panels`, `workspace.enable_floating_document_window_docking`, `file_handling.save_in_background`, `file_handling.maximize_psd_compatibility`, `performance.cache_levels`, `performance.legacy_compositing`, `scratch_disks.disks`, `units_and_rulers.column_width`, `units_and_rulers.gutter`, `plug_ins.show_extension_panels`, `plug_ins.allow_scripts_to_connect`, `plug_ins.generator_enabled`, `type_.text_engine`, `type_.recent_fonts`, `enhanced_controls.scrubby_slider_acceleration`, `enhanced_controls.touch_gestures`, `raw_defaults.color_space`, `raw_defaults.bit_depth`, `raw_defaults.resolution`, `raw_defaults.sharpen_for`, `raw_defaults.open_as_smart_object`, `raw_defaults.apply_auto_tone`, `integrations.allow_agent_control`, `integrations.control_port`. | Id | Target | Status | Issue | Note | |---|---|---|---|---| From bbe77354e03248fdb0fba8dbe59f1fc6b034eefe Mon Sep 17 00:00:00 2001 From: Unemars <62496697+Unemars@users.noreply.github.com> Date: Mon, 12 Oct 2026 14:52:45 +0200 Subject: [PATCH 68/92] Camera Raw on raw opens: Clarity, Texture and Dehaze in linear light, measured (#3815) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Camera Raw: Whites, Blacks, Shadows and Highlights closer to Photoshop's Measured as a black box on Photoshop 25.4's Camera Raw Filter. Whites and Blacks are global curves of the grey level: the measured rows per slider value, Whites first, after Shadows and Highlights. The clipping directions adapt to the image's black and white points (Whites up to 2.7 times stronger on a dark image, Blacks at least 1.2). On ten public-domain photos the mean error against Photoshop drops from 4.2-36.8 to 0.9-8.9 levels of 255. Shadows and Highlights are a local Laplacian filter (Paris et al. 2011, fast form of Aubry et al. 2014) on the log luminance, the method Adobe credits for process version 2012. Shadows raises pixels darker than their surroundings by an amount set by their own and their surroundings' tone, so big edges keep no halo, and keeps the 99th percentile; Highlights pulls pixels brighter than their surroundings toward them and keeps the 1st. The strengths are fitted to the photos (mean error 2.8-9.4 levels, was 3.7-14.3); Photoshop's exact operator was not recovered. The tone stages decode light with the document's curve: filter.cameraRaw stores encodingGamma (1.8 for ProPhoto, where raws open). Co-Authored-By: Claude Opus 5.5 (1M context) * Camera Raw Shadows/Highlights: no contour lines on smooth gradients Twelve reference values over a raw's whole range left more than a stop between them, and the remapping changes within half a stop: coefficients interpolated across that gap drew contour lines in out-of-focus areas (Shadows +100 on a Nikon D4 raw). References are now an eighth of a stop apart over the image's tones (the deepest 0.1 % share the lowest), on a copy at most 1600 px across whose change comes back to full size by a guided upsampling, so a 16-megapixel image takes about 2 s per slider and the preview matches the result. Co-Authored-By: Claude Opus 5.5 (1M context) * Camera Raw on raw opens: Shadows/Highlights in linear light, D4 look and black point as Photoshop Measured black-box on 29 Nikon D4 NEFs opened through Camera Raw in Photoshop 25.4 (sliders at +-100 and +50, exposure +-1) against our own linear development of the same files. - Shadows and Highlights of the open-time dialog now act while developing, in linear light before the tone curve, as Camera Raw does for raw files (exposure -1 gives the same gains). The log2 gain is slider/100 * C(B - anchor): B is a guided-filter base of the log2 luminance on a copy 1232 px on its long side, the anchor is image-adaptive (Shadows: log2 power mean p=1.5 of the linear luminance; Highlights: mean log2 luminance). New module photocraft_raw::tone; the preview undoes the camera curve to show the same (photocraft_raw::retone). - The D4 profile copies Camera Raw's default rendering: look matrix folded into the ForwardMatrix, per-channel curve, and an adaptive black point (0.33 x the 0.1th percentile of the luminance, Sensor::black_point). Against Photoshop on the 29 frames (1/4 size, log2 Y): default rendering median difference 0.29 -> 0.04 stop; correlation of the slider's effect Shadows +100 0.96, -100 0.91, Highlights -100 0.87, +100 0.85 (the previous filter model: 0.68 and 0.55 on DSG_3464). Co-Authored-By: Claude Opus 5.5 (1M context) * docs: the open-time Camera Raw re-develop covers Shadows and Highlights Co-Authored-By: Claude Opus 5.5 (1M context) * Camera Raw raw-stage Shadows: keep shadow contrast as Photoshop does The user saw Photoshop's shadows sink deeper with more contrast. Measured on the 29 D4 NEFs: with Shadows +100 our shadow detail had 0.79 of Photoshop's local contrast and shadows sat 0.38 stop lighter. Two causes: - The black point now comes before the Shadows / Highlights gain, as in Camera Raw (lifting first let the lift wash out the black point's deep-shadow contrast). - The guided upsampling's epsilon goes from 0.01 to 1 stop^2: the change follows strong edges but stays smooth inside texture (with 0.01 it followed every detail and flattened it). Near strong edges the effect still matches Photoshop as well as elsewhere. Shadows +100: shadow detail 0.79 -> 0.91, shadow bias +0.38 -> +0.16 stop; effect correlation Shadows -100 0.906 -> 0.946, Highlights -100 0.870 -> 0.886, others unchanged. Co-Authored-By: Claude Opus 5.5 (1M context) * Camera Raw on raw opens: Clarity, Texture and Dehaze in linear light, as Photoshop Measured black-box from Photoshop 25.4 opening 29 Nikon D4 NEFs through Camera Raw (descriptor keys Cl12, CrTx, Dhze; each at ±100 and +50, and +100 at exposure −1, 348 opens). All three act before the tone curve: the change at exposure −1 equals the one at 0 (correlation 0.98–0.99). - Clarity: log2 luminance split into bands between guided-filter bases (radii 2, 8, 32, 128 on the 1232 px work copy), each band scaled by a measured gain that follows its base's tone, plus a tone term; carried to full size with the Shadows / Highlights change. - Texture: Gaussian bands σ 0.5…16 on a half-size copy, each through its measured response (small detail raised more than strong edges, flat areas unchanged), guided-upsampled. - Dehaze: He, Sun and Tang's dark channel prior on linear ProPhoto (dark channel in Display P3, airlight from the brightest 0.1 % of it, guided-smoothed transmission), w 0.8 at +100; −100 a uniform veil. The black point stays the default rendering's. Against Photoshop, PhotoCraft's develop vs Photoshop's open on all 29 frames (median effect correlation, log2 luminance at 1/4 size, Texture at 1/2): Clarity +100 0.81, −100 0.85; Texture +100 0.85, −100 0.88; Dehaze +100 0.61 (0.78 in gamma 2.2: the crushed shadows differ), −100 0.96. Shadows / Highlights unchanged (0.964 / 0.886). The open-time Camera Raw dialog re-develops for them and its preview shows them (retone). Co-Authored-By: Claude Opus 5.5 (1M context) --------- Co-authored-by: Claude Opus 5.5 (1M context) Co-authored-by: Brandon Thomas --- crates/algo/src/camera_raw.rs | 111 ++- crates/algo/src/camera_raw/local_tone.rs | 428 ++++++++++++ crates/algo/src/camera_raw/whites_blacks.rs | 418 +++++++++++ crates/engine/src/lens_cmds.rs | 47 ++ crates/io/src/raw.rs | 78 ++- crates/io/tests/raw.rs | 31 +- crates/raw/README.md | 8 + crates/raw/src/cameras.rs | 105 ++- crates/raw/src/cr2.rs | 1 + crates/raw/src/develop.rs | 43 +- crates/raw/src/dng.rs | 1 + crates/raw/src/lib.rs | 2 + crates/raw/src/orf.rs | 1 + crates/raw/src/raf.rs | 1 + crates/raw/src/rw2.rs | 1 + crates/raw/src/sensor.rs | 4 + crates/raw/src/tiffep.rs | 1 + crates/raw/src/tone.rs | 730 ++++++++++++++++++++ crates/raw/src/tone/tables.rs | 66 ++ crates/ui-egui/src/camera_raw_ui.rs | 91 ++- docs/control-protocol.md | 5 +- 21 files changed, 2085 insertions(+), 88 deletions(-) create mode 100644 crates/algo/src/camera_raw/local_tone.rs create mode 100644 crates/algo/src/camera_raw/whites_blacks.rs create mode 100644 crates/raw/src/tone.rs create mode 100644 crates/raw/src/tone/tables.rs diff --git a/crates/algo/src/camera_raw.rs b/crates/algo/src/camera_raw.rs index 2c1b0c92..f855b08b 100644 --- a/crates/algo/src/camera_raw.rs +++ b/crates/algo/src/camera_raw.rs @@ -9,9 +9,10 @@ //! with the guided filter); negative amounts add haze toward the atmospheric light. //! 3. **Tone** on luminance with colour ratios kept: Highlights / Shadows as exposure changes //! weighted by an edge-preserving base layer (guided filter: K. He, J. Sun, X. Tang, *Guided -//! Image Filtering*, ECCV 2010), so local contrast survives; Whites / Blacks move the ends of -//! the curve; Contrast is an S-curve about middle grey; Clarity (large radius, midtone -//! weighted) and Texture (small radius) add band-pass local contrast. +//! Image Filtering*, ECCV 2010), so local contrast survives; Contrast is an S-curve about +//! middle grey; Clarity (large radius, midtone weighted) and Texture (small radius) add +//! band-pass local contrast. Whites / Blacks follow as Photoshop's Camera Raw applies them: +//! image-adaptive global curves measured on Photoshop 25.4 (see `whites_blacks`). //! 4. **Presence**: Vibrance (weighted toward less saturated colours) and Saturation. //! 5. **Tone Curve**: parametric regions (Highlights, Lights, Darks, Shadows with movable splits) //! then point curves (master and per channel), monotone cubic interpolation (F. Fritsch, @@ -54,6 +55,38 @@ pub fn validate_curve(points: &[[f32; 2]]) -> Result<(), String> { use crate::photo_util::{hash01, linear_to_srgb, par_rows, srgb_to_linear}; +mod local_tone; +mod whites_blacks; + +/// How the pixels encode light: the sRGB curve (gamma 0) or a pure power law (ProPhoto's 1.8, +/// Adobe RGB's 2.2). The tone controls work on light, so the document's own curve decodes it. +#[derive(Clone, Copy, Debug, PartialEq)] +pub(crate) struct Encoding(f32); + +impl Encoding { + pub(crate) fn of(gamma: f32) -> Self { + Encoding(if gamma.is_finite() && gamma > 0.0 { gamma.clamp(0.5, 4.0) } else { 0.0 }) + } + pub(crate) fn decode(self, v: f32) -> f32 { + if self.0 > 0.0 { v.max(0.0).powf(self.0) } else { srgb_to_linear(v) } + } + pub(crate) fn encode(self, v: f32) -> f32 { + if self.0 > 0.0 { v.max(0.0).powf(1.0 / self.0) } else { linear_to_srgb(v) } + } +} + +fn srgb_encode(v: f32) -> f32 { + linear_to_srgb(v) +} + +fn srgb_decode(v: f32) -> f32 { + srgb_to_linear(v) +} + +fn luma_linear(c: [f32; 3]) -> f32 { + luma(c) +} + /// One colour grading wheel. #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize, Default)] #[serde(default)] @@ -136,6 +169,9 @@ pub struct CameraRaw { pub seed: u32, /// Pixel-size multiplier for previews on downsampled proxies (radii in px scale by it). pub pixel_scale: f32, + /// The document's transfer curve: 0 for sRGB's, else the gamma of a power-law space (1.8 + /// for ProPhoto). Set from the document's profile; Whites and Blacks act on light. + pub encoding_gamma: f32, } impl Default for CameraRaw { @@ -191,6 +227,7 @@ impl Default for CameraRaw { vignette_style: "highlightPriority".into(), seed: 0, pixel_scale: 1.0, + encoding_gamma: 0.0, } } } @@ -491,7 +528,11 @@ impl CameraRaw { self.temperature == 0.0 && self.tint == 0.0 && self.exposure == 0.0 } fn tone_neutral(&self) -> bool { - [self.contrast, self.highlights, self.shadows, self.whites, self.blacks, self.texture, self.clarity].iter().all(|v| *v == 0.0) + self.local_tone_neutral() && self.whites == 0.0 && self.blacks == 0.0 + } + /// Contrast, Highlights, Shadows, Texture and Clarity (the luminance stage). + fn local_tone_neutral(&self) -> bool { + [self.contrast, self.highlights, self.shadows, self.texture, self.clarity].iter().all(|v| *v == 0.0) } fn hsl_neutral(&self) -> bool { self.hsl_hue.iter().chain(&self.hsl_sat).chain(&self.hsl_lum).all(|v| *v == 0.0) @@ -561,16 +602,13 @@ pub fn develop(px: &mut [[f32; 4]], w: usize, h: usize, p: &CameraRaw, float: bo if p.dehaze != 0.0 { dehaze(px, w, h, p.dehaze / 100.0); } - // 3. Tone on luminance. - if !p.tone_neutral() { + // 3. Tone. Highlights and Shadows: a local Laplacian filter (see `local_tone`). + if p.highlights != 0.0 || p.shadows != 0.0 { + local_tone::apply(px, w, h, p.shadows, p.highlights, Encoding::of(p.encoding_gamma)); + } + if !p.local_tone_neutral() && [p.contrast, p.texture, p.clarity].iter().any(|v| *v != 0.0) { let l: Vec = px.iter().map(|q| luma([q[0], q[1], q[2]]).max(0.0)).collect(); let lc: Vec = l.iter().map(|v| v.min(1.0)).collect(); - let base = if p.highlights != 0.0 || p.shadows != 0.0 { - let r = ((long * 0.015) as usize).max(2); - Some(guided_fast(&lc, &lc, w, h, r, 0.02)) - } else { - None - }; let clar = (p.clarity != 0.0).then(|| guided_fast(&lc, &lc, w, h, ((long * 0.02) as usize).max(3), 0.005)); let tex = (p.texture != 0.0).then(|| gauss(&lc, w, h, (long * 0.002).max(1.5 * ps))); let k_con = p.contrast / 100.0 * 0.6; @@ -580,12 +618,6 @@ pub fn develop(px: &mut [[f32; 4]], w: usize, h: usize, p: &CameraRaw, float: bo let i = y * w + x; let l0 = l[i]; let mut lv = lc[i]; - if let Some(b) = &base { - let bv = b[i].clamp(0.0, 1.0); - let hm = smoothstep(0.45, 0.95, bv); - let sm = 1.0 - smoothstep(0.05, 0.5, bv); - lv *= 2f32.powf(p.highlights / 100.0 * 1.2 * hm + p.shadows / 100.0 * 1.4 * sm); - } if let Some(c) = &clar { let mw = 1.0 - (2.0 * lv.clamp(0.0, 1.0) - 1.0).powi(2); lv += p.clarity / 100.0 * 0.8 * (lc[i] - c[i]) * mw; @@ -593,12 +625,6 @@ pub fn develop(px: &mut [[f32; 4]], w: usize, h: usize, p: &CameraRaw, float: bo if let Some(t) = &tex { lv += p.texture / 100.0 * 0.9 * (lc[i] - t[i]).clamp(-0.1, 0.1); } - if p.whites != 0.0 { - lv += p.whites / 100.0 * 0.25 * smoothstep(0.4, 1.0, lv); - } - if p.blacks != 0.0 { - lv += p.blacks / 100.0 * 0.15 * (1.0 - smoothstep(0.0, 0.45, lv)); - } if k_con != 0.0 { let xx = lv.clamp(0.0, 1.0); lv += -k_con * (tau * xx).sin() / tau; @@ -611,6 +637,13 @@ pub fn develop(px: &mut [[f32; 4]], w: usize, h: usize, p: &CameraRaw, float: bo } }); } + // 3b. Whites and Blacks: global curves adapted to the image's black and white points. + if p.whites != 0.0 || p.blacks != 0.0 { + let enc = Encoding::of(p.encoding_gamma); + let (bp, wp) = luminance_points(px, w, h, enc); + let (xw, xb) = whites_blacks::amounts(p.whites.clamp(-100.0, 100.0), p.blacks.clamp(-100.0, 100.0), bp, wp); + whites_blacks::apply(px, w, xw, xb, enc); + } // 4–7: per-pixel colour stages. let need_color = p.vibrance != 0.0 || p.saturation != 0.0 || !p.curves_neutral() || !p.hsl_neutral() || !p.grade_neutral(); if need_color { @@ -732,6 +765,36 @@ pub fn develop(px: &mut [[f32; 4]], w: usize, h: usize, p: &CameraRaw, float: bo } } +/// The image's black and white points as sRGB-encoded grey levels: the 3rd percentile of the +/// luminance and the 99.5th of the brightest channel, on a copy at most 256 pixels across (so a +/// preview proxy and the full image agree). +fn luminance_points(px: &[[f32; 4]], w: usize, h: usize, enc: Encoding) -> (f32, f32) { + let f = w.max(h).div_ceil(256).max(1); + let (sw, sh) = (w.div_ceil(f), h.div_ceil(f)); + let mut sum = vec![[0.0f64; 4]; sw * sh]; + for y in 0..h { + for x in 0..w { + let q = px[y * w + x]; + let s = &mut sum[(y / f) * sw + x / f]; + for c in 0..3 { + s[c] += f64::from(enc.decode(q[c]).clamp(0.0, 1.0)); + } + s[3] += 1.0; + } + } + let cells: Vec<[f32; 3]> = sum.iter().filter(|s| s[3] > 0.0).map(|s| [0, 1, 2].map(|c| (s[c] / s[3]) as f32)).collect(); + if cells.is_empty() { + return (0.0, 1.0); + } + let pct = |mut v: Vec, q: f32| { + v.sort_by(f32::total_cmp); + v[((v.len() - 1) as f32 * q).round() as usize] + }; + let bp = pct(cells.iter().map(|c| luma(*c)).collect(), 0.03); + let wp = pct(cells.iter().map(|c| c[0].max(c[1]).max(c[2])).collect(), 0.995); + (linear_to_srgb(bp), linear_to_srgb(wp)) +} + fn value_noise(x: f32, y: f32, seed: u64) -> f32 { let (xi, yi) = (x.floor(), y.floor()); let (tx, ty) = (x - xi, y - yi); diff --git a/crates/algo/src/camera_raw/local_tone.rs b/crates/algo/src/camera_raw/local_tone.rs new file mode 100644 index 00000000..7844f8d7 --- /dev/null +++ b/crates/algo/src/camera_raw/local_tone.rs @@ -0,0 +1,428 @@ +//! Shadows and Highlights as a local Laplacian filter. +//! +//! Adobe has said Camera Raw's process version 2012 rests on local Laplacian filters (S. Paris, +//! S. W. Hasinoff, J. Kautz, *Local Laplacian Filters: Edge-aware Image Processing with a +//! Laplacian Pyramid*, SIGGRAPH 2011). This follows that paper, in its fast form (M. Aubry et +//! al., *Fast Local Laplacian Filters*, ACM TOG 2014: the remapping sampled at a few reference +//! values, each pyramid coefficient interpolated between them), on the log2 luminance: +//! +//! - **Shadows** raises pixels darker than their surroundings, by an amount set by their own and +//! their surroundings' place in the image's range (1st to 99th percentile); **Highlights** +//! pulls pixels brighter than their surroundings toward them. Differences under a threshold +//! are left alone, so fine detail stays. +//! - Shadows then keeps the image's 99th percentile, Highlights its 1st (Photoshop keeps the +//! brightest content under Shadows and the darkest under Highlights). +//! - A uniform image is unchanged, edges keep no halo, and the result does not depend on the +//! image size. +//! +//! The strengths were fitted to Photoshop 25.4's Camera Raw Filter on ten public-domain photos +//! (black-box measurements, no Adobe code or data). It is an approximation: on those photos the +//! mean error against Photoshop is 2.8–9.4 levels (of 255) where the previous heuristic's was +//! 3.7–14.3. + +use super::{Encoding, luma}; +use crate::photo_util::par_rows; + +/// Spacing of the fast filter's reference values in stops. Its remapping changes within about +/// half a stop, and coefficients interpolated across wider gaps show as contour lines on smooth +/// gradients (12 references over a whole raw's range left visible steps; at an eighth of a stop a +/// ramp's slope varies by under a third, as the remapping itself makes it). +const REF_STEP: f32 = 0.125; +/// The filter runs on a copy at most this many pixels across; the change it makes is brought back +/// to full size by a guided upsampling, so a preview and the full image agree. +const WORK_SIDE: usize = 1600; +/// Knots of the strength curves over the surroundings' place in the image range (0 … 1). +const KNOTS: usize = 5; + +/// Shadows: how far a pixel darker than its surroundings rises, in stops per unit slider, as +/// a function of its own place in the image range (`own`) times a factor of its surroundings' +/// place (`around`); it rises fully once it is `sigma` stops below them. The lift depends on +/// the pixel's tone, not on the size of the difference, so it is the same at every pyramid +/// level and a big edge keeps no halo. Lowering (negative values) is `down` times as strong. +const SHADOWS: Lift = Lift { own: [-0.017, 0.466, 0.886, 1.221, -0.081], around: [4.566, 4.067, 1.088, 0.149, 0.878], sigma: 0.571, down: 0.808 }; +const HIGHLIGHTS: Side = Side { pull: [0.179, 0.141, 0.196, 0.629, 2.07], push: [0.156, 0.08, 0.175, 0.049, 1.261], sigma: 0.05 }; + +/// See [`SHADOWS`]. +struct Lift { + own: [f32; KNOTS], + around: [f32; KNOTS], + sigma: f32, + down: f32, +} + +/// Highlights: strengths per unit slider over the surroundings' place in the image range, for +/// lowering (`pull`, toward the surroundings) and raising (`push`), and the detail threshold in +/// stops. +struct Side { + pull: [f32; KNOTS], + push: [f32; KNOTS], + sigma: f32, +} + +/// One channel, `w × h`. +struct Plane { + w: usize, + h: usize, + v: Vec, +} + +/// Mirrors `i` into `0..n` (the edge sample is not repeated). +fn mirror(i: isize, n: usize) -> usize { + let n = n as isize; + if n == 1 { + return 0; + } + let p = 2 * (n - 1); + let m = i.rem_euclid(p); + (if m >= n { p - m } else { m }) as usize +} + +const TAPS: [f32; 5] = [1.0 / 16.0, 4.0 / 16.0, 6.0 / 16.0, 4.0 / 16.0, 1.0 / 16.0]; + +/// The binomial 5-tap blur, sampled every `step` pixels from 0 (1 = full resolution). +fn blur_step(p: &Plane, step: usize) -> Plane { + let (w2, h2) = (p.w.div_ceil(step), p.h.div_ceil(step)); + // Columns first at the kept rows, then rows at the kept columns. + let mut tmp = vec![0.0f32; p.w * h2]; + par_rows(&mut tmp, p.w, 1, |y2, row| { + let y = (y2 * step) as isize; + for (x, o) in row.iter_mut().enumerate() { + *o = (0..5).map(|k| TAPS[k] * p.v[mirror(y + k as isize - 2, p.h) * p.w + x]).sum(); + } + }); + let mut out = vec![0.0f32; w2 * h2]; + par_rows(&mut out, w2, 1, |y2, row| { + let src = &tmp[y2 * p.w..(y2 + 1) * p.w]; + for (x2, o) in row.iter_mut().enumerate() { + let x = (x2 * step) as isize; + *o = (0..5).map(|k| TAPS[k] * src[mirror(x + k as isize - 2, p.w)]).sum(); + } + }); + Plane { w: w2, h: h2, v: out } +} + +/// The next coarser level. +fn down(p: &Plane) -> Plane { + blur_step(p, 2) +} + +/// `p` brought up to `w × h`: zeros between samples, then the blur times four. +fn up(p: &Plane, w: usize, h: usize) -> Plane { + let mut z = Plane { w, h, v: vec![0.0; w * h] }; + for y in 0..p.h.min(h.div_ceil(2)) { + for x in 0..p.w.min(w.div_ceil(2)) { + z.v[2 * y * w + 2 * x] = p.v[y * p.w + x] * 4.0; + } + } + blur_step(&z, 1) +} + +/// Levels down to about 2 pixels on the short side. +fn depth(w: usize, h: usize) -> usize { + let mut s = w.min(h); + let mut n = 1; + while s > 2 { + s = s.div_ceil(2); + n += 1; + } + n +} + +fn gaussian(p: Plane, n: usize) -> Vec { + let mut g = vec![p]; + for _ in 1..n { + let next = down(&g[g.len() - 1]); + g.push(next); + } + g +} + +/// The local Laplacian filter of `u` with `remap(value, reference)`; the coarsest level is kept. +fn llf(u: &Plane, remap: impl Fn(f32, f32) -> f32 + Sync) -> Plane { + let n = depth(u.w, u.h); + let g = gaussian(Plane { w: u.w, h: u.h, v: u.v.clone() }, n); + // References span the image's tones; the deepest 0.1 % (noise down to the floor) share the + // lowest reference instead of stretching the spacing. + let hi = u.v.iter().fold(f32::NEG_INFINITY, |a, &v| a.max(v)); + let lo = quantile(&u.v, 0.001).min(hi); + if hi - lo <= 1e-6 || (hi - lo).is_nan() { + return Plane { w: u.w, h: u.h, v: u.v.clone() }; + } + let refs = (((hi - lo) / REF_STEP).ceil() as usize + 1).clamp(2, 96); + let step = (hi - lo) / (refs - 1) as f32; + let mut lap: Vec> = g[..n - 1].iter().map(|p| vec![0.0; p.v.len()]).collect(); + for k in 0..refs { + let r = lo + step * k as f32; + let mut m = Plane { w: u.w, h: u.h, v: u.v.clone() }; + par_rows(&mut m.v, u.w, 1, |_, row| { + for v in row.iter_mut() { + *v = remap(*v, r); + } + }); + let gr = gaussian(m, n); + for l in 0..n - 1 { + let coarse = up(&gr[l + 1], gr[l].w, gr[l].h); + let (gl, fine, lw) = (&g[l].v, &gr[l].v, g[l].w); + par_rows(&mut lap[l], lw, 1, |y, row| { + for (x, o) in row.iter_mut().enumerate() { + let i = y * lw + x; + let wgt = (1.0 - (gl[i].clamp(lo, hi) - r).abs() / step).max(0.0); + if wgt > 0.0 { + *o += wgt * (fine[i] - coarse.v[i]); + } + } + }); + } + } + let mut o = Plane { w: g[n - 1].w, h: g[n - 1].h, v: g[n - 1].v.clone() }; + for l in (0..n - 1).rev() { + let mut next = up(&o, g[l].w, g[l].h); + for (a, b) in next.v.iter_mut().zip(&lap[l]) { + *a += b; + } + o = next; + } + o +} + +/// The `q` quantile (0 … 1) of `v`. +fn quantile(v: &[f32], q: f32) -> f32 { + let mut s = v.to_vec(); + s.sort_by(f32::total_cmp); + s[((s.len() - 1) as f32 * q).round() as usize] +} + +/// 1st and 99th percentiles of the log luminance on a copy at most 256 pixels across. +fn range(u: &Plane) -> (f32, f32) { + let f = u.w.max(u.h).div_ceil(256).max(1); + let (sw, sh) = (u.w.div_ceil(f), u.h.div_ceil(f)); + let mut sum = vec![(0.0f64, 0u32); sw * sh]; + for y in 0..u.h { + for x in 0..u.w { + let c = &mut sum[(y / f) * sw + x / f]; + c.0 += f64::from(u.v[y * u.w + x]); + c.1 += 1; + } + } + let cells: Vec = sum.iter().filter(|c| c.1 > 0).map(|c| (c.0 / f64::from(c.1)) as f32).collect(); + (quantile(&cells, 0.01), quantile(&cells, 0.99)) +} + +/// `d` past the detail threshold: about 0 below `sigma`, `d − sigma` well above it. +fn excess(d: f32, sigma: f32) -> f32 { + d - sigma * (d / sigma).tanh() +} + +fn knot(t: f32, k: &[f32; KNOTS]) -> f32 { + let x = t.clamp(0.0, 1.0) * (KNOTS - 1) as f32; + let i = (x as usize).min(KNOTS - 2); + k[i] + (k[i + 1] - k[i]) * (x - i as f32) +} + +/// The Highlights pass on the log luminance `u` (`amount` −1 … 1): pixels brighter than their +/// surroundings move toward them (or away, for positive values) by the part of the difference +/// past `sigma`, then the darkest content is put back where it was. +fn highlights_pass(u: &Plane, amount: f32, side: &Side) -> Plane { + let (lo, hi) = range(u); + let span = (hi - lo).max(1.0); + let strengths = if amount < 0.0 { &side.pull } else { &side.push }; + let o = llf(u, |x, g| x + knot((g - lo) / span, strengths) * amount * excess((x - g).max(0.0), side.sigma)); + let shift = quantile(&u.v, 0.01) - quantile(&o.v, 0.01); + Plane { w: o.w, h: o.h, v: o.v.iter().map(|v| v + shift).collect() } +} + +/// The Shadows pass on the log luminance `u` (`amount` −1 … 1). +fn shadows_pass(u: &Plane, amount: f32) -> Plane { + let (lo, hi) = range(u); + let span = (hi - lo).max(1.0); + let k = if amount > 0.0 { amount } else { amount * SHADOWS.down }; + let o = llf(u, |x, g| { + let below = ((g - x) / SHADOWS.sigma).clamp(0.0, 1.0); + if below == 0.0 { + return x; + } + let w = below * below * (3.0 - 2.0 * below); + x + k * knot((x - lo) / span, &SHADOWS.own) * knot((g - lo) / span, &SHADOWS.around) * w + }); + // Keep the brightest content. + let shift = quantile(&u.v, 0.99) - quantile(&o.v, 0.99); + Plane { w: o.w, h: o.h, v: o.v.iter().map(|v| v + shift).collect() } +} + +/// Applies Shadows and Highlights (−100 … 100) to straight RGBA pixels encoded with `enc`. +pub(crate) fn apply(px: &mut [[f32; 4]], w: usize, h: usize, shadows: f32, highlights: f32, enc: Encoding) { + if (shadows == 0.0 && highlights == 0.0) || w < 2 || h < 2 { + return; + } + const FLOOR: f32 = 1.0 / 65536.0; + let u = Plane { w, h, v: px.iter().map(|q| (luma([0, 1, 2].map(|c| enc.decode(q[c]))).max(0.0) + FLOOR).log2()).collect() }; + // The filter on a copy at most WORK_SIDE across (box-averaged in log). + let f = w.max(h).div_ceil(WORK_SIDE).max(1); + let small = if f == 1 { Plane { w, h, v: u.v.clone() } } else { shrink(&u, f) }; + let mut o = Plane { w: small.w, h: small.h, v: small.v.clone() }; + if highlights != 0.0 { + o = highlights_pass(&o, highlights.clamp(-100.0, 100.0) / 100.0, &HIGHLIGHTS); + } + if shadows != 0.0 { + o = shadows_pass(&o, shadows.clamp(-100.0, 100.0) / 100.0); + } + // The change in log luminance, at full size. + let change: Vec = if f == 1 { + o.v.iter().zip(&u.v).map(|(a, b)| a - b).collect() + } else { + let d: Vec = o.v.iter().zip(&small.v).map(|(a, b)| a - b).collect(); + guided_upsample(&small, &d, &u) + }; + par_rows(px, w, 1, |y, row| { + for (x, q) in row.iter_mut().enumerate() { + let gain = change[y * w + x].exp2(); + for c in 0..3 { + q[c] = enc.encode(enc.decode(q[c]) * gain); + } + } + }); +} + +/// `u` averaged over `f × f` blocks. +fn shrink(u: &Plane, f: usize) -> Plane { + let (sw, sh) = (u.w.div_ceil(f), u.h.div_ceil(f)); + let mut v = vec![0.0f32; sw * sh]; + par_rows(&mut v, sw, 1, |y, row| { + for (x, o) in row.iter_mut().enumerate() { + let (x0, y0) = (x * f, y * f); + let (x1, y1) = ((x0 + f).min(u.w), (y0 + f).min(u.h)); + let mut s = 0.0f64; + for yy in y0..y1 { + for xx in x0..x1 { + s += f64::from(u.v[yy * u.w + xx]); + } + } + *o = (s / ((x1 - x0) * (y1 - y0)) as f64) as f32; + } + }); + Plane { w: sw, h: sh, v } +} + +/// The change `d` computed on `small` brought to the size of `full`, following its edges: a local +/// linear model of the change against the log luminance (the guided filter of K. He, J. Sun, +/// *Fast Guided Filter*, 2015), fitted on the small copy and evaluated on the full one. +fn guided_upsample(small: &Plane, d: &[f32], full: &Plane) -> Vec { + let (sw, sh) = (small.w, small.h); + let r = 2; + let eps = 0.01; + let mean = |v: &[f32]| super::box_mean(v, sw, sh, r); + let ud: Vec = small.v.iter().zip(d).map(|(a, b)| a * b).collect(); + let uu: Vec = small.v.iter().map(|a| a * a).collect(); + let (mu, md, mud, muu) = (mean(&small.v), mean(d), mean(&ud), mean(&uu)); + let a: Vec = (0..sw * sh).map(|i| (mud[i] - mu[i] * md[i]) / (muu[i] - mu[i] * mu[i] + eps)).collect(); + let b: Vec = (0..sw * sh).map(|i| md[i] - a[i] * mu[i]).collect(); + let (ma, mb) = (mean(&a), mean(&b)); + let (fx, fy) = (sw as f32 / full.w as f32, sh as f32 / full.h as f32); + let mut out = vec![0.0f32; full.w * full.h]; + par_rows(&mut out, full.w, 1, |y, row| { + let sy = (y as f32 + 0.5) * fy - 0.5; + for (x, o) in row.iter_mut().enumerate() { + let sx = (x as f32 + 0.5) * fx - 0.5; + let av = crate::photo_util::bilinear(&ma, sw, sh, 1, 0, sx, sy); + let bv = crate::photo_util::bilinear(&mb, sw, sh, 1, 0, sx, sy); + *o = av * full.v[y * full.w + x] + bv; + } + }); + out +} + +#[cfg(test)] +mod tests { + use super::*; + + const SRGB: Encoding = Encoding(0.0); + + fn grey(w: usize, h: usize, f: impl Fn(usize, usize) -> f32) -> Vec<[f32; 4]> { + (0..w * h).map(|i| f(i % w, i / w)).map(|v| [v, v, v, 1.0]).collect() + } + + #[test] + fn a_flat_image_is_unchanged() { + let mut px = grey(64, 48, |_, _| 0.4); + apply(&mut px, 64, 48, 100.0, -100.0, SRGB); + assert!(px.iter().all(|q| (q[0] - 0.4).abs() < 1e-5)); + } + + #[test] + fn shadows_raise_a_dark_area_without_a_halo() { + // A 0.1 | 0.6 step (the dark half is the image's black point, which Photoshop barely + // moves either): the bright half stays, and no halo forms on either side of the edge. + let (w, h) = (256, 128); + let mut px = grey(w, h, |x, _| if x < w / 2 { 0.1 } else { 0.6 }); + apply(&mut px, w, h, 100.0, 0.0, SRGB); + let row = &px[64 * w..65 * w]; + assert!((row[w / 2 + 1][0] - 0.6).abs() < 0.002 && (row[w - 5][0] - 0.6).abs() < 0.002); + let (far, near) = (row[10][0], row[w / 2 - 1][0]); + assert!((far - 0.1).abs() < 0.004 && (far - near).abs() < 0.004, "{far} {near}"); + } + + #[test] + fn grey_moves_as_in_photoshop() { + // Mid-grey with 1 % black (0.015) and white (0.97) corners, Photoshop 25.4: Shadows +100 + // takes the grey from 127.5 to 165.3, Highlights −100 to 89.6 (of 255). + let n = 256; + let image = |c: f32| { + grey(n, n, |x, y| { + if x >= n - 26 && y >= n - 26 { + 0.97 + } else if x >= n - 26 && y < 26 { + 0.015 + } else { + c + } + }) + }; + for (s, hl, want) in [(100.0, 0.0, 165.3), (0.0, -100.0, 89.6)] { + let mut px = image(0.5); + apply(&mut px, n, n, s, hl, SRGB); + let got = px[175 * n + 100][0] * 255.0; + assert!((got - want).abs() < 5.0, "{s} {hl}: {got} vs {want}"); + } + } + + #[test] + fn highlights_lower_a_bright_area_and_keep_the_darkest() { + let (w, h) = (192, 192); + let mut px = grey(w, h, |x, y| if (64..128).contains(&x) && (64..128).contains(&y) { 0.8 } else { 0.2 }); + apply(&mut px, w, h, 0.0, -100.0, SRGB); + assert!(px[96 * w + 96][0] < 0.75, "{}", px[96 * w + 96][0]); + assert!((px[5 * w + 5][0] - 0.2).abs() < 0.01, "{}", px[5 * w + 5][0]); + } + + #[test] + fn smooth_gradients_stay_smooth() { + // A soft ramp over eight stops, as in an out-of-focus background. Coefficients interpolated + // between references too far apart drew contour lines across such ramps (Shadows +100 on + // a D4 raw): the output must rise steadily, without ripples. + let (w, h) = (640, 48); + let mut px = grey(w, h, |x, _| crate::photo_util::linear_to_srgb((x as f32 / (w - 1) as f32 * 8.0 - 9.0).exp2())); + for (s, hl) in [(100.0, 0.0), (0.0, -100.0), (-100.0, 100.0)] { + let mut p = px.clone(); + apply(&mut p, w, h, s, hl, SRGB); + let row: Vec = (0..w).map(|x| crate::photo_util::srgb_to_linear(p[24 * w + x][0]).max(1e-6).log2()).collect(); + let steps: Vec = row.windows(2).map(|d| d[1] - d[0]).collect(); + assert!(steps.iter().all(|d| *d > 0.0), "{s} {hl}: the ramp reverses"); + let jumps: Vec = steps.windows(2).map(|d| (d[1] - d[0]).abs()).collect(); + let ripple = jumps[16..jumps.len() - 16].iter().fold(0.0f32, |a, b| a.max(*b)); + // The ramp rises 0.0125 stops per pixel; its slope may change by a third at most. + assert!(ripple < 0.004, "{s} {hl}: slope jumps by {ripple} stops per pixel"); + } + px.clear(); + } + + #[test] + fn the_result_does_not_depend_on_the_image_size() { + let at = |n: usize| { + let mut px = grey(n, n, |x, y| if x < n / 3 || y < n / 4 { 0.08 } else { 0.7 }); + apply(&mut px, n, n, 70.0, -60.0, SRGB); + [px[(n / 8) * n + n / 8][0], px[(3 * n / 4) * n + 3 * n / 4][0]] + }; + let (a, b) = (at(96), at(384)); + assert!((a[0] - b[0]).abs() < 0.02 && (a[1] - b[1]).abs() < 0.02, "{a:?} {b:?}"); + } +} diff --git a/crates/algo/src/camera_raw/whites_blacks.rs b/crates/algo/src/camera_raw/whites_blacks.rs new file mode 100644 index 00000000..382ade50 --- /dev/null +++ b/crates/algo/src/camera_raw/whites_blacks.rs @@ -0,0 +1,418 @@ +//! Whites and Blacks as Adobe Camera Raw (process version 2012) applies them. +//! +//! Measured as a black box on the Camera Raw Filter of Photoshop 25.4: grey blocks with chosen +//! histograms went through the filter by script and came back exactly; no Adobe code or data +//! was used. +//! +//! - Both are global curves of the grey level, applied after Shadows and Highlights, Whites +//! first. On an image whose darkest and lightest percent reach black and white the curve of a +//! slider value `x` is the measured row at `x` of [`WHITES`] or [`BLACKS`]. +//! - The direction that only compresses (Whites down, Blacks up) is that fixed curve on every +//! image. The direction that clips (Whites up, Blacks down) adapts: the row used is +//! `x · A(BP, WP)`. On the block images BP and WP are their darkest and lightest levels; on +//! photographs Photoshop's amounts follow best with BP the 3rd percentile of the luminance and +//! WP the 99.5th of the brightest channel, and Blacks at least 1.2 times. A low +//! white point makes Whites +100 stronger (up to 2.7 times), a raised black point Blacks +//! (up to 1.45 times at −40). Whites rows past +100 come from images where `A > 1`. +//! - Not reproduced: past −40 Photoshop's Blacks grows faster on images with a raised black +//! point (on one spanning 0.6–1 its −100 blacks out everything below 0.74, here below about +//! 0.15); its curves there are not rows of the full-range family. +//! - Colour: the clipping directions act on each channel, the compressing ones scale the pixel +//! by the curve's change of its luminance (closest to Photoshop on saturated colours). + +use super::Encoding; +use crate::photo_util::par_rows; + +/// Grey levels the curves are sampled at: 0, 1/32, …, 1 (sRGB-encoded). +const STEPS: usize = 33; +/// The first row's internal amount; rows are 10 apart. +const WHITES_FROM: f32 = -100.0; +const BLACKS_FROM: f32 = -100.0; +// Measured levels; some happen to lie near π/8 and π/4. +/// Whites curves at internal amounts -100, -90, …, 270 (rows) over grey levels 0, 1/32, …, 1. +#[allow(clippy::approx_constant)] +static WHITES: [[f32; 33]; 38] = [ + [ + 0.0000, 0.0298, 0.0621, 0.0926, 0.1226, 0.1523, 0.1817, 0.2107, 0.2391, 0.2671, 0.2946, 0.3215, 0.3480, 0.3738, 0.3995, 0.4256, 0.4517, 0.4774, 0.5028, + 0.5278, 0.5524, 0.5768, 0.6008, 0.6245, 0.6482, 0.6717, 0.6957, 0.7207, 0.7483, 0.7814, 0.8263, 0.8949, 0.9999, + ], + [ + 0.0000, 0.0298, 0.0621, 0.0926, 0.1226, 0.1523, 0.1817, 0.2107, 0.2392, 0.2672, 0.2947, 0.3217, 0.3482, 0.3742, 0.4000, 0.4263, 0.4526, 0.4785, 0.5042, + 0.5296, 0.5548, 0.5797, 0.6044, 0.6291, 0.6539, 0.6789, 0.7046, 0.7317, 0.7617, 0.7969, 0.8425, 0.9074, 0.9999, + ], + [ + 0.0000, 0.0298, 0.0621, 0.0926, 0.1226, 0.1524, 0.1818, 0.2108, 0.2393, 0.2673, 0.2950, 0.3221, 0.3487, 0.3748, 0.4008, 0.4274, 0.4540, 0.4803, 0.5064, + 0.5323, 0.5580, 0.5837, 0.6093, 0.6350, 0.6610, 0.6875, 0.7149, 0.7438, 0.7756, 0.8122, 0.8576, 0.9184, 0.9999, + ], + [ + 0.0000, 0.0298, 0.0621, 0.0926, 0.1226, 0.1524, 0.1818, 0.2109, 0.2395, 0.2677, 0.2954, 0.3227, 0.3495, 0.3759, 0.4022, 0.4291, 0.4561, 0.4828, 0.5094, + 0.5360, 0.5624, 0.5888, 0.6154, 0.6423, 0.6695, 0.6973, 0.7261, 0.7566, 0.7897, 0.8271, 0.8716, 0.9280, 0.9999, + ], + [ + 0.0000, 0.0298, 0.0621, 0.0926, 0.1226, 0.1525, 0.1820, 0.2111, 0.2398, 0.2682, 0.2961, 0.3237, 0.3508, 0.3775, 0.4042, 0.4317, 0.4591, 0.4864, 0.5136, + 0.5408, 0.5680, 0.5953, 0.6229, 0.6508, 0.6791, 0.7082, 0.7382, 0.7698, 0.8037, 0.8412, 0.8843, 0.9365, 0.9999, + ], + [ + 0.0000, 0.0298, 0.0621, 0.0927, 0.1227, 0.1527, 0.1822, 0.2116, 0.2404, 0.2690, 0.2972, 0.3251, 0.3527, 0.3799, 0.4071, 0.4351, 0.4630, 0.4910, 0.5189, + 0.5469, 0.5749, 0.6031, 0.6316, 0.6605, 0.6899, 0.7199, 0.7509, 0.7832, 0.8174, 0.8544, 0.8958, 0.9439, 0.9999, + ], + [ + 0.0000, 0.0298, 0.0621, 0.0927, 0.1229, 0.1529, 0.1827, 0.2122, 0.2414, 0.2702, 0.2989, 0.3272, 0.3553, 0.3831, 0.4110, 0.4396, 0.4682, 0.4968, 0.5254, + 0.5542, 0.5830, 0.6121, 0.6414, 0.6712, 0.7014, 0.7322, 0.7637, 0.7964, 0.8305, 0.8668, 0.9062, 0.9503, 0.9999, + ], + [ + 0.0000, 0.0298, 0.0622, 0.0928, 0.1231, 0.1534, 0.1834, 0.2132, 0.2427, 0.2720, 0.3011, 0.3300, 0.3587, 0.3872, 0.4160, 0.4452, 0.4745, 0.5038, 0.5332, + 0.5627, 0.5923, 0.6221, 0.6522, 0.6826, 0.7134, 0.7447, 0.7765, 0.8092, 0.8429, 0.8781, 0.9155, 0.9559, 1.0000, + ], + [ + 0.0000, 0.0298, 0.0623, 0.0930, 0.1236, 0.1541, 0.1844, 0.2145, 0.2445, 0.2744, 0.3041, 0.3337, 0.3632, 0.3925, 0.4221, 0.4520, 0.4820, 0.5120, 0.5421, + 0.5723, 0.6026, 0.6330, 0.6636, 0.6946, 0.7257, 0.7572, 0.7890, 0.8214, 0.8545, 0.8885, 0.9237, 0.9608, 1.0000, + ], + [ + 0.0000, 0.0298, 0.0624, 0.0934, 0.1242, 0.1551, 0.1858, 0.2164, 0.2470, 0.2775, 0.3080, 0.3383, 0.3687, 0.3989, 0.4293, 0.4600, 0.4906, 0.5213, 0.5520, + 0.5827, 0.6136, 0.6445, 0.6755, 0.7067, 0.7380, 0.7694, 0.8011, 0.8330, 0.8652, 0.8978, 0.9310, 0.9651, 1.0000, + ], + [ + 0.0000, 0.0312, 0.0625, 0.0938, 0.1250, 0.1562, 0.1875, 0.2188, 0.2500, 0.2812, 0.3125, 0.3438, 0.3750, 0.4062, 0.4375, 0.4688, 0.5000, 0.5312, 0.5625, + 0.5938, 0.6250, 0.6562, 0.6875, 0.7188, 0.7500, 0.7812, 0.8125, 0.8438, 0.8750, 0.9062, 0.9375, 0.9688, 1.0000, + ], + [ + 0.0000, 0.0299, 0.0626, 0.0940, 0.1253, 0.1567, 0.1881, 0.2195, 0.2510, 0.2825, 0.3140, 0.3456, 0.3772, 0.4089, 0.4405, 0.4720, 0.5036, 0.5351, 0.5667, + 0.5983, 0.6298, 0.6613, 0.6929, 0.7244, 0.7559, 0.7874, 0.8189, 0.8503, 0.8816, 0.9128, 0.9438, 0.9742, 1.0000, + ], + [ + 0.0000, 0.0299, 0.0627, 0.0941, 0.1257, 0.1573, 0.1890, 0.2208, 0.2526, 0.2846, 0.3167, 0.3488, 0.3811, 0.4134, 0.4456, 0.4777, 0.5098, 0.5419, 0.5741, + 0.6062, 0.6383, 0.6704, 0.7025, 0.7345, 0.7664, 0.7983, 0.8301, 0.8617, 0.8931, 0.9241, 0.9543, 0.9829, 1.0000, + ], + [ + 0.0000, 0.0299, 0.0628, 0.0944, 0.1262, 0.1582, 0.1903, 0.2225, 0.2550, 0.2876, 0.3204, 0.3534, 0.3867, 0.4200, 0.4529, 0.4858, 0.5186, 0.5516, 0.5845, + 0.6174, 0.6502, 0.6830, 0.7157, 0.7482, 0.7807, 0.8131, 0.8451, 0.8769, 0.9082, 0.9385, 0.9673, 0.9928, 1.0000, + ], + [ + 0.0000, 0.0299, 0.0629, 0.0948, 0.1269, 0.1594, 0.1920, 0.2249, 0.2582, 0.2917, 0.3256, 0.3597, 0.3942, 0.4289, 0.4628, 0.4966, 0.5305, 0.5644, 0.5983, + 0.6321, 0.6658, 0.6994, 0.7327, 0.7660, 0.7989, 0.8316, 0.8639, 0.8956, 0.9263, 0.9553, 0.9815, 1.0000, 1.0000, + ], + [ + 0.0000, 0.0299, 0.0631, 0.0953, 0.1280, 0.1610, 0.1944, 0.2282, 0.2625, 0.2973, 0.3325, 0.3683, 0.4045, 0.4407, 0.4758, 0.5109, 0.5460, 0.5811, 0.6161, + 0.6510, 0.6857, 0.7201, 0.7541, 0.7879, 0.8213, 0.8543, 0.8864, 0.9175, 0.9468, 0.9733, 0.9950, 1.0000, 1.0000, + ], + [ + 0.0000, 0.0299, 0.0633, 0.0961, 0.1293, 0.1632, 0.1976, 0.2327, 0.2684, 0.3048, 0.3419, 0.3798, 0.4183, 0.4562, 0.4928, 0.5294, 0.5660, 0.6024, 0.6387, + 0.6748, 0.7104, 0.7456, 0.7803, 0.8145, 0.8480, 0.8807, 0.9121, 0.9417, 0.9684, 0.9907, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.0300, 0.0637, 0.0971, 0.1313, 0.1663, 0.2020, 0.2387, 0.2763, 0.3149, 0.3546, 0.3952, 0.4365, 0.4763, 0.5149, 0.5532, 0.5914, 0.6294, 0.6670, + 0.7041, 0.7406, 0.7763, 0.8113, 0.8456, 0.8788, 0.9104, 0.9401, 0.9667, 0.9888, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.0300, 0.0641, 0.0984, 0.1338, 0.1703, 0.2079, 0.2468, 0.2870, 0.3286, 0.3717, 0.4161, 0.4602, 0.5024, 0.5430, 0.5833, 0.6232, 0.6627, 0.7015, + 0.7394, 0.7764, 0.8123, 0.8472, 0.8808, 0.9126, 0.9420, 0.9681, 0.9896, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.0302, 0.0647, 0.1003, 0.1374, 0.1760, 0.2160, 0.2579, 0.3016, 0.3472, 0.3949, 0.4436, 0.4908, 0.5355, 0.5784, 0.6207, 0.6622, 0.7029, 0.7424, + 0.7806, 0.8176, 0.8530, 0.8868, 0.9185, 0.9474, 0.9726, 0.9926, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.0304, 0.0656, 0.1029, 0.1423, 0.1837, 0.2271, 0.2731, 0.3215, 0.3726, 0.4262, 0.4791, 0.5294, 0.5769, 0.6220, 0.6660, 0.7086, 0.7498, 0.7893, + 0.8272, 0.8631, 0.8969, 0.9281, 0.9560, 0.9795, 0.9967, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.0305, 0.0679, 0.1094, 0.1509, 0.1968, 0.2459, 0.2956, 0.3510, 0.4094, 0.4680, 0.5248, 0.5781, 0.6278, 0.6742, 0.7195, 0.7624, 0.8031, 0.8417, + 0.8779, 0.9113, 0.9414, 0.9675, 0.9886, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.0306, 0.0702, 0.1160, 0.1623, 0.2144, 0.2709, 0.3243, 0.3885, 0.4556, 0.5199, 0.5807, 0.6369, 0.6884, 0.7355, 0.7799, 0.8217, 0.8606, 0.8964, + 0.9288, 0.9570, 0.9803, 0.9958, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.0308, 0.0725, 0.1225, 0.1737, 0.2320, 0.2960, 0.3641, 0.4393, 0.5133, 0.5825, 0.6460, 0.7032, 0.7544, 0.8003, 0.8426, 0.8817, 0.9168, 0.9475, + 0.9733, 0.9924, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.0322, 0.0751, 0.1303, 0.1918, 0.2594, 0.3348, 0.4189, 0.5044, 0.5841, 0.6565, 0.7208, 0.7771, 0.8262, 0.8692, 0.9074, 0.9408, 0.9686, 0.9900, + 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.0331, 0.0818, 0.1482, 0.2171, 0.2977, 0.3892, 0.4865, 0.5779, 0.6602, 0.7322, 0.7943, 0.8470, 0.8915, 0.9286, 0.9600, 0.9844, 0.9996, 1.0000, + 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.0340, 0.0884, 0.1661, 0.2544, 0.3540, 0.4658, 0.5729, 0.6681, 0.7496, 0.8183, 0.8748, 0.9208, 0.9568, 0.9832, 1.0000, 1.0000, 1.0000, 1.0000, + 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.3356, 0.5799, 0.6166, 0.6166, 0.6166, 0.6166, 0.6624, 0.7556, 0.8321, 0.8935, 0.9411, 0.9755, 0.9970, 0.9998, 1.0000, 1.0000, 1.0000, 1.0000, + 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.5007, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.1655, 0.1655, 0.2972, 0.4728, 0.6327, 0.7616, 0.8598, 0.9317, 0.9790, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.0457, 0.1830, 0.3836, 0.5790, 0.7379, 0.8549, 0.9360, 0.9869, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.0520, 0.2329, 0.4864, 0.6989, 0.8449, 0.9403, 0.9884, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.0773, 0.3027, 0.6040, 0.8058, 0.9302, 0.9930, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.1454, 0.4738, 0.7615, 0.9074, 0.9908, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.0000, 0.0964, 0.5416, 0.8589, 0.9897, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.1538, 0.1538, 0.7080, 0.9596, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.8439, 0.8439, 0.8439, 0.9993, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], + [ + 0.9228, 0.9228, 0.9228, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, + ], +]; +/// Blacks curves at internal amounts -100, …, 100 in steps of 10. +#[allow(clippy::approx_constant)] +static BLACKS: [[f32; 33]; 21] = [ + [ + 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0290, 0.0572, 0.0879, 0.1222, 0.1580, 0.1935, 0.2287, 0.2636, 0.2988, 0.3355, 0.3741, 0.4151, 0.4571, + 0.4990, 0.5406, 0.5818, 0.6226, 0.6631, 0.7031, 0.7424, 0.7811, 0.8192, 0.8568, 0.8937, 0.9300, 0.9655, 1.0000, + ], + [ + 0.0000, 0.0000, 0.0000, 0.0000, 0.0015, 0.0363, 0.0640, 0.0956, 0.1300, 0.1651, 0.2000, 0.2345, 0.2686, 0.3026, 0.3369, 0.3727, 0.4105, 0.4495, 0.4885, + 0.5272, 0.5657, 0.6039, 0.6419, 0.6796, 0.7169, 0.7538, 0.7903, 0.8264, 0.8621, 0.8974, 0.9322, 0.9664, 1.0000, + ], + [ + 0.0000, 0.0000, 0.0000, 0.0000, 0.0346, 0.0625, 0.0934, 0.1271, 0.1616, 0.1959, 0.2298, 0.2635, 0.2969, 0.3301, 0.3638, 0.3990, 0.4357, 0.4727, 0.5094, + 0.5460, 0.5824, 0.6187, 0.6547, 0.6906, 0.7262, 0.7615, 0.7965, 0.8313, 0.8657, 0.8998, 0.9336, 0.9671, 1.0000, + ], + [ + 0.0000, 0.0000, 0.0000, 0.0235, 0.0554, 0.0850, 0.1175, 0.1514, 0.1852, 0.2187, 0.2519, 0.2849, 0.3178, 0.3505, 0.3837, 0.4183, 0.4537, 0.4891, 0.5243, + 0.5594, 0.5944, 0.6292, 0.6639, 0.6985, 0.7329, 0.7671, 0.8010, 0.8347, 0.8683, 0.9016, 0.9347, 0.9676, 1.0000, + ], + [ + 0.0000, 0.0000, 0.0020, 0.0438, 0.0724, 0.1035, 0.1365, 0.1699, 0.2030, 0.2359, 0.2686, 0.3011, 0.3336, 0.3659, 0.3986, 0.4327, 0.4669, 0.5011, 0.5352, + 0.5692, 0.6031, 0.6369, 0.6706, 0.7043, 0.7378, 0.7711, 0.8043, 0.8373, 0.8702, 0.9029, 0.9355, 0.9679, 1.0000, + ], + [ + 0.0000, 0.0000, 0.0230, 0.0567, 0.0865, 0.1182, 0.1510, 0.1839, 0.2164, 0.2489, 0.2812, 0.3133, 0.3455, 0.3775, 0.4100, 0.4433, 0.4767, 0.5100, 0.5433, + 0.5765, 0.6096, 0.6426, 0.6756, 0.7086, 0.7414, 0.7741, 0.8067, 0.8392, 0.8716, 0.9039, 0.9361, 0.9682, 1.0000, + ], + [ + 0.0000, 0.0000, 0.0368, 0.0670, 0.0976, 0.1294, 0.1619, 0.1943, 0.2265, 0.2586, 0.2906, 0.3225, 0.3544, 0.3862, 0.4184, 0.4512, 0.4839, 0.5166, 0.5492, + 0.5818, 0.6144, 0.6469, 0.6793, 0.7117, 0.7441, 0.7763, 0.8085, 0.8406, 0.8727, 0.9046, 0.9365, 0.9683, 1.0000, + ], + [ + 0.0000, 0.0000, 0.0444, 0.0749, 0.1058, 0.1377, 0.1699, 0.2020, 0.2339, 0.2657, 0.2975, 0.3292, 0.3609, 0.3926, 0.4245, 0.4568, 0.4891, 0.5213, 0.5535, + 0.5857, 0.6179, 0.6499, 0.6820, 0.7140, 0.7460, 0.7779, 0.8098, 0.8416, 0.8734, 0.9052, 0.9368, 0.9685, 1.0000, + ], + [ + 0.0000, 0.0086, 0.0511, 0.0817, 0.1128, 0.1445, 0.1763, 0.2080, 0.2397, 0.2713, 0.3029, 0.3344, 0.3660, 0.3975, 0.4292, 0.4611, 0.4930, 0.5249, 0.5567, + 0.5886, 0.6204, 0.6522, 0.6839, 0.7157, 0.7475, 0.7791, 0.8108, 0.8424, 0.8740, 0.9056, 0.9371, 0.9686, 1.0000, + ], + [ + 0.0000, 0.0198, 0.0564, 0.0874, 0.1186, 0.1501, 0.1817, 0.2133, 0.2447, 0.2762, 0.3076, 0.3390, 0.3705, 0.4018, 0.4333, 0.4649, 0.4965, 0.5281, 0.5597, + 0.5912, 0.6227, 0.6543, 0.6858, 0.7173, 0.7488, 0.7802, 0.8117, 0.8431, 0.8745, 0.9059, 0.9373, 0.9686, 1.0000, + ], + [ + 0.0000, 0.0312, 0.0625, 0.0938, 0.1250, 0.1562, 0.1875, 0.2188, 0.2500, 0.2812, 0.3125, 0.3438, 0.3750, 0.4062, 0.4375, 0.4688, 0.5000, 0.5312, 0.5625, + 0.5938, 0.6250, 0.6562, 0.6875, 0.7188, 0.7500, 0.7812, 0.8125, 0.8438, 0.8750, 0.9062, 0.9375, 0.9688, 1.0000, + ], + [ + 0.0000, 0.0313, 0.0650, 0.0979, 0.1303, 0.1624, 0.1942, 0.2260, 0.2576, 0.2891, 0.3206, 0.3520, 0.3833, 0.4146, 0.4455, 0.4763, 0.5070, 0.5378, 0.5684, + 0.5991, 0.6298, 0.6605, 0.6912, 0.7219, 0.7526, 0.7833, 0.8141, 0.8450, 0.8758, 0.9067, 0.9377, 0.9688, 1.0000, + ], + [ + 0.0000, 0.0326, 0.0677, 0.1022, 0.1357, 0.1686, 0.2010, 0.2332, 0.2652, 0.2969, 0.3286, 0.3601, 0.3915, 0.4227, 0.4532, 0.4835, 0.5138, 0.5440, 0.5741, + 0.6042, 0.6344, 0.6645, 0.6946, 0.7248, 0.7550, 0.7853, 0.8156, 0.8461, 0.8766, 0.9072, 0.9380, 0.9689, 1.0000, + ], + [ + 0.0000, 0.0341, 0.0706, 0.1066, 0.1413, 0.1749, 0.2079, 0.2405, 0.2728, 0.3048, 0.3366, 0.3682, 0.3996, 0.4307, 0.4608, 0.4906, 0.5203, 0.5500, 0.5796, + 0.6092, 0.6387, 0.6683, 0.6979, 0.7276, 0.7573, 0.7871, 0.8170, 0.8472, 0.8773, 0.9077, 0.9382, 0.9690, 1.0000, + ], + [ + 0.0000, 0.0354, 0.0736, 0.1113, 0.1472, 0.1814, 0.2149, 0.2479, 0.2805, 0.3127, 0.3446, 0.3763, 0.4077, 0.4385, 0.4681, 0.4974, 0.5267, 0.5558, 0.5849, + 0.6139, 0.6429, 0.6720, 0.7011, 0.7303, 0.7595, 0.7889, 0.8184, 0.8481, 0.8780, 0.9081, 0.9384, 0.9690, 1.0000, + ], + [ + 0.0000, 0.0368, 0.0768, 0.1162, 0.1531, 0.1881, 0.2221, 0.2554, 0.2882, 0.3206, 0.3527, 0.3843, 0.4158, 0.4461, 0.4753, 0.5041, 0.5328, 0.5615, 0.5900, + 0.6185, 0.6470, 0.6755, 0.7041, 0.7328, 0.7616, 0.7906, 0.8197, 0.8491, 0.8787, 0.9085, 0.9386, 0.9691, 1.0000, + ], + [ + 0.0000, 0.0381, 0.0802, 0.1214, 0.1593, 0.1949, 0.2293, 0.2630, 0.2961, 0.3286, 0.3607, 0.3924, 0.4236, 0.4536, 0.4823, 0.5106, 0.5388, 0.5669, 0.5949, + 0.6229, 0.6509, 0.6789, 0.7070, 0.7352, 0.7636, 0.7922, 0.8209, 0.8500, 0.8793, 0.9089, 0.9388, 0.9691, 1.0000, + ], + [ + 0.0000, 0.0394, 0.0837, 0.1267, 0.1656, 0.2018, 0.2367, 0.2707, 0.3039, 0.3365, 0.3686, 0.4003, 0.4314, 0.4608, 0.4890, 0.5168, 0.5445, 0.5721, 0.5996, + 0.6271, 0.6546, 0.6822, 0.7098, 0.7375, 0.7655, 0.7937, 0.8221, 0.8509, 0.8799, 0.9092, 0.9390, 0.9692, 1.0000, + ], + [ + 0.0000, 0.0407, 0.0875, 0.1322, 0.1720, 0.2088, 0.2441, 0.2784, 0.3118, 0.3444, 0.3765, 0.4082, 0.4389, 0.4679, 0.4955, 0.5229, 0.5501, 0.5771, 0.6042, + 0.6312, 0.6582, 0.6853, 0.7124, 0.7398, 0.7673, 0.7952, 0.8233, 0.8517, 0.8804, 0.9096, 0.9391, 0.9692, 1.0000, + ], + [ + 0.0000, 0.0421, 0.0915, 0.1379, 0.1786, 0.2160, 0.2516, 0.2861, 0.3196, 0.3523, 0.3844, 0.4159, 0.4462, 0.4747, 0.5019, 0.5287, 0.5554, 0.5820, 0.6085, + 0.6351, 0.6616, 0.6882, 0.7149, 0.7419, 0.7690, 0.7965, 0.8243, 0.8524, 0.8810, 0.9099, 0.9393, 0.9693, 1.0000, + ], + [ + 0.0000, 0.0436, 0.0957, 0.1438, 0.1853, 0.2232, 0.2592, 0.2938, 0.3274, 0.3601, 0.3922, 0.4235, 0.4533, 0.4813, 0.5080, 0.5343, 0.5605, 0.5866, 0.6127, + 0.6387, 0.6648, 0.6910, 0.7173, 0.7439, 0.7707, 0.7978, 0.8253, 0.8532, 0.8815, 0.9102, 0.9394, 0.9693, 1.0000, + ], +]; +const BPS: [f32; 9] = [0.0000, 0.0200, 0.0500, 0.1000, 0.2000, 0.3000, 0.4500, 0.6000, 0.8000]; +const WPS: [f32; 8] = [0.1000, 0.2000, 0.3000, 0.4500, 0.6000, 0.8000, 0.9000, 1.0000]; +static AW: [[f32; 8]; 9] = [ + [1.7750, 2.3875, 2.4000, 2.1625, 1.9438, 1.6125, 1.3875, 1.0000], + [1.8125, 2.5250, 2.3937, 2.1688, 1.9375, 1.6062, 1.3938, 0.9875], + [2.7000, 2.4688, 2.2750, 2.0688, 1.8875, 1.6000, 1.3875, 0.9938], + [2.3250, 2.3250, 2.1875, 1.9750, 1.7937, 1.5188, 1.3250, 1.0437], + [2.0187, 2.0187, 2.0187, 1.8625, 1.7063, 1.4062, 1.2250, 0.9250], + [1.7500, 1.7500, 1.7500, 1.7500, 1.6438, 1.3562, 1.1687, 0.8625], + [1.4937, 1.4937, 1.4937, 1.4937, 1.4937, 1.2875, 1.1000, 0.7875], + [1.1687, 1.1687, 1.1687, 1.1687, 1.1687, 1.1687, 1.0375, 0.7562], + [0.8250, 0.8250, 0.8250, 0.8250, 0.8250, 0.8250, 0.8250, 0.7562], +]; +static AB: [[f32; 8]; 9] = [ + [0.9938, 0.9812, 1.0000, 1.0125, 0.9563, 0.9688, 1.0437, 1.0000], + [1.0437, 1.0250, 1.0125, 1.0000, 1.0000, 1.0375, 1.0000, 0.9938], + [1.2312, 1.2063, 1.1875, 1.1625, 1.1438, 1.1438, 1.1375, 1.1250], + [1.2500, 1.2500, 1.2312, 1.2125, 1.2125, 1.2375, 1.2375, 1.2375], + [1.1750, 1.1750, 1.1750, 1.1750, 1.2063, 1.2688, 1.3125, 1.3375], + [1.1812, 1.1812, 1.1812, 1.1812, 1.2125, 1.2812, 1.3313, 1.4125], + [1.2375, 1.2375, 1.2375, 1.2375, 1.2375, 1.3062, 1.3562, 1.4375], + [1.3250, 1.3250, 1.3250, 1.3250, 1.3250, 1.3250, 1.3687, 1.4500], + [1.3938, 1.3938, 1.3938, 1.3938, 1.3938, 1.3938, 1.3938, 1.4312], +]; + +/// A curve row at a fractional internal amount `x`, at grey level `v` (both interpolated). +fn curve(rows: &[[f32; STEPS]], from: f32, x: f32, v: f32) -> f32 { + if v >= 1.0 { + return 1.0; + } + let r = ((x - from) / 10.0).clamp(0.0, (rows.len() - 1) as f32); + let i = (r as usize).min(rows.len() - 2); + let t = r - i as f32; + let at = |row: &[f32; STEPS]| { + let p = v.max(0.0) * (STEPS - 1) as f32; + let j = (p as usize).min(STEPS - 2); + let s = p - j as f32; + row[j] + (row[j + 1] - row[j]) * s + }; + at(&rows[i]) * (1.0 - t) + at(&rows[i + 1]) * t +} + +/// Whites at internal amount `x` (−100 … 270) of grey level `v`. +pub(crate) fn whites(v: f32, x: f32) -> f32 { + curve(&WHITES, WHITES_FROM, x, v) +} + +/// Blacks at internal amount `x` (−100 … 100) of grey level `v`. +pub(crate) fn blacks(v: f32, x: f32) -> f32 { + curve(&BLACKS, BLACKS_FROM, x, v) +} + +/// The least Blacks adaptation on photographs. +const PHOTO_BLACKS: f32 = 1.2; + +/// Bilinear lookup of an adaptation table at black point `bp` and white point `wp`. +fn adapt(table: &[[f32; 8]; 9], bp: f32, wp: f32) -> f32 { + let idx = |grid: &[f32], v: f32| { + let v = v.clamp(grid[0], grid[grid.len() - 1]); + let i = grid.windows(2).position(|w| v <= w[1]).unwrap_or(grid.len() - 2); + (i, (v - grid[i]) / (grid[i + 1] - grid[i])) + }; + let (i, s) = idx(&BPS, bp); + let (j, t) = idx(&WPS, wp); + let row = |i: usize| table[i][j] * (1.0 - t) + table[i][j + 1] * t; + row(i) * (1.0 - s) + row(i + 1) * s +} + +/// The internal amounts of the Whites and Blacks sliders (−100 … 100) for an image whose 1st +/// and 99th luminance percentiles are the grey levels `bp` and `wp` (sRGB-encoded). +pub(crate) fn amounts(whites: f32, blacks: f32, bp: f32, wp: f32) -> (f32, f32) { + let w = if whites > 0.0 { whites * adapt(&AW, bp, wp) } else { whites }; + // On photographs Photoshop's Blacks is about 1.2 times the block images' amount even where + // their black point is 0 (ten public-domain photos: 1.08–1.36). + let b = if blacks < 0.0 { blacks * adapt(&AB, bp, wp).max(PHOTO_BLACKS) } else { blacks }; + (w.clamp(-100.0, 270.0), b.clamp(-100.0, 100.0)) +} + +/// Applies Whites and Blacks (internal amounts `w`, `b`) to straight RGBA pixels (`width` per +/// row) encoded with `enc`. Values above 1 (float documents) keep their excess. +pub(crate) fn apply(px: &mut [[f32; 4]], width: usize, w: f32, b: f32, enc: Encoding) { + if w == 0.0 && b == 0.0 { + return; + } + // A grey level's new level, both sRGB-encoded. + let grey = |v: f32| { + let v = if w != 0.0 { whites(v, w) } else { v }; + if b != 0.0 { blacks(v, b) } else { v } + }; + let per_channel = w > 0.0 || b < 0.0; + par_rows(px, width, 1, |_, row| { + for q in row.iter_mut() { + let lin = [0, 1, 2].map(|c| enc.decode(q[c])); + if per_channel { + for c in 0..3 { + let over = (lin[c] - 1.0).max(0.0); + q[c] = enc.encode(super::srgb_decode(grey(super::srgb_encode(lin[c].min(1.0)))) + over); + } + } else { + let y = super::luma_linear(lin).max(0.0); + if y <= 1e-7 { + continue; + } + let y2 = super::srgb_decode(grey(super::srgb_encode(y.min(1.0)))) + (y - 1.0).max(0.0); + let k = y2 / y; + for c in 0..3 { + q[c] = enc.encode(lin[c] * k); + } + } + } + }); +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn full_range_rows_match_photoshop() { + // Photoshop 25.4 on a 64-level block image spanning black to white (sRGB levels). + assert!((whites(97.1 / 255.0, 100.0) * 255.0 - 137.4).abs() < 0.6); + assert!((whites(194.3 / 255.0, -100.0) * 255.0 - 167.6).abs() < 0.6); + assert!((blacks(97.1 / 255.0, -100.0) * 255.0 - 60.0).abs() < 0.6); + assert!((blacks(48.6 / 255.0, 100.0) * 255.0 - 67.0).abs() < 0.6); + // The compressing directions keep black and white. + assert_eq!(whites(1.0, -100.0), 1.0); + assert_eq!(blacks(0.0, 100.0), 0.0); + } + + #[test] + fn the_clipping_directions_adapt_to_the_image() { + // A dark, low-contrast image needs more: Whites +50 acts like +94.5 on [0.05, 0.6]. + let (w, _) = amounts(50.0, 0.0, 0.05, 0.6); + assert!((w - 94.5).abs() < 2.0, "{w}"); + // A raised black point strengthens Blacks −40 to −58 on [0.6, 1]. + let (_, b) = amounts(0.0, -40.0, 0.6, 1.0); + assert!((b + 58.0).abs() < 1.0, "{b}"); + // Never below the photographs' 1.2. + assert!((amounts(0.0, -50.0, 0.0, 1.0).1 + 60.0).abs() < 1e-3); + // The compressing directions never adapt. + assert_eq!(amounts(-50.0, 50.0, 0.3, 0.6), (-50.0, 50.0)); + } +} diff --git a/crates/engine/src/lens_cmds.rs b/crates/engine/src/lens_cmds.rs index 31d69300..379ca240 100644 --- a/crates/engine/src/lens_cmds.rs +++ b/crates/engine/src/lens_cmds.rs @@ -369,7 +369,28 @@ fn adaptive_wide_angle(s: &mut Session, p: &Value) -> Result { })) } +/// The transfer curve Camera Raw decodes `doc`'s values with ([`CameraRaw::encoding_gamma`]): +/// ProPhoto's gamma 1.8 (raws open in it), Adobe RGB's 563/256, 1 for linear sRGB, else 0 for +/// the sRGB curve. +pub fn encoding_gamma(doc: &Document) -> f32 { + use photocraft_cms::Builtin; + let profile = crate::color_cmds::document_profile(doc); + [(Builtin::ProPhotoCompat, 1.8), (Builtin::AdobeRgbCompat, 563.0 / 256.0), (Builtin::LinearSrgb, 1.0)] + .into_iter() + .find(|(b, _)| profile.same_colors(b.profile())) + .map_or(0.0, |(_, g)| g) +} + fn camera_raw_cmd(s: &mut Session, p: &Value) -> Result { + // The document's transfer curve goes with the settings, so a Smart Filter keeps it. + let mut p = p.clone(); + if p.get("encodingGamma").is_none() + && let Some(g) = s.active().map(|d| encoding_gamma(&d.doc)).filter(|g| *g > 0.0) + && let Value::Object(m) = &mut p + { + m.insert("encodingGamma".into(), json!((f64::from(g) * 1e4).round() / 1e4)); + } + let p = &p; let cr = raw_params(RAW, p)?; // New settings are strict; stored Smart Filters re-apply through the lenient `raw_params`. cr.validate().map_err(|e| bad(RAW, e))?; @@ -583,6 +604,32 @@ mod tests { assert!((p[0] - p[2]).abs() < 0.01, "{p:?}"); } + #[test] + fn camera_raw_decodes_light_with_the_documents_curve() { + // A raw opens in ProPhoto (gamma 1.8): the filter keeps that with its settings, so Whites, + // Blacks, Shadows and Highlights work on the same light as when it was applied. + let mut s = session(16); + s.execute("edit.assignProfile", json!({"profile": "prophoto-compat"})).unwrap(); + assert_eq!(encoding_gamma(&s.active().unwrap().doc), 1.8); + s.execute("layer.smartObjects.convertToSmartObject", json!({})).unwrap(); + s.execute(RAW, json!({"shadows": 40, "whites": -30})).unwrap(); + let d = s.active().unwrap(); + let filters = match &d.doc.layer(d.active_layer.unwrap()).unwrap().content { + LayerContent::Smart(so) => so.smart_filters.clone(), + _ => panic!("smart object expected"), + }; + assert_eq!(filters[0].params["encodingGamma"], json!(1.8)); + // sRGB documents use the sRGB curve, the default, and store nothing. + let mut s = session(8); + assert_eq!(encoding_gamma(&s.active().unwrap().doc), 0.0); + s.execute("layer.smartObjects.convertToSmartObject", json!({})).unwrap(); + s.execute(RAW, json!({"shadows": 40})).unwrap(); + let d = s.active().unwrap(); + if let LayerContent::Smart(so) = &d.doc.layer(d.active_layer.unwrap()).unwrap().content { + assert!(so.smart_filters[0].params.get("encodingGamma").is_none()); + } + } + #[test] fn camera_raw_rejects_an_area_too_large_to_develop() { // #962: `area.width() * area.height()` overflowed u32 on a legal 65536×65536 canvas, diff --git a/crates/io/src/raw.rs b/crates/io/src/raw.rs index 7e1f9164..26e62d25 100644 --- a/crates/io/src/raw.rs +++ b/crates/io/src/raw.rs @@ -15,6 +15,7 @@ use std::sync::Arc; use photocraft_cms::{Builtin, Intent, Profile, Transform}; use photocraft_codecs::{self as codecs, ChannelLayout, Format, Image, SampleType}; use photocraft_raw::{CameraLook, DevelopOptions, Limits, PreviewColorSpace, RawError, Reference, Sensor, WhiteBalance}; +pub use photocraft_raw::{Tone, retone}; use crate::flat::image_to_document; use crate::{ImportResult, IoError}; @@ -41,8 +42,9 @@ fn upright_preview(raw: &[u8], jpeg: &[u8]) -> Result { Ok(img.oriented(o)?) } -/// Camera Raw's Temperature, Tint and Exposure, applied while developing the sensor data -/// (the open-time Camera Raw dialog) instead of to the developed RGB pixels. +/// Camera Raw's Temperature, Tint, Exposure, Shadows, Highlights, Clarity, Texture and Dehaze, +/// applied while developing the sensor data (the open-time Camera Raw dialog) instead of to the +/// developed RGB pixels. #[derive(Clone, Copy, Debug, Default, PartialEq)] pub struct RawTuning { /// −100…100, as `photocraft_algo::camera_raw::CameraRaw::temperature`. @@ -51,11 +53,23 @@ pub struct RawTuning { pub tint: f32, /// EV, as `CameraRaw::exposure`. pub exposure: f32, + /// −100…100, as `CameraRaw::shadows`: in linear light before the tone curve, as Camera Raw + /// does for raw files ([`photocraft_raw::Tone`]). + pub shadows: f32, + /// −100…100, as `CameraRaw::highlights`. + pub highlights: f32, + /// −100…100, as `CameraRaw::clarity`. + pub clarity: f32, + /// −100…100, as `CameraRaw::texture`. + pub texture: f32, + /// −100…100, as `CameraRaw::dehaze`. + pub dehaze: f32, } /// Develops a raw file with `tuning` applied at the raw stage: Exposure as develop exposure, -/// Temperature / Tint as gains on the camera's as-shot white-balance multipliers (the same -/// gains the Camera Raw filter applies to RGB). The second value is `false` when the file has +/// Shadows, Highlights, Clarity, Texture and Dehaze in linear light before the tone curve, Temperature / Tint as gains on the +/// camera's as-shot white-balance multipliers (the same gains the Camera Raw filter applies to +/// RGB). The second value is `false` when the file has /// no as-shot white balance: Temperature / Tint were then not applied, and the caller keeps /// them as RGB adjustments. pub fn import_raw_tuned(name: &str, bytes: &[u8], tuning: &RawTuning) -> Result<(ImportResult, bool), IoError> { @@ -65,13 +79,18 @@ pub fn import_raw_tuned(name: &str, bytes: &[u8], tuning: &RawTuning) -> Result< return Err(IoError::Raw(RawError::Malformed(format!("exposure {} EV is out of range", tuning.exposure)))); } let sensor = photocraft_raw::decode(bytes, &limits()).map_err(IoError::Raw)?; - let mut opts = DevelopOptions { limits: limits(), ..Default::default() }; - // Use the same camera rendering as normal import. Fit at the camera's default WB and - // exposure before applying user controls, so the fit cannot cancel their adjustments. - if sensor.color.calibrations.is_empty() { - opts.camera_look = fit_preview_look(bytes, &sensor, &opts).ok(); - } - opts.exposure = exposure; + let slider = |v: f32| if v.is_finite() { v.clamp(-100.0, 100.0) } else { 0.0 }; + let tone = photocraft_raw::Tone { + shadows: slider(tuning.shadows), + highlights: slider(tuning.highlights), + clarity: slider(tuning.clarity), + texture: slider(tuning.texture), + dehaze: slider(tuning.dehaze), + }; + // The colour rendering the default open used (a look fitted to the camera's JPEG for files + // without colour calibration), so re-developing changes only what the sliders change. + let camera_look = default_look(bytes, &sensor); + let mut opts = DevelopOptions { limits: limits(), exposure, tone, camera_look, ..Default::default() }; let wb_applied = match sensor.camera_wb { Some(m) => { let g = wb_gains(tuning.temperature, tuning.tint); @@ -86,10 +105,45 @@ pub fn import_raw_tuned(name: &str, bytes: &[u8], tuning: &RawTuning) -> Result< } else { "estimated white balance".into() }; - let summary = format!("developed in Camera Raw (exposure {:+.2} EV, {wb})", tuning.exposure); + let tone = [("shadows", tone.shadows), ("highlights", tone.highlights), ("clarity", tone.clarity), ("texture", tone.texture), ("dehaze", tone.dehaze)] + .iter() + .filter(|(_, v)| *v != 0.0) + .map(|(k, v)| format!(", {k} {v:+.0}")) + .collect::(); + let summary = format!("developed in Camera Raw (exposure {:+.2} EV{tone}, {wb})", tuning.exposure); Ok((developed_document(name, format, dev, &summary)?, wb_applied)) } +/// The tone curve `bytes` develop with by default: the fitted look's for a file without colour +/// calibration (see [`import_raw_with`]), else the camera profile's (empty: none, or not a raw +/// this crate decodes). For previews of the open-time raw-stage sliders +/// ([`photocraft_raw::retone`]), in linear-light knots. +pub fn tone_curve(bytes: &[u8]) -> Vec<[f32; 2]> { + let Ok(sensor) = photocraft_raw::decode(bytes, &limits()) else { return Vec::new() }; + match default_look(bytes, &sensor) { + Some(look) => look.tone.as_ref().map(look_knots).unwrap_or_default(), + None => sensor.tone_curve, + } +} + +/// A fitted look's tone curve as knots for [`photocraft_raw::retone`] (which reads them +/// log-linearly): sampled densely enough that the two agree within a fraction of a code value. +fn look_knots(t: &photocraft_raw::ToneCurve) -> Vec<[f32; 2]> { + const N: usize = 256; + (1..=N).map(|i| (i as f64 / N as f64).powi(2)).map(|x| [x as f32, t.eval(x) as f32]).collect() +} + +/// The look a default open develops `bytes` with: fitted to the embedded JPEG when the file has +/// no colour calibration, is not monochrome and the fit clearly helps (as [`import_raw_with`] +/// does), else `None`. It is fitted at the camera's own white balance and exposure, so a +/// re-develop's sliders are not fitted away. +fn default_look(bytes: &[u8], sensor: &Sensor) -> Option { + if !sensor.color.calibrations.is_empty() || sensor.is_monochrome() { + return None; + } + fit_preview_look(bytes, sensor, &DevelopOptions { limits: limits(), ..Default::default() }).ok() +} + /// "Canon" + "Canon EOS 80D" and "NIKON CORPORATION" + "NIKON D3200" read as the model alone: /// the model already starts with the make's first word. fn camera_name(make: Option<&str>, model: Option<&str>) -> String { diff --git a/crates/io/tests/raw.rs b/crates/io/tests/raw.rs index d0bc370d..7a11f4fb 100644 --- a/crates/io/tests/raw.rs +++ b/crates/io/tests/raw.rs @@ -214,7 +214,11 @@ fn camera_raw_tuning_keeps_the_default_look_and_applies_user_gains_after_fitting assert!(fitted(&normal.warnings)); let sensor = decode(&bytes, &Default::default()).unwrap(); let look = fit_preview_look(&bytes, &sensor, &DevelopOptions::default()).unwrap(); - for tuning in [RawTuning::default(), RawTuning { exposure: 0.5, ..Default::default() }, RawTuning { exposure: -0.5, temperature: 20.0, tint: -15.0 }] { + for tuning in [ + RawTuning::default(), + RawTuning { exposure: 0.5, ..Default::default() }, + RawTuning { exposure: -0.5, temperature: 20.0, tint: -15.0, ..Default::default() }, + ] { let (got, applied) = import_raw_tuned("camera.nef", &bytes, &tuning).unwrap(); assert!(applied && fitted(&got.warnings) && !fallback(&got.warnings), "{:?}", got.warnings); assert_eq!(got.document.depth, SampleType::U16); @@ -283,3 +287,28 @@ fn truncated_raws_with_a_fittable_preview_do_not_panic() { let _ = photocraft_io::raw::import_raw_tuned("x.nef", &b[..n], &Default::default()); } } + +/// The open-time Camera Raw re-develop keeps the colour rendering the default open used: a raw +/// without calibration gets the same look fitted to its JPEG, so neutral settings give the same +/// pixels, and the previews' tone curve is the look's. +#[test] +fn a_re_develop_keeps_the_fitted_look() { + let (w, h) = (480, 320); + let cam = patches(w, h); + let nef = nef_uncompressed(&cam, w, h, Some(camera_rendering(&cam, w, h))); + let opened = import("DSC_0003.NEF", &nef).unwrap(); + let (again, _) = photocraft_io::raw::import_raw_tuned("DSC_0003.NEF", &nef, &Default::default()).unwrap(); + assert!(fitted(&again.warnings), "{:?}", again.warnings); + let pixels = |d: &photocraft_doc::Document| { + let s = d.layers[0].surface().unwrap(); + let mut px = vec![[0.0f32; 4]; w * h]; + s.read_rgba_into(photocraft_geom::Rect::new(0, 0, w as i32, h as i32), &mut px); + px + }; + assert_eq!(pixels(&opened.document), pixels(&again.document)); + let curve = photocraft_io::raw::tone_curve(&nef); + assert!(curve.len() > 2 && curve.windows(2).all(|k| k[1][0] > k[0][0] && k[1][1] >= k[0][1]), "{curve:?}"); + // The camera's brightening curve: mid-grey comes out lighter. + let mid = curve.iter().find(|k| k[0] >= 0.18).unwrap(); + assert!(mid[1] > mid[0], "{mid:?}"); +} diff --git a/crates/raw/README.md b/crates/raw/README.md index 7bcfdcfe..461a0ed0 100644 --- a/crates/raw/README.md +++ b/crates/raw/README.md @@ -122,6 +122,14 @@ brightened shadows locally (Active D-Lighting), which one global curve cannot fo (preview decode included) takes about 50–70 ms on a 24 MP file. It is an estimate of the camera's look, not a measured calibration: picture styles and hue-dependent rendering are approximated. +Cameras with a profile measured against Photoshop's Camera Raw (`src/cameras.rs`: the Nikon D4) carry +a calibration, so no look is fitted for them. On 6 D4 NEFs against Photoshop 25.4's default Camera +Raw rendering (quarter size, medians over the frames) the measured profile is 0.048 stop from its +luminance with a mean CIE76 ΔE of 1.8; the look fitted to the embedded JPEG would be 0.30 stop and +ΔE 6.4, as it follows the camera's picture style instead. The open-time re-develop +(`photocraft-io`'s `import_raw_tuned`) and the tone curve its previews use (`tone_curve`) take the +same look as the default open, so changing a slider does not change the colour rendering. + ## Tools `cargo run --release -p photocraft-raw --example rawinfo -- [--dump] [--demosaic ahd] [--png DIR] FILE...` diff --git a/crates/raw/src/cameras.rs b/crates/raw/src/cameras.rs index 45eb542c..7439433c 100644 --- a/crates/raw/src/cameras.rs +++ b/crates/raw/src/cameras.rs @@ -11,10 +11,13 @@ //! (2 px of optical black on the left, 50 + 8 on the right show as a purple stripe otherwise). The //! data is already black-subtracted (the darkest image pixels reach 0). Green saturates at //! 15546–15672 while red and blue reach 15687–16383, so one level of 15520 makes clipped -//! highlights white without shifting the white balance. Matrix and curve were fitted to the -//! camera's embedded JPEGs (Picture Control Standard, Active D-Lighting off; 52 frames, smooth -//! areas, 4 × 4 means): on 15 held-out frames the development is 7.2/255 per channel off the -//! camera's JPEG on average, against 34 without a profile. +//! highlights white without shifting the white balance. Matrix, curve and black point copy +//! Photoshop Camera Raw's default rendering of these files, measured black-box: 29 NEFs opened +//! in Photoshop 25.4 against our own linear development of the same data (8 × 8 means, pixels +//! clipped in neither). The matrix is our first ForwardMatrix (fitted to the camera's embedded +//! JPEGs) times a linear-ProPhoto look matrix whose rows sum to 1; the curve applies per channel +//! after it; the black point follows the frame's darkest tones ([`crate::tone`]). Median +//! luminance difference to Camera Raw: 0.04 stop (0.29 with the camera-JPEG curve). //! //! Bodies whose full profile is not measured yet can still get their measured image area — the //! same alignment method, see [`IMAGE_AREAS`] — so their frames crop like the camera's JPEG. @@ -22,39 +25,63 @@ use crate::color::{Calibration, ColorInfo, IDENTITY, Mat3}; use crate::sensor::{Rect, Sensor}; -const D4_FORWARD: Mat3 = [[0.644598, 0.0703598, 0.249262], [0.342249, 0.518929, 0.138822], [0.0568265, -0.269568, 1.03795]]; +const D4_FORWARD: Mat3 = [[0.639454, 0.260359, 0.0643991], [0.273094, 0.796492, -0.0695779], [0.00965321, -0.131427, 0.94699]]; +/// A third of the 0.1th percentile of the luminance, as Camera Raw renders D4 NEFs by default. +const D4_BLACK_POINT: f32 = 0.33; const D4_COLOR: Mat3 = [[0.895936, -0.218092, -0.185988], [-1.09736, 2.06898, -0.0131889], [-0.26977, 0.393884, 0.687829]]; -const D4_TONE: [[f32; 2]; 31] = [ - [0.005524272, 0.00285028], - [0.006569503, 0.00357083], - [0.0078125, 0.00447912], - [0.009290681, 0.00605813], - [0.01104854, 0.00841445], - [0.01313901, 0.011536], - [0.015625, 0.0165399], - [0.01858136, 0.0230234], - [0.02209709, 0.0319205], - [0.02627801, 0.0434858], - [0.03125, 0.0582138], - [0.03716272, 0.0771963], - [0.04419417, 0.0993894], - [0.05255603, 0.125058], - [0.0625, 0.157207], - [0.07432544, 0.194929], - [0.08838835, 0.236109], - [0.1051121, 0.279155], - [0.125, 0.329365], - [0.1486509, 0.388405], - [0.1767767, 0.457944], - [0.2102241, 0.52456], - [0.25, 0.598051], - [0.2973018, 0.668794], - [0.3535534, 0.749954], - [0.4204482, 0.815443], - [0.5, 0.870167], - [0.5946036, 0.907869], - [std::f32::consts::FRAC_1_SQRT_2, 0.939351], - [0.8408964, 0.970567], +const D4_TONE: [[f32; 2]; 53] = [ + [0.00012207031, 7.44377e-05], + [0.00014516688, 8.44049e-05], + [0.00017263349, 9.57067e-05], + [0.00020529698, 0.000108523], + [0.00024414062, 0.000123055], + [0.00029033376, 0.000123202], + [0.00034526698, 0.000123348], + [0.00041059396, 0.000142387], + [0.00048828125, 0.000164366], + [0.0005806675, 0.00020246], + [0.00069053395, 0.000249382], + [0.0008211879, 0.000310083], + [0.0009765625, 0.000385559], + [0.001161335, 0.000474115], + [0.0013810679, 0.00058301], + [0.0016423758, 0.000717142], + [0.001953125, 0.000882133], + [0.00232267, 0.00109054], + [0.0027621358, 0.00134818], + [0.0032847517, 0.00163655], + [0.00390625, 0.0019866], + [0.00464534, 0.00235945], + [0.0055242716, 0.00280228], + [0.0065695033, 0.00342616], + [0.0078125, 0.00418894], + [0.00929068, 0.00540942], + [0.011048543, 0.0069855], + [0.013139007, 0.00959286], + [0.015625, 0.0131734], + [0.01858136, 0.0181471], + [0.022097087, 0.0249987], + [0.026278013, 0.0336416], + [0.03125, 0.0452726], + [0.03716272, 0.0591889], + [0.044194173, 0.077383], + [0.052556027, 0.0990869], + [0.0625, 0.126878], + [0.07432544, 0.161688], + [0.088388346, 0.206049], + [0.10511205, 0.256563], + [0.125, 0.31946], + [0.14865088, 0.382637], + [0.17677669, 0.458308], + [0.2102241, 0.531942], + [0.25, 0.617405], + [0.29730177, 0.683279], + [0.35355338, 0.756182], + [0.4204482, 0.809073], + [0.5, 0.865664], + [0.59460354, 0.900869], + [std::f32::consts::FRAC_1_SQRT_2, 0.937507], + [0.8408964, 0.956434], [1.0, 1.0], ]; @@ -71,6 +98,8 @@ struct Profile { forward: Mat3, color: Mat3, tone: &'static [[f32; 2]], + /// Camera Raw's adaptive black-point factor ([`Sensor::black_point`]). + black_point: f32, } const PROFILES: &[Profile] = &[Profile { @@ -83,6 +112,7 @@ const PROFILES: &[Profile] = &[Profile { forward: D4_FORWARD, color: D4_COLOR, tone: &D4_TONE, + black_point: D4_BLACK_POINT, }]; /// A measured image area of a body whose remaining profile has not been @@ -134,6 +164,7 @@ pub(crate) fn apply(s: &mut Sensor) { ..ColorInfo::default() }; s.tone_curve = p.tone.to_vec(); + s.black_point = p.black_point; } #[cfg(test)] @@ -164,6 +195,7 @@ mod tests { baseline_exposure: 0.0, gain_maps: Vec::new(), tone_curve: Vec::new(), + black_point: 0.0, warnings: vec!["NEF: black level not recorded in a documented tag; assumed 0".into()], } } @@ -181,6 +213,7 @@ mod tests { assert_eq!(s.color.calibrations.len(), 1); assert_eq!(s.color.calibrations[0].forward_matrix, Some(D4_FORWARD)); assert_eq!(s.tone_curve.len(), D4_TONE.len()); + assert_eq!(s.black_point, D4_BLACK_POINT); assert!(s.warnings.is_empty(), "the D4's black level is known: {:?}", s.warnings); // The profile gives a colour conversion for the as-shot white balance. assert!(s.color.balanced_to_xyz_d50([0.5, 1.0, 0.7]).is_some()); diff --git a/crates/raw/src/cr2.rs b/crates/raw/src/cr2.rs index 5b360122..8e851c5d 100644 --- a/crates/raw/src/cr2.rs +++ b/crates/raw/src/cr2.rs @@ -293,6 +293,7 @@ pub(crate) fn decode(t: &Tiff, limits: &Limits) -> Result { baseline_exposure: 0.0, gain_maps: Vec::new(), tone_curve: Vec::new(), + black_point: 0.0, warnings, }) } diff --git a/crates/raw/src/develop.rs b/crates/raw/src/develop.rs index 8b69cc29..ebe8656a 100644 --- a/crates/raw/src/develop.rs +++ b/crates/raw/src/develop.rs @@ -1,12 +1,15 @@ //! Raw development: linearize, subtract black, scale to white, white //! balance, clip highlights, demosaic, camera → XYZ (D50) → linear ProPhoto, -//! exposure, gamma 1.8 encode to 16 bits, orientation. +//! exposure, Dehaze, Shadows / Highlights / Clarity / Texture and the black +//! point (`tone.rs`), the profile's tone curve, gamma 1.8 encode to 16 bits, +//! orientation. use crate::color::{self, Mat3}; use crate::demosaic::{Demosaic, PAD, Padded, Pattern, demosaic, demosaic_cfa}; use crate::error::{RawError, Result}; use crate::look::{CameraLook, ToneCurve}; use crate::sensor::Sensor; +use crate::tone::{Haze, Tone, ToneMap, black_level}; use crate::{Limits, RawFormat, par}; /// White balance choice. @@ -30,6 +33,9 @@ pub struct DevelopOptions { pub exposure: f64, /// Apply the file's orientation (rotate / flip the pixels). pub orient: bool, + /// Camera Raw's Shadows, Highlights, Clarity, Texture and Dehaze, applied in linear light + /// before the tone curve. + pub tone: Tone, pub limits: Limits, /// A colour rendering fitted to the camera's own JPEG ([`crate::fit_look`]). When set it /// replaces the file's colour calibration (or the neutral fallback) and adds its tone curve. @@ -43,6 +49,7 @@ impl Default for DevelopOptions { white_balance: WhiteBalance::default(), exposure: 0.0, orient: true, + tone: Tone::default(), limits: Limits::default(), camera_look: None, } @@ -330,7 +337,24 @@ pub fn develop_sensor(s: &Sensor, opts: &DevelopOptions) -> Result { } } - // Camera → ProPhoto, exposure, the look's tone curve, gamma 1.8, 16 bits. + // Camera → ProPhoto, exposure, Dehaze, Shadows / Highlights / Clarity / Texture and the black + // point, the look's (or the profile's) tone curve, gamma 1.8, 16 bits. + let y_row = color::rgb_to_xyz(color::ROMM, color::D50_XY)[1].map(|v| v as f32); + let lum = |v: &[f32; 3]| y_row[0] * v[0] + y_row[1] * v[1] + y_row[2] * v[2]; + // Monochrome: the one sample, grey; no colour matrix. + let pro = |p: &[f32]| if mono { [grey_gain * p[0]; 3] } else { [0, 1, 2].map(|k| out_m[k][0] * p[0] + out_m[k][1] * p[1] + out_m[k][2] * p[2]) }; + let haze = Haze::new(w, h, |i| pro(&rgb[i * 3..i * 3 + 3]), opts.tone.dehaze); + // Linear ProPhoto of pixel `i` after Dehaze. + let linear = |i: usize, p: &[f32]| { + let v = pro(p); + haze.as_ref().map_or(v, |z| z.apply(i % w, i / w, v)) + }; + let mut map = ToneMap::new(w, h, |i| lum(&linear(i, &rgb[i * 3..i * 3 + 3])), opts.tone, s.black_point); + if let (Some(m), Some(_)) = (&mut map, &haze) { + // The black point belongs to the default rendering: Dehaze does not move it (taken after + // Dehaze it fell to almost 0, and Dehaze darkened less than Photoshop's). + m.black = black_level(w, h, |i| lum(&pro(&rgb[i * 3..i * 3 + 3])), s.black_point); + } let mut out = vec![0u16; w * h * 3]; let lut = match look { Some(l) => GammaLut::with_tone(l.tone.as_ref()), @@ -339,13 +363,16 @@ pub fn develop_sensor(s: &Sensor, opts: &DevelopOptions) -> Result { par::chunks_mut(&mut out, band * w * 3, |b, chunk| { let start = b * band * w * 3; let src = &rgb[start..start + chunk.len()]; - for (o, p) in chunk.as_chunks_mut::<3>().0.iter_mut().zip(src.as_chunks::<3>().0) { - if mono { - *o = [lut.encode(grey_gain * p[0]); 3]; - continue; + for (i, (o, p)) in chunk.as_chunks_mut::<3>().0.iter_mut().zip(src.as_chunks::<3>().0).enumerate() { + let mut v = linear(b * band * w + i, p); + if let Some(m) = &map { + let g = m.gain(i % w, b * band + i / w, lum(&v)); + // The black point first, as Camera Raw: lifting before it would flatten the + // deepest shadows' contrast. + v = v.map(|c| m.unblack(c) * g); } for k in 0..3 { - o[k] = lut.encode(out_m[k][0] * p[0] + out_m[k][1] * p[1] + out_m[k][2] * p[2]); + o[k] = lut.encode(v[k]); } } }); @@ -453,7 +480,7 @@ impl GammaLut { /// `curve` at linear `v`: linear interpolation between the points in log₂ of the input, a line /// through 0 below the first point, the last output beyond the last. -fn tone(curve: &[[f32; 2]], v: f32) -> f32 { +pub(crate) fn tone(curve: &[[f32; 2]], v: f32) -> f32 { let (Some(first), Some(last)) = (curve.first(), curve.last()) else { return v }; if v <= first[0] { return if first[0] > 0.0 { v * first[1] / first[0] } else { first[1] }; diff --git a/crates/raw/src/dng.rs b/crates/raw/src/dng.rs index 5ff9fd14..e8422b54 100644 --- a/crates/raw/src/dng.rs +++ b/crates/raw/src/dng.rs @@ -271,6 +271,7 @@ pub(crate) fn decode(t: &Tiff, limits: &Limits) -> Result { baseline_exposure: if baseline_exposure.is_finite() { baseline_exposure.clamp(-10.0, 10.0) } else { 0.0 }, gain_maps, tone_curve: Vec::new(), + black_point: 0.0, warnings, }) } diff --git a/crates/raw/src/lib.rs b/crates/raw/src/lib.rs index 9a702f2d..dc1805d4 100644 --- a/crates/raw/src/lib.rs +++ b/crates/raw/src/lib.rs @@ -64,6 +64,7 @@ mod sensor; mod sony; mod tiff; mod tiffep; +mod tone; #[cfg(feature = "testgen")] pub mod testgen; @@ -76,6 +77,7 @@ pub use crate::look::{CameraLook, LookRejected, PROXY_EDGE, Reference, ToneCurve pub use crate::opcodes::GainMap; pub use crate::preview::{Preview, PreviewColorSpace, embedded_preview, embedded_preview_color_space, embedded_previews}; pub use crate::sensor::{BlackLevels, Cfa, Rect, Sensor}; +pub use crate::tone::{Tone, retone}; use crate::tiff::{Tiff, tag}; diff --git a/crates/raw/src/orf.rs b/crates/raw/src/orf.rs index ba159267..9271aff9 100644 --- a/crates/raw/src/orf.rs +++ b/crates/raw/src/orf.rs @@ -150,6 +150,7 @@ pub(crate) fn decode(t: &Tiff, limits: &Limits) -> Result { baseline_exposure: 0.0, gain_maps: Vec::new(), tone_curve: Vec::new(), + black_point: 0.0, warnings, }) } diff --git a/crates/raw/src/raf.rs b/crates/raw/src/raf.rs index dee720b6..cb794889 100644 --- a/crates/raw/src/raf.rs +++ b/crates/raw/src/raf.rs @@ -302,6 +302,7 @@ pub(crate) fn decode(bytes: &[u8], limits: &Limits) -> Result { baseline_exposure, gain_maps: Vec::new(), tone_curve: Vec::new(), + black_point: 0.0, warnings, }) } diff --git a/crates/raw/src/rw2.rs b/crates/raw/src/rw2.rs index fe1e0b2a..231cd097 100644 --- a/crates/raw/src/rw2.rs +++ b/crates/raw/src/rw2.rs @@ -170,6 +170,7 @@ pub(crate) fn decode(t: &Tiff, limits: &Limits) -> Result { baseline_exposure: 0.0, gain_maps: Vec::new(), tone_curve: Vec::new(), + black_point: 0.0, warnings, }) } diff --git a/crates/raw/src/sensor.rs b/crates/raw/src/sensor.rs index a775586d..e8c65ebf 100644 --- a/crates/raw/src/sensor.rs +++ b/crates/raw/src/sensor.rs @@ -157,6 +157,10 @@ pub struct Sensor { /// output]` pairs in linear ProPhoto, applied per channel after the colour conversion and /// exposure. Below the first point the curve is a line through 0; empty: no curve. pub tone_curve: Vec<[f32; 2]>, + /// Camera Raw's adaptive black point, for profiles that copy its default rendering: this + /// factor times the 0.1th percentile of the image's linear luminance is subtracted before the + /// tone curve (see `tone.rs`). 0: no black point. + pub black_point: f32, pub warnings: Vec, } diff --git a/crates/raw/src/tiffep.rs b/crates/raw/src/tiffep.rs index b940d6bc..4a75491f 100644 --- a/crates/raw/src/tiffep.rs +++ b/crates/raw/src/tiffep.rs @@ -223,6 +223,7 @@ pub(crate) fn decode(t: &Tiff, format: RawFormat, limits: &Limits) -> Result bool { + self.gain_neutral() && self.dehaze == 0.0 + } + + /// No luminance gain: Shadows, Highlights, Clarity and Texture at 0. + fn gain_neutral(&self) -> bool { + self.work_neutral() && self.texture == 0.0 + } + + /// Nothing to compute on the work copy: Shadows, Highlights and Clarity at 0. + fn work_neutral(&self) -> bool { + self.shadows == 0.0 && self.highlights == 0.0 && self.clarity == 0.0 + } +} + +/// Long side of the copy the base is computed on, and the guided filter's radius and ε there. +const WORK_SIDE: usize = 1232; +const BASE_RADIUS: f32 = 32.0; +const BASE_EPS: f32 = 1.0; +/// ε (stops²) of the guided upsampling that carries the change to full size. +const UPSAMPLE_EPS: f32 = 1.0; +/// The curves' first knot (stops from the anchor) and knot spacing. +const LO: f32 = -12.0; +const STEP: f32 = 0.25; + +// log₂ gain at +100 / −100 against B − anchor, knots LO, LO + STEP, … (measured; flat or +// extended linearly beyond the measured range, never steeper than 0.8 stop per stop so tones +// keep their order). +const SHADOWS_UP: [f32; 73] = [ + 2.142, 2.142, 2.142, 2.142, 2.142, 2.142, 2.142, 2.142, 2.142, 2.142, 2.142, 2.142, 2.142, 2.142, 2.142, 2.142, 2.142, 2.142, 2.142, 2.142, 2.142, 2.142, + 2.142, 2.142, 2.142, 2.142, 2.138, 2.117, 2.074, 2.010, 1.918, 1.797, 1.668, 1.546, 1.429, 1.315, 1.204, 1.093, 0.979, 0.860, 0.734, 0.604, 0.482, 0.378, + 0.288, 0.211, 0.157, 0.127, 0.104, 0.078, 0.056, 0.046, 0.044, 0.044, 0.044, 0.044, 0.044, 0.041, 0.030, 0.014, 0.003, 0.000, 0.000, 0.000, 0.000, 0.000, + 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, +]; +const SHADOWS_DOWN: [f32; 73] = [ + -2.365, -2.365, -2.365, -2.365, -2.365, -2.365, -2.365, -2.365, -2.365, -2.365, -2.365, -2.365, -2.365, -2.365, -2.365, -2.365, -2.365, -2.365, -2.365, + -2.365, -2.365, -2.365, -2.365, -2.346, -2.270, -2.155, -2.078, -2.054, -2.031, -1.973, -1.872, -1.739, -1.604, -1.483, -1.372, -1.266, -1.161, -1.053, + -0.940, -0.821, -0.696, -0.570, -0.455, -0.356, -0.270, -0.197, -0.146, -0.117, -0.098, -0.076, -0.057, -0.048, -0.046, -0.046, -0.046, -0.046, -0.046, + -0.043, -0.032, -0.014, -0.003, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, +]; +const HIGHLIGHTS_UP: [f32; 73] = [ + 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, + 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.001, 0.002, 0.003, 0.004, 0.008, 0.017, 0.030, 0.043, 0.055, 0.070, 0.085, 0.097, 0.106, + 0.114, 0.120, 0.127, 0.142, 0.167, 0.199, 0.239, 0.301, 0.381, 0.470, 0.569, 0.677, 0.796, 0.925, 1.056, 1.176, 1.268, 1.319, 1.339, 1.347, 1.351, 1.357, + 1.364, 1.372, 1.380, 1.388, 1.396, 1.404, 1.412, +]; +#[allow(clippy::approx_constant)] // measured values, one of them happens to be close to e +const HIGHLIGHTS_DOWN: [f32; 73] = [ + 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, + 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, -0.004, -0.020, -0.046, -0.068, -0.086, -0.104, -0.116, -0.118, -0.118, -0.118, -0.118, -0.118, + -0.119, -0.120, -0.123, -0.127, -0.131, -0.144, -0.169, -0.204, -0.245, -0.301, -0.375, -0.452, -0.537, -0.639, -0.753, -0.872, -0.997, -1.132, -1.294, + -1.475, -1.637, -1.751, -1.836, -1.936, -2.059, -2.191, -2.323, -2.454, -2.586, -2.718, -2.850, +]; + +/// Clarity: the work-copy radii of the bases between its bands, and their guided-filter ε. +const CLARITY_RADII: [f32; 4] = [2.0, 8.0, 32.0, 128.0]; +const CLARITY_EPS: f32 = 1.0; +/// Texture: long side of its copy, the Gaussians' σ there, and the guided upsampling's ε (small: +/// the change must follow fine detail into the full-size pixels). +const TEXTURE_SIDE: usize = 2464; +const TEXTURE_SIGMAS: [f32; 6] = [0.5, 1.0, 2.0, 4.0, 8.0, 16.0]; +const TEXTURE_UPSAMPLE_EPS: f32 = 1e-4; +/// Dehaze: dark-channel window radius and guided smoothing radius (work copy), its ε, the +/// smallest transmission, and the haze weight at +100 and −100. +const HAZE_RADIUS: f32 = 8.0; +const HAZE_SMOOTH: f32 = 64.0; +const HAZE_EPS: f32 = 1e-3; +const HAZE_T0: f32 = 0.1; +const HAZE_UP: f32 = 0.8; +const HAZE_DOWN: f32 = 0.22; +/// Linear ProPhoto → linear Display P3 (both D50): the dark channel was measured in Photoshop's +/// Display P3 output. +const PRO_TO_P3: [[f32; 3]; 3] = [[1.632638, -0.379816, -0.252821], [-0.153846, 1.166859, -0.013013], [0.010511, -0.062886, 1.052375]]; + +/// A change of log₂ luminance computed on a reduced copy, carried to full size along the image's +/// own edges (guided upsampling): a local linear model `change = a · log₂ Y + b` per reduced pixel. +struct Upsampled { + sw: usize, + sh: usize, + a: Vec, + b: Vec, + /// log₂ luminance floor (the reduced copy's 0.1th percentile). + floor: f32, +} + +impl Upsampled { + /// The change at full-size pixel (`x`, `y`) of a `w × h` image, of linear luminance `lum`. + fn change(&self, w: usize, h: usize, x: usize, y: usize, lum: f32) -> f32 { + let l = if lum > 0.0 { lum.log2().max(self.floor) } else { self.floor }; + bilinear(&self.a, self.sw, self.sh, w, h, x, y) * l + bilinear(&self.b, self.sw, self.sh, w, h, x, y) + } +} + +/// `v` (`sw × sh`) at full-size pixel (`x`, `y`) of a `w × h` image, bilinearly. +fn bilinear(v: &[f32], sw: usize, sh: usize, w: usize, h: usize, x: usize, y: usize) -> f32 { + let sx = ((x as f32 + 0.5) * sw as f32 / w as f32 - 0.5).clamp(0.0, (sw - 1) as f32); + let sy = ((y as f32 + 0.5) * sh as f32 / h as f32 - 0.5).clamp(0.0, (sh - 1) as f32); + let (x0, y0) = (sx as usize, sy as usize); + let (x1, y1) = ((x0 + 1).min(sw - 1), (y0 + 1).min(sh - 1)); + let (fx, fy) = (sx - x0 as f32, sy - y0 as f32); + let top = v[y0 * sw + x0] * (1.0 - fx) + v[y0 * sw + x1] * fx; + let bottom = v[y1 * sw + x0] * (1.0 - fx) + v[y1 * sw + x1] * fx; + top * (1.0 - fy) + bottom * fy +} + +/// Box means of `f` over `k × k` cells, `k` the smallest factor that brings the long side to +/// `side` or less: (`sw`, `sh`, the means). +fn reduce(w: usize, h: usize, side: usize, f: impl Fn(usize) -> [f32; N] + Sync) -> (usize, usize, Vec<[f32; N]>) { + let k = w.max(h).div_ceil(side).max(1); + let (sw, sh) = (w.div_ceil(k), h.div_ceil(k)); + let rows = par::map(sh, |sy| { + let (y0, y1) = (sy * k, ((sy + 1) * k).min(h)); + (0..sw) + .map(|sx| { + let (x0, x1) = (sx * k, ((sx + 1) * k).min(w)); + let mut s = [0.0f64; N]; + for y in y0..y1 { + for x in x0..x1 { + let v = f(y * w + x); + for c in 0..N { + s[c] += f64::from(v[c].max(0.0)); + } + } + } + let n = ((x1 - x0) * (y1 - y0)) as f64; + s.map(|v| (v / n) as f32) + }) + .collect::>() + }); + (sw, sh, rows.concat()) +} + +/// The luminance change of one image (Shadows, Highlights, Clarity on the work copy; Texture on +/// a half-size copy) and the black point. +pub(crate) struct ToneMap { + w: usize, + h: usize, + work: Option, + texture: Option, + /// Linear black point to subtract (0: none). + pub(crate) black: f32, +} + +impl ToneMap { + /// `lum(i)`: linear luminance of full-size pixel `i` (row-major, `w × h`). `black_point`: the + /// camera profile's black-point factor (see [`crate::Sensor::black_point`]). `None` when + /// nothing changes. Dehaze is not part of it (see [`Haze`]). + pub(crate) fn new(w: usize, h: usize, lum: impl Fn(usize) -> f32 + Sync, tone: Tone, black_point: f32) -> Option { + if w == 0 || h == 0 || (tone.gain_neutral() && black_point <= 0.0) { + return None; + } + let (sw, sh, y) = reduce(w, h, WORK_SIDE, |i| [lum(i)]); + let y: Vec = y.into_iter().map(|[v]| v).collect(); + let p01 = quantile(&y, 0.001).max(2f32.powi(-20)); + let black = if black_point > 0.0 { black_point * p01 } else { 0.0 }; + let work = (!tone.work_neutral()).then(|| { + let l: Vec = y.iter().map(|v| v.max(p01).log2()).collect(); + let n = l.len() as f64; + let geo = (l.iter().map(|v| f64::from(*v)).sum::() / n) as f32; + let scale = sw.max(sh) as f32 / WORK_SIDE as f32; + let mut change = vec![0.0f32; l.len()]; + if tone.shadows != 0.0 || tone.highlights != 0.0 { + let pm = ((l.iter().map(|v| f64::from(v.exp2()).powf(1.5)).sum::() / n).log2() / 1.5) as f32; + let r = ((BASE_RADIUS * scale).round() as usize).max(1); + let base = guided(&l, &l, sw, sh, r, BASE_EPS); + for (c, b) in change.iter_mut().zip(&base) { + *c += shadows(tone.shadows, b - pm) + highlights(tone.highlights, b - geo); + } + } + if tone.clarity != 0.0 { + clarity(&mut change, &l, sw, sh, geo, scale, tone.clarity); + } + // Fit change ≈ a · l + b locally, averaged; evaluated at full size. The large ε lets the + // change follow strong edges only: inside texture it stays smooth, so fine detail keeps + // its contrast as in Camera Raw (with ε 0.01 shadow detail lost a fifth of it; with ε 4 the change bled ~16 px over 3-stop edges). + let (a, b) = linear_fit(&l, &change, sw, sh, 2, UPSAMPLE_EPS); + Upsampled { sw, sh, a, b, floor: p01.log2() } + }); + let texture = (tone.texture != 0.0).then(|| texture(w, h, &lum, tone.texture)); + Some(ToneMap { w, h, work, texture, black }) + } + + /// The gain at full-size pixel (`x`, `y`) of linear luminance `lum`. + pub(crate) fn gain(&self, x: usize, y: usize, lum: f32) -> f32 { + if self.work.is_none() && self.texture.is_none() { + return 1.0; + } + let c = [&self.work, &self.texture].iter().filter_map(|u| u.as_ref()).map(|u| u.change(self.w, self.h, x, y, lum)).sum::(); + c.clamp(-6.0, 6.0).exp2() + } + + /// Black-point subtraction of one linear value. + #[inline] + pub(crate) fn unblack(&self, v: f32) -> f32 { + if self.black > 0.0 { ((v - self.black) / (1.0 - self.black)).max(0.0) } else { v } + } +} + +/// The black point of an image of luminance `lum` for the profile's factor (0: none): `factor` +/// times the 0.1th percentile of the work copy's linear luminance. +pub(crate) fn black_level(w: usize, h: usize, lum: impl Fn(usize) -> f32 + Sync, factor: f32) -> f32 { + if w == 0 || h == 0 || factor <= 0.0 { + return 0.0; + } + let (_, _, y) = reduce(w, h, WORK_SIDE, |i| [lum(i)]); + let y: Vec = y.into_iter().map(|[v]| v).collect(); + factor * quantile(&y, 0.001).max(2f32.powi(-20)) +} + +/// The slider's table for its direction and its weight 0…1. +fn direction(s: f32, up: &'static T, down: &'static T) -> (f32, &'static T) { + let s = s.clamp(-100.0, 100.0) / 100.0; + if s >= 0.0 { (s, up) } else { (-s, down) } +} + +/// A table on evenly spaced knots `lo`, `lo + step`, …, read linearly, flat beyond its ends. +fn even(c: &[f32; N], lo: f32, step: f32, x: f32) -> f32 { + let t = ((x - lo) / step).clamp(0.0, (N - 1) as f32); + let i = (t as usize).min(N - 2); + c[i] + (c[i + 1] - c[i]) * (t - i as f32) +} + +/// Adds Clarity `s` to `change`: bands of `l` between guided bases, each scaled by a gain that +/// follows its base's tone (relative to `geo`), and a tone term of the coarsest base. +fn clarity(change: &mut [f32], l: &[f32], sw: usize, sh: usize, geo: f32, scale: f32, s: f32) { + let (k, t) = direction(s, &tables::CLARITY_UP, &tables::CLARITY_DOWN); + let mut prev = l.to_vec(); + for (band, r) in CLARITY_RADII.iter().enumerate() { + let base = guided(l, l, sw, sh, ((r * scale).round() as usize).max(1), CLARITY_EPS); + for ((c, p), b) in change.iter_mut().zip(&prev).zip(&base) { + *c += k * (p - b) * even(&t.bands[band], tables::CLARITY_TONE_LO, tables::CLARITY_TONE_STEP, b - geo); + } + prev = base; + } + for (c, b) in change.iter_mut().zip(&prev) { + *c += k * (even(&t.base, tables::CLARITY_BASE_LO, tables::CLARITY_BASE_STEP, b - geo) + t.offset); + } +} + +/// Texture `s` on a half-size copy: each Gaussian band of log₂ luminance through its measured +/// response (zero for flat areas), carried to full size. +fn texture(w: usize, h: usize, lum: &(impl Fn(usize) -> f32 + Sync), s: f32) -> Upsampled { + let (sw, sh, y) = reduce(w, h, TEXTURE_SIDE, |i| [lum(i)]); + let y: Vec = y.into_iter().map(|[v]| v).collect(); + let p01 = quantile(&y, 0.001).max(2f32.powi(-20)); + let l: Vec = y.iter().map(|v| v.max(p01).log2()).collect(); + let scale = sw.max(sh) as f32 / TEXTURE_SIDE as f32; + let (k, t) = direction(s, &tables::TEXTURE_UP, &tables::TEXTURE_DOWN); + let mut change = vec![0.0f32; l.len()]; + let mut prev = l.clone(); + for (band, sigma) in TEXTURE_SIGMAS.iter().enumerate() { + let base = gauss(&l, sw, sh, sigma * scale); + let zero = knots(&t[band], 0.0); + for ((c, p), b) in change.iter_mut().zip(&prev).zip(&base) { + *c += k * (knots(&t[band], p - b) - zero); + } + prev = base; + } + let (a, b) = linear_fit(&l, &change, sw, sh, 2, TEXTURE_UPSAMPLE_EPS); + Upsampled { sw, sh, a, b, floor: p01.log2() } +} + +/// Texture's band response on the knots [`tables::TEXTURE_KNOTS`], read linearly, flat beyond. +fn knots(c: &[f32; 11], d: f32) -> f32 { + let k = &tables::TEXTURE_KNOTS; + let d = d.clamp(k[0], k[10]); + let i = k.partition_point(|v| *v <= d).clamp(1, 10); + let f = (d - k[i - 1]) / (k[i] - k[i - 1]); + c[i - 1] + (c[i] - c[i - 1]) * f +} + +/// Gaussian blur of `v` (`w × h`), σ `sigma`, radius ⌈3σ⌉, mirrored edges. +fn gauss(v: &[f32], w: usize, h: usize, sigma: f32) -> Vec { + if sigma <= 0.05 { + return v.to_vec(); + } + let r = (3.0 * sigma).ceil() as isize; + let mut k: Vec = (-r..=r).map(|x| (-(x * x) as f32 / (2.0 * sigma * sigma)).exp()).collect(); + let sum: f32 = k.iter().sum(); + k.iter_mut().for_each(|v| *v /= sum); + let rows = par::map(h, |y| { + let src = &v[y * w..(y + 1) * w]; + (0..w as isize).map(|x| k.iter().enumerate().map(|(j, kv)| kv * src[mirror(x + j as isize - r, w)]).sum::()).collect::>() + }); + let tmp = rows.concat(); + let cols = par::map(w, |x| { + (0..h as isize).map(|y| k.iter().enumerate().map(|(j, kv)| kv * tmp[mirror(y + j as isize - r, h) * w + x]).sum::()).collect::>() + }); + let mut out = vec![0.0f32; w * h]; + for (x, col) in cols.iter().enumerate() { + for (y, v) in col.iter().enumerate() { + out[y * w + x] = *v; + } + } + out +} + +/// Minimum over a `(2r + 1)²` window, edges clamped. +fn min_filter(v: &[f32], w: usize, h: usize, r: usize) -> Vec { + let rows = par::map(h, |y| { + let src = &v[y * w..(y + 1) * w]; + (0..w).map(|x| src[x.saturating_sub(r)..=(x + r).min(w - 1)].iter().fold(f32::MAX, |a, b| a.min(*b))).collect::>() + }); + let tmp = rows.concat(); + let cols = + par::map(w, |x| (0..h).map(|y| (y.saturating_sub(r)..=(y + r).min(h - 1)).map(|yy| tmp[yy * w + x]).fold(f32::MAX, f32::min)).collect::>()); + let mut out = vec![0.0f32; w * h]; + for (x, col) in cols.iter().enumerate() { + for (y, v) in col.iter().enumerate() { + out[y * w + x] = *v; + } + } + out +} + +/// Camera Raw's Dehaze on linear ProPhoto RGB (see the module docs). +pub(crate) struct Haze { + w: usize, + h: usize, + sw: usize, + sh: usize, + /// Transmission per work-copy pixel (Dehaze > 0); empty for the veil of Dehaze < 0. + t: Vec, + /// Airlight, linear ProPhoto. + air: [f32; 3], + /// Weight of the uniform veil (Dehaze < 0). + veil: f32, +} + +impl Haze { + /// `px(i)`: linear ProPhoto RGB of full-size pixel `i`. `None` at 0. + pub(crate) fn new(w: usize, h: usize, px: impl Fn(usize) -> [f32; 3] + Sync, amount: f32) -> Option { + let amount = amount.clamp(-100.0, 100.0) / 100.0; + if w == 0 || h == 0 || amount == 0.0 { + return None; + } + let (sw, sh, small) = reduce(w, h, WORK_SIDE, px); + let p3 = |v: &[f32; 3]| PRO_TO_P3.map(|row| (row[0] * v[0] + row[1] * v[1] + row[2] * v[2]).max(0.0)); + let small_p3: Vec<[f32; 3]> = small.iter().map(p3).collect(); + // Airlight: mean colour of the 0.1 % of pixels with the brightest dark channel. + let dc: Vec = small_p3.iter().map(|c| c[0].min(c[1]).min(c[2])).collect(); + let top = (dc.len() / 1000).max(1); + let mut idx: Vec = (0..dc.len()).collect(); + idx.select_nth_unstable_by(top - 1, |a, b| dc[*b].total_cmp(&dc[*a])); + let mut air = [0.0f32; 3]; + for i in &idx[..top] { + for c in 0..3 { + air[c] += small[*i][c] / top as f32; + } + } + let air = air.map(|v| v.max(1e-6)); + if amount < 0.0 { + return Some(Haze { w, h, sw, sh, t: Vec::new(), air, veil: HAZE_DOWN * -amount }); + } + let air_p3 = p3(&air).map(|v| v.max(1e-6)); + let scale = sw.max(sh) as f32 / WORK_SIDE as f32; + let dark0: Vec = small_p3.iter().map(|c| (0..3).map(|k| c[k] / air_p3[k]).fold(f32::MAX, f32::min)).collect(); + let dark = min_filter(&dark0, sw, sh, ((HAZE_RADIUS * scale).round() as usize).max(1)); + let y = crate::color::rgb_to_xyz(crate::color::ROMM, crate::color::D50_XY)[1].map(|v| v as f32); + let lum = |c: &[f32; 3]| y[0] * c[0] + y[1] * c[1] + y[2] * c[2]; + let air_y = lum(&air).max(1e-6); + let guide: Vec = small.iter().map(|c| lum(c) / air_y).collect(); + let smooth = guided(&guide, &dark, sw, sh, ((HAZE_SMOOTH * scale).round() as usize).max(1), HAZE_EPS); + let wgt = HAZE_UP * amount; + let t = smooth.iter().map(|d| (1.0 - wgt * d).max(HAZE_T0)).collect(); + Some(Haze { w, h, sw, sh, t, air, veil: 0.0 }) + } + + /// Dehaze at full-size pixel (`x`, `y`) of linear ProPhoto `v`. + pub(crate) fn apply(&self, x: usize, y: usize, v: [f32; 3]) -> [f32; 3] { + if self.t.is_empty() { + return [0, 1, 2].map(|c| v[c] * (1.0 - self.veil) + self.air[c] * self.veil); + } + let t = bilinear(&self.t, self.sw, self.sh, self.w, self.h, x, y).max(HAZE_T0); + [0, 1, 2].map(|c| ((v[c] - self.air[c]) / t + self.air[c]).max(0.0)) + } +} + +fn curve(c: &[f32; 73], d: f32) -> f32 { + let t = ((d - LO) / STEP).clamp(0.0, (c.len() - 1) as f32); + let i = (t as usize).min(c.len() - 2); + let f = t - i as f32; + c[i] + (c[i + 1] - c[i]) * f +} + +/// log₂ gain of Shadows `s` (−100…100) at `d` stops from its anchor. +fn shadows(s: f32, d: f32) -> f32 { + let s = s.clamp(-100.0, 100.0) / 100.0; + if s > 0.0 { + s * curve(&SHADOWS_UP, d) + } else if s < 0.0 { + -s * curve(&SHADOWS_DOWN, d) + } else { + 0.0 + } +} + +/// log₂ gain of Highlights `h` (−100…100) at `d` stops from its anchor. +fn highlights(h: f32, d: f32) -> f32 { + let h = h.clamp(-100.0, 100.0) / 100.0; + if h > 0.0 { + h * curve(&HIGHLIGHTS_UP, d) + } else if h < 0.0 { + -h * curve(&HIGHLIGHTS_DOWN, d) + } else { + 0.0 + } +} + +/// The `q` quantile (0…1) of `v`. +fn quantile(v: &[f32], q: f32) -> f32 { + let mut s = v.to_vec(); + let k = ((s.len() - 1) as f32 * q).round() as usize; + let (_, m, _) = s.select_nth_unstable_by(k, |a, b| a.total_cmp(b)); + *m +} + +/// Index `i` mirrored into `0..n` (half-sample symmetric: … 1 0 | 0 1 … n−1 | n−1 n−2 …). +fn mirror(i: isize, n: usize) -> usize { + let n = n as isize; + let p = i.rem_euclid(2 * n); + (if p < n { p } else { 2 * n - 1 - p }) as usize +} + +/// Box mean of radius `r` with mirrored edges. +fn box_mean(v: &[f32], w: usize, h: usize, r: usize) -> Vec { + let k = (2 * r + 1) as f64; + let ri = r as isize; + let rows = par::map(h, |y| { + let src = &v[y * w..(y + 1) * w]; + let mut acc: f64 = (-ri..=ri).map(|i| f64::from(src[mirror(i, w)])).sum(); + let mut out = vec![0.0f32; w]; + for (x, o) in out.iter_mut().enumerate() { + *o = (acc / k) as f32; + let x = x as isize; + acc += f64::from(src[mirror(x + ri + 1, w)]) - f64::from(src[mirror(x - ri, w)]); + } + out + }); + let tmp = rows.concat(); + let cols = par::map(w, |x| { + let at = |y: isize| f64::from(tmp[mirror(y, h) * w + x]); + let mut acc: f64 = (-ri..=ri).map(at).sum(); + let mut out = vec![0.0f32; h]; + for (y, o) in out.iter_mut().enumerate() { + *o = (acc / k) as f32; + let y = y as isize; + acc += at(y + ri + 1) - at(y - ri); + } + out + }); + let mut out = vec![0.0f32; w * h]; + for (x, col) in cols.iter().enumerate() { + for (y, v) in col.iter().enumerate() { + out[y * w + x] = *v; + } + } + out +} + +/// Local linear fit `p ≈ a · i + b` over boxes of radius `r` (regularized by `eps`), with `a` +/// and `b` box-averaged (K. He, J. Sun, X. Tang, *Guided Image Filtering*, 2010). +fn linear_fit(i: &[f32], p: &[f32], w: usize, h: usize, r: usize, eps: f32) -> (Vec, Vec) { + let ip: Vec = i.iter().zip(p).map(|(a, b)| a * b).collect(); + let ii: Vec = i.iter().map(|a| a * a).collect(); + let (mi, mp, mip, mii) = (box_mean(i, w, h, r), box_mean(p, w, h, r), box_mean(&ip, w, h, r), box_mean(&ii, w, h, r)); + let a: Vec = (0..w * h).map(|k| (mip[k] - mi[k] * mp[k]) / ((mii[k] - mi[k] * mi[k]).max(0.0) + eps)).collect(); + let b: Vec = (0..w * h).map(|k| mp[k] - a[k] * mi[k]).collect(); + (box_mean(&a, w, h, r), box_mean(&b, w, h, r)) +} + +/// Guided filter of `p` with guide `i`. +fn guided(i: &[f32], p: &[f32], w: usize, h: usize, r: usize, eps: f32) -> Vec { + let (a, b) = linear_fit(i, p, w, h, r, eps); + a.iter().zip(&b).zip(i).map(|((a, b), i)| a * i + b).collect() +} + +/// The raw-stage sliders ([`Tone`]) on an image [`develop`](crate::develop) already made (gamma-1.8 ProPhoto +/// RGBA, 0…1) with the profile tone `curve`, for a preview of the open-time setting: the curve is +/// undone, the change applied in linear light and the curve redone. The developed pixels already +/// carry the black point, so the change's map is computed from the luminance after it rather +/// than before; that only differs in the deepest shadows. +pub fn retone(px: &mut [[f32; 4]], w: usize, h: usize, curve: &[[f32; 2]], tone: Tone) { + if tone.is_neutral() || w == 0 || h == 0 || px.len() < w * h { + return; + } + let forward = |v: f32| crate::develop::tone(curve, v.clamp(0.0, 1.0)).clamp(0.0, 1.0).powf(1.0 / 1.8); + // The inverse from a table over s = √v (the encoding is steep near 0). + const N: usize = 4096; + let table: Vec = (0..=N).map(|i| forward((i as f32 / N as f32).powi(2))).collect(); + let inverse = |e: f32| { + let i = table.partition_point(|t| *t < e).clamp(1, N); + let (a, b) = (table[i - 1], table[i]); + let f = if b > a { ((e - a) / (b - a)).clamp(0.0, 1.0) } else { 0.0 }; + ((i - 1) as f32 + f) / N as f32 + }; + let mut lin: Vec<[f32; 3]> = px.iter().map(|p| [0, 1, 2].map(|k| inverse(p[k]).powi(2))).collect(); + if let Some(haze) = Haze::new(w, h, |i| lin[i], tone.dehaze) { + for (i, l) in lin.iter_mut().enumerate() { + *l = haze.apply(i % w, i / w, *l); + } + } + let y = crate::color::rgb_to_xyz(crate::color::ROMM, crate::color::D50_XY)[1].map(|v| v as f32); + let lum = |c: &[f32; 3]| y[0] * c[0] + y[1] * c[1] + y[2] * c[2]; + let map = ToneMap::new(w, h, |i| lum(&lin[i]), tone, 0.0); + for (i, (p, l)) in px.iter_mut().zip(&lin).enumerate() { + let g = map.as_ref().map_or(1.0, |m| m.gain(i % w, i / w, lum(l))); + for k in 0..3 { + p[k] = forward(l[k] * g); + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + + const SHADOWS: Tone = Tone { shadows: 100.0, ..Tone::NEUTRAL }; + const HIGHLIGHTS: Tone = Tone { highlights: -100.0, ..Tone::NEUTRAL }; + + /// Three vertical bands of linear luminance 2⁻⁷ | 2⁻⁴ | 2⁻¹, times `scale`. + fn bands(w: usize, h: usize, scale: f32) -> Vec { + (0..w * h).map(|i| scale * [2f32.powi(-7), 2f32.powi(-4), 0.5][(i % w) * 3 / w]).collect() + } + + fn gains(y: &[f32], w: usize, h: usize, tone: Tone) -> Vec { + let Some(m) = ToneMap::new(w, h, |i| y[i], tone, 0.0) else { return vec![1.0; w * h] }; + (0..w * h).map(|i| m.gain(i % w, i / w, y[i])).collect() + } + + #[test] + fn shadows_lift_the_dark_area_and_keep_the_bright_one() { + let (w, h) = (300, 120); + let g = gains(&bands(w, h, 1.0), w, h, SHADOWS); + let (dark, mid, bright) = (g[60 * w + 50], g[60 * w + 150], g[60 * w + 250]); + // 5 stops below the anchor: about +2 stops, as Camera Raw lifts such areas; 1 stop above it: almost nothing. + assert!(dark.log2() > 1.8 && dark.log2() < 2.3, "{dark}"); + assert!(mid > 1.0 && mid < dark, "{mid}"); + assert!(bright.log2() < 0.06, "{bright}"); + } + + #[test] + fn highlights_lower_the_bright_area_and_keep_the_dark_one() { + let (w, h) = (300, 120); + let g = gains(&bands(w, h, 1.0), w, h, HIGHLIGHTS); + let (dark, bright) = (g[60 * w + 50], g[60 * w + 250]); + // 3 stops above the anchor about −1 stop; 3 below a slight darkening (Camera Raw lowers a + // high-contrast frame as a whole a little too). + assert!(dark.log2() < 0.0 && dark.log2() > -0.15, "{dark}"); + assert!(bright.log2() < -0.8 && bright.log2() > -1.3, "{bright}"); + } + + #[test] + fn exposure_changes_nothing() { + let (w, h) = (300, 120); + for tone in [SHADOWS, HIGHLIGHTS, Tone { shadows: -60.0, highlights: 40.0, clarity: 50.0, texture: -40.0, ..Tone::NEUTRAL }] { + let (a, b) = (gains(&bands(w, h, 1.0), w, h, tone), gains(&bands(w, h, 0.25), w, h, tone)); + assert!(a.iter().zip(&b).all(|(a, b)| (a - b).abs() < 1e-3 * a), "{tone:?}"); + } + } + + #[test] + fn areas_move_as_a_whole_without_a_halo() { + // Next to an edge the change stays between the two areas' changes (no over- or undershoot) + // and close to the change inside the area. + let (w, h) = (600, 120); + let g: Vec = gains(&bands(w, h, 1.0), w, h, SHADOWS).iter().map(|g| g.log2()).collect(); + let row = &g[60 * w..61 * w]; + let (dark, mid) = (row[w / 6], row[w / 2]); + for (x, v) in row.iter().enumerate().take(w / 2).skip(w / 6) { + assert!(*v <= dark + 1e-3 && *v >= mid - 1e-3, "{x}: {v} outside {mid}…{dark}"); + } + // Within 0.3 stop: near strong edges the change matches Photoshop as well as elsewhere. + assert!(dark - row[w / 3 - 2] < 0.3 && row[w / 3 + 2] - mid < 0.3, "{} {} | {} {}", dark, row[w / 3 - 2], row[w / 3 + 2], mid); + } + + #[test] + fn the_result_does_not_depend_on_the_image_size() { + let probe = |w: usize, h: usize| { + let g = gains(&bands(w, h, 1.0), w, h, SHADOWS); + [w / 6, w / 2, 5 * w / 6].map(|x| g[(h / 2) * w + x].log2()) + }; + let (a, b) = (probe(4928, 1640), probe(1232, 410)); + assert!(a.iter().zip(&b).all(|(a, b)| (a - b).abs() < 0.02), "{a:?} vs {b:?}"); + } + + #[test] + fn the_black_point_follows_the_darkest_tones() { + let (w, h) = (300, 120); + let y = bands(w, h, 1.0); + let m = ToneMap::new(w, h, |i| y[i], Tone::default(), 0.33).unwrap(); + assert!((m.black - 0.33 * 2f32.powi(-7)).abs() < 1e-7, "{}", m.black); + assert!(m.unblack(m.black * 0.5) == 0.0 && (m.unblack(1.0) - 1.0).abs() < 1e-6); + assert!(ToneMap::new(w, h, |i| y[i], Tone::default(), 0.0).is_none()); + } + + /// log₂ luminance of a `w × h` image: `base` plus a vertical sine of `amp` stops and period `period` px. + fn stripes(w: usize, h: usize, base: f32, amp: f32, period: f32) -> Vec { + (0..w * h).map(|i| (base + amp * ((i % w) as f32 * std::f32::consts::TAU / period).sin()).exp2()).collect() + } + + /// Peak-to-peak log₂ luminance over the middle row's central half, after the gains. + fn swing(y: &[f32], g: &[f32], w: usize, h: usize) -> f32 { + let row = (h / 2) * w; + let v: Vec = (w / 4..3 * w / 4).map(|x| (y[row + x] * g[row + x]).log2()).collect(); + v.iter().cloned().fold(f32::MIN, f32::max) - v.iter().cloned().fold(f32::MAX, f32::min) + } + + #[test] + fn clarity_raises_midtone_detail_and_minus_flattens_it() { + let (w, h) = (1232, 200); + let y = stripes(w, h, -2.5, 0.25, 40.0); + let before = swing(&y, &vec![1.0; w * h], w, h); + let up = swing(&y, &gains(&y, w, h, Tone { clarity: 100.0, ..Tone::NEUTRAL }), w, h); + let down = swing(&y, &gains(&y, w, h, Tone { clarity: -100.0, ..Tone::NEUTRAL }), w, h); + // Measured: +100 roughly doubles midtone detail, −100 flattens it by more than a third. + assert!(up > 1.5 * before && up < 3.5 * before, "{before} → {up}"); + assert!(down < 0.8 * before && down > 0.1 * before, "{before} → {down}"); + } + + #[test] + fn texture_raises_fine_detail_more_than_coarse_and_leaves_flat_areas() { + let (w, h) = (2464, 160); + let fine = stripes(w, h, -2.5, 0.1, 6.0); + let coarse = stripes(w, h, -2.5, 0.1, 600.0); + let gain = |y: &[f32]| swing(y, &gains(y, w, h, Tone { texture: 100.0, ..Tone::NEUTRAL }), w, h) / swing(y, &vec![1.0; w * h], w, h); + let (f, c) = (gain(&fine), gain(&coarse)); + assert!(f > 1.15, "fine detail ×{f}"); + assert!(c < 1.05 && f > c + 0.1, "coarse ×{c}, fine ×{f}"); + let flat = vec![0.2f32; 400 * 300]; + assert!(gains(&flat, 400, 300, Tone { texture: 100.0, ..Tone::NEUTRAL }).iter().all(|g| (g - 1.0).abs() < 1e-4)); + } + + #[test] + fn dehaze_lowers_the_haze_and_minus_adds_a_veil() { + // A pale, hazy sky (top) over a darker, colourful ground. + let (w, h) = (400, 300); + let px: Vec<[f32; 3]> = (0..w * h).map(|i| if i / w < h / 2 { [0.55, 0.6, 0.7] } else { [0.12, 0.08, 0.03] }).collect(); + let up = Haze::new(w, h, |i| px[i], 100.0).unwrap(); + let (sky, ground) = (up.apply(200, 40, px[40 * w + 200]), up.apply(200, 260, px[260 * w + 200])); + // The airlight itself stays; what is darker than it moves away from it. + assert!(sky.iter().zip(&px[40 * w + 200]).all(|(a, b)| (a - b).abs() < 0.02), "{sky:?}"); + assert!(ground[2] < 0.03 && ground[0] <= 0.12, "{ground:?}"); + let down = Haze::new(w, h, |i| px[i], -100.0).unwrap(); + let veiled = down.apply(200, 260, px[260 * w + 200]); + assert!((0..3).all(|c| veiled[c] > px[260 * w + 200][c]), "{veiled:?}"); + assert!(Haze::new(w, h, |i| px[i], 0.0).is_none()); + } + + #[test] + fn retone_changes_nothing_at_zero_and_matches_the_develop_stage() { + let (w, h) = (300, 120); + let y = bands(w, h, 1.0); + let curve = [[0.01, 0.02], [0.1, 0.25], [1.0, 1.0]]; + let enc = |v: f32| crate::develop::tone(&curve, v).powf(1.0 / 1.8); + let px: Vec<[f32; 4]> = y.iter().map(|v| [enc(*v), enc(*v), enc(*v), 1.0]).collect(); + let mut same = px.clone(); + retone(&mut same, w, h, &curve, Tone::default()); + assert_eq!(same, px); + let mut out = px.clone(); + retone(&mut out, w, h, &curve, SHADOWS); + let g = gains(&y, w, h, SHADOWS); + for i in [60 * w + 50, 60 * w + 150, 60 * w + 250] { + assert!((out[i][0] - enc(y[i] * g[i])).abs() < 0.003, "{i}: {} vs {}", out[i][0], enc(y[i] * g[i])); + } + } +} diff --git a/crates/raw/src/tone/tables.rs b/crates/raw/src/tone/tables.rs new file mode 100644 index 00000000..eb489236 --- /dev/null +++ b/crates/raw/src/tone/tables.rs @@ -0,0 +1,66 @@ +//! Measured tables for Clarity and Texture (see the parent module's docs). Generated by +//! photoshop-acr-re `tools/export_presence.py` from the fits in `tools/presfinal.py`. + +/// Clarity's tone knots for the band gains (relative to the frame's mean log₂ luminance) +/// and for the tone term. +pub(super) const CLARITY_TONE_LO: f32 = -8.0; +pub(super) const CLARITY_TONE_STEP: f32 = 2.0; +pub(super) const CLARITY_BASE_LO: f32 = -8.0; +pub(super) const CLARITY_BASE_STEP: f32 = 1.0; + +/// One direction of Clarity at full strength: per band (finest first) the gain of the band +/// against its base's tone, the tone term of the coarsest base, and a constant (log₂). +pub(super) struct Clarity { + pub(super) bands: [[f32; 7]; 4], + pub(super) base: [f32; 13], + pub(super) offset: f32, +} + +/// Clarity +100 (cross-validated effect correlation 0.81). +pub(super) const CLARITY_UP: Clarity = Clarity { + bands: [ + [0.9573, 0.9573, 0.9573, 1.5534, 1.3206, 1.0011, 1.1671], + [1.0920, 1.0920, 1.0920, 1.1946, 0.9268, 0.5702, 1.1336], + [0.7149, 0.7149, 0.7149, 0.9739, 0.8363, 0.5026, 0.6025], + [0.9620, 0.9620, 0.9620, 0.5886, 0.4937, 0.2263, 0.7602], + ], + base: [0.2924, 0.2924, 0.2924, 0.2924, 0.2924, 0.2924, 0.1063, 0.0520, 0.2993, 0.2779, -0.0507, -0.0348, -0.2987], + offset: -0.2342, +}; + +/// Clarity -100 (cross-validated effect correlation 0.92). +pub(super) const CLARITY_DOWN: Clarity = Clarity { + bands: [ + [-0.0449, -0.0449, -0.0449, 0.0021, -0.5728, -1.0000, -0.8334], + [-0.0734, -0.0734, -0.0734, -0.0653, -0.7011, -1.0000, -0.8558], + [-0.0462, -0.0462, -0.0462, -0.0394, -0.4121, -0.6502, -0.5797], + [0.0527, 0.0527, 0.0527, -0.0505, 0.0206, 0.0066, 0.0594], + ], + base: [-0.0179, -0.0179, -0.0179, -0.0179, -0.0179, -0.0179, -0.0079, -0.0138, 0.0165, 0.0167, 0.0509, 0.0485, 0.0390], + offset: 0.0107, +}; + +/// Texture's band-response knots (stops of band detail). +pub(super) const TEXTURE_KNOTS: [f32; 11] = [-2.0000, -1.0000, -0.5000, -0.2500, -0.1000, 0.0000, 0.1000, 0.2500, 0.5000, 1.0000, 2.0000]; + +/// Texture +100: per band (σ 0.5 … 16 on the half-size copy) its change against +/// the band's detail on [`TEXTURE_KNOTS`] (cross-validated correlation 0.89). +pub(super) const TEXTURE_UP: [[f32; 11]; 6] = [ + [-0.1951, -0.1951, -0.1951, -0.1951, -0.0637, -0.0122, 0.0595, 0.2096, 0.2096, 0.2096, 0.2096], + [-0.0598, -0.0598, -0.0598, -0.1444, -0.0747, -0.0089, 0.0477, 0.0790, 0.0494, 0.0494, 0.0494], + [-0.0648, -0.0648, -0.0648, -0.1096, -0.0822, -0.0196, 0.0420, 0.0509, 0.0331, 0.0331, 0.0331], + [-0.0886, -0.0886, -0.0886, -0.0958, -0.0526, 0.0136, 0.0836, 0.0817, 0.0851, 0.0851, 0.0851], + [-0.0728, -0.0728, -0.0728, -0.0525, -0.0203, 0.0305, 0.0752, 0.0759, 0.0762, 0.0408, 0.0408], + [-0.0140, -0.0140, 0.0051, 0.0180, 0.0141, 0.0207, 0.0181, 0.0092, 0.0050, -0.0051, -0.0051], +]; + +/// Texture -100: per band (σ 0.5 … 16 on the half-size copy) its change against +/// the band's detail on [`TEXTURE_KNOTS`] (cross-validated correlation 0.91). +pub(super) const TEXTURE_DOWN: [[f32; 11]; 6] = [ + [0.0194, 0.0194, 0.0194, 0.0194, -0.1470, -0.2059, -0.2565, -0.3623, -0.3623, -0.3623, -0.3623], + [0.1957, 0.1957, 0.1957, 0.2306, 0.1984, 0.1493, 0.0965, 0.0527, 0.0333, 0.0333, 0.0333], + [0.0426, 0.0426, 0.0426, 0.0942, 0.0664, 0.0104, -0.0384, -0.0452, -0.0167, -0.0167, -0.0167], + [0.0725, 0.0725, 0.0725, 0.0795, 0.0659, 0.0050, -0.0538, -0.0603, -0.0689, -0.0689, -0.0689], + [0.0771, 0.0771, 0.0771, 0.0492, 0.0319, -0.0107, -0.0507, -0.0533, -0.0512, -0.0225, -0.0225], + [0.0137, 0.0137, 0.0027, -0.0062, -0.0018, -0.0046, -0.0051, 0.0038, 0.0086, 0.0170, 0.0170], +]; diff --git a/crates/ui-egui/src/camera_raw_ui.rs b/crates/ui-egui/src/camera_raw_ui.rs index 8b77e7a0..c939714d 100644 --- a/crates/ui-egui/src/camera_raw_ui.rs +++ b/crates/ui-egui/src/camera_raw_ui.rs @@ -64,6 +64,9 @@ pub struct CameraRawDialog { pub render_ms: f64, /// Set for the open-time dialog ([`Target::OpenRaw`]). raw_open: Option, + /// The open-time dialog's camera tone curve: Shadows / Highlights act on the raw data there, + /// in linear light before this curve, and the preview undoes it to show the same. + raw_curve: Option>, } impl CameraRawDialog { @@ -129,6 +132,11 @@ impl CameraRawDialog { let mut px = self.proxy.clone(); let mut p = self.params.clone(); p.pixel_scale = (self.pw as f32 / self.full_w.max(1) as f32).min(1.0); + if let Some(curve) = &self.raw_curve { + let tone = raw_stage(&p); + photocraft_io::raw::retone(&mut px, self.pw, self.ph, curve, tone); + (p.shadows, p.highlights, p.clarity, p.texture, p.dehaze) = (0.0, 0.0, 0.0, 0.0, 0.0); + } photocraft_algo::camera_raw::develop(&mut px, self.pw, self.ph, &p, self.float); if let Some(mask) = &self.selection { for ((out, original), coverage) in px.iter_mut().zip(&self.proxy).zip(mask) { @@ -174,9 +182,10 @@ enum Target { /// A raw file opened interactively, shown in Camera Raw before it is kept (as Photoshop opens /// raws in Adobe Camera Raw first). The document is already developed with the defaults; Open -/// re-develops it when Temperature, Tint or Exposure changed (those act on the sensor data, see -/// [`photocraft_io::raw::import_raw_tuned`]) and applies the other settings as one Camera Raw -/// step, then marks the document unmodified. Cancel closes it. +/// re-develops it when Temperature, Tint, Exposure, Shadows, Highlights, Clarity, Texture or +/// Dehaze changed (those act on the sensor data, see [`photocraft_io::raw::import_raw_tuned`]) +/// and applies the other settings as one Camera Raw step, then marks the document unmodified. +/// Cancel closes it. #[derive(Clone, Debug)] pub struct RawOpen { pub document: photocraft_doc::DocId, @@ -216,8 +225,15 @@ fn open_raw(app: &mut PhotocraftApp, ctx: &egui::Context, raw: RawOpen) -> Resul app.session.set_active(index); let (layer, surf, _) = crate::distort_ui::active_pixels(app)?; open_pixels(app, ctx, layer, surf, CameraRaw::default(), Coverage::None, Target::OpenRaw)?; + let curve = match (&raw.bytes, &raw.path) { + (Some(b), _) => Some(photocraft_io::raw::tone_curve(b)), + #[cfg(not(target_arch = "wasm32"))] + (None, Some(p)) => std::fs::read(p).ok().map(|b| photocraft_io::raw::tone_curve(&b)), + _ => None, + }; if let Some(d) = app.camera_raw.as_mut() { d.layer_name = raw.name.clone(); + d.raw_curve = curve; d.raw_open = Some(raw); } Ok(()) @@ -256,6 +272,11 @@ pub struct Redevelop { filter_step: bool, } +/// The sliders a raw open applies while developing, before the tone curve (as Camera Raw does). +fn raw_stage(p: &CameraRaw) -> photocraft_io::raw::Tone { + photocraft_io::raw::Tone { shadows: p.shadows, highlights: p.highlights, clarity: p.clarity, texture: p.texture, dehaze: p.dehaze } +} + /// Open: re-develop for raw-stage settings, apply the rest, keep the document unmodified. /// /// Re-developing reads and decodes the whole raw again, so in the desktop app (background jobs @@ -264,7 +285,16 @@ pub struct Redevelop { /// (tests, the web) it runs inline. fn commit_open_raw(app: &mut PhotocraftApp, params: &CameraRaw, raw: &RawOpen) -> Result { let index = document_index(app, raw.document).ok_or("the raw document was closed")?; - let tuning = photocraft_io::raw::RawTuning { temperature: params.temperature, tint: params.tint, exposure: params.exposure }; + let tuning = photocraft_io::raw::RawTuning { + temperature: params.temperature, + tint: params.tint, + exposure: params.exposure, + shadows: params.shadows, + highlights: params.highlights, + clarity: params.clarity, + texture: params.texture, + dehaze: params.dehaze, + }; // Without the file the raw-stage settings stay RGB adjustments, like the filter's. let source = match (&raw.bytes, &raw.path) { (Some(b), _) => Some(photocraft_engine::jobs::OpenSource::Bytes(b.clone())), @@ -346,6 +376,11 @@ fn finish_redevelop(app: &mut PhotocraftApp, params: &CameraRaw, raw: &RawOpen, crate::notices::io_warnings(app, &format!("Opened {}", raw.name), &without_develop_note(&warnings)); let mut rest = params.clone(); rest.exposure = 0.0; + rest.shadows = 0.0; + rest.highlights = 0.0; + rest.clarity = 0.0; + rest.texture = 0.0; + rest.dehaze = 0.0; if v.get("wb").and_then(Value::as_bool) == Some(true) { rest.temperature = 0.0; rest.tint = 0.0; @@ -482,6 +517,10 @@ fn open_pixels( let st = app.session.active().ok_or("no document")?; let canvas = st.doc.bounds(); let name = st.doc.layer(layer).map(|l| l.name.clone()).unwrap_or_default(); + let mut params = params; + if params.encoding_gamma == 0.0 { + params.encoding_gamma = photocraft_engine::lens_cmds::encoding_gamma(&st.doc); + } // Use the engine filter domain, including pixels outside the canvas: spatial Camera Raw // stages (vignette, grain, local contrast) must agree with the committed result. let area = canvas.union(&surf.content_bounds()); @@ -591,6 +630,7 @@ fn open_pixels( curve_rect: None, render_ms: 0.0, raw_open: None, + raw_curve: None, }; d.render(ctx); app.camera_raw = Some(d); @@ -937,7 +977,8 @@ fn draw(app: &mut PhotocraftApp, ctx: &egui::Context, own_window: bool) { // Never tile a checker across the offscreen extent of a highly zoomed image. widgets::checker(preview.painter(), r.intersect(view), 8.0); preview.painter().image(tex.id(), r, ERect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE); - let detail_needed = r.width() * ctx.pixels_per_point() > d.pw as f32 || r.height() * ctx.pixels_per_point() > d.ph as f32; + let raw_tone = d.raw_curve.is_some() && !raw_stage(&d.params).is_neutral(); + let detail_needed = !raw_tone && (r.width() * ctx.pixels_per_point() > d.pw as f32 || r.height() * ctx.pixels_per_point() > d.ph as f32); d.detail.paint(&preview, r, d.preview_revision, d.show_before, &d.params, detail_needed, &d.display); if d.detail.pending() { ctx.request_repaint_after(std::time::Duration::from_millis(50)); @@ -1336,6 +1377,46 @@ mod tests { assert!(mean_red(&app) > before + 0.05, "{before} → {}", mean_red(&app)); } + #[test] + fn shadows_of_a_raw_open_act_on_the_raw_data_and_the_preview_shows_it() { + let (mut app, dng) = raw_app(); + let ctx = egui::Context::default(); + app.open_bytes("IMG_0002.dng", &dng).unwrap(); + let raw = app.pending_raw_open.take().unwrap(); + open_raw(&mut app, &ctx, raw).unwrap(); + assert!(app.camera_raw.as_ref().unwrap().raw_curve.is_some(), "the preview knows how the raw was developed"); + let mean = |px: &[[f32; 4]]| px.iter().map(|p| p[0] + p[1] + p[2]).sum::() / px.len() as f32; + let preview_before = mean(&app.camera_raw.as_ref().unwrap().processed); + let before = mean_red(&app); + menu(&mut app, &ctx, "filter.cameraRaw", &json!({"ui": {"set": {"shadows": 100}}})).unwrap().unwrap(); + let d = app.camera_raw.as_mut().unwrap(); + d.render(&ctx); + assert!(mean(&d.processed) > preview_before + 0.01, "{preview_before} → {}", mean(&d.processed)); + let r = menu(&mut app, &ctx, "filter.cameraRaw", &json!({"ui": {"commit": true}})).unwrap().unwrap(); + assert_eq!(r["redeveloped"], true, "{r}"); + assert!(r.get("filter").is_none(), "Shadows acts while developing, not as a later filter step: {r}"); + assert!(mean_red(&app) > before + 0.01, "{before} → {}", mean_red(&app)); + } + + #[test] + fn clarity_texture_and_dehaze_of_a_raw_open_act_on_the_raw_data() { + let (mut app, dng) = raw_app(); + let ctx = egui::Context::default(); + app.open_bytes("IMG_0003.dng", &dng).unwrap(); + let raw = app.pending_raw_open.take().unwrap(); + open_raw(&mut app, &ctx, raw).unwrap(); + let before = mean_red(&app); + let preview_before = app.camera_raw.as_ref().unwrap().processed.clone(); + menu(&mut app, &ctx, "filter.cameraRaw", &json!({"ui": {"set": {"clarity": 60, "texture": 40, "dehaze": 50}}})).unwrap().unwrap(); + let d = app.camera_raw.as_mut().unwrap(); + d.render(&ctx); + assert_ne!(d.processed, preview_before, "the preview shows the raw-stage change"); + let r = menu(&mut app, &ctx, "filter.cameraRaw", &json!({"ui": {"commit": true}})).unwrap().unwrap(); + assert_eq!(r["redeveloped"], true, "{r}"); + assert!(r.get("filter").is_none(), "they act while developing, not as a later filter step: {r}"); + assert!(mean_red(&app) < before, "Dehaze darkens: {before} → {}", mean_red(&app)); + } + #[test] fn background_redevelop_keeps_the_tab_position_and_view() { let (mut app, dng) = raw_app(); diff --git a/docs/control-protocol.md b/docs/control-protocol.md index 3f0be8eb..72d1902c 100644 --- a/docs/control-protocol.md +++ b/docs/control-protocol.md @@ -429,8 +429,9 @@ keeps the dialog open for correction. Nothing else writes document history. command line) of a camera raw developed from its sensor data shows this dialog first, titled "Camera Raw (name)", with **Open** and **Cancel**, as Photoshop opens raws in Adobe Camera Raw. `ui.inspect.cameraRaw.openingRaw` is then `{name, path}`. Commit (Open) re-develops the raw when -Temperature, Tint or Exposure changed (as-shot white-balance gains and develop exposure on the -sensor data; without an as-shot white balance, or without the file's bytes, they stay RGB +Temperature, Tint, Exposure, Shadows, Highlights, Clarity, Texture or Dehaze changed (as-shot +white-balance gains, develop exposure, and the other five in linear light before the camera's +tone curve, as Camera Raw does for raw files; without an as-shot white balance, or without the file's bytes, they stay RGB adjustments), applies the remaining settings as one `filter.cameraRaw` step and leaves the document unmodified; its result is `{document, redeveloped, filter?}`. Cancel closes the document. `app.open` and other automation opens never show the dialog. The preference From cbcdeb2549237785462ebbf5ba4560d0bfda6e3c Mon Sep 17 00:00:00 2001 From: MrCloudy2 <123890706+MrCloudy2@users.noreply.github.com> Date: Mon, 12 Oct 2026 14:52:57 +0200 Subject: [PATCH 69/92] Layer styles: Photoshop's measured contour presets; Satin's contour lookup (#3803) * fix(effects): Photoshop's measured contour presets; Satin reads contours from the far end The built-in contour presets were hand-drawn guesses and none matched Photoshop. They are now Photoshop 27.11's own curves, measured by running a Satin with each preset against a Linear one (38 levels per curve, thinned to within 1 %, straight segments). The measurement also showed how Satin applies a contour: |c(1 - v) - c(1)| (Cone and Cone - Inverted Satins are identical; a Gaussian Satin is 0.36 at 0.5 while the Gaussian on a glow is 0.64). New effects::satin_lut, used by the CPU and GPU satin paths. Probe results vs Photoshop (max level error): Satin with every preset <= 3 (Cove - Shallow 9), was up to 128; Outer Glow Gaussian 38 -> 2, Ring - Double 121 -> 15, Cone 48-52 -> 4-7; bevel Contour Cone at 100 % range 27 -> 12. Corpus oracles unchanged (their stored curves are symmetric). Gloss Contour is still off: that is the bevel's gloss model, not the presets. Co-Authored-By: Claude Opus 5.5 * Layer style UI test: the Contour Editor on the measured Cone The measured Cone preset has 18 points, all inner ones corners, so the editor test moves point 1 between its neighbours and checks the corner flags by position instead of the old three-point shape. Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 Co-authored-by: Brandon Thomas --- crates/compose/src/effects.rs | 12 +- crates/engine/src/layer_style.rs | 286 +++++++++++++++++++++++++++--- crates/gpu/src/fx.rs | 2 +- crates/ui-egui/src/layer_style.rs | 12 +- 4 files changed, 278 insertions(+), 34 deletions(-) diff --git a/crates/compose/src/effects.rs b/crates/compose/src/effects.rs index c594e5bd..05bd1f10 100644 --- a/crates/compose/src/effects.rs +++ b/crates/compose/src/effects.rs @@ -882,6 +882,16 @@ fn contour_lut(c: &Contour) -> Option> { } } +/// Satin's coverage transfer: the contour read from its far end, `|c(1 − v) − c(1)|`. Measured in +/// Photoshop 27.11: Cone and Cone − Inverted Satins are identical, and a Gaussian Satin runs under +/// the diagonal (0.36 at 0.5) while the same Gaussian on a glow or gloss runs over it (0.65). +/// `None` = identity. +pub fn satin_lut(c: &Contour) -> Option> { + let lut = contour_lut(c)?; + let end = lut.last().copied().unwrap_or(1.0); + Some(lut.iter().rev().map(|v| (v - end).abs()).collect()) +} + /// Interpolated lookup in a 0..=1 table (as the GPU's `lut()`). fn lut_at(l: &[f32], v: f32) -> f32 { let x = v.clamp(0.0, 1.0) * (l.len() - 1) as f32; @@ -1706,7 +1716,7 @@ fn satin_map(shape: &Map, s: &photocraft_doc::effects::Satin) -> Map { if s.invert { m = m.map(|v| 1.0 - v); } - let mut m = apply_contour(m, &s.contour); + let mut m = apply_lut(m, satin_lut(&s.contour)); for (v, a) in m.v.iter_mut().zip(&shape.v) { *v *= a; } diff --git a/crates/engine/src/layer_style.rs b/crates/engine/src/layer_style.rs index bf2d55a5..878bcaca 100644 --- a/crates/engine/src/layer_style.rs +++ b/crates/engine/src/layer_style.rs @@ -98,39 +98,250 @@ pub fn effect_defaults(kind: &str) -> Value { /// A contour preset point: input, output (both `0..=1`) and whether it is a corner. pub type ContourPoint = (f32, f32, bool); -/// Built-in contour presets, in the order of Photoshop's default contour picker. The shapes are -/// our own control points, drawn to match each preset's visible curve; imported PSD contours keep -/// their own points. Points are sorted by input; a corner point bends the curve sharply. +/// Built-in contour presets, in the order of Photoshop's default contour picker. Each is Photoshop's +/// own curve as measured in Photoshop 27.11 (a Satin of each preset against a Linear one, 38 +/// levels per curve, read back through Satin's mirrored lookup — see +/// `photocraft_compose::effects::satin_lut` — and thinned to within 1 %), joined by straight +/// segments (every inner point a corner). Imported PSD contours keep their own points. pub const CONTOURS: &[(&str, &[ContourPoint])] = &[ ("Linear", &[(0.0, 0.0, false), (1.0, 1.0, false)]), - ("Cone", &[(0.0, 0.0, false), (0.5, 1.0, true), (1.0, 0.0, false)]), - ("Cone - Inverted", &[(0.0, 1.0, false), (0.5, 0.0, true), (1.0, 1.0, false)]), - ("Cove - Deep", &[(0.0, 0.0, false), (0.3, 0.02, false), (0.6, 0.12, false), (0.85, 0.4, false), (1.0, 1.0, false)]), - ("Cove - Shallow", &[(0.0, 0.0, false), (0.5, 0.22, false), (1.0, 1.0, false)]), - ("Gaussian", &[(0.0, 0.0, false), (0.25, 0.08, false), (0.5, 0.5, false), (0.75, 0.92, false), (1.0, 1.0, false)]), - ("Half Round", &[(0.0, 0.0, false), (0.04, 0.28, false), (0.15, 0.53, false), (0.35, 0.8, false), (0.65, 0.95, false), (1.0, 1.0, false)]), - ("Ring", &[(0.0, 0.0, false), (0.25, 0.7, false), (0.5, 1.0, false), (0.75, 0.7, false), (1.0, 0.0, false)]), - ("Ring - Double", &[(0.0, 0.0, false), (0.25, 1.0, false), (0.5, 0.0, true), (0.75, 1.0, false), (1.0, 0.0, false)]), - ("Rolling Slope - Descending", &[(0.0, 1.0, false), (0.25, 0.62, false), (0.5, 0.58, false), (0.75, 0.28, false), (1.0, 0.0, false)]), ( - "Rounded Steps", + "Cone", &[ (0.0, 0.0, false), - (0.08, 0.01, false), - (0.165, 0.167, false), - (0.25, 0.323, false), - (0.333, 0.333, true), - (0.413, 0.343, false), - (0.5, 0.5, false), - (0.587, 0.657, false), - (0.667, 0.667, true), - (0.747, 0.677, false), - (0.833, 0.833, false), - (0.92, 0.99, false), + (0.172, 0.477, true), + (0.195, 0.555, true), + (0.266, 0.711, true), + (0.383, 0.922, true), + (0.43, 0.969, true), + (0.477, 0.992, true), + (0.523, 0.992, true), + (0.57, 0.969, true), + (0.664, 0.859, true), + (0.703, 0.789, true), + (0.742, 0.711, true), + (0.836, 0.477, true), + (0.859, 0.398, true), + (0.914, 0.266, true), + (0.945, 0.156, true), + (0.977, 0.078, true), + (1.0, 0.0, false), + ], + ), + ( + "Cone - Inverted", + &[ + (0.0, 1.0, false), + (0.031, 0.922, true), + (0.07, 0.789, true), + (0.172, 0.523, true), + (0.195, 0.445, true), + (0.266, 0.289, true), + (0.383, 0.078, true), + (0.43, 0.031, true), + (0.477, 0.008, true), + (0.523, 0.008, true), + (0.57, 0.031, true), + (0.664, 0.141, true), + (0.703, 0.211, true), + (0.742, 0.289, true), + (0.836, 0.523, true), + (0.859, 0.602, true), + (0.914, 0.734, true), + (0.945, 0.844, true), + (0.977, 0.922, true), (1.0, 1.0, false), ], ), - ("Sawtooth 1", &[(0.0, 0.0, false), (0.3, 1.0, true), (0.34, 0.0, true), (0.64, 1.0, true), (0.68, 0.0, true), (1.0, 1.0, false)]), + ( + "Cove - Deep", + &[ + (0.0, 0.258, false), + (0.344, 0.289, true), + (0.383, 0.297, true), + (0.477, 0.352, true), + (0.57, 0.43, true), + (0.617, 0.484, true), + (0.664, 0.57, true), + (0.703, 0.711, true), + (0.742, 0.906, true), + (0.773, 1.0, true), + (1.0, 1.0, false), + ], + ), + ( + "Cove - Shallow", + &[ + (0.0, 0.0, false), + (0.008, 0.164, true), + (0.016, 0.477, true), + (0.039, 0.508, true), + (0.172, 0.57, true), + (0.305, 0.688, true), + (0.344, 0.734, true), + (0.477, 0.945, true), + (0.523, 1.0, true), + (1.0, 1.0, false), + ], + ), + ( + "Gaussian", + &[ + (0.0, 0.0, false), + (0.117, 0.023, true), + (0.172, 0.055, true), + (0.234, 0.117, true), + (0.305, 0.234, true), + (0.383, 0.414, true), + (0.523, 0.688, true), + (0.617, 0.812, true), + (0.703, 0.891, true), + (0.805, 0.953, true), + (1.0, 1.0, false), + ], + ), + ( + "Half Round", + &[ + (0.0, 0.0, false), + (0.07, 0.18, true), + (0.195, 0.445, true), + (0.266, 0.555, true), + (0.383, 0.703, true), + (0.523, 0.828, true), + (0.617, 0.883, true), + (0.773, 0.945, true), + (1.0, 1.0, false), + ], + ), + ( + "Ring", + &[ + (0.0, 0.0, false), + (0.031, 0.078, true), + (0.039, 0.117, true), + (0.117, 0.383, true), + (0.172, 0.609, true), + (0.195, 0.734, true), + (0.266, 0.953, true), + (0.305, 1.0, true), + (0.344, 0.992, true), + (0.383, 0.922, true), + (0.43, 0.805, true), + (0.477, 0.641, true), + (0.57, 0.281, true), + (0.617, 0.141, true), + (0.664, 0.055, true), + (0.703, 0.016, true), + (0.742, 0.016, true), + (0.773, 0.062, true), + (0.836, 0.234, true), + (0.859, 0.344, true), + (0.891, 0.445, true), + (0.914, 0.547, true), + (0.945, 0.734, true), + (0.977, 0.875, true), + (1.0, 1.0, false), + ], + ), + ( + "Ring - Double", + &[ + (0.0, 0.0, false), + (0.055, 0.086, true), + (0.094, 0.172, true), + (0.117, 0.242, true), + (0.172, 0.477, true), + (0.195, 0.625, true), + (0.266, 0.891, true), + (0.305, 0.945, true), + (0.344, 0.891, true), + (0.383, 0.695, true), + (0.43, 0.367, true), + (0.477, 0.07, true), + (0.523, 0.047, true), + (0.57, 0.32, true), + (0.617, 0.648, true), + (0.664, 0.867, true), + (0.703, 0.93, true), + (0.742, 0.852, true), + (0.773, 0.641, true), + (0.805, 0.375, true), + (0.836, 0.156, true), + (0.859, 0.031, true), + (0.891, 0.023, true), + (0.914, 0.109, true), + (0.977, 0.703, true), + (0.984, 0.82, true), + (1.0, 1.0, false), + ], + ), + ( + "Rolling Slope - Descending", + &[ + (0.0, 1.0, false), + (0.008, 1.0, true), + (0.031, 0.93, true), + (0.039, 0.883, true), + (0.07, 0.758, true), + (0.141, 0.539, true), + (0.195, 0.406, true), + (0.266, 0.352, true), + (0.305, 0.352, true), + (0.523, 0.57, true), + (0.57, 0.602, true), + (0.617, 0.617, true), + (0.703, 0.602, true), + (0.742, 0.562, true), + (0.836, 0.391, true), + (0.914, 0.211, true), + (0.945, 0.109, true), + (0.977, 0.039, true), + (0.984, 0.008, true), + (1.0, 0.0, false), + ], + ), + ( + "Rounded Steps", + &[ + (0.0, 0.234, false), + (0.031, 0.305, true), + (0.039, 0.336, true), + (0.094, 0.43, true), + (0.141, 0.477, true), + (0.234, 0.492, true), + (0.266, 0.516, true), + (0.305, 0.602, true), + (0.344, 0.664, true), + (0.383, 0.711, true), + (0.477, 0.734, true), + (0.523, 0.797, true), + (0.57, 0.898, true), + (0.617, 0.953, true), + (0.664, 0.984, true), + (0.773, 0.984, true), + (0.836, 0.906, true), + (0.891, 0.891, true), + (0.914, 0.898, true), + (1.0, 1.0, false), + ], + ), + ( + "Sawtooth 1", + &[ + (0.0, 0.0, false), + (0.031, 0.047, true), + (0.195, 0.375, true), + (0.266, 0.492, true), + (0.477, 0.047, true), + (0.523, 0.055, true), + (0.742, 0.469, true), + (0.773, 0.445, true), + (0.914, 0.18, true), + (0.945, 0.102, true), + (1.0, 0.0, false), + ], + ), ]; /// Names earlier versions offered, still accepted by `contour` params (scripts, saved defaults). @@ -1118,10 +1329,29 @@ mod tests { assert_eq!(lin.contour, Contour::Linear); } + #[test] + fn contour_presets_match_photoshop() { + // Photoshop 27.11, measured through Satin: Cone and Cone − Inverted Satins are identical, + // and Gaussian reads 0.36 at 0.5 through Satin but 0.64 as the preset curve (glows, gloss). + let lut = |name: &str| { + let Some(Contour::Custom { points, corners, .. }) = builtin_contour(name) else { panic!("{name}") }; + photocraft_compose::adjust::contour_curve_lut(&points, &corners) + }; + let satin = |name: &str| photocraft_compose::effects::satin_lut(&builtin_contour(name).unwrap()).unwrap(); + let at = |l: &[f32], x: f32| l[(x * (l.len() - 1) as f32).round() as usize]; + let (cone, inverted) = (satin("Cone"), satin("Cone - Inverted")); + for x in [0.1, 0.25, 0.5, 0.8] { + assert!((at(&cone, x) - at(&inverted, x)).abs() < 0.03, "{x}: {} vs {}", at(&cone, x), at(&inverted, x)); + } + assert!((at(&satin("Gaussian"), 0.5) - 0.36).abs() < 0.04, "{}", at(&satin("Gaussian"), 0.5)); + assert!((at(&lut("Gaussian"), 0.5) - 0.64).abs() < 0.03, "{}", at(&lut("Gaussian"), 0.5)); + assert!((at(&lut("Cove - Deep"), 0.0) - 0.26).abs() < 0.02, "Cove - Deep starts above zero"); + } + #[test] fn contour_presets_and_custom_curves_apply_in_one_undo_step() { let mut s = session(); - // Picking Cone: the preset's own curve, its peak a corner, in one undo step. + // Picking Cone: the preset's own curve, its points corners, in one undo step. s.execute("layer.layerStyle.dropShadow", json!({"contour": "Cone", "antiAlias": true})).unwrap(); let Effect::DropShadow(sh) = &effects(&s)[0] else { panic!() }; assert_eq!(sh.contour, builtin_contour("Cone").unwrap()); @@ -1129,7 +1359,9 @@ mod tests { let Contour::Custom { points, corners, .. } = &sh.contour else { panic!() }; let lut = photocraft_compose::adjust::contour_curve_lut(points, corners); let at = |x: f32| lut[(x * (lut.len() - 1) as f32).round() as usize]; - assert!((at(0.5) - 1.0).abs() < 1e-3 && (at(0.25) - 0.5).abs() < 0.01, "a sharp Λ, not a rounded hump"); + // Photoshop's measured Cone: 0 at both ends, a 0.99 peak at 0.5, symmetric. + assert!(at(0.0).abs() < 1e-3 && at(1.0).abs() < 1e-3 && at(0.5) > 0.98, "a Λ: {} {} {}", at(0.0), at(0.5), at(1.0)); + assert!((at(0.25) - at(0.75)).abs() < 0.03, "symmetric: {} vs {}", at(0.25), at(0.75)); assert_eq!(contour_param(&sh.contour), json!("Cone")); s.execute("edit.undo", json!({})).unwrap(); assert!(effects(&s).is_empty(), "one undo removes it"); diff --git a/crates/gpu/src/fx.rs b/crates/gpu/src/fx.rs index 10f92726..9eba5888 100644 --- a/crates/gpu/src/fx.rs +++ b/crates/gpu/src/fx.rs @@ -358,7 +358,7 @@ pub(crate) fn program_with(e: &Effect, light: &GlobalLight, vector_shape: bool, let a = b.conv(a, photocraft_compose::effects::tent_kernel(s.size)); let c = b.shift(In::Shape, -dx, -dy, 0.0, false); let c = b.conv(c, photocraft_compose::effects::tent_kernel(s.size)); - b.finish(a, Some(c), s.invert, &s.contour, true, 0); + b.finish_lut(a, Some(c), s.invert, photocraft_compose::effects::satin_lut(&s.contour), true, 0); 1 } Effect::BevelEmboss(bv) => { diff --git a/crates/ui-egui/src/layer_style.rs b/crates/ui-egui/src/layer_style.rs index 93f22c47..b350cef5 100644 --- a/crates/ui-egui/src/layer_style.rs +++ b/crates/ui-egui/src/layer_style.rs @@ -1693,17 +1693,19 @@ mod tests { apply(&f, |cmd, p| s.execute(cmd, p).map_err(|e| e.to_string())).unwrap(); assert_eq!(shadow(&s), photocraft_engine::layer_style::builtin_contour("Cone").unwrap()); - // The Contour Editor: drag the peak to 40 % / 80 %, make the first point a corner. + // The Contour Editor: drag the second point to 10 % / 30 % (between its neighbours on + // the measured Cone), make the first point a corner. contour::open_editor(&mut f, "fx1", "contour"); - assert!(contour::set_point(&mut f, 1, 40.0, 80.0)); + assert!(contour::set_point(&mut f, 1, 10.0, 30.0)); assert!(contour::set_corner(&mut f, 0, true)); - assert!(!contour::set_point(&mut f, 9, 10.0, 10.0), "no such point"); + assert!(!contour::set_point(&mut f, 99, 10.0, 10.0), "no such point"); contour::close_editor(&mut f, true); apply(&f, |cmd, p| s.execute(cmd, p).map_err(|e| e.to_string())).unwrap(); let photocraft_doc::Contour::Custom { name, points, corners } = shadow(&s) else { panic!() }; assert_eq!(name, "Custom", "an edited preset is no longer called Cone"); - assert!((points[1].input - 102.0 / 255.0).abs() < 1e-6 && (points[1].output - 204.0 / 255.0).abs() < 1e-6, "{points:?}"); - assert_eq!(corners, vec![true, true, false]); + assert!((points[1].input - 0.1).abs() < 3e-3 && (points[1].output - 0.3).abs() < 3e-3, "{points:?}"); + assert_eq!(corners.len(), points.len()); + assert!(corners[0] && corners[1] && !corners[corners.len() - 1], "{corners:?}"); // Cancel restores the curve the editor opened with. let before = f.clone(); From 81f974503358e57a34f920f7aa4924ad84f85a39 Mon Sep 17 00:00:00 2001 From: Gotix-eg Date: Mon, 12 Oct 2026 16:03:40 +0300 Subject: [PATCH 70/92] fix(smart-object): keep pixels when rasterizing smart object layer (#3873) Resolve an issue where rasterizing a smart object layer resulted in an empty raster surface if the cache was not yet populated. Now refreshes the smart layer snapshot if needed, extracts the rendered surface, converts to the document pixel format, and cleans up PSD placed-layer blocks (SoLd, SoLE, PlLd). Includes a regression test suite covering solid fills, new layers, shape layers, and transformed smart objects. Co-authored-by: Brandon Thomas Co-authored-by: Claude Opus 5.5 --- crates/engine/src/extra_cmds.rs | 82 +++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 3 deletions(-) diff --git a/crates/engine/src/extra_cmds.rs b/crates/engine/src/extra_cmds.rs index 251acfb3..1399784b 100644 --- a/crates/engine/src/extra_cmds.rs +++ b/crates/engine/src/extra_cmds.rs @@ -696,10 +696,34 @@ fn rasterize_content(s: &mut Session, id: LayerId, only: Option<&str>, key: &str "shape" => { s.execute("layer.rasterize.shape", json!({"layer": id.0, "coalesce": key}))?; } - _ => { - let label = if kind == "fill" { "Rasterize Fill Content" } else { "Rasterize Smart Object" }; + "smart" => { s.coalesce_request = Some(key.to_string()); - let r = s.edit(label, |doc, _| { + let r = s.edit("Rasterize Smart Object", |doc, _| { + let snapshot = doc.clone(); + let mut snap = doc.layer(id).cloned().ok_or(EngineError::NoLayer(id))?; + if matches!(snap.content, LayerContent::Smart(ref sm) if sm.cache.is_none()) { + let _ = crate::smart_cmds::refresh_layer(&snapshot, &mut snap); + } + let fmt = snapshot.pixel_format(); + let surface = match &mut snap.content { + LayerContent::Smart(sm) => match sm.cache.take() { + Some(c) => c, + None => content_pixels(&snapshot, &snap), + }, + _ => return Err(EngineError::Other(format!("layer {} is not a smart object", id.0))), + }; + let surface = if surface.format() == fmt { surface } else { surface.convert(fmt) }; + let l = doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?; + l.content = LayerContent::Raster(surface); + l.psd_blocks.retain(|(k, _)| k != b"SoLd" && k != b"SoLE" && k != b"PlLd"); + Ok(()) + }); + s.coalesce_request = None; + r?; + } + _ => { + s.coalesce_request = Some(key.to_string()); + let r = s.edit("Rasterize Fill Content", |doc, _| { let snap = doc.layer(id).cloned().ok_or(EngineError::NoLayer(id))?; let px = content_pixels(doc, &snap); let l = doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?; @@ -1655,4 +1679,56 @@ mod tests { assert_eq!(s.active().unwrap().history.past_len(), steps + 1); assert!(doc(&s).walk().iter().all(|(_, _, l)| !matches!(l.content, LayerContent::Fill(_)))); } + + #[test] + fn rasterize_smart_object_layer() { + let mut s = session(8); + s.execute("edit.fill", json!({"contents": "color", "color": "#ff0000"})).unwrap(); + let px_before = pixel(&s, 5, 5); + s.execute("layer.smartObjects.convertToSmartObject", json!({})).unwrap(); + assert!(matches!(active(&s).content, LayerContent::Smart(_))); + s.execute("layer.rasterize.smartObject", json!({})).unwrap(); + assert!(matches!(active(&s).content, LayerContent::Raster(_))); + let px_after = pixel(&s, 5, 5); + assert_eq!(px_after, px_before); + + // Case 2: New layer above background + let mut s2 = session(8); + s2.execute("layer.new.layer", json!({})).unwrap(); + s2.execute("select.rect", json!({"x": 10, "y": 10, "width": 20, "height": 20})).unwrap(); + s2.execute("edit.fill", json!({"contents": "color", "color": "#00ff00"})).unwrap(); + s2.execute("select.deselect", json!({})).unwrap(); + let px_mid = pixel(&s2, 20, 20); + assert_eq!(px_mid[1], 1.0); // green + s2.execute("layer.smartObjects.convertToSmartObject", json!({})).unwrap(); + assert!(matches!(active(&s2).content, LayerContent::Smart(_))); + s2.execute("layer.rasterize.smartObject", json!({})).unwrap(); + assert!(matches!(active(&s2).content, LayerContent::Raster(_))); + let px_after_rast = pixel(&s2, 20, 20); + assert_eq!(px_after_rast, px_mid); + + // Case 3: Shape layer converted to smart object then rasterized + let mut s3 = session(8); + s3.execute("shape.create", json!({"kind": "rect", "rect": [10, 10, 40, 40], "fill": "#0000ff"})).unwrap(); + let px_shape = pixel(&s3, 20, 20); + s3.execute("layer.smartObjects.convertToSmartObject", json!({})).unwrap(); + assert!(matches!(active(&s3).content, LayerContent::Smart(_))); + s3.execute("layer.rasterize.layer", json!({})).unwrap(); + assert!(matches!(active(&s3).content, LayerContent::Raster(_))); + let px_after_shape = pixel(&s3, 20, 20); + assert_eq!(px_after_shape, px_shape); + + // Case 4: Transformed smart object + let mut s4 = session(8); + s4.execute("layer.new.layer", json!({})).unwrap(); + s4.execute("select.rect", json!({"x": 10, "y": 10, "width": 20, "height": 20})).unwrap(); + s4.execute("edit.fill", json!({"contents": "color", "color": "#ffff00"})).unwrap(); + s4.execute("select.deselect", json!({})).unwrap(); + s4.execute("layer.smartObjects.convertToSmartObject", json!({})).unwrap(); + // Move smart object by 10, 10 + s4.execute("edit.transform", json!({"matrix": [1, 0, 0, 1, 10, 10]})).unwrap(); + s4.execute("layer.rasterize.smartObject", json!({})).unwrap(); + assert!(matches!(active(&s4).content, LayerContent::Raster(_))); + assert_eq!(pixel(&s4, 30, 30), vec![1.0, 1.0, 0.0, 1.0]); + } } From 3f72158f0af959674651bfb8086ee000bf8f5157 Mon Sep 17 00:00:00 2001 From: MrCloudy2 <123890706+MrCloudy2@users.noreply.github.com> Date: Mon, 12 Oct 2026 15:05:22 +0200 Subject: [PATCH 71/92] fix(psd): write kept 8B64 blocks as 8BIM in a PSD (#3743) A PSD re-saved from a PSB kept the source's global FMsk and cinf blocks with their 8B64 signature, and Photoshop 27.11 refuses such a file as "not compatible with this version". 8B64 exists only in PSB, so a kept block is written as 8BIM when the output is a PSD; a PSB keeps 8B64. Measured by bisecting the 3 refused corpus re-exports in Photoshop: each opened once the 8B64 blocks were gone. Co-authored-by: Claude Opus 5.5 Co-authored-by: Brandon Thomas --- crates/io/src/psd_export.rs | 27 ++++++++++++++++++++++++++- crates/io/tests/roundtrip.rs | 5 ++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/crates/io/src/psd_export.rs b/crates/io/src/psd_export.rs index 4c7463a3..36f5941f 100644 --- a/crates/io/src/psd_export.rs +++ b/crates/io/src/psd_export.rs @@ -1356,6 +1356,13 @@ pub(crate) fn estimate_psd_size(doc: &Document) -> Option { estimate_encoded_size(raw_bytes, rows, structural_bytes) } +/// The signature a kept tagged block is written with. `8B64` exists only in PSB files: a PSD +/// with an `8B64` block (kept from a PSB source, e.g. its global `FMsk` or `cinf`) is refused by +/// Photoshop as "not compatible with this version" (measured in Photoshop 27.11). +fn block_signature(sig: [u8; 4], version: Version) -> [u8; 4] { + if version == Version::Psd && sig == *b"8B64" { *b"8BIM" } else { sig } +} + pub(crate) fn psd_version(doc: &Document, force_psb: bool, size_exceeds_limit: bool) -> Version { let exceeds_dimensions = doc.size.width > 30_000 || doc.size.height > 30_000; if force_psb || exceeds_dimensions || size_exceeds_limit { Version::Psb } else { Version::Psd } @@ -1578,7 +1585,7 @@ fn document_to_psd_nested(doc: &Document, opts: &PsdExportOptions, depth: u32, c if !ex.records.is_empty() && matches!(&key, b"Lr16" | b"Lr32" | b"Layr") { continue; } - global_blocks.push(global_block(sig, key, &data)); + global_blocks.push(global_block(block_signature(sig, version), key, &data)); } if let Some(txt2) = txt2 { let mut tb = TaggedBlock::new(*b"Txt2", txt2.clone()); @@ -1784,6 +1791,24 @@ mod tests { assert_eq!(psd_version(&small, false, small_size_exceeds_limit), Version::Psd); assert_eq!(psd_version(&small, true, small_size_exceeds_limit), Version::Psb); } + #[test] + fn kept_psb_blocks_are_written_as_8bim_in_a_psd() { + // Photoshop 27.11 refuses a PSD holding `8B64` blocks ("not compatible with this + // version"); they came from re-saving a PSB as PSD with its global FMsk and cinf kept. + let mut doc = document(4, 4); + doc.metadata.psd_global_blocks = vec![ + (*b"8B64", *b"FMsk", std::sync::Arc::new(vec![0xff, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50])), + (*b"8BIM", *b"Patt", std::sync::Arc::new(Vec::new())), + ]; + let signatures = |force_psb| { + let opts = PsdExportOptions { force_psb, ..PsdExportOptions::default() }; + let bytes = document_to_psd_with(&doc, &opts).0.to_bytes().unwrap(); + let file = PsdFile::from_bytes(&bytes).unwrap(); + file.global_blocks.iter().map(|b| (b.signature, b.key)).collect::>() + }; + assert_eq!(signatures(false), vec![(*b"8BIM", *b"FMsk"), (*b"8BIM", *b"Patt")]); + assert_eq!(signatures(true), vec![(*b"8B64", *b"FMsk"), (*b"8BIM", *b"Patt")], "a PSB keeps 8B64"); + } /// A layered document with transparency in the merged image and an alpha channel: the name /// and DisplayInfo resources hold one entry per extra channel, the merged transparency first, diff --git a/crates/io/tests/roundtrip.rs b/crates/io/tests/roundtrip.rs index 3e2403f2..651d74d5 100644 --- a/crates/io/tests/roundtrip.rs +++ b/crates/io/tests/roundtrip.rs @@ -305,7 +305,10 @@ fn psd_raw_resources_and_global_blocks_preserved() { d.metadata.psd_global_blocks.push((*b"8BIM", *b"Patt", std::sync::Arc::new(vec![7; 6]))); d.metadata.psd_global_blocks.push((*b"8B64", *b"lnk2", std::sync::Arc::new(vec![1, 2]))); let back = roundtrip(&d); - assert_eq!(back.metadata, d.metadata); + // A PSD holds no `8B64` blocks (Photoshop refuses the file): a kept PSB block is written as `8BIM`. + let mut expected = d.metadata.clone(); + expected.psd_global_blocks[1].0 = *b"8BIM"; + assert_eq!(back.metadata, expected); } #[test] From aa4d4859b4912a4efc960fbe6ca703d227477a09 Mon Sep 17 00:00:00 2001 From: Sir Starch Date: Mon, 12 Oct 2026 15:13:38 +0200 Subject: [PATCH 72/92] fix(io): preserve indexed BMP color tables (#3802) (#3869) Co-authored-by: Brandon Thomas Co-authored-by: Claude Opus 5.5 --- crates/codecs/README.md | 3 ++ crates/codecs/src/codecs/via_image.rs | 5 ++++ crates/codecs/src/lib.rs | 5 ++++ crates/io/src/flat.rs | 8 +++++ crates/io/tests/flat.rs | 43 +++++++++++++++++++++++++++ docs/file-format-parity.md | 5 ++-- 6 files changed, 67 insertions(+), 2 deletions(-) diff --git a/crates/codecs/README.md b/crates/codecs/README.md index ee639bcb..e44890a0 100644 --- a/crates/codecs/README.md +++ b/crates/codecs/README.md @@ -61,6 +61,9 @@ the encode plan, and `fidelity_warnings` reports the conversion when it loses in `Image::convert` applies the same ICC rule: it keeps the profile only when the colour model stays the same. +Palette BMP pixels decode as RGB in `Image`; `bmp_palette` exposes the embedded table so +`photocraft-io` can open them in Indexed Color mode. + ## Documented asymmetries and limitations * **FITS.** The image in the primary HDU, or the first `IMAGE` extension, is read; `NAXIS3 = 3` diff --git a/crates/codecs/src/codecs/via_image.rs b/crates/codecs/src/codecs/via_image.rs index eca2fbb7..c91be5ba 100644 --- a/crates/codecs/src/codecs/via_image.rs +++ b/crates/codecs/src/codecs/via_image.rs @@ -32,6 +32,11 @@ fn map_err(f: Format, e: image::ImageError) -> CodecError { } } +pub(crate) fn bmp_palette(bytes: &[u8]) -> Result>, CodecError> { + let decoder = image::codecs::bmp::BmpDecoder::new(Cursor::new(bytes)).map_err(|e| map_err(Format::Bmp, e))?; + Ok(decoder.get_palette().map(|palette| palette.to_vec())) +} + pub(crate) fn decode(f: Format, bytes: &[u8], limits: &Limits) -> Result { let fmt = image_format(f).ok_or_else(|| CodecError::unsupported(f, "not handled by image backend"))?; let mut reader = image::ImageReader::with_format(Cursor::new(bytes), fmt); diff --git a/crates/codecs/src/lib.rs b/crates/codecs/src/lib.rs index 8278ac0d..16025a5a 100644 --- a/crates/codecs/src/lib.rs +++ b/crates/codecs/src/lib.rs @@ -98,6 +98,11 @@ pub fn decode_as_with(format: Format, bytes: &[u8], opts: &DecodeOptions) -> Res finish_decode(img, o, opts) } +/// Returns the embedded colour table for an indexed BMP, if it has one. +pub fn bmp_palette(bytes: &[u8]) -> Result>, CodecError> { + via_image::bmp_palette(bytes) +} + /// Lists the pages (image directories) of a TIFF or BigTIFF file without decoding pixels: the /// main IFD chain and its SubIFDs, each with its size, kind (page, reduced-resolution copy or /// mask) and storage. [`TiffInfo::default_page`] is the page [`decode`] opens. diff --git a/crates/io/src/flat.rs b/crates/io/src/flat.rs index 450969e8..129282e6 100644 --- a/crates/io/src/flat.rs +++ b/crates/io/src/flat.rs @@ -20,7 +20,15 @@ pub fn import_flat(name: &str, bytes: &[u8]) -> Result { return import_tiff_page(name, bytes, None); } let img = codecs::decode(bytes)?; + // A palette BMP opens in Indexed Color mode with its colour table, as in Photoshop (#3802). + let bmp_palette = if codecs::detect(bytes) == Some(Format::Bmp) { codecs::bmp_palette(bytes).ok().flatten() } else { None }; let mut r = image_to_document(name, &img)?; + if let Some(colors) = bmp_palette.filter(|c| !c.is_empty()) + && r.document.mode == ColorMode::Rgb + { + r.document.mode = ColorMode::Indexed; + r.document.color_table = Some(photocraft_doc::ColorTable { colors, transparent: None }); + } r.document.file_encoding = file_encoding(bytes); if codecs::detect(bytes) == Some(Format::Tga) && img.layout() == ChannelLayout::Rgba { tga_alpha_to_channel(&mut r.document)?; diff --git a/crates/io/tests/flat.rs b/crates/io/tests/flat.rs index 728f65d1..4b184ad7 100644 --- a/crates/io/tests/flat.rs +++ b/crates/io/tests/flat.rs @@ -54,6 +54,49 @@ codec_rt!(fits_rgb8, "fits", ColorMode::Rgb, SampleType::U8, false, 0.0); codec_rt!(fits_gray16, "fit", ColorMode::Grayscale, SampleType::U16, false, 0.0); codec_rt!(fits_rgb32, "fits", ColorMode::Rgb, SampleType::F32, false, 0.0); +fn indexed_bmp_8() -> Vec { + const FILE_HEADER_SIZE: usize = 14; + const INFO_HEADER_SIZE: usize = 40; + const PALETTE_ENTRY_SIZE: usize = 4; + const PALETTE: [[u8; 3]; 2] = [[10, 20, 30], [200, 100, 50]]; + const PIXEL_ROW: [u8; 4] = [0, 1, 0, 0]; + let pixel_offset = FILE_HEADER_SIZE + INFO_HEADER_SIZE + PALETTE.len() * PALETTE_ENTRY_SIZE; + let file_size = pixel_offset + PIXEL_ROW.len(); + let mut bytes = Vec::with_capacity(file_size); + bytes.extend_from_slice(b"BM"); + bytes.extend_from_slice(&(file_size as u32).to_le_bytes()); + bytes.extend_from_slice(&[0; 4]); + bytes.extend_from_slice(&(pixel_offset as u32).to_le_bytes()); + bytes.extend_from_slice(&(INFO_HEADER_SIZE as u32).to_le_bytes()); + bytes.extend_from_slice(&2i32.to_le_bytes()); + bytes.extend_from_slice(&1i32.to_le_bytes()); + bytes.extend_from_slice(&1u16.to_le_bytes()); + bytes.extend_from_slice(&8u16.to_le_bytes()); + bytes.extend_from_slice(&0u32.to_le_bytes()); + bytes.extend_from_slice(&(PIXEL_ROW.len() as u32).to_le_bytes()); + bytes.extend_from_slice(&0i32.to_le_bytes()); + bytes.extend_from_slice(&0i32.to_le_bytes()); + bytes.extend_from_slice(&(PALETTE.len() as u32).to_le_bytes()); + bytes.extend_from_slice(&0u32.to_le_bytes()); + for [r, g, b] in PALETTE { + bytes.extend_from_slice(&[b, g, r, 0]); + } + bytes.extend_from_slice(&PIXEL_ROW); + bytes +} + +#[test] +fn indexed_bmp_opens_with_its_color_table() { + let doc = import("indexed.bmp", &indexed_bmp_8()).unwrap().document; + assert_eq!(doc.mode, ColorMode::Indexed); + assert_eq!(doc.depth, SampleType::U8); + assert_eq!(doc.color_table.as_ref().unwrap().colors.get(..2), Some(&[[10, 20, 30], [200, 100, 50]][..])); + let px = doc.layers[0].surface().unwrap().rgba(1, 0); + assert!((px[0] - 200.0 / 255.0).abs() < 1e-6); + assert!((px[1] - 100.0 / 255.0).abs() < 1e-6); + assert!((px[2] - 50.0 / 255.0).abs() < 1e-6); +} + /// FITS header cards travel as the document's text metadata, so an astro frame keeps its /// OBJECT, EXPTIME and the rest through an edit. #[test] diff --git a/docs/file-format-parity.md b/docs/file-format-parity.md index deb41496..024d596f 100644 --- a/docs/file-format-parity.md +++ b/docs/file-format-parity.md @@ -1,6 +1,6 @@ # File-format parity -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-12 · **Change:** minor (Save keeps a JPEG's quality and a WebP's lossy/lossless encoding) · **Target:** Adobe Photoshop 2026 +> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (indexed BMP palette mode; Save keeps a JPEG's quality and a WebP's encoding) · **Target:** Adobe Photoshop 2026 Every format Photoshop 2026 (27.11.0) reads or writes, with PhotoCraft's support, fidelity and tests. Photoshop's list comes from its `Info.plist` `CFBundleDocumentTypes`, the PiPL read/write @@ -28,7 +28,7 @@ XL are missing (gap G10). Remaining: 300–500 h including PSD fidelity. | JPEG | R/W | yes | yes | 8-bit Gray/RGB/CMYK, ICC/EXIF/XMP; Save keeps the opened file's quality (estimated from its quantisation tables, #2399); no JPEG Options dialog (quality 0–12, baseline/progressive) (FILE-215-19) | | PNG | R/W | yes | yes | 8/16-bit, ICC/text; APNG first frame only; alpha channels on open (#2225) | | GIF | R/W | yes | yes | File › Open keeps the first frame; New Video Layer from File and Video Frames to Layers take every frame, with the timeline rate from the delays (#572). Per-frame delays and keeping the frames in `.pcraft` are not done | -| BMP | R/W | yes | yes | 8-bit | +| BMP | R/W | yes | yes | 8-bit; palette BMPs open in Indexed Color mode | | WebP | R/W | yes | yes | Lossless and our own lossy VP8 encoder; ICC/EXIF/XMP; Save keeps an opened file lossy (at its quality) or lossless (#2399) | | AVIF | R/W | no (#463) | optional feature, off by default | | | JPEG XL | R/W | inside DNG only | no | | @@ -140,6 +140,7 @@ remaining gaps in #1606 stay tracked with per-sample corpus ceilings. | Date | Change | Summary | |---|---|---| +| 2026-10-12 | minor | Palette BMPs open in Indexed Color mode (#3802) | | 2026-10-12 | minor | Save writes a JPEG at its own estimated quality and a WebP lossy or lossless as opened (#2399) | | 2026-10-11 | minor | D5100 image area and fitted-look preservation in Camera Raw tuning | | 2026-10-10 | major | First version: Photoshop 2026 27.11.0's formats from its bundle, against our codecs; Affinity notes moved from `roadmap.md` | From 8d49ecf50d59885fb2dcf38a203d62b314565726 Mon Sep 17 00:00:00 2001 From: FinnNk Date: Mon, 12 Oct 2026 14:17:43 +0100 Subject: [PATCH 73/92] feat: Photoshop's tool keys (arrows turn the brush, Shift-click new type, Space+F canvas colour) (#3725) * feat: Left and Right arrows turn the brush tip With a painting tool, Photoshop's Left and Right arrow keys turn the brush tip 1 degree (15 with Shift); Right turns it clockwise. tools.rotateBrush turns the session brush's angle by "degrees", wrapped into -180..180, and move_mods::arrow_keys gives it the plain and Shift arrows only for the painting tools, when no Move-tool, transform or selection nudge applies and no type is being edited. Alt-arrows still kern type; Ctrl-arrows still nudge the layer. Co-Authored-By: Claude Opus 5.5 * feat(ui): Shift-click with the Type tool starts new text over existing type In Photoshop a click on existing type with the Type tool edits it, and a Shift-click there starts a new type layer instead, so text can be placed over other text. pointer_down now leaves a Shift-click unconsumed when no type is being edited, so it starts new text; inside the text being edited, Shift-click still extends the selection. Co-Authored-By: Claude Opus 5.5 * feat(ui): Space+F cycles the canvas colour Photoshop's Space+F steps the pasteboard (canvas) colour through Default, Black, Dark Gray, Medium Gray, Light Gray and Custom, and Shift+Space+F steps back, round and round. While the Hand key is held, F does this instead of Cycle Screen Mode; the choice is saved like picking it in the pasteboard menu (interface.canvasColor). docs/ui-parity.md lists the new tool keys. Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 --- crates/engine/src/brush_key_cmds.rs | 48 ++++++++++++++++++++- crates/ui-egui/src/canvas_tool_menu.rs | 14 ++++++ crates/ui-egui/src/lib.rs | 2 + crates/ui-egui/src/move_mods.rs | 52 ++++++++++++++++++++++- crates/ui-egui/src/shortcuts.rs | 11 +++++ crates/ui-egui/src/tool_shortcut_tests.rs | 39 +++++++++++++++++ crates/ui-egui/src/type_tool.rs | 21 ++++++++- docs/ui-parity.md | 4 +- 8 files changed, 185 insertions(+), 6 deletions(-) create mode 100644 crates/ui-egui/src/tool_shortcut_tests.rs diff --git a/crates/engine/src/brush_key_cmds.rs b/crates/engine/src/brush_key_cmds.rs index e4887bee..56663b40 100644 --- a/crates/engine/src/brush_key_cmds.rs +++ b/crates/engine/src/brush_key_cmds.rs @@ -2,11 +2,15 @@ //! has no menu item for them but lists them in Edit › Keyboard Shortcuts › Tools ("Decrease Brush //! Size"…); here they are ordinary commands with default shortcuts, so they can be rebound, //! recorded and driven by agents. Each one is a `tools.setBrush` on the session brush. +//! +//! `tools.rotateBrush` turns the tip: Photoshop's ← / → while painting (1°, ⇧ 15°). Arrows mean +//! other things with other tools, so the shell gives them to it only for the painting tools +//! (`move_mods::arrow_keys`). use serde_json::{Value, json}; use crate::commands::{CommandSpec, always}; -use crate::{Result, Session}; +use crate::{EngineError, Result, Session}; /// Photoshop's largest brush diameter, in pixels. pub const MAX_SIZE: f32 = 5000.0; @@ -35,6 +39,23 @@ fn hardness(s: &mut Session, up: bool) -> Result { crate::brush_cmds::set_brush(s, &json!({ "brush": { "hardness": hardness } })) } +/// The brush angle turned by `degrees` (positive is anticlockwise, as the angle field counts), +/// wrapped into Photoshop's -180..=180. +fn turned(angle: f32, degrees: f32) -> f32 { + let a = (angle + degrees).rem_euclid(360.0); + if a > 180.0 { a - 360.0 } else { a } +} + +fn rotate(s: &mut Session, p: &Value) -> Result { + let by = p + .get("degrees") + .and_then(Value::as_f64) + .filter(|d| d.is_finite() && d.abs() <= 360.0) + .ok_or_else(|| EngineError::BadParams { cmd: "tools.rotateBrush".into(), msg: "`degrees` must be a number from -360 to 360".into() })?; + let angle = turned(s.tools.brush.angle, by as f32); + crate::brush_cmds::set_brush(s, &json!({ "brush": { "angle": angle } })) +} + macro_rules! key_cmd { ($id:literal, $label:literal, $sc:literal, $run:expr) => { CommandSpec { id: $id, label: $label, menu: &[], shortcut: Some($sc), params: "{}", enabled: always, run: $run, journal: true } @@ -47,6 +68,16 @@ pub fn specs() -> Vec { key_cmd!("tools.increaseBrushSize", "Increase Brush Size", "]", |s, _| size(s, true)), key_cmd!("tools.decreaseBrushHardness", "Decrease Brush Hardness", "Shift+[", |s, _| hardness(s, false)), key_cmd!("tools.increaseBrushHardness", "Increase Brush Hardness", "Shift+]", |s, _| hardness(s, true)), + CommandSpec { + id: "tools.rotateBrush", + label: "Rotate Brush Tip", + menu: &[], + shortcut: None, + params: r##"{"degrees":-360..360 (positive anticlockwise; ← / → while painting send 1, ⇧ 15)}"##, + enabled: always, + run: rotate, + journal: true, + }, ] } @@ -74,6 +105,21 @@ mod tests { assert_eq!(hardness_step(0.0, false), 0.0); } + #[test] + fn rotate_brush_turns_the_tip_and_wraps_at_180() { + assert_eq!(turned(0.0, 1.0), 1.0); + assert_eq!(turned(179.0, 15.0), -166.0); + assert_eq!(turned(-175.0, -15.0), 170.0); + assert_eq!(turned(180.0, 0.0), 180.0); + let mut s = Session::new(); + s.execute("tools.rotateBrush", json!({"degrees": -15})).unwrap(); + assert_eq!(s.tools.brush.angle, -15.0); + for bad in [json!({}), json!({"degrees": "x"}), json!({"degrees": 1e9}), json!(null)] { + assert!(s.execute("tools.rotateBrush", bad.clone()).is_err(), "{bad}"); + } + assert_eq!(s.tools.brush.angle, -15.0); + } + #[test] fn commands_step_the_session_brush_and_journal() { let mut s = Session::new(); diff --git a/crates/ui-egui/src/canvas_tool_menu.rs b/crates/ui-egui/src/canvas_tool_menu.rs index 13af25d8..b6b86111 100644 --- a/crates/ui-egui/src/canvas_tool_menu.rs +++ b/crates/ui-egui/src/canvas_tool_menu.rs @@ -123,6 +123,20 @@ const ENDS_TYPE_EDIT: [&str; 5] = /// The pasteboard menu's Select Custom Color… row. pub const PASTEBOARD_PICK: &str = "pasteboard.selectCustomColor"; +/// The pasteboard colours in the menu's order, which Space+F steps through. +const CANVAS_COLORS: [CanvasColor; 6] = + [CanvasColor::Default, CanvasColor::Black, CanvasColor::DarkGray, CanvasColor::MediumGray, CanvasColor::LightGray, CanvasColor::Custom]; + +/// Photoshop's Space+F (⇧Space+F backwards): the next pasteboard colour, round and round. Saved +/// like a choice in the pasteboard menu (`interface.canvasColor`). +pub fn cycle_canvas_color(app: &mut PhotocraftApp, backward: bool) -> Result<(), String> { + let n = CANVAS_COLORS.len(); + let at = CANVAS_COLORS.iter().position(|c| *c == app.session.prefs().interface.canvas_color).unwrap_or(0); + let next = if backward { (at + n - 1) % n } else { (at + 1) % n }; + let name = CANVAS_COLORS.get(next).map_or("default", |c| c.name()); + app.run("prefs.set", json!({"values": {"interface.canvasColor": name}})).map(|_| ()) +} + /// The Zoom and Hand tools' context menu: the zoom steps and fixed zooms of the View menu, plus /// the Hand tool's Fill Screen. pub const VIEW_MENU: &[Row] = &[ diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs index 1ba0bce8..d6309afc 100644 --- a/crates/ui-egui/src/lib.rs +++ b/crates/ui-egui/src/lib.rs @@ -2289,6 +2289,8 @@ mod color_replacement_tests; mod layer_shortcut_tests; #[cfg(test)] mod pencil_tests; +#[cfg(test)] +mod tool_shortcut_tests; #[cfg(test)] mod pixel_aspect_tests; diff --git a/crates/ui-egui/src/move_mods.rs b/crates/ui-egui/src/move_mods.rs index 193a70bb..b3e7820d 100644 --- a/crates/ui-egui/src/move_mods.rs +++ b/crates/ui-egui/src/move_mods.rs @@ -175,7 +175,7 @@ pub fn arrow_keys(app: &mut PhotocraftApp, ctx: &egui::Context) -> bool { use egui::{Key, Modifiers}; let cmd = ctx.input(|i| i.modifiers.command) && crate::hold_keys::cmd_nudges(app); if app.ui.tool != Tool::Move && app.ui.transform.is_none() && !cmd { - return selection_arrow_keys(app, ctx); + return selection_arrow_keys(app, ctx) || brush_arrow_keys(app, ctx); } // `consume_key` never ignores an extra ⌘, so it is part of every pattern while it moves. let base = if cmd { Modifiers::COMMAND } else { Modifiers::NONE }; @@ -193,6 +193,30 @@ pub fn arrow_keys(app: &mut PhotocraftApp, ctx: &egui::Context) -> bool { false } +/// ← / → with a painting tool: turn the brush tip 1° (⇧ 15°), as Photoshop does; → turns it +/// clockwise. Returns true when a key was used. +fn brush_arrow_keys(app: &mut PhotocraftApp, ctx: &egui::Context) -> bool { + use egui::{Key, Modifiers}; + // Only plain or ⇧ arrows (`consume_key` ignores an extra ⌥, which kerns type), and never + // while type is being edited. + let m = ctx.input(|i| i.modifiers); + if !app.ui.tool.is_brushlike() || app.ui.text_edit.is_some() || m.alt || m.command || m.ctrl { + return false; + } + for (key, sign) in [(Key::ArrowLeft, 1.0), (Key::ArrowRight, -1.0)] { + // ⇧ first: `consume_key` ignores an extra ⇧. + for (mods, step) in [(Modifiers::SHIFT, 15.0), (Modifiers::NONE, 1.0)] { + if ctx.input_mut(|i| i.consume_key(mods, key)) { + if let Err(e) = app.run("tools.rotateBrush", json!({"degrees": sign * step})) { + app.ui.status = e; + } + return true; + } + } + } + false +} + /// Moves the selected layers (or the Free Transform box, or the selected pixels) by `(dx, dy)` /// pixels, as the Move tool (also when ⌘ makes it the temporary Move tool). pub fn nudge(app: &mut PhotocraftApp, dx: f64, dy: f64, duplicate_first: bool) { @@ -404,6 +428,27 @@ mod tests { arrow_keys(app, &ctx) } + /// Photoshop's ← / → with a painting tool turn the brush tip 1°, ⇧ 15°; → is clockwise. Other + /// tools keep their arrows (the Hand has none, the marquee nudges the selection). + #[test] + fn arrows_turn_the_brush_tip_for_painting_tools_only() { + let mut app = app_with_layer(); + for tool in [Tool::Brush, Tool::Eraser, Tool::CloneStamp] { + app.ui.tool = tool; + app.run("tools.setBrush", json!({"brush": {"angle": 0}})).unwrap(); + assert!(press(&mut app, egui::Key::ArrowLeft, egui::Modifiers::NONE), "{tool:?}"); + assert_eq!(app.session.tools.brush.angle, 1.0, "{tool:?}: ← anticlockwise"); + assert!(press(&mut app, egui::Key::ArrowRight, egui::Modifiers::SHIFT)); + assert_eq!(app.session.tools.brush.angle, -14.0, "{tool:?}: ⇧→ 15° clockwise"); + } + app.run("tools.setBrush", json!({"brush": {"angle": 0}})).unwrap(); + // ⌥-arrows are not the brush's (they kern type, and ⌘ moves). + assert!(!press(&mut app, egui::Key::ArrowLeft, egui::Modifiers::ALT)); + app.ui.tool = Tool::Hand; + assert!(!press(&mut app, egui::Key::ArrowLeft, egui::Modifiers::NONE)); + assert_eq!(app.session.tools.brush.angle, 0.0); + } + /// Real key events: ⇧ nudges 10 px and ⌥ duplicates first (egui ignores extra ⇧ / ⌥ when /// matching, so the plain arrow must not be tried first). #[test] @@ -433,8 +478,11 @@ mod tests { app.ui.tool = Tool::Brush; let id = app.session.active().unwrap().active_layer.unwrap(); let n0 = app.session.active().unwrap().doc.layers.len(); - assert!(!press(&mut app, egui::Key::ArrowRight, egui::Modifiers::NONE), "a plain arrow is not the Brush's"); + // A plain arrow turns the Brush's tip (below), never the layer. + assert!(press(&mut app, egui::Key::ArrowRight, egui::Modifiers::NONE)); assert_eq!(bounds(&app, id), photocraft_geom::Rect::new(8, 8, 24, 24)); + assert_eq!(app.session.tools.brush.angle, -1.0); + app.run("tools.setBrush", json!({"brush": {"angle": 0}})).unwrap(); for cmd in [CTRL, MAC_CMD] { assert!(press(&mut app, egui::Key::ArrowRight, cmd)); } diff --git a/crates/ui-egui/src/shortcuts.rs b/crates/ui-egui/src/shortcuts.rs index 511265e1..7c0c8145 100644 --- a/crates/ui-egui/src/shortcuts.rs +++ b/crates/ui-egui/src/shortcuts.rs @@ -456,6 +456,17 @@ pub fn handle(app: &mut PhotocraftApp, ctx: &egui::Context) { return; } } + // Space+F (⇧Space+F backwards) cycles the pasteboard colour, as in Photoshop: F while the + // Hand key is held, before F's own Cycle Screen Mode. + if !matches!(focus, Focus::Text) && app.ui.text_edit.is_none() && crate::hold_keys::reposition_held(app, ctx) { + let back = ctx.input_mut(|i| i.consume_key(Modifiers::SHIFT, Key::F)); + if back || ctx.input_mut(|i| i.consume_key(Modifiers::NONE, Key::F)) { + if let Err(e) = crate::canvas_tool_menu::cycle_canvas_color(app, back) { + app.ui.status = e; + } + return; + } + } // Inline type editing eats text and navigation keys; ⌘-shortcuts still reach the menus. let editing = crate::type_tool::handle_keys(app, ctx); // Registry, UI and menu-catalogue shortcuts (see [`crate::shortcut_dispatch::bindings`]). diff --git a/crates/ui-egui/src/tool_shortcut_tests.rs b/crates/ui-egui/src/tool_shortcut_tests.rs new file mode 100644 index 00000000..712e7765 --- /dev/null +++ b/crates/ui-egui/src/tool_shortcut_tests.rs @@ -0,0 +1,39 @@ +//! Photoshop's tool keys that aren't plain shortcuts: Space+F cycles the pasteboard colour. + +use egui::{Key, Modifiers}; +use serde_json::json; + +use crate::PhotocraftApp; + +fn app() -> PhotocraftApp { + let mut app = PhotocraftApp::new(photocraft_engine::Session::new(), crate::Services::default()); + app.run("file.new", json!({"width": 20, "height": 10})).unwrap(); + app +} + +/// Space+F steps the pasteboard colour forward and ⇧Space+F back, round and round; F alone is +/// still Cycle Screen Mode. +#[test] +fn space_f_cycles_the_canvas_colour() { + use photocraft_engine::prefs::CanvasColor; + let mut app = app(); + let ctx = egui::Context::default(); + let frame = |app: &mut PhotocraftApp, events: Vec| { + ctx.begin_pass(egui::RawInput { events, ..Default::default() }); + crate::shortcuts::handle(app, &ctx); + ctx.end_pass().textures_delta.clear(); + }; + let key = |key, pressed, modifiers| egui::Event::Key { key, physical_key: None, pressed, repeat: false, modifiers }; + let color = |app: &PhotocraftApp| app.session.prefs().interface.canvas_color; + frame(&mut app, vec![key(Key::Space, true, Modifiers::NONE)]); + frame(&mut app, vec![key(Key::F, true, Modifiers::NONE), key(Key::F, false, Modifiers::NONE)]); + assert_eq!(color(&app), CanvasColor::Black); + frame(&mut app, vec![egui::Event::ModifiersChanged(Modifiers::SHIFT), key(Key::F, true, Modifiers::SHIFT), key(Key::F, false, Modifiers::SHIFT)]); + frame(&mut app, vec![key(Key::F, true, Modifiers::SHIFT), key(Key::F, false, Modifiers::SHIFT)]); + assert_eq!(color(&app), CanvasColor::Custom, "backwards past Default wraps round"); + frame(&mut app, vec![egui::Event::ModifiersChanged(Modifiers::NONE), key(Key::Space, false, Modifiers::NONE)]); + let mode = app.ui.view.screen_mode.clone(); + frame(&mut app, vec![key(Key::F, true, Modifiers::NONE), key(Key::F, false, Modifiers::NONE)]); + assert_eq!(color(&app), CanvasColor::Custom, "F alone leaves the canvas colour"); + assert_ne!(app.ui.view.screen_mode, mode, "and cycles the screen mode"); +} diff --git a/crates/ui-egui/src/type_tool.rs b/crates/ui-egui/src/type_tool.rs index e1e3573e..28d4d7c5 100644 --- a/crates/ui-egui/src/type_tool.rs +++ b/crates/ui-egui/src/type_tool.rs @@ -251,8 +251,9 @@ pub fn pointer_down(app: &mut PhotocraftApp, x: f64, y: f64, mods: egui::Modifie commit_with(app, mods); return true; // Photoshop: a click outside commits without starting new text } - // The Type Mask tools always start new text: existing type layers are just pixels to them. - if app.ui.tool.is_type_mask() { + // The Type Mask tools always start new text: existing type layers are just pixels to them; + // so does a ⇧-click with the Type tool, as in Photoshop, to start new text over old. + if app.ui.tool.is_type_mask() || mods.shift { return false; } if let Some(id) = hit_layer(app, x, y) { @@ -2220,6 +2221,22 @@ mod tests { current_text(app, LayerId(ed.layer)).unwrap() } + /// Photoshop: a click on existing type edits it; a ⇧-click there starts a new type layer. + #[test] + fn shift_click_on_existing_type_starts_new_text() { + let mut app = app(); + pointer_up(&mut app, [50.0, 100.0], [50.0, 100.0]); + insert(&mut app, "Existing words"); + commit(&mut app); + let existing = app.session.active().unwrap().doc.layers.last().unwrap().id; + let (x, y) = (60.0, 95.0); + assert_eq!(hit_layer(&mut app, x, y), Some(existing), "the click lands on the existing text"); + assert!(!pointer_down(&mut app, x, y, egui::Modifiers::SHIFT), "⇧: not consumed, so a new type layer starts"); + assert!(app.ui.text_edit.is_none()); + assert!(pointer_down(&mut app, x, y, egui::Modifiers::NONE), "a plain click edits the existing text"); + assert_eq!(app.ui.text_edit.as_ref().map(|e| e.layer), Some(existing.0)); + } + #[test] fn click_creates_placeholder_selected_and_typing_replaces_it() { let mut app = app(); diff --git a/docs/ui-parity.md b/docs/ui-parity.md index 3daee822..76b59de7 100644 --- a/docs/ui-parity.md +++ b/docs/ui-parity.md @@ -1,6 +1,6 @@ # UI parity: tools, handles, modifiers and feel -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-11 · **Change:** minor (⇧-dragged guides land on ruler ticks; layer and selection keys) · **Target:** Adobe Photoshop 2026 +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-12 · **Change:** minor (⇧-dragged guides land on ruler ticks; layer and selection keys; tool keys) · **Target:** Adobe Photoshop 2026 How PhotoCraft's direct manipulation compares with Photoshop 2026 (27.11.0): the toolbox, the handles and modifier keys of each gesture, nudging, snapping, numeric precision, navigation, @@ -184,6 +184,7 @@ Triangle and Curvature Pen (minus legacy Rounded Rectangle and Targeted Adjustme | Shortcut glyphs per platform | done (UI-217-19) | | | Brush size/hardness keys on non-US layouts | done (#3109): `[` `]` need AltGr on many layouts, so Photoshop uses other keys there (German: Ö / #, ⇧ for hardness). `layout_keys.rs` has a data table of such layouts (`LAYOUTS`, add rows to support one more) and a fallback for all others: the keys at the US `[` / `]` positions act as `[` / `]` when they don't type brackets. Off once a real bracket is typed; Edit › Keyboard Shortcuts overrides still apply | | | Layer and selection keys: ⌘, toggles visibility, ⌘\ targets the mask, / locks transparency, ⌘⌥2 loads luminosity, ⌘⌥⌫ fills from history, Tab / ⇧Tab rename the next layer, ⌥-click a thumbnail fits the layer | done (2026-10-11) | | +| Tool keys: ← / → turn the brush tip (1°, ⇧ 15°), ⇧-click with Type starts new text over old, Space+F / ⇧Space+F cycle the pasteboard colour | done (2026-10-11) | | ## Panels and workspace @@ -217,3 +218,4 @@ Paragraph; the rest open as in-app floating windows. | 2026-10-11 | minor | History snapshots: the camera button takes one, snapshot rows return to it as a new state, rename and delete it (#2966) | | 2026-10-11 | minor | ⇧-drag a guide out of a ruler lands on the nearest ruler tick (#3770) | | 2026-10-11 | minor | Layer and selection keys from Photoshop's shortcut set: ⌘, toggles, ⌘\, /, ⌘⌥2, ⌘⌥⌫, Tab rename-next, ⌥-click thumbnail to fit | +| 2026-10-11 | minor | Tool keys from Photoshop's shortcut set: ← / → rotate the brush tip, ⇧-click for new type, Space+F canvas colour | From 73ed08ddbe4ffbc0bc686e7c4acbb5aecbc81fb4 Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Mon, 12 Oct 2026 15:28:31 +0200 Subject: [PATCH 74/92] PSD type: read styles from the run's sheets and place text at its Txt2 frame (#3795, #1317) (#3819) * PSD type: resolve paragraph and character styles from the run's own sheets (#3795) apply_engine_data filled a run's missing attributes only from the Normal sheets (TheNormalParagraphSheet / TheNormalStyleSheet). A run that takes its alignment or size from a named sheet (by Parent index or Name), or from its paragraph's DefaultStyleSheet, was read with Normal's values, so a centred paragraph style came back Left and starting an edit re-laid the text half a line to the side. Resolve run -> named sheet -> paragraph's default character style -> Normal, ignoring missing or out-of-range references. On export, runs whose sheet reference is rewritten also get the attributes they inherited, so they keep their look whatever they now point to. * PSD type: place text at its Txt2 frame and keep box lines whose descent overhangs (#1317) Recent Photoshop keeps part of a type layer's position in its Txt2 frame: a frame-to-text-space matrix and, for point text, the anchor, with EngineData's PointBase left at the origin and BoxBounds in the frame's space. Import ignored them, so box text landed far off the canvas once an edit started (the text 'disappeared') and point text moved up a line and off its alignment anchor. Apply the frame when its origin lands in the TySh bounds (and not already without it, so a TySh PhotoCraft rewrote is not moved twice). Photoshop also keeps a box line whose baseline is inside the box while its descenders hang below it; layout dropped such lines (and some single-line boxes rendered nothing). --------- Co-authored-by: Brandon Thomas Co-authored-by: Claude Opus 5.5 --- crates/io/src/psd_import.rs | 1 + crates/io/tests/psd_style_sheets.rs | 225 ++++++++++++++++++++++++++++ crates/text/src/layout.rs | 6 +- crates/text/src/psd.rs | 203 +++++++++++++++++++++---- crates/text/src/psd_styles.rs | 27 +++- crates/text/src/tests.rs | 98 ++++++++++++ 6 files changed, 528 insertions(+), 32 deletions(-) create mode 100644 crates/io/tests/psd_style_sheets.rs diff --git a/crates/io/src/psd_import.rs b/crates/io/src/psd_import.rs index ffe2d34e..af19a0d7 100644 --- a/crates/io/src/psd_import.rs +++ b/crates/io/src/psd_import.rs @@ -307,6 +307,7 @@ impl Ctx<'_> { }); if let Some(txt2) = &self.txt2 { photocraft_text::psd::apply_txt2(&mut t, &data, txt2); + photocraft_text::psd::apply_txt2_frame(&mut t, &data, txt2); } // Photoshop's pixels are the cache only when the file has some: ag-psd, GIMP and // other writers leave type layers without image data (Photoshop re-renders them on diff --git a/crates/io/tests/psd_style_sheets.rs b/crates/io/tests/psd_style_sheets.rs new file mode 100644 index 00000000..0634dd3f --- /dev/null +++ b/crates/io/tests/psd_style_sheets.rs @@ -0,0 +1,225 @@ +//! #3795: a PSD type layer's alignment and character attributes can come from its style sheets +//! rather than its runs. A run's `Properties` / `StyleSheetData` hold only its overrides; the rest +//! comes from the paragraph style its `Name` names in `ParagraphSheetSet`, the character style in +//! `StyleSheetSet` (by name, or the paragraph's `DefaultStyleSheet`), then the Normal sheets. +//! Reading only the Normal sheets left a centred paragraph style read as Left, so starting an +//! edit re-laid the text out half a line to the side. + +use photocraft_doc::text::TextAlign; +use photocraft_geom::Affine; +use photocraft_psd::descriptor::{Descriptor, Id, UnicodeString, Value as D}; +use photocraft_text::engine_data::Value as E; +use photocraft_text::psd::{TySh, text_layer_from_tysh, write_tysh}; + +fn real(v: f64) -> E { + E::Real(v) +} + +fn d(kv: Vec<(&str, E)>) -> E { + E::Dict(kv.into_iter().map(|(k, v)| (k.to_string(), v)).collect()) +} + +/// Photoshop-shaped EngineData for one paragraph of point text. `para` is the paragraph run's +/// `ParagraphSheet`, `style` the character run's `StyleSheet`; the sheet sets are the +/// `ResourceDict`'s, with Normal at index 0. +fn engine(text: &str, para: E, style: E, para_set: Vec, style_set: Vec) -> E { + let ed_text = format!("{text}\r"); + let n = ed_text.encode_utf16().count() as i64; + let res = d(vec![ + ( + "FontSet", + E::Array(vec![d(vec![("Name", E::String("Inter-Regular".into())), ("Script", E::Int(0)), ("FontType", E::Int(1)), ("Synthetic", E::Int(0))])]), + ), + ("StyleSheetSet", E::Array(style_set)), + ("ParagraphSheetSet", E::Array(para_set)), + ("TheNormalStyleSheet", E::Int(0)), + ("TheNormalParagraphSheet", E::Int(0)), + ]); + d(vec![ + ( + "EngineDict", + d(vec![ + ("Editor", d(vec![("Text", E::String(ed_text))])), + ("ParagraphRun", d(vec![("RunArray", E::Array(vec![d(vec![("ParagraphSheet", para)])])), ("RunLengthArray", E::Array(vec![E::Int(n)]))])), + ("StyleRun", d(vec![("RunArray", E::Array(vec![d(vec![("StyleSheet", style)])])), ("RunLengthArray", E::Array(vec![E::Int(n)]))])), + ( + "Rendered", + d(vec![( + "Shapes", + d(vec![( + "Children", + E::Array(vec![d(vec![ + ("ShapeType", E::Int(0)), + ("Cookie", d(vec![("Photoshop", d(vec![("ShapeType", E::Int(0)), ("PointBase", E::Array(vec![real(0.0), real(0.0)]))]))])), + ])]), + )]), + )]), + ), + ]), + ), + ("ResourceDict", res), + ]) +} + +fn normal_char(size: f64) -> E { + d(vec![ + ("Name", E::String("Normal RGB".into())), + ("StyleSheetData", d(vec![("Font", E::Int(0)), ("FontSize", real(size)), ("AutoLeading", E::Bool(true))])), + ]) +} + +fn para_sheet(name: &str, justification: i64, default_style: i64) -> E { + d(vec![("Name", E::String(name.into())), ("DefaultStyleSheet", E::Int(default_style)), ("Properties", d(vec![("Justification", E::Int(justification))]))]) +} + +fn layer(text: &str, ed: &E) -> photocraft_doc::TextLayer { + let desc = Descriptor::new("TxLr") + .with("Txt ", D::Text(UnicodeString::new_nul(text))) + .with("Ornt", D::Enumerated { type_id: Id::new("Ornt"), value: Id::new("Hrzn") }) + .with("TextIndex", D::Integer(0)) + .with("EngineData", D::RawData(photocraft_text::engine_data::write(ed))); + let data = write_tysh(&TySh { transform: Affine::translate(450.0, 300.0), text: desc, warp: None, bounds: [0.0; 4] }); + let mut t = text_layer_from_tysh(&data, 72.0).expect("parses"); + // Import keeps the block, as for a layer read from a file. + t.psd_raw = Some(std::sync::Arc::new(data)); + t +} + +/// The paragraph run names a centred (or right-aligned) paragraph style and overrides nothing. +#[test] +fn alignment_from_the_paragraph_style_the_run_names() { + for (j, want) in [(2, TextAlign::Center), (1, TextAlign::Right)] { + let ed = engine( + "LOREM IPSUM", + d(vec![("Name", E::String("Title".into())), ("DefaultStyleSheet", E::Int(0)), ("Properties", d(vec![]))]), + d(vec![("StyleSheetData", d(vec![]))]), + vec![para_sheet("Normal RGB", 0, 0), para_sheet("Title", j, 0)], + vec![normal_char(48.0)], + ); + let t = layer("LOREM IPSUM", &ed); + assert_eq!(t.paragraphs[0].style.align, want, "Justification {j} from the paragraph style"); + // Laid out around the anchor like Photoshop draws it. + let b = photocraft_text::TextEngine::new().layout(&t, 72.0).bounds().unwrap(); + match want { + TextAlign::Center => assert!((b[0] + b[2]).abs() < 1.0, "centred on the anchor: {b:?}"), + _ => assert!(b[2].abs() < 1.0, "ends at the anchor: {b:?}"), + } + } +} + +/// A run's own value still wins over its paragraph style, and an unknown style name or an +/// out-of-range sheet index falls back to Normal. +#[test] +fn run_overrides_win_and_bad_references_fall_back_to_normal() { + let ed = engine( + "Text", + d(vec![("Name", E::String("Title".into())), ("DefaultStyleSheet", E::Int(0)), ("Properties", d(vec![("Justification", E::Int(1))]))]), + d(vec![("StyleSheetData", d(vec![]))]), + vec![para_sheet("Normal RGB", 0, 0), para_sheet("Title", 2, 0)], + vec![normal_char(48.0)], + ); + assert_eq!(layer("Text", &ed).paragraphs[0].style.align, TextAlign::Right); + let ed = engine( + "Text", + d(vec![("Name", E::String("Missing".into())), ("DefaultStyleSheet", E::Int(9)), ("Properties", d(vec![]))]), + d(vec![("Name", E::String("Missing".into())), ("StyleSheetData", d(vec![]))]), + vec![para_sheet("Normal RGB", 2, 0)], + vec![normal_char(30.0)], + ); + let t = layer("Text", &ed); + assert_eq!(t.paragraphs[0].style.align, TextAlign::Center, "Normal's alignment"); + assert!((t.runs[0].style.size_pt - 30.0).abs() < 0.01, "Normal's size: {}", t.runs[0].style.size_pt); +} + +/// Character attributes from the paragraph's default character style (`DefaultStyleSheet`) and +/// from a character style the run names. +#[test] +fn character_attributes_from_the_style_sheets() { + let big = d(vec![("Name", E::String("Big".into())), ("StyleSheetData", d(vec![("FontSize", real(72.0))]))]); + let ed = engine( + "Text", + d(vec![("DefaultStyleSheet", E::Int(1)), ("Properties", d(vec![]))]), + d(vec![("StyleSheetData", d(vec![]))]), + vec![para_sheet("Normal RGB", 0, 0)], + vec![normal_char(12.0), big.clone()], + ); + assert!((layer("Text", &ed).runs[0].style.size_pt - 72.0).abs() < 0.01, "the paragraph's default character style"); + let ed = engine( + "Text", + d(vec![("DefaultStyleSheet", E::Int(0)), ("Properties", d(vec![]))]), + d(vec![("Name", E::String("Big".into())), ("StyleSheetData", d(vec![]))]), + vec![para_sheet("Normal RGB", 0, 0)], + vec![normal_char(12.0), big], + ); + let t = layer("Text", &ed); + assert!((t.runs[0].style.size_pt - 72.0).abs() < 0.01, "the named character style: {}", t.runs[0].style.size_pt); + // Other attributes still come from Normal. + assert_eq!( + t.runs[0].style.font_family, + layer( + "Text", + &engine( + "Text", + d(vec![("Properties", d(vec![]))]), + d(vec![("StyleSheetData", d(vec![]))]), + vec![para_sheet("Normal RGB", 0, 0)], + vec![normal_char(12.0)] + ) + ) + .runs[0] + .style + .font_family + ); +} + +/// Export writes every run fully resolved and keeps the sheet sets: a round trip reads the same +/// alignment and size, with one entry per sheet. +#[test] +fn styles_from_sheets_survive_a_round_trip() { + use photocraft_color::{ColorMode, SampleType}; + use photocraft_doc::{Document, Layer, LayerContent, Size}; + let ed = engine( + "LOREM IPSUM", + d(vec![("Name", E::String("Title".into())), ("DefaultStyleSheet", E::Int(1)), ("Properties", d(vec![]))]), + d(vec![("StyleSheetData", d(vec![]))]), + vec![para_sheet("Normal RGB", 0, 0), para_sheet("Title", 2, 1)], + vec![normal_char(12.0), d(vec![("Name", E::String("Big".into())), ("StyleSheetData", d(vec![("FontSize", real(48.0))]))])], + ); + let mut t = layer("LOREM IPSUM", &ed); + let mut doc = Document::new("t", Size::new(900, 600), ColorMode::Rgb, SampleType::U8); + doc.resolution_dpi = 72.0; + photocraft_text::TextEngine::new().render_layer(&mut t, 72.0, doc.pixel_format()); + doc.layers.push(Layer::new("t", LayerContent::Text(t))); + let bytes = photocraft_io::export(&doc, "t.psd", &Default::default()).unwrap().bytes; + let back = photocraft_io::import("t.psd", &bytes).unwrap().document; + let LayerContent::Text(bt) = &back.layers[0].content else { panic!("not a type layer") }; + assert_eq!(bt.paragraphs[0].style.align, TextAlign::Center); + assert!((bt.runs[0].style.size_pt - 48.0).abs() < 0.01, "{}", bt.runs[0].style.size_pt); +} + +/// A layer that inherits its alignment and size from sheets it no longer links to (a document +/// without those styles) keeps them through export: runs are written with what they inherited. +#[test] +fn unlinked_runs_keep_their_inherited_style_on_export() { + use photocraft_color::{ColorMode, SampleType}; + use photocraft_doc::{Document, Layer, LayerContent, Size}; + let ed = engine( + "LOREM IPSUM", + d(vec![("Name", E::String("Title".into())), ("DefaultStyleSheet", E::Int(1)), ("Properties", d(vec![]))]), + d(vec![("StyleSheetData", d(vec![]))]), + vec![para_sheet("Normal RGB", 0, 0), para_sheet("Title", 2, 1)], + vec![normal_char(12.0), d(vec![("Name", E::String("Big".into())), ("StyleSheetData", d(vec![("FontSize", real(48.0))]))])], + ); + let mut t = layer("LOREM IPSUM", &ed); + assert!(t.psd_raw.is_some()); + let mut doc = Document::new("t", Size::new(900, 600), ColorMode::Rgb, SampleType::U8); + doc.resolution_dpi = 72.0; + photocraft_text::TextEngine::new().render_layer(&mut t, 72.0, doc.pixel_format()); + doc.layers.push(Layer::new("t", LayerContent::Text(t))); + // No `text_styles_map::import`: the document has no styles and the runs link to none. + let bytes = photocraft_io::export(&doc, "t.psd", &Default::default()).unwrap().bytes; + let back = photocraft_io::import("t.psd", &bytes).unwrap().document; + let LayerContent::Text(bt) = &back.layers[0].content else { panic!("not a type layer") }; + assert_eq!(bt.paragraphs[0].style.align, TextAlign::Center); + assert!((bt.runs[0].style.size_pt - 48.0).abs() < 0.01, "{}", bt.runs[0].style.size_pt); +} diff --git a/crates/text/src/layout.rs b/crates/text/src/layout.rs index f7494bd9..7fdbb8a0 100644 --- a/crates/text/src/layout.rs +++ b/crates/text/src/layout.rs @@ -702,7 +702,11 @@ impl Layouter { Some(b) => b + leading + pending_space, }; pending_space = 0.0; - let overflow = if vertical { baseline + descent > -box_rect.0 + 0.5 } else { baseline + descent > box_rect.1 + box_rect.3 + 0.5 }; + // Photoshop keeps a horizontal line whose baseline is inside the box and lets + // its descenders hang below the bottom edge (#1317: three 35 pt lines in a + // 91.3 pt box, the last baseline at 88). Requiring the descent to fit dropped + // that line. + let overflow = if vertical { baseline + descent > -box_rect.0 + 0.5 } else { baseline > box_rect.1 + box_rect.3 + 0.5 }; if is_box && overflow { stop = true; break; diff --git a/crates/text/src/psd.rs b/crates/text/src/psd.rs index b1359f31..27b19095 100644 --- a/crates/text/src/psd.rs +++ b/crates/text/src/psd.rs @@ -12,7 +12,7 @@ use photocraft_color::{Color, ColorMode}; use photocraft_doc::TextLayer; use photocraft_doc::text::{AntiAlias, Caps, CharStyle, Kerning, Orientation, ParagraphRun, ParagraphStyle, TextAlign, TextRun, TextShape, TextWarp}; -use photocraft_geom::Affine; +use photocraft_geom::{Affine, Point}; use photocraft_psd::descriptor::{Descriptor, Id, UnicodeString, Value as D, VersionedDescriptor}; use crate::engine_data::{self as ed, Value as E}; @@ -212,6 +212,83 @@ pub fn apply_txt2(layer: &mut TextLayer, tysh: &[u8], txt2: &E) { layer.sync_summary(); } +/// The frame (`Txt2 /0 /8 /0` entry) of text object `index`: its rendered frame's `/10` names it. +fn txt2_frame(txt2: &E, index: usize) -> Option<&E> { + let object = txt2.path(&["1", "1"]).and_then(E::as_array)?.get(index)?; + let frame = + object.path(&["1", "2"]).and_then(E::as_array)?.first()?.get("6").and_then(E::as_array)?.iter().find_map(|f| f.get("10").and_then(E::as_i64))?; + txt2.path(&["0", "8", "0"]).and_then(E::as_array)?.get(usize::try_from(frame).ok()?)?.get("0") +} + +/// Places `layer` where Photoshop draws it when the text object's frame in `Txt2` is moved +/// (#1317). Recent Photoshop keeps a type layer's position partly in its `Txt2` frame: a matrix +/// (`/2 /2`) from the frame's space to the `TySh` text space and, for point text, the anchor +/// (`/0`), while EngineData's `PointBase` stays at the origin and `BoxBounds` stays in the +/// frame's space. Ignoring them put the text far from Photoshop's pixels (off the canvas, so +/// it "disappeared" as soon as an edit started), and point text a line too high and off its +/// alignment anchor. Only when the layer's `TextIndex` entry still holds the layer's text, as +/// for [`apply_txt2`], and the frame agrees with the `TySh` `bounds`. +pub fn apply_txt2_frame(layer: &mut TextLayer, tysh: &[u8], txt2: &E) { + let Some(t) = parse_tysh(tysh) else { return }; + let Some(index) = (match t.text.get("TextIndex") { + Some(D::Integer(i)) => usize::try_from(*i).ok(), + _ => None, + }) else { + return; + }; + let text = txt2.path(&["1", "1"]).and_then(E::as_array).and_then(|a| a.get(index)).and_then(|o| o.path(&["0", "0"])).and_then(E::as_str); + if text.is_none_or(|t| t.strip_suffix('\r').unwrap_or(t).replace('\r', "\n") != layer.text) { + return; + } + let Some(frame) = txt2_frame(txt2, index) else { return }; + let m = arr_f(frame.path(&["2", "2"])); + let matrix = if m.len() == 6 && m.iter().all(|v| v.is_finite()) { Affine { m: [m[0], m[1], m[2], m[3], m[4], m[5]] } } else { Affine::IDENTITY }; + let at = match layer.shape { + TextShape::Point => { + let p = arr_f(frame.get("0")); + if p.len() == 2 && p.iter().all(|v| v.is_finite()) { Affine::translate(p[0], p[1]) } else { Affine::IDENTITY } + } + TextShape::Box { .. } => Affine::IDENTITY, + }; + let to_text = matrix.mul(&at); + if to_text == Affine::IDENTITY || to_text.determinant().abs() <= 1e-9 { + return; + } + // The frame's origin (point text: the anchor; box text: the box's top left) must land in + // the text-space `bounds` Photoshop wrote beside it, and not already be there without it. A `TySh` PhotoCraft rewrote (an edited + // or moved layer whose text is unchanged keeps its old `Txt2` object and frame) already has + // the frame folded into its transform and its `bounds` near the origin: applying the frame + // again would move it twice. + let origin = match layer.shape { + TextShape::Point => Point::new(0.0, 0.0), + TextShape::Box { .. } => { + let b = engine_data(&t.text) + .map(|e| { + arr_f( + e.path(&["EngineDict", "Rendered", "Shapes", "Children"]) + .and_then(E::as_array) + .and_then(|c| c.first()) + .and_then(|s| s.path(&["Cookie", "Photoshop", "BoxBounds"])), + ) + }) + .unwrap_or_default(); + let [x, y, ..] = b[..] else { return }; + Point::new(x, y) + } + }; + let Some([l, top, r, bottom]) = descriptor_rect(&t.text, "bounds") else { return }; + let inside = |p: Point| p.x >= l - 1.0 && p.x <= r + 1.0 && p.y >= top - 1.0 && p.y <= bottom + 1.0; + if inside(origin) || !inside(to_text.apply(origin)) { + return; + } + { + // From the file's own transform: the frame's anchor is exact, so it replaces the + // ink-box estimate `legacy_point_origin` made for such point text (#1469), which put + // the baseline at the ink's top and the anchor at the ink's left whatever the alignment. + layer.transform = t.transform.mul(&to_text); + } +} + /// OpenType settings of a `Txt2` style that are on/off flags, by style key, as Photoshop /// writes them (each turned on alone in the Character panel's OpenType settings and read back): /// `/20` Contextual Alternates, `/23` Fractions, `/24` Ordinals, `/25` Swash, `/26` Titling @@ -380,46 +457,97 @@ fn apply_engine_data(layer: &mut TextLayer, e: &E, txt: Option<&str>, k: f32) { .and_then(E::as_array) .map(|a| a.iter().map(|f| f.get("Name").and_then(E::as_str).unwrap_or("").to_string()).collect()) .unwrap_or_default(); - let default_sheet = res.and_then(|r| r.get("TheNormalStyleSheet")).and_then(E::as_i64).unwrap_or(0) as usize; - let base_style = - res.and_then(|r| r.get("StyleSheetSet")).and_then(E::as_array).and_then(|a| a.get(default_sheet).or(a.first())).and_then(|s| s.get("StyleSheetData")); - let default_para_sheet = res.and_then(|r| r.get("TheNormalParagraphSheet")).and_then(E::as_i64).unwrap_or(0) as usize; - let base_para = res - .and_then(|r| r.get("ParagraphSheetSet")) - .and_then(E::as_array) - .and_then(|a| a.get(default_para_sheet).or(a.first())) - .and_then(|s| s.get("Properties")); + // Style resolution (#3795). A run's own `StyleSheetData` / `Properties` hold only what it + // overrides; the rest comes from its sheets, as in Photoshop: + // - a paragraph run: its `Properties` → the `ParagraphSheetSet` entry its `Name` names (a + // paragraph style; or its `Parent` index) → `TheNormalParagraphSheet`; + // - a character run: its `StyleSheetData` → the `StyleSheetSet` entry its `Parent` or `Name` + // names (a character style) → the default character style of its paragraph (the paragraph run's + // `DefaultStyleSheet`, else its paragraph style's) → `TheNormalStyleSheet`. + // Missing or out-of-range indices fall through to the next level, then to the defaults. + let style_set: &[E] = res.and_then(|r| r.get("StyleSheetSet")).and_then(E::as_array).unwrap_or(&[]); + let para_set: &[E] = res.and_then(|r| r.get("ParagraphSheetSet")).and_then(E::as_array).unwrap_or(&[]); + let index = |key: &str| res.and_then(|r| r.get(key)).and_then(E::as_i64).and_then(|i| usize::try_from(i).ok()); + let normal_style = index("TheNormalStyleSheet").and_then(|i| style_set.get(i)).or(style_set.first()); + let normal_para = index("TheNormalParagraphSheet").and_then(|i| para_set.get(i)).or(para_set.first()); + // A run names its sheet by a `Parent` index or by `Name` (see `psd_styles::reference`). + let named = |set: &'_ [E], sheet: &E| -> Option { + if let Some(i) = sheet.get("Parent").and_then(E::as_i64).and_then(|i| usize::try_from(i).ok()).filter(|i| *i < set.len()) { + return Some(i); + } + let name = sheet.get("Name").and_then(E::as_str)?; + set.iter().position(|s| s.get("Name").and_then(E::as_str) == Some(name)) + }; + + // Paragraph runs first: a character run's defaults depend on its paragraph. + let prun = e.path(&["EngineDict", "ParagraphRun"]); + let psheets: Vec<&E> = + prun.and_then(|r| r.get("RunArray")).and_then(E::as_array).map(|a| a.iter().filter_map(|x| x.get("ParagraphSheet")).collect()).unwrap_or_default(); + let plens16 = arr_f(prun.and_then(|r| r.get("RunLengthArray"))); + let plens = utf16_to_byte_lengths(&ed_text, &plens16); + let empty = E::Dict(Vec::new()); + // Per paragraph run: its merged base properties and its default character style. + let para_bases: Vec<(E, Option<&E>)> = psheets + .iter() + .map(|sheet| { + let style = named(para_set, sheet).and_then(|i| para_set.get(i)); + let base = merged(&[style.and_then(|s| s.get("Properties")), normal_para.and_then(|s| s.get("Properties"))]); + let char_default = [Some(*sheet), style] + .into_iter() + .flatten() + .find_map(|s| s.get("DefaultStyleSheet").and_then(E::as_i64).and_then(|i| usize::try_from(i).ok()).and_then(|i| style_set.get(i))); + (base, char_default) + }) + .collect(); + layer.paragraphs = psheets + .iter() + .zip(¶_bases) + .zip(plens) + .map(|((sheet, (base, _)), len)| ParagraphRun { len, style: para_style(Some(base), sheet.get("Properties").unwrap_or(&empty), k) }) + .collect(); // Character runs. let srun = e.path(&["EngineDict", "StyleRun"]); - let sdata: Vec<&E> = srun - .and_then(|r| r.get("RunArray")) - .and_then(E::as_array) - .map(|a| a.iter().filter_map(|x| x.path(&["StyleSheet", "StyleSheetData"])).collect()) - .unwrap_or_default(); - let slens = utf16_to_byte_lengths(&ed_text, &arr_f(srun.and_then(|r| r.get("RunLengthArray")))); + let ssheets: Vec<&E> = + srun.and_then(|r| r.get("RunArray")).and_then(E::as_array).map(|a| a.iter().filter_map(|x| x.get("StyleSheet")).collect()).unwrap_or_default(); + let slens16 = arr_f(srun.and_then(|r| r.get("RunLengthArray"))); + let slens = utf16_to_byte_lengths(&ed_text, &slens16); + // The paragraph run each character run starts in (UTF-16 offsets). + let para_of = |at: f64| -> Option { + let mut end = 0.0; + for (i, n) in plens16.iter().enumerate() { + end += n; + if at < end { + return Some(i); + } + } + plens16.len().checked_sub(1) + }; + let mut at16 = 0.0; + let bases: Vec = ssheets + .iter() + .enumerate() + .map(|(i, sheet)| { + let own = named(style_set, sheet).and_then(|i| style_set.get(i)); + let para_default = para_of(at16).and_then(|p| para_bases.get(p)).and_then(|(_, c)| *c); + at16 += slens16.get(i).copied().unwrap_or(0.0); + merged(&[own, para_default, normal_style].map(|s| s.and_then(|s| s.get("StyleSheetData")))) + }) + .collect(); + let sdata: Vec<&E> = ssheets.iter().map(|s| s.get("StyleSheetData").unwrap_or(&empty)).collect(); let incoming: Vec<(usize, bool, f32)> = sdata .iter() + .zip(&bases) .zip(&slens) - .map(|(d, len)| { - let auto = lookup(d, base_style, "AutoKerning").and_then(E::as_bool) != Some(false); - let kern = lookup(d, base_style, "Kerning").and_then(E::as_f64).filter(|v| v.is_finite()).unwrap_or(0.0) as f32; + .map(|((d, base), len)| { + let auto = lookup(d, Some(base), "AutoKerning").and_then(E::as_bool) != Some(false); + let kern = lookup(d, Some(base), "Kerning").and_then(E::as_f64).filter(|v| v.is_finite()).unwrap_or(0.0) as f32; (*len, auto, kern) }) .collect(); - layer.runs = sdata.iter().zip(slens).map(|(d, len)| TextRun { len, style: char_style(base_style, d, &fonts, k) }).collect(); + layer.runs = sdata.iter().zip(&bases).zip(slens).map(|((d, base), len)| TextRun { len, style: char_style(Some(base), d, &fonts, k) }).collect(); layer.runs = kerning_from_pairs(&layer.text, layer.char_runs(), &incoming); - // Paragraph runs. - let prun = e.path(&["EngineDict", "ParagraphRun"]); - let pdata: Vec<&E> = prun - .and_then(|r| r.get("RunArray")) - .and_then(E::as_array) - .map(|a| a.iter().filter_map(|x| x.path(&["ParagraphSheet", "Properties"])).collect()) - .unwrap_or_default(); - let plens = utf16_to_byte_lengths(&ed_text, &arr_f(prun.and_then(|r| r.get("RunLengthArray")))); - layer.paragraphs = pdata.iter().zip(plens).map(|(d, len)| ParagraphRun { len, style: para_style(base_para, d, k) }).collect(); - // Shape. let shape = e.path(&["EngineDict", "Rendered", "Shapes", "Children"]).and_then(E::as_array).and_then(|a| a.first()); if let Some(sh) = shape @@ -432,6 +560,21 @@ fn apply_engine_data(layer: &mut TextLayer, e: &E, txt: Option<&str>, k: f32) { } } +/// The dictionaries in `levels` as one: a key comes from the first level that has it. +fn merged(levels: &[Option<&E>]) -> E { + let mut out: Vec<(String, E)> = Vec::new(); + for level in levels.iter().flatten() { + if let E::Dict(kv) = level { + for (k, v) in kv { + if !out.iter().any(|(o, _)| o == k) { + out.push((k.clone(), v.clone())); + } + } + } + } + E::Dict(out) +} + fn lookup<'a>(run: &'a E, base: Option<&'a E>, key: &str) -> Option<&'a E> { run.get(key).or_else(|| base.and_then(|b| b.get(key))) } diff --git a/crates/text/src/psd_styles.rs b/crates/text/src/psd_styles.rs index fb3b297f..4caba321 100644 --- a/crates/text/src/psd_styles.rs +++ b/crates/text/src/psd_styles.rs @@ -55,6 +55,20 @@ fn reference(sheet: Option<&E>, set_names: &[String], normal: usize) -> Option Option { let t = parse_tysh(tysh)?; @@ -170,6 +184,7 @@ pub fn write_style_sheets(tysh: &[u8], layer: &TextLayer, styles: &TextStyles, d rd.set("TheNormalParagraphSheet", E::Int(0)); rd.set("FontSet", E::Array(fonts.iter().map(|f| crate::psd::font_entry(f)).collect())); } + let char_fonts = e.path(&["ResourceDict", "FontSet"]).or_else(|| e.path(&["DocumentResources", "FontSet"])).map(|f| names(Some(f))).unwrap_or_default(); let char_ix = |id: Option| id.and_then(|id| styles.character.iter().position(|d| d.id == id)).map(|i| i as i64 + 1); let para_ix = |id: Option| id.and_then(|id| styles.paragraph.iter().position(|d| d.id == id)).map(|i| i as i64 + 1); let runs = layer.char_runs(); @@ -193,9 +208,16 @@ pub fn write_style_sheets(tysh: &[u8], layer: &TextLayer, styles: &TextStyles, d if let Some(sheet) = r.get_mut("StyleSheet") { remove_key(sheet, "Parent"); remove_key(sheet, "Name"); - if let Some(ix) = char_ix(run_at(start).and_then(|r| r.style.style_sheet)) { + let run = run_at(start); + if let Some(ix) = char_ix(run.and_then(|r| r.style.style_sheet)) { sheet.set("Parent", E::Int(ix)); } + // The run's reference may be dropped or renumbered: write what it inherited + // too, so it keeps its look whatever sheet it now points to (#3795). + if let Some(run) = run { + let fi = char_fonts.iter().position(|f| *f == postscript_for(&run.style)).unwrap_or(0); + fill_missing(sheet, "StyleSheetData", style_sheet_data(&run.style, fi, k)); + } } } } @@ -208,6 +230,9 @@ pub fn write_style_sheets(tysh: &[u8], layer: &TextLayer, styles: &TextStyles, d if let Some(ix) = para_ix(paras.get(i).and_then(|p| p.style.style_sheet)) { sheet.set("Parent", E::Int(ix)); } + if let Some(p) = paras.get(i) { + fill_missing(sheet, "Properties", paragraph_properties(&p.style, k)); + } } } } diff --git a/crates/text/src/tests.rs b/crates/text/src/tests.rs index dc8df9e5..ae3092ca 100644 --- a/crates/text/src/tests.rs +++ b/crates/text/src/tests.rs @@ -1580,6 +1580,104 @@ fn a_served_script_fallback_joins_the_fallback_stack_once_it_arrives() { assert!(db.fallback_stack().any(|f| f == "Cairo"), "{:?}", db.fallback_stack().collect::>()); } +/// #1317: Photoshop keeps the last line of a text box whose baseline is inside the box even +/// when its descenders hang below the bottom edge (three 35 pt lines of 25 pt type in a +/// 91.3 pt box). A line whose baseline falls outside the box is still dropped. +#[test] +fn box_lines_whose_descent_hangs_below_the_box_are_kept() { + let mut e = TextEngine::new(); + let mut t = styled("one\ntwo\nthree", CharStyle { size_pt: 25.0, leading_pt: Some(35.0), ..Default::default() }); + t.shape = TextShape::Box { x: 0.0, y: 0.0, width: 300.0, height: 91.27 }; + let l = e.layout(&t, 72.0); + assert_eq!(l.lines.len(), 3, "{:?}", l.lines.iter().map(|l| l.baseline).collect::>()); + assert!(l.lines[2].baseline <= 91.27 + 0.5); + t.shape = TextShape::Box { x: 0.0, y: 0.0, width: 300.0, height: 80.0 }; + assert_eq!(e.layout(&t, 72.0).lines.len(), 2, "the third baseline (about 88) is below an 80 pt box"); +} + +/// `Txt2` with one text object for `text` whose rendered frame is frame 0, and that frame: +/// for point text an anchor `point`, and a frame-to-text matrix `matrix` (recent Photoshop, +/// #1317). +fn txt2_with_frame(text: &str, point: Option<[f64; 2]>, matrix: [f64; 6]) -> Vec { + let mut v = txt2_with_modes(text, &[(text.encode_utf16().count() + 1, 1)]); + // Close the object's model early: `… >> >> ] >>` → `… >> /1 << /2 [ frame ] >> >> ] >>`. + let tail = b"] >> >> >> ] >>"; + assert!(v.ends_with(tail)); + v.truncate(v.len() - tail.len()); + v.extend_from_slice(b"] >> >> /1 << /2 [ << /6 [ << /10 0 >> ] >> ] >> >> ] >>"); + let pt = point.map(|[x, y]| format!("/0 [ {x:.5} {y:.5} ] ")).unwrap_or_default(); + let m = matrix.map(|x| format!("{x:.5}")).join(" "); + let frames = format!("/0 << /8 << /0 [ << /0 << {pt}/2 << /2 [ {m} ] >> >> >> ] >> >>"); + let at = v.windows(9).position(|w| w == b"/0 << >> ").unwrap(); + v.splice(at..at + 9, frames.into_bytes().into_iter().chain(*b" ")); + v +} + +/// #1317: point text whose anchor Photoshop keeps only in its `Txt2` frame (EngineData's +/// `PointBase` at the origin, the transform far away) is placed at that anchor, not at the +/// ink's top left. A rewritten `TySh` (bounds near the origin) is left alone. +#[test] +fn txt2_frame_places_point_text_at_its_anchor() { + let mut t = point("2", 100.0); + t.transform = Affine::translate(-1000.0, -2000.0); + // Photoshop's text space: anchor at (1100, 2050), ink above its baseline. + let tysh = with_text_index(&crate::psd::build_tysh(&t, 72.0, Some([1100.0, 1980.0, 1160.0, 2050.0])), 0); + let txt2 = crate::psd::parse_txt2(&txt2_with_frame("2", Some([1000.0, 2100.0]), [1.0, 0.0, 0.0, 1.0, 100.0, -50.0])).unwrap(); + let mut l = crate::psd::text_layer_from_tysh(&tysh, 72.0).unwrap(); + crate::psd::apply_txt2_frame(&mut l, &tysh, &txt2); + let o = l.transform.apply(photocraft_geom::Point::new(0.0, 0.0)); + assert!((o.x - 100.0).abs() < 1e-3 && (o.y - 50.0).abs() < 1e-3, "anchor at {o:?}"); + // Already folded in (bounds near the origin): unchanged; another text: unchanged. + let tysh = with_text_index(&crate::psd::build_tysh(&t, 72.0, Some([0.0, -70.0, 60.0, 0.0])), 0); + let mut l = crate::psd::text_layer_from_tysh(&tysh, 72.0).unwrap(); + let before = l.transform; + crate::psd::apply_txt2_frame(&mut l, &tysh, &txt2); + assert_eq!(l.transform, before); + let tysh = with_text_index(&crate::psd::build_tysh(&t, 72.0, Some([1100.0, 1980.0, 1160.0, 2050.0])), 0); + let other = crate::psd::parse_txt2(&txt2_with_frame("3", Some([1000.0, 2100.0]), [1.0, 0.0, 0.0, 1.0, 100.0, -50.0])).unwrap(); + let mut l = crate::psd::text_layer_from_tysh(&tysh, 72.0).unwrap(); + let before = l.transform; + crate::psd::apply_txt2_frame(&mut l, &tysh, &other); + assert_eq!(l.transform, before); +} + +/// `tysh` with its text-space `bounds` set to `r` (Photoshop's, where it drew the text). +fn with_bounds(tysh: &[u8], r: [f64; 4]) -> Vec { + use photocraft_psd::descriptor::{Descriptor, Id, Value}; + let mut t = crate::psd::parse_tysh(tysh).unwrap(); + let mut d = Descriptor::default(); + for (k, v) in ["Left", "Top ", "Rght", "Btom"].iter().zip(r) { + d.items.push((Id::new(k), Value::Double(v))); + } + t.text.items.retain(|(k, _)| !k.is("bounds")); + t.text.items.push((Id::new("bounds"), Value::Descriptor(d))); + crate::psd::write_tysh(&t) +} + +/// #1317: a text box whose `BoxBounds` are in its `Txt2` frame's space is moved by the frame's +/// matrix onto the `bounds` Photoshop drew it at (it used to land off the canvas, so its text +/// "disappeared" when an edit started). +#[test] +fn txt2_frame_moves_box_text_onto_its_bounds() { + let mut t = styled("Casemiro 45", CharStyle { size_pt: 25.0, ..Default::default() }); + t.shape = TextShape::Box { x: 500.0, y: 600.0, width: 300.0, height: 90.0 }; + t.transform = Affine::translate(-700.0, -300.0); + let built = with_text_index(&crate::psd::build_tysh(&t, 72.0, None), 0); + let tysh = with_bounds(&built, [960.0, 300.0, 1260.0, 390.0]); + let txt2 = crate::psd::parse_txt2(&txt2_with_frame("Casemiro 45", None, [1.0, 0.0, 0.0, 1.0, 460.0, -300.0])).unwrap(); + let mut l = crate::psd::text_layer_from_tysh(&tysh, 72.0).unwrap(); + assert!(matches!(l.shape, TextShape::Box { .. })); + crate::psd::apply_txt2_frame(&mut l, &tysh, &txt2); + let TextShape::Box { x, y, .. } = l.shape else { panic!("not a box") }; + let o = l.transform.apply(photocraft_geom::Point::new(f64::from(x), f64::from(y))); + assert!((o.x - 260.0).abs() < 1e-3 && (o.y - 0.0).abs() < 1e-3, "box top left at {o:?}"); + // PhotoCraft's own `TySh` (bounds = the box, frame already folded in): unchanged. + let mut l = crate::psd::text_layer_from_tysh(&built, 72.0).unwrap(); + let before = l.transform; + crate::psd::apply_txt2_frame(&mut l, &built, &txt2); + assert_eq!(l.transform, before); +} + /// Preferences ▸ Type ▸ Missing Glyph Protection: off, only the default family is in the /// fallback stack, so a face without the glyph shows the missing-glyph box instead of a /// fallback's glyph (#1909). From 76fa06dbd5d5bf1cb40d6cf8f9d8b8c38eab6c5e Mon Sep 17 00:00:00 2001 From: Derek Gliwa Date: Mon, 12 Oct 2026 08:28:37 -0500 Subject: [PATCH 75/92] Merged and stamped layers keep their content bounds in CMYK and Lab (#3886) Merging or stamping converts the straight-RGBA composite into the document's colour model. Transparent black converts to K = 100% in CMYK and neutral a/b in Lab, so those pixels no longer equal the surface's default pixel, prune() keeps them, and the layer's content bounds span everything that was rendered: the whole canvas for Stamp Visible, Stamp Down and Copy Merged, and for Merge Layers, Merge Visible and Merge Down whenever an input may draw anywhere (a fill layer, even a masked one). Fully transparent pixels are now written as the default pixel in both conversion paths: photocraft_compose::flatten_to_surface (stamps, Copy Merged) and engine pixels::composite_layers (merges). Only formats with alpha are affected; over a Background everything stays opaque. Tests: engine merge_transparent_bounds (Merge Layers, Merge Visible over a transparent document, with a masked fill layer and onto a Background, Stamp Visible, Stamp Down, undo) in RGB/Gray at 8/16/32 bit and CMYK/Lab at 8/16 bit, and a compose unit test for flatten_to_surface. The masked fill layer test fails on main (merged layer = full canvas in CMYK). Co-authored-by: dgliwa <2328690+dgliwa@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 Co-authored-by: Brandon Thomas --- crates/compose/src/lib.rs | 12 +- crates/compose/src/tests.rs | 28 ++++ .../engine/tests/merge_transparent_bounds.rs | 146 ++++++++++++++++++ 3 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 crates/engine/tests/merge_transparent_bounds.rs diff --git a/crates/compose/src/lib.rs b/crates/compose/src/lib.rs index 08dcdeaf..cb88d002 100644 --- a/crates/compose/src/lib.rs +++ b/crates/compose/src/lib.rs @@ -233,6 +233,11 @@ pub fn band_rows_for(width: u32, requested: i32) -> i32 { /// The document's composite as a pixel surface in `fmt` (straight RGBA converted to its model /// and depth), optionally flattened over an opaque `background`; rendered and written in bands, /// so no full-size float composite is held. Tiles equal to the default pixel are pruned. +/// +/// Fully transparent pixels are written as the default pixel. Converting transparent black +/// leaves colour behind in CMYK (K = 100%) and Lab (neutral a/b = 0.5), and those pixels would +/// otherwise count as content: the result would span the whole canvas. +/// /// A CMYK document of plain Normal layers is composited in its ink values instead /// ([`native::flatten_cmyk`]), so flattening doesn't round-trip its pixels through RGB (#3778). pub fn flatten_to_surface(doc: &Document, fmt: photocraft_color::PixelFormat, background: Option<[f32; 3]>) -> Surface { @@ -249,6 +254,7 @@ pub fn composite_to_surface(doc: &Document, rect: Rect, fmt: photocraft_color::P } let mut s = Surface::new(fmt); let n = fmt.channels(); + let empty = s.default_pixel(); let mut data = Vec::new(); // The composite separates back to CMYK through the document's own profile, the one its // pixels were read through. @@ -262,7 +268,11 @@ pub fn composite_to_surface(doc: &Document, rect: Rect, fmt: photocraft_color::P data.resize(band.px.len() * n, 0.0); photocraft_color::convert::with_cmyk_space(cmyk.as_ref(), || { for (p, out) in band.px.iter().zip(data.chunks_exact_mut(n)) { - photocraft_raster::from_rgba_into(&fmt, *p, out); + if fmt.alpha && (p[3] <= 0.0 || p[3].is_nan()) && empty.len() == n { + out.copy_from_slice(&empty); + } else { + photocraft_raster::from_rgba_into(&fmt, *p, out); + } } }); s.write_region(band.rect, &data); diff --git a/crates/compose/src/tests.rs b/crates/compose/src/tests.rs index 869c316d..aca7a10c 100644 --- a/crates/compose/src/tests.rs +++ b/crates/compose/src/tests.rs @@ -604,6 +604,34 @@ fn cmyk_document_renders_via_rgb() { assert!(p[0] < 0.3 && (p[0] - p[1]).abs() < 0.05 && (p[1] - p[2]).abs() < 0.05 && p[3] == 1.0, "{p:?}"); } +/// Transparent pixels convert to colour in CMYK (K = 100%) and Lab (a/b = 0.5). A flattened +/// surface must still treat them as empty, or its content spans the whole canvas. +#[test] +fn flatten_to_surface_leaves_transparent_pixels_empty_in_every_mode() { + let modes = [ + (ColorMode::Rgb, [SampleType::U8, SampleType::U16, SampleType::F32].as_slice()), + (ColorMode::Grayscale, &[SampleType::U8, SampleType::U16, SampleType::F32]), + (ColorMode::Cmyk, &[SampleType::U8, SampleType::U16]), + (ColorMode::Lab, &[SampleType::U8, SampleType::U16]), + ]; + for (mode, samples) in modes { + for &sample in samples { + let mut d = Document::new("t", Size::new(300, 200), mode, sample); + let fmt = PixelFormat::new(mode, sample, true); + let mut l = Layer::raster("dot", fmt); + let opaque: Vec = photocraft_raster::from_rgba(&fmt, [0.9, 0.4, 0.1, 1.0]); + l.surface_mut().unwrap().fill_rect(Rect::new(120, 80, 140, 90), &opaque); + d.layers.push(l); + let s = flatten_to_surface(&d, fmt, None); + assert_eq!(s.content_bounds(), Rect::new(120, 80, 140, 90), "{mode:?} {sample:?}"); + // Over a background everything is content, as before. + let fmt_opaque = PixelFormat::new(mode, sample, false); + let s = flatten_to_surface(&d, fmt_opaque, Some([1.0, 1.0, 1.0])); + assert_eq!(s.rgba(5, 5)[3], 1.0, "{mode:?} {sample:?}: background stays opaque"); + } + } +} + #[test] fn sixteen_bit_and_float_layers_composite() { for fmt in [PixelFormat::RGBA16, PixelFormat::RGBA32F] { diff --git a/crates/engine/tests/merge_transparent_bounds.rs b/crates/engine/tests/merge_transparent_bounds.rs new file mode 100644 index 00000000..c7960072 --- /dev/null +++ b/crates/engine/tests/merge_transparent_bounds.rs @@ -0,0 +1,146 @@ +//! Merging small layers gives a layer as big as their content in every colour mode. In CMYK and +//! Lab, transparent pixels used to keep the colour of converted transparent black, so Merge +//! Layers, Merge Visible, Stamp Visible and Stamp Down made layers that spanned the whole canvas: +//! Free Transform, the Move tool and alignment then worked on the canvas instead of the content. + +use photocraft_doc::{Layer, LayerId}; +use photocraft_engine::Session; +use photocraft_engine::transform_cmds::transform_bounds; +use photocraft_geom::Rect; +use serde_json::{Value, json}; + +const W: u32 = 300; +const H: u32 = 400; +/// Two small shapes far from the canvas edges, and the box around both. +const A: [i32; 4] = [40, 300, 20, 30]; +const B: [i32; 4] = [90, 320, 25, 20]; +const BOTH: Rect = Rect { x0: 40, y0: 300, x1: 115, y1: 340 }; + +/// Every mode at the depths it supports (Photoshop has no 32-bit CMYK or Lab). +const CASES: &[(&str, u32)] = + &[("rgb", 8), ("rgb", 16), ("rgb", 32), ("gray", 8), ("gray", 16), ("gray", 32), ("cmyk", 8), ("cmyk", 16), ("lab", 8), ("lab", 16)]; + +fn id_of(r: &Value) -> LayerId { + LayerId(r["layer"].as_u64().unwrap()) +} + +/// A transparent document with the two shapes on their own layers. +fn scene(mode: &str, depth: u32) -> (Session, LayerId, LayerId) { + let mut s = Session::new(); + s.execute("file.new", json!({"width": W, "height": H, "mode": mode, "depth": depth, "background": "transparent"})).unwrap(); + let a = id_of(&s.execute("shape.create", json!({"kind": "rect", "rect": A, "fill": "#e07020"})).unwrap()); + let b = id_of(&s.execute("shape.create", json!({"kind": "rect", "rect": B, "fill": "#3060c0"})).unwrap()); + (s, a, b) +} + +fn select(s: &mut Session, ids: &[LayerId]) { + s.execute("layer.select", json!({"layer": ids[0].0})).unwrap(); + for id in &ids[1..] { + s.execute("layer.select", json!({"layer": id.0, "mode": "add"})).unwrap(); + } +} + +fn active(s: &Session) -> &Layer { + let st = s.active().unwrap(); + st.doc.layer(st.active_layer.unwrap()).unwrap() +} + +/// The merged layer hugs the shapes (anti-aliased edges may add a pixel) and still shows them. +fn assert_tight(s: &Session, what: &str) { + let doc = &s.active().unwrap().doc; + let layer = active(s); + let b = transform_bounds(doc, layer); + let grown = Rect::new(BOTH.x0 - 1, BOTH.y0 - 1, BOTH.x1 + 1, BOTH.y1 + 1); + assert!(grown.contains_rect(&b) && b.contains_rect(&Rect::new(BOTH.x0 + 1, BOTH.y0 + 1, BOTH.x1 - 1, BOTH.y1 - 1)), "{what}: bounds {b:?}, want ~{BOTH:?}"); + let surf = layer.surface().unwrap(); + // Inside each shape: opaque. Between them and far away: transparent. + assert!(surf.rgba(A[0] + 5, A[1] + 5)[3] > 0.99, "{what}: first shape kept"); + assert!(surf.rgba(B[0] + 5, B[1] + 5)[3] > 0.99, "{what}: second shape kept"); + assert!(surf.rgba(70, 310)[3] < 0.01, "{what}: gap stays transparent"); + assert!(surf.rgba(5, 5)[3] < 0.01, "{what}: corner stays transparent"); +} + +#[test] +fn merge_layers_keeps_content_bounds_in_every_mode() { + for &(mode, depth) in CASES { + let (mut s, a, b) = scene(mode, depth); + select(&mut s, &[a, b]); + s.execute("layer.mergeLayers", json!({})).unwrap(); + assert_tight(&s, &format!("Merge Layers {mode} {depth}")); + } +} + +#[test] +fn merge_visible_keeps_content_bounds_in_every_mode() { + for &(mode, depth) in CASES { + let (mut s, _, _) = scene(mode, depth); + s.execute("layer.mergeVisible", json!({})).unwrap(); + assert_tight(&s, &format!("Merge Visible {mode} {depth}")); + } +} + +#[test] +fn stamps_keep_content_bounds_in_every_mode() { + for &(mode, depth) in CASES { + let (mut s, _, _) = scene(mode, depth); + s.execute("layer.stampVisible", json!({})).unwrap(); + assert_tight(&s, &format!("Stamp Visible {mode} {depth}")); + + let (mut s, a, b) = scene(mode, depth); + select(&mut s, &[a, b]); + s.execute("layer.stampDown", json!({})).unwrap(); + assert_tight(&s, &format!("Stamp Down {mode} {depth}")); + } +} + +/// A fill layer may draw anywhere, so merging one renders the whole canvas; its mask still +/// limits the merged layer to the shapes. +#[test] +fn merging_a_masked_fill_layer_keeps_content_bounds_in_every_mode() { + let masked_scene = |mode: &str, depth: u32| { + let (mut s, a, _) = scene(mode, depth); + s.execute("select.rect", json!({"x": B[0], "y": B[1], "width": B[2], "height": B[3]})).unwrap(); + let fill = id_of(&s.execute("layer.newFillLayer.solidColor", json!({"color": "#3060c0"})).unwrap()); + s.execute("select.deselect", json!({})).unwrap(); + (s, a, fill) + }; + for &(mode, depth) in CASES { + let (mut s, a, fill) = masked_scene(mode, depth); + select(&mut s, &[a, fill]); + s.execute("layer.mergeLayers", json!({})).unwrap(); + assert_tight(&s, &format!("Merge Layers with a fill layer {mode} {depth}")); + + let (mut s, _, _) = masked_scene(mode, depth); + s.execute("layer.mergeVisible", json!({})).unwrap(); + assert_tight(&s, &format!("Merge Visible with a fill layer {mode} {depth}")); + } +} + +/// Over an opaque Background, Merge Visible still makes an opaque, canvas-sized Background. +#[test] +fn merge_visible_onto_a_background_stays_opaque() { + for &(mode, depth) in CASES { + let mut s = Session::new(); + s.execute("file.new", json!({"width": W, "height": H, "mode": mode, "depth": depth, "background": "white"})).unwrap(); + s.execute("shape.create", json!({"kind": "rect", "rect": A, "fill": "#e07020"})).unwrap(); + s.execute("layer.mergeVisible", json!({})).unwrap(); + let what = format!("{mode} {depth}"); + let doc = &s.active().unwrap().doc; + let layer = active(&s); + assert_eq!(layer.name, "Background", "{what}"); + assert_eq!(transform_bounds(doc, layer), Rect::new(0, 0, W as i32, H as i32), "{what}"); + let white = layer.surface().unwrap().rgba(5, 5); + assert!(white.iter().all(|c| *c > 0.98), "{what}: Background stays white, got {white:?}"); + } +} + +/// Undo restores both layers after the fixed merge. +#[test] +fn merge_layers_in_cmyk_is_one_undo_step() { + let (mut s, a, b) = scene("cmyk", 8); + select(&mut s, &[a, b]); + s.execute("layer.mergeLayers", json!({})).unwrap(); + s.execute("edit.undo", json!({})).unwrap(); + let doc = &s.active().unwrap().doc; + assert!(doc.layer(a).is_some() && doc.layer(b).is_some()); +} From 4010630c98084b9e296dbc845c477a0bfeb662ef Mon Sep 17 00:00:00 2001 From: jonathanwxh-cell Date: Mon, 12 Oct 2026 21:32:37 +0800 Subject: [PATCH 76/92] Preserve surviving channel targets and visibility on deletion (#3887) Co-authored-by: jonathnwxh <258340642+jonathanwxh-cell@users.noreply.github.com> Co-authored-by: Codex --- crates/engine/src/channel_cmds.rs | 4 ++ crates/engine/src/channel_cmds/tests.rs | 50 +++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/crates/engine/src/channel_cmds.rs b/crates/engine/src/channel_cmds.rs index 39ce9c82..63f8f5b6 100644 --- a/crates/engine/src/channel_cmds.rs +++ b/crates/engine/src/channel_cmds.rs @@ -1126,11 +1126,15 @@ fn delete_channel(s: &mut Session, p: &Value) -> Result { _ => return Err(bad(cmd, "missing `channel`")), }, }; + // `edit` validates the view against the shorter channel list before we can remap it. + // Keep the original indices and eyes so a surviving final channel is not discarded. + let view = s.active().ok_or(EngineError::NoDocument)?.channel_view.clone(); s.edit("Delete Channel", |doc, _| { doc.channels.remove(i); Ok(()) })?; if let Some(st) = s.active_mut() { + st.channel_view = view; let v = &mut st.channel_view; if i < v.alpha_visible.len() { v.alpha_visible.remove(i); diff --git a/crates/engine/src/channel_cmds/tests.rs b/crates/engine/src/channel_cmds/tests.rs index 17727dc8..d39dda70 100644 --- a/crates/engine/src/channel_cmds/tests.rs +++ b/crates/engine/src/channel_cmds/tests.rs @@ -168,6 +168,56 @@ fn channel_management_and_view_state() { assert_eq!(doc(&s).channels.len(), 3); } +#[test] +fn deleting_an_earlier_channel_keeps_the_last_channel_targeted() { + for depth in [8, 16, 32] { + let mut s = session_depth(depth); + s.execute("channel.new", json!({"name": "Remove", "fill": "black"})).unwrap(); + s.execute("channel.new", json!({"name": "Keep", "fill": "white"})).unwrap(); + let layer_before = px(&s, 5, 5); + s.execute("channel.delete", json!({"channel": "Remove"})).unwrap(); + assert_eq!(doc(&s).channels[0].name, "Keep"); + let view = &s.active().unwrap().channel_view; + assert_eq!(view.target, ChannelTarget::Alpha(0), "the surviving target follows its new index"); + assert!(view.alpha_shown(0)); + assert_eq!(view.visible_colors(3), 0, "keep the channel-only view"); + + s.execute("image.adjustments.invert", json!({})).unwrap(); + assert_eq!(chan(&s, 0, 5, 5), 0.0, "implicit pixel edits still target Keep"); + assert_eq!(px(&s, 5, 5), layer_before, "the layer must not be edited instead"); + assert!(s.undo()); + assert_eq!(chan(&s, 0, 5, 5), 1.0); + assert_eq!(px(&s, 5, 5), layer_before); + assert!(s.redo()); + assert_eq!(chan(&s, 0, 5, 5), 0.0); + assert_eq!(px(&s, 5, 5), layer_before); + } +} + +#[test] +fn deleting_a_channel_remaps_all_surviving_eyes_and_targets() { + for target_index in 0..3 { + let mut s = session(); + for name in ["First", "Middle", "Last"] { + s.execute("channel.new", json!({"name": name})).unwrap(); + } + s.execute("channel.target", json!({"channel": target_index})).unwrap(); + for (channel, visible) in [false, false, true].into_iter().enumerate() { + s.execute("channel.setVisible", json!({"channel": channel, "visible": visible})).unwrap(); + } + s.execute("channel.delete", json!({"channel": "Middle"})).unwrap(); + let view = &s.active().unwrap().channel_view; + let expected = match target_index { + 0 => ChannelTarget::Alpha(0), + 1 => ChannelTarget::Composite, + _ => ChannelTarget::Alpha(1), + }; + assert_eq!(view.target, expected, "old target {target_index}"); + assert!(!view.alpha_shown(0)); + assert!(view.alpha_shown(1), "Last keeps its eye when Middle is removed"); + } +} + #[test] fn every_colour_channel_can_hide_while_alpha_stays() { let mut s = session(); From 7958dc63fb8143bdb208d96d7d641f392d65e321 Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Mon, 12 Oct 2026 15:42:58 +0200 Subject: [PATCH 77/92] Layers: Merge Group for a selected group (#3832) (#3888) * Layers: Merge Group for a selected group (#3832) With a lone group selected, Layer > Merge Layers (Cmd+E) reads Merge Group and the Layers panel's right-click menu offers Merge Group instead of Merge Down, as in Photoshop. The new layer.mergeGroup command flattens the group's visible contents into one pixel layer in its place, named after the group, keeping its opacity, blend mode (Pass Through becomes Normal), clipping and locks. Before, Cmd+E on a group ran Merge Down and merged the whole group into the layer below it. * i18n: Vietnamese row for Merge Group Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Brandon Thomas Co-authored-by: Claude Opus 5.5 --- crates/engine/src/commands.rs | 38 +++++++++++++++++++++++++++ crates/engine/src/layer_multi_cmds.rs | 6 +++++ crates/engine/src/tests.rs | 38 +++++++++++++++++++++++++++ crates/ui-egui/src/i18n/cs.tsv | 1 + crates/ui-egui/src/i18n/de.tsv | 1 + crates/ui-egui/src/i18n/el.tsv | 1 + crates/ui-egui/src/i18n/es.tsv | 1 + crates/ui-egui/src/i18n/fr.tsv | 1 + crates/ui-egui/src/i18n/id.tsv | 1 + crates/ui-egui/src/i18n/it.tsv | 1 + crates/ui-egui/src/i18n/ja.tsv | 1 + crates/ui-egui/src/i18n/ko.tsv | 1 + crates/ui-egui/src/i18n/nl.tsv | 1 + crates/ui-egui/src/i18n/pl.tsv | 1 + crates/ui-egui/src/i18n/pt-br.tsv | 1 + crates/ui-egui/src/i18n/ru.tsv | 1 + crates/ui-egui/src/i18n/uk.tsv | 1 + crates/ui-egui/src/i18n/vi.tsv | 1 + crates/ui-egui/src/i18n/zh-hans.tsv | 1 + crates/ui-egui/src/i18n/zh-hant.tsv | 1 + crates/ui-egui/src/layer_menu_ui.rs | 28 ++++++++++++++++++++ crates/ui-egui/src/menus.rs | 8 ++++++ 22 files changed, 135 insertions(+) diff --git a/crates/engine/src/commands.rs b/crates/engine/src/commands.rs index a47bde9f..5524388c 100644 --- a/crates/engine/src/commands.rs +++ b/crates/engine/src/commands.rs @@ -782,6 +782,13 @@ fn build() -> Vec { })?; Ok(Value::Null) }), + cmd!("layer.mergeGroup", "Merge Group", ["Layer"], None, r##"{"layer":id?}"##, has_layer, |s, p| { + let id = layer_param(s, p)?; + if !s.active().and_then(|d| d.doc.layer(id)).is_some_and(|l| matches!(l.content, LayerContent::Group(_))) { + return Err(EngineError::Other("Merge Group needs a group".into())); + } + merge_group(s, id) + }), cmd!("layer.flattenImage", "Flatten Image", ["Layer"], None, "{}", has_doc, |s, _| { s.edit("Flatten Image", |doc, active| { let fmt = doc.pixel_format(); @@ -1427,6 +1434,37 @@ pub(crate) fn layer_copy(doc: &Document, id: LayerId) -> Result { Ok(dup) } +/// Layer › Merge Group (⌘E with a group selected, #3832): the group's visible contents, as they +/// show, become one pixel layer in its place, named after it. Like Photoshop, the layer keeps the +/// group's opacity, blend mode (Pass Through becomes Normal), clipping and locks; the group's mask +/// and style are applied to the pixels. +fn merge_group(s: &mut Session, id: LayerId) -> Result { + s.edit("Merge Group", |doc, active| { + let group = doc.layer(id).ok_or(EngineError::NoLayer(id))?.clone(); + if !group.visible { + return Err(EngineError::Other("the group is hidden".into())); + } + let fmt = doc.pixel_format(); + let fmt = photocraft_color::PixelFormat::new(fmt.mode, fmt.sample, true); + let mut solo = group.clone(); + solo.opacity = 1.0; + solo.blend = photocraft_doc::BlendMode::Normal; + solo.clipped = false; + let mut tmp = doc.clone(); + tmp.layers = vec![solo]; + let mut merged = Layer::new(group.name.clone(), LayerContent::Raster(pixels::composite_layers(&tmp, fmt, None))); + merged.id = group.id; + merged.opacity = group.opacity; + merged.blend = if group.blend == photocraft_doc::BlendMode::PassThrough { photocraft_doc::BlendMode::Normal } else { group.blend }; + merged.clipped = group.clipped; + merged.locks = group.locks; + *doc.layer_mut(id).ok_or(EngineError::NoLayer(id))? = merged; + *active = Some(id); + Ok(()) + })?; + Ok(json!({ "layer": id.0 })) +} + #[cfg(test)] mod registry_tests { use super::*; diff --git a/crates/engine/src/layer_multi_cmds.rs b/crates/engine/src/layer_multi_cmds.rs index 2d51dfdf..db96c3c1 100644 --- a/crates/engine/src/layer_multi_cmds.rs +++ b/crates/engine/src/layer_multi_cmds.rs @@ -1217,6 +1217,12 @@ pub fn group_layers(s: &mut Session, p: &Value) -> Result { fn merge_layers(s: &mut Session) -> Result { let sel = selected(s); if sel.len() < 2 { + // ⌘E on a lone group is Photoshop's Merge Group (#3832); on a layer, Merge Down. + if let Some(&id) = sel.first() + && s.active().and_then(|d| d.doc.layer(id)).is_some_and(|l| matches!(l.content, LayerContent::Group(_))) + { + return s.execute("layer.mergeGroup", json!({ "layer": id.0 })); + } return s.execute("layer.mergeDown", json!({})); } let mid = s.edit("Merge Layers", |doc, active| { diff --git a/crates/engine/src/tests.rs b/crates/engine/src/tests.rs index a35a19bb..08e17bd3 100644 --- a/crates/engine/src/tests.rs +++ b/crates/engine/src/tests.rs @@ -1469,3 +1469,41 @@ fn delete_layer_preserves_an_unaffected_active_layer_and_last_layer_guard() { assert_eq!(s.active().unwrap().active_layer, Some(other)); assert_eq!(s.active().unwrap().history.past_len(), before); } + +#[test] +fn merge_down_on_a_group_merges_the_group() { + // #3832: with a group selected, Merge Down is Photoshop's Merge Group (⌘E): the group's + // contents become one layer in its place, named after it, and the layer below is untouched. + let mut s = session_with_doc(); + let below = s.execute("layer.new.layer", json!({"name": "Below"})).unwrap()["layer"].as_u64().unwrap(); + s.execute("edit.fill", json!({"color": "#00ff00"})).unwrap(); + let a = s.execute("layer.new.layer", json!({"name": "A"})).unwrap()["layer"].as_u64().unwrap(); + s.execute("select.rect", json!({"x": 0, "y": 0, "width": 10, "height": 48})).unwrap(); + s.execute("edit.fill", json!({"color": "#ff0000"})).unwrap(); + s.execute("select.deselect", json!({})).unwrap(); + let b = s.execute("layer.new.layer", json!({"name": "B"})).unwrap()["layer"].as_u64().unwrap(); + s.execute("select.rect", json!({"x": 20, "y": 0, "width": 10, "height": 48})).unwrap(); + s.execute("edit.fill", json!({"color": "#0000ff"})).unwrap(); + s.execute("select.deselect", json!({})).unwrap(); + s.execute("layer.select", json!({"layer": b})).unwrap(); + s.execute("layer.select", json!({"layer": a, "mode": "add"})).unwrap(); + let group = s.execute("layer.groupLayers", json!({"name": "Badge"})).unwrap()["layer"].as_u64().unwrap(); + s.execute("layer.setProps", json!({"layer": group, "opacity": 0.5})).ok(); + let before = [px(&mut s, 5, 5), px(&mut s, 25, 5), px(&mut s, 50, 5)]; + let layers = s.active().unwrap().doc.layer_count(); + s.execute("layer.select", json!({"layer": group})).unwrap(); + s.execute("layer.mergeLayers", json!({})).unwrap(); + let st = s.active().unwrap(); + let merged = st.doc.layer(st.active_layer.unwrap()).unwrap().clone(); + assert_eq!(merged.name, "Badge"); + assert!(matches!(merged.content, photocraft_doc::LayerContent::Raster(_)), "one pixel layer"); + assert!(st.doc.layer(photocraft_doc::LayerId(below)).is_some(), "the layer below stays"); + assert_eq!(st.doc.layer_count(), layers - 2, "group and its two layers became one"); + let after = [px(&mut s, 5, 5), px(&mut s, 25, 5), px(&mut s, 50, 5)]; + for (a, b) in before.iter().zip(&after) { + assert!(a.iter().zip(b).all(|(x, y)| (x - y).abs() < 1.0 / 255.0), "{before:?} -> {after:?}"); + } + // Undo brings the group back. + s.execute("edit.undo", json!({})).unwrap(); + assert!(s.active().unwrap().doc.layer(photocraft_doc::LayerId(group)).is_some()); +} diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index 0b74504d..e7de3409 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -398,6 +398,7 @@ Select Linked Layers Vybrat propojené vrstvy Merge Layers Sloučit vrstvy Merge Down Sloučit dolů + Merge Group Sloučit skupinu Merge Visible Sloučit viditelné Stamp Visible Otisknout viditelné Select Layer Above Vybrat vrstvu nad diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index 604dcb43..ac313154 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -394,6 +394,7 @@ Select Linked Layers Verknüpfte Ebenen auswählen Merge Layers Ebenen zusammenfügen Merge Down Nach unten zusammenfügen + Merge Group Gruppe zusammenfügen Merge Visible Sichtbare zusammenfügen Stamp Visible Sichtbare Ebenen stempeln Select Layer Above Ebene darüber auswählen diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index 17677731..e5be1055 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -1838,6 +1838,7 @@ New Guide Layout… Νέα διάταξη οδηγών… New Guides From Shape Νέοι οδηγοί από σχήμα Merge Down Συγχώνευση με το υποκείμενο επίπεδο + Merge Group Συγχώνευση ομάδας Stamp Visible Συνένωση ορατών σε νέο επίπεδο Select Layer Above Επιλογή επάνω επιπέδου Select Layer Below Επιλογή κάτω επιπέδου diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index 7ad6d980..b9869565 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -391,6 +391,7 @@ Select Linked Layers Seleccionar capas vinculadas Merge Layers Combinar capas Merge Down Combinar hacia abajo + Merge Group Combinar grupo Merge Visible Combinar visibles Stamp Visible Sellar visibles Select Layer Above Seleccionar la capa de arriba diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index 7863936b..f426b28c 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -387,6 +387,7 @@ Select Linked Layers Sélectionner les calques liés Merge Layers Fusionner les calques Merge Down Fusionner avec le calque inférieur + Merge Group Fusionner le groupe Merge Visible Fusionner les calques visibles Stamp Visible Tamponner les calques visibles Stamp Down Tamponner sur le calque inférieur diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv index 74bd4462..420600cf 100644 --- a/crates/ui-egui/src/i18n/id.tsv +++ b/crates/ui-egui/src/i18n/id.tsv @@ -380,6 +380,7 @@ Select Linked Layers Pilih Layer Tertaut Merge Layers Gabungkan Layer Merge Down Gabung ke Bawah + Merge Group Gabungkan Grup Merge Visible Gabung yang Terlihat Stamp Visible Stamp yang Terlihat Stamp Down Stamp ke Bawah diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 3d2a0efb..410ab8f6 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -390,6 +390,7 @@ Select Linked Layers Seleziona livelli collegati Merge Layers Unisci livelli Merge Down Unisci sotto + Merge Group Unisci gruppo Merge Visible Unisci visibili Stamp Visible Unisci visibili in nuovo Select Layer Above Seleziona livello sopra diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index 2196441a..7e5e65a6 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -391,6 +391,7 @@ Select Linked Layers リンクしたレイヤーを選択 Merge Layers レイヤーを結合 Merge Down 下のレイヤーと結合 + Merge Group グループを結合 Merge Visible 表示レイヤーを結合 Stamp Visible 表示レイヤーをスタンプ Select Layer Above 上のレイヤーを選択 diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index 9476f0da..f48633c2 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -375,6 +375,7 @@ Select Linked Layers 연결된 레이어 선택 Merge Layers 레이어 병합 Merge Down 아래 레이어와 병합 + Merge Group 그룹 병합 Merge Visible 보이는 레이어 병합 Stamp Visible 보이는 레이어의 병합 사본 만들기 Select Layer Above 위 레이어 선택 diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index fda481dc..3778a8a1 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -383,6 +383,7 @@ Select Linked Layers Gekoppelde lagen selecteren Merge Layers Lagen samenvoegen Merge Down Omlaag samenvoegen + Merge Group Groep samenvoegen Merge Visible Zichtbare samenvoegen Stamp Visible Zichtbare stempelen Select Layer Above Laag erboven selecteren diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index ed63d439..ce9387b6 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -389,6 +389,7 @@ Select Linked Layers Zaznacz połączone warstwy Merge Layers Scal warstwy Merge Down Scal w dół + Merge Group Scal grupę Merge Visible Scal widoczne Stamp Visible Odbij widoczne Select Layer Above Zaznacz warstwę powyżej diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index a4242dc8..92e9c238 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -383,6 +383,7 @@ Select Linked Layers Selecionar camadas vinculadas Merge Layers Mesclar camadas Merge Down Mesclar para baixo + Merge Group Mesclar grupo Merge Visible Mesclar visíveis Stamp Visible Carimbar visíveis Stamp Down Carimbar para baixo diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index ead84742..7e1d12bb 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -1897,6 +1897,7 @@ Lock Layers… Заблокировать слои… Mean Среднее Merge Down Выполнить сведение + Merge Group Объединить группу Merge Layers Объединить слои Merge Shape Components Объединить компоненты фигуры Merge Visible Свести видимые diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index 7f59884e..11a4caa9 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -1876,6 +1876,7 @@ Lock Layers… Заблокувати шари… Mean Середнє значення Merge Down Об'єднати з нижнім + Merge Group Об'єднати групу Merge Layers Об'єднати шари Merge Shape Components Об'єднати компоненти фігури Merge Visible Об'єднати видимі diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index c05376c1..ca091c14 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -936,6 +936,7 @@ Disable Layer Mask Tắt mặt nạ lớp Release Clipping Mask Nhả mặt nạ cắt Merge Down Gộp xuống + Merge Group Gộp nhóm Quick Export As PNG Xuất nhanh dạng PNG Rename Layer… Đổi tên lớp… Frame from Layers… Frame từ các lớp… diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index 08f00a0f..d0309166 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -393,6 +393,7 @@ Select Linked Layers 选择链接的图层 Merge Layers 合并图层 Merge Down 向下合并 + Merge Group 合并组 Merge Visible 合并可见图层 Stamp Visible 盖印可见图层 Select Layer Above 选择上方图层 diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index f2bcab85..8698dfc0 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -398,6 +398,7 @@ Select Linked Layers 選取連結的圖層 Merge Layers 合併圖層 Merge Down 向下合併圖層 + Merge Group 合併群組 Merge Visible 合併可見圖層 Stamp Visible 蓋印可見圖層 Select Layer Above 選取上方圖層 diff --git a/crates/ui-egui/src/layer_menu_ui.rs b/crates/ui-egui/src/layer_menu_ui.rs index 6c4c0ec9..5be01c75 100644 --- a/crates/ui-egui/src/layer_menu_ui.rs +++ b/crates/ui-egui/src/layer_menu_ui.rs @@ -111,6 +111,9 @@ pub fn entries(l: &Layer, multi: bool, has_selection: bool) -> Vec { v.push(None); if multi { v.push(Some((tl!("Merge Layers"), "layer.mergeLayers"))); + } else if matches!(l.content, LayerContent::Group(_)) { + // Photoshop's Merge Group: a group merges itself, not into the layer below (#3832). + v.push(Some((tl!("Merge Group"), "layer.mergeGroup"))); } else { v.push(Some((tl!("Merge Down"), "layer.mergeDown"))); } @@ -654,6 +657,31 @@ mod tests { assert!(ids.contains(&"layer.mergeLayers")); } + /// #3832: a group's right-click menu and the Layer menu offer Photoshop's Merge Group, which + /// merges the group itself (not into the layer below), and it is enabled. + #[test] + fn a_group_offers_merge_group() { + let mut s = photocraft_engine::Session::new(); + s.execute("file.new", json!({"width": 10, "height": 10})).unwrap(); + s.execute("layer.new.layer", json!({})).unwrap(); + s.execute("layer.groupLayers", json!({"name": "G"})).unwrap(); + let st = s.active().unwrap(); + let g = st.doc.layer(st.active_layer.unwrap()).unwrap().clone(); + let e: Vec<(&str, &str)> = entries(&g, false, false).into_iter().flatten().collect(); + assert!(e.contains(&("Merge Group", "layer.mergeGroup")), "{e:?}"); + assert!(!e.iter().any(|x| x.0 == "Merge Down")); + let mut app = crate::PhotocraftApp::new(s, Default::default()); + app.sync_views(); + let items = crate::menus::menu_items(&app); + let item = items.iter().find(|i| i.id == "layer.mergeLayers").unwrap(); + assert_eq!(item.label, "Merge Group"); + assert!(item.enabled, "Merge Group runs on a group"); + // A plain layer keeps Merge Layers. + app.run("layer.new.layer", json!({})).unwrap(); + let items = crate::menus::menu_items(&app); + assert_eq!(items.iter().find(|i| i.id == "layer.mergeLayers").unwrap().label, "Merge Layers"); + } + #[test] fn add_mask_uses_the_selection() { assert_eq!(add_mask_command(false, false), "layer.layerMask.revealAll"); diff --git a/crates/ui-egui/src/menus.rs b/crates/ui-egui/src/menus.rs index 4e6c9ba1..18f1d6af 100644 --- a/crates/ui-egui/src/menus.rs +++ b/crates/ui-egui/src/menus.rs @@ -966,6 +966,14 @@ pub fn menu_items(app: &PhotocraftApp) -> Vec { { item.label = crate::layer_menu_ui::mask_toggle_label(mask.enabled).into(); } + // Layer › Merge Layers reads Merge Group with just a group selected, as in Photoshop (#3832). + if let Some(st) = app.session.active() + && st.selected_layers().len() <= 1 + && st.active_layer.and_then(|id| st.doc.layer(id)).is_some_and(|l| matches!(l.content, photocraft_doc::LayerContent::Group(_))) + && let Some(item) = items.iter_mut().find(|i| i.id == "layer.mergeLayers") + { + item.label = "Merge Group".into(); + } // The File quick-export command uses the format selected in Export Preferences. // On the web it intentionally downloads PNG until the quick-export service supports // the other formats; the Layer quick-export command also always produces PNG. From 094c4f30e4067bd3eb8564bed53843ac77881e7e Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Mon, 12 Oct 2026 15:43:34 +0200 Subject: [PATCH 78/92] CMS tests: validate profile-specific CMYK black endpoints (#3890) Retain the relative paper-white requirement and round-trip checks while validating finite, bounded endpoints and darker full-K ink. Add an encoded and reparsed AToB1 regression with an independently calculated 100/87/74/61/48 lightness ramp, plus invalid endpoint cases. Signed-off-by: FredApps <153173854+FredApps@users.noreply.github.com> --- crates/cms/tests/cms.rs | 69 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/crates/cms/tests/cms.rs b/crates/cms/tests/cms.rs index ba3f008f..f390a390 100644 --- a/crates/cms/tests/cms.rs +++ b/crates/cms/tests/cms.rs @@ -450,6 +450,73 @@ fn malformed_profiles_are_rejected_without_panicking() { } } +// A press's full-K lightness depends on its ink and paper (newsprint can exceed L* 40). +// Keep the relative paper-white check and require finite endpoints with darker, bounded ink. +fn cmyk_endpoints_valid(paper: [f64; 3], black: [f64; 3]) -> bool { + // Allow only float rounding at the physical L* limits, not a different printing condition. + let lightness = -1e-4..=100.0 + 1e-4; + paper.iter().chain(&black).all(|v| v.is_finite()) + && lightness.contains(&paper[0]) + && lightness.contains(&black[0]) + && paper[0] > 90.0 + && black[0] < paper[0] +} + +#[test] +fn a_light_black_cmyk_lut_has_the_known_relative_ramp() { + use photocraft_cms::Curve; + use photocraft_cms::pipeline::Stage; + use photocraft_cms::profile::{Lut, LutKind}; + + let mut p = cmyk().clone(); + // Independent linear test model: L* = 100 - 52 K, neutral a*/b*. Exercise A2B1 only; + // the inherited coated profile's inverse is not an inverse of this generated model. + p.a2b = [None, None, None]; + p.b2a = [None, None, None]; + p.a2b[1] = Some(Lut { + kind: LutKind::Ab, + inputs: 4, + outputs: 3, + stages: vec![ + Stage::Curves(vec![Curve::Identity; 4]), + Stage::Clut(Clut::sample(vec![2; 4], 3, |ink, out| { + out.copy_from_slice(&enc([100.0 - 52.0 * f64::from(ink[3]), 0.0, 0.0])); + })), + Stage::Curves(vec![Curve::Identity; 3]), + ], + }); + let p = Profile::parse(&p.with_encoded_bytes().to_bytes()).unwrap(); + let paper = to_lab(&p, &[0.0; 4], Intent::RelativeColorimetric); + let black = to_lab(&p, &[0.0, 0.0, 0.0, 1.0], Intent::RelativeColorimetric); + assert!(cmyk_endpoints_valid(paper, black), "{paper:?} {black:?}"); + // Explicit expected values, not the validation predicate: also catch wrong channels, + // intent selection, constant output and incorrect LUT encoding/interpolation. + for (k, expected) in [(0.0, 100.0), (0.25, 87.0), (0.5, 74.0), (0.75, 61.0), (1.0, 48.0)] { + let actual = to_lab(&p, &[0.0, 0.0, 0.0, k], Intent::RelativeColorimetric); + // The writer quantizes the CLUT to 16 bits: at most 0.000763 L* error. + assert!((actual[0] - expected).abs() < 0.001 && actual[1].abs() < 1e-4 && actual[2].abs() < 1e-4, "K={k}: {actual:?}"); + } +} + +#[test] +fn cmyk_endpoints_reject_invalid_values() { + let paper = [100.0, 0.0, 0.0]; + let black = [48.0, 0.0, 0.0]; + for bad in [f64::NAN, f64::INFINITY, f64::NEG_INFINITY] { + for channel in 0..3 { + let mut p = paper; + let mut k = black; + p[channel] = bad; + k[channel] = bad; + assert!(!cmyk_endpoints_valid(p, black)); + assert!(!cmyk_endpoints_valid(paper, k)); + } + } + for (p, k) in [(90.0, 48.0), (100.01, 48.0), (100.0, -0.01), (100.0, 100.01), (100.0, 100.0), (99.0, 100.0)] { + assert!(!cmyk_endpoints_valid([p, 0.0, 0.0], [k, 0.0, 0.0]), "L*: paper {p}, black {k}"); + } +} + /// Parses every profile the OS ships (macOS ColorSync; read-only, nothing is copied) and /// converts through each. #[test] @@ -500,7 +567,7 @@ fn system_profiles() { // Real CMYK profile: paper lighter than 100 % K. let w = to_lab(&p, &[0.0; 4], Intent::RelativeColorimetric); let k = to_lab(&p, &[0.0, 0.0, 0.0, 1.0], Intent::RelativeColorimetric); - assert!(w[0] > 90.0 && k[0] < 40.0, "{}: {w:?} {k:?}", path.display()); + assert!(cmyk_endpoints_valid(w, k), "{}: {w:?} {k:?}", path.display()); // And it round-trips through its own BToA. if p.b2a[1].is_some() { let to = Transform::new(lab(), &p, Intent::RelativeColorimetric, false).unwrap(); From 8072636e0f5a74d9e1bd4fca5101b31a23db2607 Mon Sep 17 00:00:00 2001 From: jonathanwxh-cell Date: Mon, 12 Oct 2026 21:46:59 +0800 Subject: [PATCH 79/92] Count video footage in history memory budgets (#3894) Co-authored-by: jonathnwxh <258340642+jonathanwxh-cell@users.noreply.github.com> Co-authored-by: Codex --- crates/ops/src/lib.rs | 83 +++++++++++++++++++++++++++++++++++++++++ crates/ops/src/tiles.rs | 7 ++++ 2 files changed, 90 insertions(+) diff --git a/crates/ops/src/lib.rs b/crates/ops/src/lib.rs index 0f29cf8e..70cbebe0 100644 --- a/crates/ops/src/lib.rs +++ b/crates/ops/src/lib.rs @@ -419,6 +419,89 @@ mod tests { assert_eq!(counter.bytes_with(&empty), retained as u128); } + fn video_document(depth: SampleType, frames: usize) -> Document { + let mut doc = Document::new("video", Size::new(64, 64), ColorMode::Rgb, depth); + let mut layer = Layer::raster("Video", doc.pixel_format()); + let footage: Vec<_> = (0..frames) + .map(|i| { + let mut surface = photocraft_doc::Surface::new(doc.pixel_format()); + surface.write_pixel(1, 1, &[i as f32 / frames as f32, 0.0, 0.0, 1.0]); + surface + }) + .collect(); + layer.content = photocraft_doc::LayerContent::Raster(footage[0].clone()); + layer.video = Some(photocraft_doc::VideoData::new(footage, 24.0)); + doc.layers.push(layer); + doc + } + + #[test] + fn video_memory_counts_originals_and_deduplicates_displayed_frames() { + for depth in [SampleType::U8, SampleType::U16, SampleType::F32] { + let mut doc = video_document(depth, 3); + let tile = doc.layers[0].surface().unwrap().tiles().next().unwrap().1.bytes().len(); + let video = doc.layers[0].video.as_mut().unwrap(); + video.original_frames = Some(video.frames.clone()); + // Original footage and the displayed frame alias the stack, except this painted frame. + video.frames[2].write_pixel(1, 1, &[0.0, 1.0, 0.0, 1.0]); + let mut cur = Arc::new(doc); + let mut h = History { max_bytes: usize::MAX, ..History::default() }; + assert_eq!(h.pixel_bytes(&cur), 4 * tile); + for name in ["A", "B"] { + edit(&mut h, &mut cur, "Rename", |doc| doc.name = name.into()); + h.trim(&cur); + } + assert_counter(&h, &cur); + assert_eq!(h.pixel_bytes(&cur), 4 * tile); + assert_eq!(h.unique_bytes(&cur), 0); + // Rasterizing keeps the displayed frame; the rest of the clip survives only in undo. + edit(&mut h, &mut cur, "Rasterize", |doc| doc.layers[0].video = None); + assert_eq!(h.unique_bytes(&cur), 3 * tile); + assert_eq!(h.pixel_bytes(&cur), 4 * tile); + assert_counter(&h, &cur); + cur = h.undo(cur).unwrap().0; + assert_eq!(h.unique_bytes(&cur), 0); + assert_counter(&h, &cur); + cur = h.redo(cur).unwrap().0; + assert_eq!(h.unique_bytes(&cur), 3 * tile); + assert_counter(&h, &cur); + h.clear(); + assert_eq!(h.pixel_bytes(&cur), tile); + } + } + + #[test] + fn video_memory_budget_evicts_deleted_off_playhead_frames() { + for depth in [SampleType::U8, SampleType::U16, SampleType::F32] { + let mut cur = Arc::new(video_document(depth, 6)); + let tile = cur.layers[0].surface().unwrap().tiles().next().unwrap().1.bytes().len(); + let mut h = History::default(); + for _ in 0..4 { + edit(&mut h, &mut cur, "Delete Frame", |doc| { + doc.layers[0].video.as_mut().unwrap().frames.remove(1); + }); + } + assert_eq!(h.pixel_bytes(&cur), 6 * tile); + assert_eq!(h.unique_bytes(&cur), 4 * tile); + h.max_bytes = 3 * tile; + assert_eq!(h.trim(&cur), 3); + assert_eq!(h.past_len(), 1); + assert_eq!(h.pixel_bytes(&cur), 3 * tile); + assert_eq!(h.unique_bytes(&cur), tile); + assert_counter(&h, &cur); + cur = h.undo(cur).unwrap().0; + assert_eq!(cur.layers[0].video.as_ref().unwrap().frames.len(), 3); + assert_counter(&h, &cur); + cur = h.redo(cur).unwrap().0; + assert_eq!(cur.layers[0].video.as_ref().unwrap().frames.len(), 2); + assert_counter(&h, &cur); + // A budget below the remaining clip still keeps the latest step undoable. + h.max_bytes = 1; + assert_eq!(h.trim(&cur), 0); + assert!(h.can_undo()); + } + } + #[test] fn counter_tracks_eviction_undo_redo_branching_purge_and_clones() { for depth in [SampleType::U8, SampleType::U16, SampleType::F32] { diff --git a/crates/ops/src/tiles.rs b/crates/ops/src/tiles.rs index 59d73cb5..c4178b5b 100644 --- a/crates/ops/src/tiles.rs +++ b/crates/ops/src/tiles.rs @@ -19,6 +19,13 @@ pub(crate) fn surfaces(doc: &Document, mut visit: impl FnMut(&Surface)) { if let Some(mask) = &layer.mask { visit(&mask.surface); } + if let Some(video) = &layer.video { + // Undo retains the whole clip, not only the displayed frame. Visit aliases too: + // Tiles tracks every owner and counts their shared allocations only once. + for frame in video.frames.iter().chain(video.original_frames.iter().flatten()) { + visit(frame); + } + } } for channel in doc.channels.iter().chain(&doc.quick_mask) { visit(&channel.surface); From a58b6f3d9ef68bc5e993aa0958f73528783fde80 Mon Sep 17 00:00:00 2001 From: jonathanwxh-cell Date: Mon, 12 Oct 2026 21:52:59 +0800 Subject: [PATCH 80/92] Mix filtered selection edges with premultiplied alpha (#3895) * Mix filtered selection edges with premultiplied alpha Co-authored-by: Codex * Update stylize kernel comparison for alpha-aware selection mixing Co-authored-by: Codex --------- Co-authored-by: jonathnwxh <258340642+jonathanwxh-cell@users.noreply.github.com> Co-authored-by: Codex --- crates/algo/src/blur.rs | 5 +- crates/algo/src/blur/motion_apply.rs | 2 +- crates/algo/src/blur/motion_fft_tests.rs | 4 +- crates/algo/src/blur/motion_tests.rs | 2 +- crates/algo/src/lib.rs | 33 +++++++- crates/algo/src/pixelate/tests.rs | 2 +- crates/algo/src/shape_blur_tests.rs | 2 +- crates/algo/src/stylize2/tests.rs | 12 +-- crates/algo/src/tests_iris.rs | 2 +- crates/algo/src/tests_selection_mix.rs | 98 ++++++++++++++++++++++++ crates/algo/src/tests_tilt_shift.rs | 2 +- 11 files changed, 139 insertions(+), 25 deletions(-) create mode 100644 crates/algo/src/tests_selection_mix.rs diff --git a/crates/algo/src/blur.rs b/crates/algo/src/blur.rs index 606ee7db..ae8b12f4 100644 --- a/crates/algo/src/blur.rs +++ b/crates/algo/src/blur.rs @@ -992,8 +992,9 @@ mod tests { let mixed = crate::apply_in(&s, &p, canvas, canvas, Some(&half), canvas); for (x, y) in [(0, 0), (18, 11), (36, 22)] { let (o, f, m) = (s.pixel(x, y), full.pixel(x, y), mixed.pixel(x, y)); - for c in 0..4 { - assert!((m[c] - (o[c] + f[c]) / 2.0).abs() < 1e-5, "({x},{y}) channel {c}"); + assert!((m[3] - (o[3] + f[3]) / 2.0).abs() < 1e-5, "({x},{y}) alpha"); + for c in 0..3 { + assert!((m[c] * m[3] - (o[c] * o[3] + f[c] * f[3]) / 2.0).abs() < 1e-5, "({x},{y}) premultiplied channel {c}"); } } let cancel = || true; diff --git a/crates/algo/src/blur/motion_apply.rs b/crates/algo/src/blur/motion_apply.rs index cc2f3e84..166a1da5 100644 --- a/crates/algo/src/blur/motion_apply.rs +++ b/crates/algo/src/blur/motion_apply.rs @@ -169,7 +169,7 @@ fn apply_inner( return None; } if let Some(selection) = selection { - crate::mix_selection(&mut data, output, selection, &src); + crate::mix_selection(&mut data, output, selection, &src, fmt.alpha); } if ctl.cancelled() { return None; diff --git a/crates/algo/src/blur/motion_fft_tests.rs b/crates/algo/src/blur/motion_fft_tests.rs index 12271d7b..fd27434b 100644 --- a/crates/algo/src/blur/motion_fft_tests.rs +++ b/crates/algo/src/blur/motion_fft_tests.rs @@ -280,7 +280,7 @@ fn motion_fft_pipeline_supports_depths_models_edges_selections_and_tile_seams() for mask in [None, Some(&selection)] { let mut expected_data = filtered.clone(); if let Some(mask) = mask { - crate::mix_selection(&mut expected_data, rect, mask, &src); + crate::mix_selection(&mut expected_data, rect, mask, &src, alpha); } let mut expected = source.clone(); expected.write_region(rect, &expected_data); @@ -362,7 +362,7 @@ fn motion_fft_production_crosses_real_tile_seams_and_leaves_other_pixels_untouch let mut expected = source.clone(); let mut data = filtered.clone(); if let Some(mask) = mask { - crate::mix_selection(&mut data, area, mask, &src); + crate::mix_selection(&mut data, area, mask, &src, true); } expected.write_region(area, &data); let expected = Image::read(&expected, check); diff --git a/crates/algo/src/blur/motion_tests.rs b/crates/algo/src/blur/motion_tests.rs index 822cbb75..1141dec5 100644 --- a/crates/algo/src/blur/motion_tests.rs +++ b/crates/algo/src/blur/motion_tests.rs @@ -69,7 +69,7 @@ fn row_surface(surface: &Surface, params: &FilterParams, area: Rect, bounds: Rec let ctx = Ctx { bounds, mode: format.mode, alpha: format.alpha }; let mut data = motion_rows(&src, area, &ctx, *angle, *distance); if let Some(selection) = selection { - crate::mix_selection(&mut data, area, selection, &src); + crate::mix_selection(&mut data, area, selection, &src, format.alpha); } let mut result = surface.clone(); result.write_region(area, &data); diff --git a/crates/algo/src/lib.rs b/crates/algo/src/lib.rs index ded4ad31..fdbe6dd7 100644 --- a/crates/algo/src/lib.rs +++ b/crates/algo/src/lib.rs @@ -1095,7 +1095,7 @@ fn apply_tiled_with_impl( return (*t, Vec::new()); }; if let Some(sel) = selection { - mix_selection(&mut data, *t, sel, src); + mix_selection(&mut data, *t, sel, src, fmt.alpha); } tick(); (*t, data) @@ -1179,7 +1179,7 @@ fn apply_box_blur( let write = |(s, v): &mut (Surface, Vec)| { for (t, data) in v.iter_mut() { if let Some(sel) = selection { - mix_selection(data, *t, sel, &Image::read(surface, *t)); + mix_selection(data, *t, sel, &Image::read(surface, *t), fmt.alpha); } s.write_region(*t, data); } @@ -1202,8 +1202,9 @@ fn apply_box_blur( } /// Mixes filtered `data` for `t` back toward the original pixels in `orig` by the selection's -/// coverage (channel 0 of `sel`). -fn mix_selection(data: &mut [f32], t: Rect, sel: &Surface, orig: &Image) { +/// coverage (channel 0 of `sel`). Changing alpha requires premultiplied colour interpolation; +/// otherwise hidden colours leak into feathered edges and alpha-removing filters darken them. +fn mix_selection(data: &mut [f32], t: Rect, sel: &Surface, orig: &Image, alpha: bool) { let w = t.width() as usize; for (i, px) in data.chunks_exact_mut(orig.ch.max(1)).enumerate() { let (x, y) = (t.x0 + (i % w) as i32, t.y0 + (i / w) as i32); @@ -1211,6 +1212,27 @@ fn mix_selection(data: &mut [f32], t: Rect, sel: &Surface, orig: &Image) { if k >= 1.0 { continue; } + if k <= 0.0 { + for (c, v) in px.iter_mut().enumerate() { + *v = orig.get(x, y, c); + } + continue; + } + if alpha { + let a = px.len() - 1; + let original_alpha = orig.get(x, y, a); + let filtered_alpha = px[a]; + if original_alpha != filtered_alpha { + let mixed_alpha = original_alpha + (filtered_alpha - original_alpha) * k; + let original_weight = original_alpha * (1.0 - k); + let filtered_weight = filtered_alpha * k; + for (c, v) in px[..a].iter_mut().enumerate() { + *v = if mixed_alpha > 0.0 { (orig.get(x, y, c) * original_weight + *v * filtered_weight) / mixed_alpha } else { 0.0 }; + } + px[a] = mixed_alpha; + continue; + } + } for (c, v) in px.iter_mut().enumerate() { let o = orig.get(x, y, c); *v = o + (*v - o) * k; @@ -1229,6 +1251,9 @@ mod tests_ext; #[cfg(test)] mod tests_mosaic; +#[cfg(test)] +mod tests_selection_mix; + /// The current upstream sampler through the identical source/selection/tile pipeline. #[cfg(test)] #[allow(clippy::too_many_arguments)] diff --git a/crates/algo/src/pixelate/tests.rs b/crates/algo/src/pixelate/tests.rs index 83d89bf3..c82d7473 100644 --- a/crates/algo/src/pixelate/tests.rs +++ b/crates/algo/src/pixelate/tests.rs @@ -153,7 +153,7 @@ fn tiled_filters_match_scalar_at_all_depths_with_soft_selection() { FilterParams::ColorHalftone { max_radius, angles } => reference::halftone(&image, bounds, &ctx, max_radius, angles), _ => Vec::new(), }; - crate::mix_selection(&mut expected_data, bounds, &selection, &image); + crate::mix_selection(&mut expected_data, bounds, &selection, &image, ctx.alpha); let mut expected = surface.clone(); expected.write_region(bounds, &expected_data); for tile in [1, 7, 17, 256] { diff --git a/crates/algo/src/shape_blur_tests.rs b/crates/algo/src/shape_blur_tests.rs index 96f8f4c1..02bdb0b3 100644 --- a/crates/algo/src/shape_blur_tests.rs +++ b/crates/algo/src/shape_blur_tests.rs @@ -129,7 +129,7 @@ fn surfaces_exact_depth_models_alpha_selection_and_tile_boundaries() { }; let spans = Spans::new(radius, shape_inside(shape)); let mut expected = conv_spans(&src, area, &ctx, &spans); - crate::mix_selection(&mut expected, area, &selection, &src); + crate::mix_selection(&mut expected, area, &selection, &src, alpha); let mut reference = surface.clone(); reference.write_region(area, &expected); for tile in [17, 256] { diff --git a/crates/algo/src/stylize2/tests.rs b/crates/algo/src/stylize2/tests.rs index cc44558e..3d7f6b52 100644 --- a/crates/algo/src/stylize2/tests.rs +++ b/crates/algo/src/stylize2/tests.rs @@ -167,17 +167,7 @@ fn storage_selection_and_tile_sizes_match_original_kernels() { FilterParams::Wind { method, from_right, seed } => wind_direct(&src, area, &ctx, method, from_right, seed), _ => continue, }; - let original = s.read_region(area); - for (i, px) in raw.chunks_exact_mut(fmt.channels()).enumerate() { - let (x, y) = (area.x0 + (i % area.width() as usize) as i32, area.y0 + (i / area.width() as usize) as i32); - let k = selection.sample_channel(x, y, 0); - if k >= 1.0 { - continue; - } - for (c, v) in px.iter_mut().enumerate() { - *v = original[i * fmt.channels() + c] + (*v - original[i * fmt.channels() + c]) * k; - } - } + crate::mix_selection(&mut raw, area, &selection, &src, fmt.alpha); let mut want = s.clone(); want.write_region(area, &raw); for tile in [1, 7, 17, 256] { diff --git a/crates/algo/src/tests_iris.rs b/crates/algo/src/tests_iris.rs index 1f930c17..2d54c8f1 100644 --- a/crates/algo/src/tests_iris.rs +++ b/crates/algo/src/tests_iris.rs @@ -170,7 +170,7 @@ fn iris_depths_models_selection_tiles_and_cancellation() { let t = Rect::new(x, y, (x + tile).min(area.x1), (y + tile).min(area.y1)); let src = Image::read_clamped(&surface, t.inflate(radius), bounds); let mut data = reference::iris(&src, t, &ctx, &pins); - crate::mix_selection(&mut data, t, &selection, &src); + crate::mix_selection(&mut data, t, &selection, &src, alpha); want.write_region(t, &data); } } diff --git a/crates/algo/src/tests_selection_mix.rs b/crates/algo/src/tests_selection_mix.rs new file mode 100644 index 00000000..f715a8bb --- /dev/null +++ b/crates/algo/src/tests_selection_mix.rs @@ -0,0 +1,98 @@ +use super::*; +use photocraft_color::{PixelFormat, SampleType}; + +fn selection(coverage: f32) -> Surface { + Surface::with_default(PixelFormat::new(ColorMode::Grayscale, SampleType::F32, false), &[coverage]) +} + +#[test] +fn feathered_color_to_alpha_preserves_appearance_over_the_key() { + let r = Rect::new(0, 0, 1, 1); + let filter = FilterParams::ColorToAlpha { color: [1.0; 4], transparency_threshold: 0.0, opacity_threshold: 1.0 }; + for sample in SampleType::ALL { + for mode in [ColorMode::Rgb, ColorMode::Grayscale] { + for alpha in [0.5, 1.0] { + let format = PixelFormat::new(mode, sample, true); + let mut s = Surface::new(format); + let mut p = vec![0.5; format.channels()]; + *p.last_mut().unwrap() = alpha; + s.write_pixel(0, 0, &p); + let original = s.pixel(0, 0); + let a = format.channels() - 1; + for coverage in [0.0, 0.25, 0.5, 0.75, 1.0] { + let out = apply(&s, &filter, r, r, Some(&selection(coverage))); + let actual = out.pixel(0, 0); + let tolerance = if sample == SampleType::U8 { 2.0 / 255.0 } else { 1e-4 }; + for c in 0..a { + let before = original[c] * original[a] + 1.0 - original[a]; + let after = actual[c] * actual[a] + 1.0 - actual[a]; + assert!( + (before - after).abs() < tolerance, + "{sample:?}/{mode:?}, alpha={alpha}, coverage={coverage}: {original:?} -> {actual:?}, over white {before} -> {after}" + ); + } + } + } + } + } +} + +#[test] +fn feathered_offset_ignores_hidden_colour_of_the_original_pixel() { + let r = Rect::new(0, 0, 2, 1); + let filter = FilterParams::Offset { horizontal: 1, vertical: 0, undefined: UndefinedAreas::Wrap }; + for sample in SampleType::ALL { + let mut s = Surface::new(PixelFormat::new(ColorMode::Rgb, sample, true)); + s.write_pixel(0, 0, &[1.0, 0.0, 0.0, 0.0]); + s.write_pixel(1, 0, &[0.0, 0.0, 1.0, 1.0]); + let out = apply(&s, &filter, r, r, Some(&selection(0.5))); + let p = out.pixel(0, 0); + assert_eq!(&p[..3], &[0.0, 0.0, 1.0], "{sample:?}: hidden red contaminated the selected blue: {p:?}"); + assert!((p[3] - 0.5).abs() < 1.0 / 255.0); + } +} + +#[test] +fn feathered_blurs_do_not_reintroduce_hidden_colour() { + let r = Rect::new(0, 0, 3, 3); + let mut s = Surface::new(PixelFormat::RGBA32F); + s.fill_rect(r, &[1.0, 0.0, 0.0, 0.0]); + s.write_pixel(1, 1, &[0.0, 0.0, 1.0, 1.0]); + for filter in [FilterParams::BoxBlur { radius: 1.0 }, FilterParams::MotionBlur { angle: 0.0, distance: 3.0 }] { + let full = apply(&s, &filter, r, r, None); + let out = apply(&s, &filter, r, r, Some(&selection(0.5))); + let p = out.pixel(0, 1); + assert!(p[3] > 0.0, "{filter:?}: expected blur to spread coverage"); + assert!((p[3] - full.pixel(0, 1)[3] * 0.5).abs() < 1e-6, "{filter:?}: selection should halve the new coverage"); + assert!(p[0].abs() < 1e-6 && (p[2] - 1.0).abs() < 1e-6, "{filter:?}: hidden red reappeared: {p:?}"); + } +} + +#[test] +fn selection_mixing_keeps_hdr_range_and_exact_endpoints() { + let r = Rect::new(0, 0, 1, 1); + let original = Image { rect: r, ch: 4, data: vec![-2.0, 4.0, 0.5, 0.25] }; + let filtered = vec![8.0, -4.0, 0.75, 1.0]; + let mut data = filtered.clone(); + mix_selection(&mut data, r, &selection(0.5), &original, true); + for (&actual, expected) in data.iter().zip([6.0, -2.4, 0.7, 0.625]) { + assert!((actual - expected).abs() < 1e-6, "{data:?}"); + } + for coverage in [0.0, 1.0] { + let mut data = filtered.clone(); + mix_selection(&mut data, r, &selection(coverage), &original, true); + assert_eq!(data, if coverage == 0.0 { &original.data } else { &filtered }.clone()); + } +} + +#[test] +fn selection_mixing_without_alpha_keeps_every_channel_independent() { + let r = Rect::new(0, 0, 1, 1); + // One channel is a mask; three/four channels can be RGB or CMYK without alpha. + for ch in [1, 3, 4] { + let original = Image { rect: r, ch, data: vec![0.25; ch] }; + let mut data = vec![0.75; ch]; + mix_selection(&mut data, r, &selection(0.25), &original, false); + assert_eq!(data, vec![0.375; ch]); + } +} diff --git a/crates/algo/src/tests_tilt_shift.rs b/crates/algo/src/tests_tilt_shift.rs index 49a6e79b..88066ca9 100644 --- a/crates/algo/src/tests_tilt_shift.rs +++ b/crates/algo/src/tests_tilt_shift.rs @@ -177,7 +177,7 @@ fn tilt_shift_depths_models_selection_and_tile_edges_match_reference() { None => Image::read(&surface, t.inflate(radius)), }; let mut data = reference::tilt_shift(&src, t, &ctx, 17.0, (0.3, 0.7), 29.0, 0.07, 0.3); - crate::mix_selection(&mut data, t, &selection, &src); + crate::mix_selection(&mut data, t, &selection, &src, alpha); want.write_region(t, &data); } } From bb17dd555c161dbc6ca20c4cf856d1bf713456e5 Mon Sep 17 00:00:00 2001 From: HEOJUNFO <100739943+HEOJUNFO@users.noreply.github.com> Date: Mon, 12 Oct 2026 22:57:11 +0900 Subject: [PATCH 81/92] Color: convert input-only embedded profiles to the working space on open (#3876) (#3900) An iPhone photo embeds Apple's Wide Color Sharing Profile, an input-class profile with only AToB tables. Preserve kept it as the document's space, so every composite into the document failed with "RGB profile without matrix/TRC or BToA tags". Such a profile can't be a destination, so open converts from it to the working space whatever the policy (Off still discards it) and the report says inputOnly. Co-authored-by: Claude Opus 5.5 (1M context) --- crates/cms/src/profile.rs | 7 ++++ crates/engine/src/color_cmds.rs | 62 +++++++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 3 deletions(-) diff --git a/crates/cms/src/profile.rs b/crates/cms/src/profile.rs index 6d646cc1..99f5710e 100644 --- a/crates/cms/src/profile.rs +++ b/crates/cms/src/profile.rs @@ -296,6 +296,13 @@ impl Profile { self.a2b.iter().all(Option::is_none) && (self.matrix.is_some() && self.trc.is_some() || self.gray_trc.is_some()) } + /// Whether colours can be converted into this profile for every intent. Input profiles with + /// only AToB tables (Apple's Wide Color Sharing Profile on iPhone photos) can't: they + /// describe a source but have no PCS → device path. + pub fn can_be_destination(&self) -> bool { + [Intent::Perceptual, Intent::RelativeColorimetric, Intent::Saturation].into_iter().all(|i| self.pcs_to_device(i).is_ok()) + } + fn lut_for(luts: &[Option; 3], intent: Intent) -> Option<&Lut> { let i = match intent { Intent::Perceptual => 0, diff --git a/crates/engine/src/color_cmds.rs b/crates/engine/src/color_cmds.rs index f6d4b1b1..a68188bd 100644 --- a/crates/engine/src/color_cmds.rs +++ b/crates/engine/src/color_cmds.rs @@ -276,18 +276,22 @@ impl ColorState { if !mismatch || linear_hdr { return merge(base, json!({"action": "kept"})); } + // An input-only profile can't be the document's space: nothing could be + // composited into it (#3876). Preserve converts it to the working space instead. + let input_only = !emb.can_be_destination(); let action = match policy { - Policy::Preserve => "kept", + Policy::Preserve if !input_only => "kept", Policy::Off => { doc.icc_profile = None; "discarded" } - Policy::Convert => match convert_document(doc, &working, self.settings.intent(), self.settings.bpc) { + Policy::Preserve | Policy::Convert => match convert_document(doc, &working, self.settings.intent(), self.settings.bpc) { Ok(()) => "converted", Err(_) => "kept", }, }; - merge(base, json!({"action": action, "ask": self.settings.ask_on_mismatch})) + let report = merge(base, json!({"action": action, "ask": self.settings.ask_on_mismatch})); + if input_only { merge(report, json!({"inputOnly": true})) } else { report } } None => { // Untagged files are assumed to be in the working space; tag them when it is not @@ -1397,6 +1401,58 @@ mod settings_tests { assert_eq!(desc(&s.active().unwrap().doc).as_deref(), Some("Display P3")); } + /// Display P3 as an input profile with only an AToB table, like Apple's Wide Color Sharing + /// Profile embedded in iPhone photos. + fn input_only_p3() -> Profile { + let p3 = Builtin::DisplayP3.profile(); + let t = Transform::new(p3, Builtin::LabD50.profile(), Intent::RelativeColorimetric, false).unwrap(); + let clut = photocraft_cms::Clut::sample(vec![9; 3], 3, |inp, out| t.eval(inp, out)); + let ident = || photocraft_cms::pipeline::Stage::Curves(vec![photocraft_cms::Curve::Identity; 3]); + let lut = photocraft_cms::profile::Lut { + kind: photocraft_cms::profile::LutKind::Ab, + inputs: 3, + outputs: 3, + stages: vec![ident(), photocraft_cms::pipeline::Stage::Clut(clut), ident()], + }; + let mut p = p3.clone(); + p.class = photocraft_cms::ProfileClass::Input; + p.pcs = photocraft_cms::Pcs::Lab; + p.description = "Input-only P3".into(); + (p.matrix, p.trc) = (None, None); + p.a2b = [Some(lut), None, None]; + p.b2a = [None, None, None]; + p.with_encoded_bytes() + } + + #[test] + fn input_only_profiles_are_converted_on_open() { + // #3876: an iPhone photo's input-only profile was kept as the document's space, so + // compositing anything into it failed with "RGB profile without matrix/TRC or BToA tags". + let input = input_only_p3(); + assert!(Builtin::DisplayP3.profile().can_be_destination()); + assert!(!input.can_be_destination()); + let mut s = Session::new(); + let mut d = tagged("srgb"); + d.icc_profile = Some(input.to_bytes()); + let (photo, r) = s.open_document(d, None); + assert_eq!((r["action"].as_str(), r["inputOnly"].as_bool(), r["ask"].as_bool()), (Some("converted"), Some(true), Some(true))); + let doc = &s.active().unwrap().doc; + assert!(desc(doc).unwrap().starts_with("sRGB")); + // Converted from P3, not reinterpreted as sRGB. + assert!((doc.layers[0].surface().unwrap().pixel(1, 1)[0] - 0.2).abs() > 0.01); + let (other, _) = s.open_document(tagged("srgb"), None); + s.execute("layer.copyToDocument", json!({"document": photo, "source": other})).unwrap(); + // Off still discards the profile, and profiles that can be a destination are still kept. + s.execute("edit.colorSettings", json!({"policyRgb": "off"})).unwrap(); + let mut d = tagged("srgb"); + d.icc_profile = Some(input.to_bytes()); + let (_, r) = s.open_document(d, None); + assert_eq!((r["action"].as_str(), r["inputOnly"].as_bool()), (Some("discarded"), Some(true))); + s.execute("edit.colorSettings", json!({"policyRgb": "preserve"})).unwrap(); + let (_, r) = s.open_document(tagged("display-p3"), None); + assert_eq!((r["action"].as_str(), r.get("inputOnly")), (Some("kept"), None)); + } + /// A little-endian EXIF block whose Exif IFD holds ColorSpace = `space`. fn exif_color_space(space: u16) -> Vec { let mut b = b"Exif\0\0II\x2a\0\x08\0\0\0".to_vec(); From fd21e734111ef0af3f26b77e3e59d3d651c50f91 Mon Sep 17 00:00:00 2001 From: Valentin Klein Date: Mon, 12 Oct 2026 16:06:16 +0200 Subject: [PATCH 82/92] Format: check pattern sizes on load (#3478) (#3484) * Format: check pattern sizes on load (#3478) A .pcraft pattern's width/height came straight from the manifest, so a 1 KB file could declare a 65535x65535 pattern without tiles; painting it allocated width*height*16 bytes (abort) and the engine's u32 size math overflowed. - format: reject patterns 0 px on a side (Corrupt) or above the PSD reader's 30 000 px edge (LimitExceeded). - doc: Pattern::pixel_count / is_paintable with MAX_PAINT_PIXELS (2^26, a 1 GiB f32 RGBA working copy). - compose/gpu: patterns too large to paint paint nothing instead of allocating (Tile::new_in, pattern_rgba, PreparedPatterns, GPU plan). - engine: brush.texturePattern refuses them; average_color uses u64 math and a bounded corner. Co-Authored-By: Claude Opus 5.5 * gpu: skip unpaintable patterns in the Bevel texture too The Bevel & Emboss texture element uploaded the pattern through pattern_rgba, which now returns no pixels for a pattern too large to paint; filter it like the other GPU pattern lookups. Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 Co-authored-by: Brandon Thomas --- crates/compose/src/pattern.rs | 24 +++++++++++++++--- crates/doc/src/pattern.rs | 17 +++++++++++++ crates/engine/src/fill_cmds.rs | 2 +- crates/engine/src/paint_cmds.rs | 2 +- crates/engine/src/pattern_cmds.rs | 23 ++++++++++++++--- .../engine/src/retouch_cmds/pattern_stamp.rs | 2 +- crates/format/src/convert.rs | 9 +++++++ crates/format/tests/corruption.rs | 25 +++++++++++++++++++ crates/gpu/src/fx.rs | 2 +- crates/gpu/src/plan.rs | 6 ++--- 10 files changed, 98 insertions(+), 14 deletions(-) diff --git a/crates/compose/src/pattern.rs b/crates/compose/src/pattern.rs index a55c2c8a..a2c5c52f 100644 --- a/crates/compose/src/pattern.rs +++ b/crates/compose/src/pattern.rs @@ -45,7 +45,7 @@ impl<'a> PreparedPatterns<'a> { pub(crate) fn get(&self, id: &str, name: &str) -> Option> { let p = photocraft_doc::pattern::find(self.patterns, id, name)?; - if p.is_empty() { + if !p.is_paintable() { return None; } let bytes = usize::try_from(p.width) @@ -87,9 +87,13 @@ impl<'a> PreparedPatterns<'a> { /// colour mode `mode`. A pattern keeps its own colours (an RGB pattern stays RGB, in the /// library and in the document), but in a Grayscale or CMYK document it paints that mode's /// colours: what Edit › Fill writes into the document's pixels, and what Photoshop shows (the -/// pattern in colour in its picker, filled in grey). +/// pattern in colour in its picker, filled in grey). Empty for a pattern that isn't +/// [paintable](Pattern::is_paintable). pub fn pattern_rgba(p: &Pattern, mode: ColorMode) -> Vec<[f32; 4]> { - let mut px = vec![[0.0f32; 4]; (p.width as usize).saturating_mul(p.height as usize)]; + let Some(n) = p.is_paintable().then(|| usize::try_from(p.pixel_count()).ok()).flatten() else { + return Vec::new(); + }; + let mut px = vec![[0.0f32; 4]; n]; p.surface.read_rgba_into(p.rect(), &mut px); let paints_in = matches!(mode, ColorMode::Grayscale | ColorMode::Bitmap | ColorMode::Duotone | ColorMode::Cmyk); if paints_in && p.surface.format().mode != mode { @@ -117,8 +121,9 @@ impl Tile { } /// The tile of `p` painted into a document of colour mode `mode` (see [`pattern_rgba`]). + /// `None` when the pattern isn't [paintable](Pattern::is_paintable). pub fn new_in(p: &Pattern, mode: ColorMode) -> Option { - if p.is_empty() { + if !p.is_paintable() { return None; } let (w, h) = (p.width as usize, p.height as usize); @@ -255,6 +260,17 @@ mod tests { assert_eq!(px[8], [0.0, 0.0, 1.0, 1.0]); // x = 4 } + #[test] + fn patterns_too_large_to_paint_are_skipped_without_allocating() { + // Only the size is declared (no tiles): a hostile file can claim any size. + let p = Pattern { id: "big".into(), name: "Big".into(), width: 9000, height: 8000, surface: Surface::new(PixelFormat::RGBA8) }; + assert!(!p.is_paintable()); + assert!(Tile::new(&p).is_none()); + assert!(pattern_rgba(&p, ColorMode::Rgb).is_empty()); + let list = [p]; + assert!(PreparedPatterns::new(&list, 0).get("big", "").is_none()); + } + #[test] fn link_phase_scale_and_angle_move_the_origin() { let t = Tile::new(&checker()).unwrap(); diff --git a/crates/doc/src/pattern.rs b/crates/doc/src/pattern.rs index 47279e2c..9a43c0a4 100644 --- a/crates/doc/src/pattern.rs +++ b/crates/doc/src/pattern.rs @@ -5,6 +5,13 @@ use photocraft_geom::Rect; use photocraft_raster::Surface; +/// Largest pattern edge a file may declare (the PSD reader's limit; Define Pattern stops at 4000). +pub const MAX_EDGE: u32 = 30_000; + +/// Most pixels a pattern may have to be painted. Renderers expand a pattern into a 16-byte-per-pixel +/// working copy, so this keeps that copy at 1 GiB; larger patterns paint nothing. +pub const MAX_PAINT_PIXELS: u64 = 1 << 26; + /// One pattern tile. Pixels cover `0..width × 0..height` of `surface`, in any pixel format /// (depth and colour model are the pattern's own, as in Photoshop). #[derive(Clone, Debug, PartialEq)] @@ -57,6 +64,16 @@ impl Pattern { pub fn is_empty(&self) -> bool { self.width == 0 || self.height == 0 } + + /// Pixels in the tile (`width × height`, never overflowing). + pub fn pixel_count(&self) -> u64 { + u64::from(self.width) * u64::from(self.height) + } + + /// Whether the tile has pixels and is small enough to paint (see [`MAX_PAINT_PIXELS`]). + pub fn is_paintable(&self) -> bool { + !self.is_empty() && self.pixel_count() <= MAX_PAINT_PIXELS + } } /// Display form of a stored pattern name (see [`Pattern::display_name`]). diff --git a/crates/engine/src/fill_cmds.rs b/crates/engine/src/fill_cmds.rs index a7350daf..130977ce 100644 --- a/crates/engine/src/fill_cmds.rs +++ b/crates/engine/src/fill_cmds.rs @@ -106,7 +106,7 @@ pub fn fill(s: &mut Session, p: &Value) -> Result { "pattern" => { let pat = crate::pattern_cmds::resolve_param(s, CMD, p)?; let (scale, angle, _, phase) = crate::pattern_cmds::placement(p); - let tile = photocraft_compose::pattern::Tile::new(&pat).ok_or_else(|| bad("the pattern is empty"))?; + let tile = photocraft_compose::pattern::Tile::new(&pat).ok_or_else(|| bad("the pattern is empty or too large to paint"))?; // Photoshop's Fill uses the canvas origin. let place = photocraft_compose::pattern::Placement::new(Rect::EMPTY, false, phase, scale, angle); out["pattern"] = json!(pat.id); diff --git a/crates/engine/src/paint_cmds.rs b/crates/engine/src/paint_cmds.rs index 7366758e..ad16cd85 100644 --- a/crates/engine/src/paint_cmds.rs +++ b/crates/engine/src/paint_cmds.rs @@ -55,7 +55,7 @@ fn bucket(s: &mut Session, p: &Value) -> Result { let pattern = if source == "pattern" { let pat = crate::pattern_cmds::resolve_param(s, "paint.bucket", p)?; let tile = photocraft_compose::pattern::Tile::new(&pat) - .ok_or_else(|| EngineError::BadParams { cmd: "paint.bucket".into(), msg: "the pattern is empty".into() })?; + .ok_or_else(|| EngineError::BadParams { cmd: "paint.bucket".into(), msg: "the pattern is empty or too large to paint".into() })?; let (scale, angle, _, phase) = crate::pattern_cmds::placement(p); Some((tile, scale, angle, phase)) } else { diff --git a/crates/engine/src/pattern_cmds.rs b/crates/engine/src/pattern_cmds.rs index 21bee128..d58fd9e8 100644 --- a/crates/engine/src/pattern_cmds.rs +++ b/crates/engine/src/pattern_cmds.rs @@ -326,8 +326,12 @@ fn new_fill_layer(s: &mut Session, p: &Value) -> Result { fn brush_texture(s: &mut Session, p: &Value) -> Result { let pat = resolve_param(s, "brush.texturePattern", p)?; + let n = pat.is_paintable().then(|| usize::try_from(pat.pixel_count()).ok()).flatten(); + let Some(n) = n else { + return Err(bad("brush.texturePattern", "the pattern is empty or too large to paint")); + }; // Brush textures are grey: luminance of the composite over white. - let mut px = vec![[0.0f32; 4]; (pat.width * pat.height) as usize]; + let mut px = vec![[0.0f32; 4]; n]; pat.surface.read_rgba_into(pat.rect(), &mut px); let lum: Vec = px .iter() @@ -348,8 +352,11 @@ fn brush_texture(s: &mut Session, p: &Value) -> Result { /// A swatch colour for UIs (average of the tile), straight RGB. pub fn average_color(p: &Pattern) -> Color { - let mut px = vec![[0.0f32; 4]; (p.width * p.height) as usize]; - p.surface.read_rgba_into(p.rect(), &mut px); + // A pattern too large to paint is averaged over its paintable top-left corner. + let side = photocraft_doc::pattern::MAX_PAINT_PIXELS.isqrt() as u32; + let (w, h) = (p.width.min(side), p.height.min(side)); + let mut px = vec![[0.0f32; 4]; w as usize * h as usize]; + p.surface.read_rgba_into(Rect::new(0, 0, w as i32, h as i32), &mut px); let n = px.len().max(1) as f32; let s = px.iter().fold([0.0f32; 3], |a, q| [a[0] + q[0], a[1] + q[1], a[2] + q[2]]); Color::rgb(s[0] / n, s[1] / n, s[2] / n) @@ -560,4 +567,14 @@ mod tests { assert!(s.tools.brush.texture.enabled); assert!(matches!(s.tools.brush.texture.pattern, photocraft_paint::Pattern::Tile(_))); } + + #[test] + fn a_pattern_too_large_to_paint_is_refused_not_allocated() { + // width × height overflows u32: this panicked (debug) or wrapped (release). + let mut s = session(8); + let huge = Pattern { id: "huge".into(), name: "Huge".into(), width: 65_536, height: 65_536, surface: Surface::new(PixelFormat::RGBA8) }; + s.patterns.items.push(huge); + let e = s.execute("brush.texturePattern", json!({"pattern": "huge"})).unwrap_err(); + assert!(e.to_string().contains("too large"), "{e}"); + } } diff --git a/crates/engine/src/retouch_cmds/pattern_stamp.rs b/crates/engine/src/retouch_cmds/pattern_stamp.rs index cb9e0adf..0dc9f102 100644 --- a/crates/engine/src/retouch_cmds/pattern_stamp.rs +++ b/crates/engine/src/retouch_cmds/pattern_stamp.rs @@ -45,7 +45,7 @@ pub(super) fn run(s: &mut Session, p: &Value) -> Result { return Err(bad(CMD, "`points` is empty")); }; let phase = stamp_phase(p, CMD, aligned, first)?; - let tile = Tile::new(&pat).ok_or_else(|| bad(CMD, "the pattern is empty"))?; + let tile = Tile::new(&pat).ok_or_else(|| bad(CMD, "the pattern is empty or too large to paint"))?; reject_huge_stroke(CMD, &stroke)?; let seed = p.get("seed").and_then(Value::as_u64).unwrap_or_else(|| { diff --git a/crates/format/src/convert.rs b/crates/format/src/convert.rs index 4dbbb6aa..47ea5383 100644 --- a/crates/format/src/convert.rs +++ b/crates/format/src/convert.rs @@ -592,6 +592,15 @@ impl Loader<'_> { } let mut patterns = Vec::with_capacity(m.patterns.len()); for p in &m.patterns { + // Sizes come from the file: a pattern with no tiles can claim any size, and renderers + // allocate per pixel. + let max = photocraft_doc::pattern::MAX_EDGE; + if p.width == 0 || p.height == 0 { + return Err(FormatError::corrupt(format!("pattern `{}` is {}×{} px", p.name, p.width, p.height))); + } + if p.width > max || p.height > max { + return Err(FormatError::LimitExceeded(format!("pattern `{}` is {}×{} px (max {max} per side)", p.name, p.width, p.height))); + } patterns.push(Pattern { id: p.id.clone(), name: p.name.clone(), width: p.width, height: p.height, surface: self.surface(&p.surface)? }); } let layer_comps = m.layer_comps.iter().map(|c| self.comp(c)).collect::>>()?; diff --git a/crates/format/tests/corruption.rs b/crates/format/tests/corruption.rs index 2f47203b..2ef07bcd 100644 --- a/crates/format/tests/corruption.rs +++ b/crates/format/tests/corruption.rs @@ -419,6 +419,31 @@ fn tile_coordinates_outside_the_i32_pixel_range_are_rejected() { } } +/// Rewrites the first pattern's declared size (its tiles stay as saved). +fn with_pattern_size(w: u64, h: u64) -> Vec { + rebuild(sample_cached(), |n, d| { + if n != "manifest.json" { + return Some(d); + } + let mut v: serde_json::Value = serde_json::from_slice(&d).unwrap(); + let p = &mut v["document"]["patterns"][0]; + assert!(p.is_object(), "the sample has a pattern"); + p["width"] = w.into(); + p["height"] = h.into(); + Some(serde_json::to_vec(&v).unwrap()) + }) +} + +#[test] +fn pattern_sizes_from_the_file_are_checked() { + // A pattern can claim any size without tiles; painting it allocated per pixel (abort). + let huge = load_from_bytes(&with_pattern_size(65_535, 65_535)); + assert!(matches!(huge, Err(FormatError::LimitExceeded(_))), "{huge:?}"); + let empty = load_from_bytes(&with_pattern_size(0, 24)); + assert!(matches!(empty, Err(FormatError::Corrupt(_))), "{empty:?}"); + assert!(load_from_bytes(&with_pattern_size(32, 24)).is_ok()); +} + /// A canvas is a few bytes of manifest JSON; one past the budget is refused before any work (#2935). /// The default budget is the largest canvas the app creates (300000 × 300000, as `file.new`, /// Canvas Size and PSB import allow), so everything a user can save reopens. diff --git a/crates/gpu/src/fx.rs b/crates/gpu/src/fx.rs index 9eba5888..cc396d8b 100644 --- a/crates/gpu/src/fx.rs +++ b/crates/gpu/src/fx.rs @@ -389,7 +389,7 @@ pub(crate) fn program_with(e: &Effect, light: &GlobalLight, vector_shape: bool, h = b.push(st); } if let Some(t) = &bv.texture - && let Some(pat) = photocraft_doc::pattern::find(patterns, &t.id, &t.name).filter(|p| !p.is_empty()) + && let Some(pat) = photocraft_doc::pattern::find(patterns, &t.id, &t.name).filter(|p| p.is_paintable()) { // Texture element (`effects::bevel_height`): luminance × depth / unit added. let unit = if bv.depth.abs() > 1e-6 { (g.depth / bv.depth).abs().max(1e-3) } else { g.width.max(1.0) }; diff --git a/crates/gpu/src/plan.rs b/crates/gpu/src/plan.rs index f5a3b573..fb135dc1 100644 --- a/crates/gpu/src/plan.rs +++ b/crates/gpu/src/plan.rs @@ -803,7 +803,7 @@ impl<'a> Planner<'a> { // compose::render_fill: the pattern tiled from the layer's frame (transparent // when missing), then the layer's masks. let empty = self.clear(); - let Some(pat) = photocraft_doc::pattern::find(self.cx.patterns, id, name).filter(|p| !p.is_empty()) else { return Ok(empty) }; + let Some(pat) = photocraft_doc::pattern::find(self.cx.patterns, id, name).filter(|p| p.is_paintable()) else { return Ok(empty) }; let frame = photocraft_compose::fill_frame(layer, self.cx.canvas); let anchor = if frame.is_empty() { (0.0, 0.0) } else { (f64::from(frame.x0), f64::from(frame.y0)) }; let paint = Paint::Pattern(pat, placement(anchor, *link, *phase, *scale, *angle)); @@ -1097,7 +1097,7 @@ impl<'a> Planner<'a> { }; for &(_, e) in &rev { if let Effect::PatternOverlay { common, name, id, scale, angle, link, phase } = e - && let Some(pat) = photocraft_doc::pattern::find(self.cx.patterns, id, name).filter(|p| !p.is_empty()) + && let Some(pat) = photocraft_doc::pattern::find(self.cx.patterns, id, name).filter(|p| p.is_paintable()) { let paint = Paint::Pattern(pat, placement(anchor, *link, *phase, *scale, *angle)); l = self.paint(l, content, Cov::One, &paint, common.blend, common.opacity, F_GATE, clip, sb); @@ -1312,7 +1312,7 @@ impl<'a> Planner<'a> { match p { FxPaint::Color(c) => Paint::Color(c.to_rgb()), FxPaint::Gradient(g) => Paint::Gradient(g), - FxPaint::Pattern { name, id, scale } => match photocraft_doc::pattern::find(self.cx.patterns, id, name).filter(|p| !p.is_empty()) { + FxPaint::Pattern { name, id, scale } => match photocraft_doc::pattern::find(self.cx.patterns, id, name).filter(|p| p.is_paintable()) { Some(pat) => Paint::Pattern(pat, placement(anchor, true, (0.0, 0.0), *scale, 0.0)), None => Paint::None, }, From 73a56d76032a9d94cda7c838d110f82c3914d8be Mon Sep 17 00:00:00 2001 From: Valentin Klein Date: Mon, 12 Oct 2026 16:08:20 +0200 Subject: [PATCH 83/92] Format: overflow-safe blob decode and bounds-checked ZIP reads (#3486) (#3501) - store: `max_blob_bytes as u64 + 1` overflowed for usize::MAX (debug panic; release take(0), so every blob failed). The blob read and the tile decode now share decompress_bounded(), which saturates. - zip: ZipReader::read sliced `data_offset..data_offset + compressed` unchecked although Entry is pub + Clone; a foreign entry is now a Corrupt error. - store: Collect::tile reuses tile_le(); Object::content() gives the stored bytes once (existing_object_is_valid no longer builds them twice). Co-authored-by: Claude Opus 5.5 Co-authored-by: Brandon Thomas --- crates/format/src/store.rs | 65 +++++++++++++++---------------- crates/format/src/zip.rs | 20 +++++++++- crates/format/tests/corruption.rs | 9 +++++ 3 files changed, 60 insertions(+), 34 deletions(-) diff --git a/crates/format/src/store.rs b/crates/format/src/store.rs index 674c99f2..c14b4882 100644 --- a/crates/format/src/store.rs +++ b/crates/format/src/store.rs @@ -30,14 +30,24 @@ fn compress(data: &[u8]) -> Vec { ruzstd::encoding::compress_to_vec(data, ruzstd::encoding::CompressionLevel::Fastest) } -fn decompress(data: &[u8], expected: usize, what: &str) -> Result> { - let mut dec = ruzstd::decoding::StreamingDecoder::new(data).map_err(|e| FormatError::corrupt(format!("{what}: zstd: {e}")))?; - let mut out = Vec::with_capacity(expected.min(64 << 20)); - (&mut dec).take(expected as u64 + 1).read_to_end(&mut out).map_err(|e| FormatError::corrupt(format!("{what}: zstd: {e}")))?; - if out.len() != expected { - return Err(FormatError::corrupt(format!("{what}: expected {expected} bytes, got {}", out.len()))); +/// Decodes a zstd frame of at most `max` bytes (`LimitExceeded` beyond). With `exact`, the +/// decoded length must be exactly that (`Corrupt` otherwise). +fn decompress_bounded(data: &[u8], max: usize, exact: Option, what: &str) -> Result> { + let zstd = |e: &dyn std::fmt::Display| FormatError::corrupt(format!("{what}: zstd: {e}")); + let mut dec = ruzstd::decoding::StreamingDecoder::new(data).map_err(|e| zstd(&e))?; + let mut out = Vec::with_capacity(exact.unwrap_or(0).min(max).min(64 << 20)); + // `max` may be `usize::MAX`: one byte past it must not overflow. + let limit = u64::try_from(max).unwrap_or(u64::MAX).saturating_add(1); + (&mut dec).take(limit).read_to_end(&mut out).map_err(|e| zstd(&e))?; + match exact { + Some(n) if out.len() != n => Err(FormatError::corrupt(format!("{what}: expected {n} bytes, got {}", out.len()))), + None if out.len() > max => Err(FormatError::LimitExceeded(format!("{what} exceeds {max} bytes"))), + _ => Ok(out), } - Ok(out) +} + +fn decompress(data: &[u8], expected: usize, what: &str) -> Result> { + decompress_bounded(data, expected, Some(expected), what) } fn hash_bytes(b: &[u8]) -> Hash { @@ -228,12 +238,7 @@ impl Fetch for LoadFetch<'_> { let z = self.src.get(&path, self.opts.max_blob_bytes)?; // Blob length is not in the manifest; the frame header bounds it and // we cap at max_blob_bytes. - let mut dec = ruzstd::decoding::StreamingDecoder::new(&z[..]).map_err(|e| FormatError::corrupt(format!("{path}: zstd: {e}")))?; - let mut data = Vec::new(); - (&mut dec).take(self.opts.max_blob_bytes as u64 + 1).read_to_end(&mut data).map_err(|e| FormatError::corrupt(format!("{path}: zstd: {e}")))?; - if data.len() > self.opts.max_blob_bytes { - return Err(FormatError::LimitExceeded(format!("{path} exceeds max_blob_bytes"))); - } + let data = decompress_bounded(&z, self.opts.max_blob_bytes, None, &path)?; self.account(data.len())?; if hash_bytes(&data) != hash { return Err(FormatError::corrupt(format!("{path}: content does not match its hash"))); @@ -313,13 +318,7 @@ impl Sink for Collect<'_> { self.tiles.entry(h.clone()).or_insert_with(|| (tile.clone(), format.sample)); return h; } - let h = if cfg!(target_endian = "big") { - let mut b = tile.bytes().to_vec(); - swap_to_le(&mut b, format.sample); - hash_bytes(&b) - } else { - hash_bytes(tile.bytes()) - }; + let h = hash_bytes(&tile_le(tile, format.sample)); if let Some(cache) = self.hash_cache.as_deref_mut() { cache.insert(key, (Arc::downgrade(tile), h.clone())); } @@ -414,21 +413,23 @@ enum Object { impl Object { fn compressed(&self) -> Vec { - match self { - Object::Tile(t, s) => compress(&tile_le(t, *s)), - Object::Blob(b) => compress(b), - } + compress(&self.content()) } - fn matches_content_hash(&self, compressed: &[u8], what: &str) -> bool { - let expected = match self { + /// The bytes this object stores (tiles little-endian). + fn content(&self) -> std::borrow::Cow<'_, [u8]> { + match self { Object::Tile(tile, sample) => tile_le(tile, *sample), Object::Blob(blob) => std::borrow::Cow::Borrowed(blob.as_slice()), - }; - decompress(compressed, expected.len(), what).is_ok_and(|actual| hash_bytes(&actual) == hash_bytes(&expected)) + } } } +/// Whether `compressed` decodes to exactly `expected`. +fn content_matches(expected: &[u8], compressed: &[u8], what: &str) -> bool { + decompress(compressed, expected.len(), what).is_ok_and(|actual| hash_bytes(&actual) == hash_bytes(expected)) +} + fn file_signature(metadata: &std::fs::Metadata) -> Option { #[cfg(unix)] let unix = { @@ -587,10 +588,8 @@ fn existing_object_is_valid(path: &Path, object: &Object, what: &str) -> Result< } let signature = file_signature(&metadata); - let expected_len = match object { - Object::Tile(tile, sample) => tile_le(tile, *sample).len(), - Object::Blob(blob) => blob.len(), - }; + let expected = object.content(); + let expected_len = expected.len(); // This is the same bound used by the tile loader. It comfortably includes // zstd framing overhead while keeping damaged files bounded when inspected. let max_compressed_len = expected_len.saturating_add(expected_len / 8).saturating_add(4096); @@ -604,7 +603,7 @@ fn existing_object_is_valid(path: &Path, object: &Object, what: &str) -> Result< if compressed.len() > max_compressed_len { return Ok((false, None)); } - Ok((object.matches_content_hash(&compressed, what), signature)) + Ok((content_matches(&expected, &compressed, what), signature)) } /// A bundle path and its compressed bytes. diff --git a/crates/format/src/zip.rs b/crates/format/src/zip.rs index 1e296e16..9ec92c2f 100644 --- a/crates/format/src/zip.rs +++ b/crates/format/src/zip.rs @@ -201,7 +201,12 @@ impl<'a> ZipReader<'a> { if e.uncompressed > max { return Err(FormatError::LimitExceeded(format!("zip entry `{}` is {} bytes (max {max})", e.name, e.uncompressed))); } - let raw = &self.bytes[e.data_offset..e.data_offset + e.compressed]; + // `Entry` is public and cloneable: one from another archive must not index out of range. + let raw = e + .data_offset + .checked_add(e.compressed) + .and_then(|end| self.bytes.get(e.data_offset..end)) + .ok_or_else(|| FormatError::corrupt(format!("zip entry `{}` out of range", e.name)))?; let data = match e.method { 0 => raw.to_vec(), 8 => { @@ -366,6 +371,19 @@ mod tests { assert!(matches!(archive.read_by_name("manifest.json", usize::MAX), Err(FormatError::Corrupt(_)))); } + #[test] + fn an_entry_from_another_archive_is_an_error_not_a_panic() { + let mut big = ZipWriter::new(); + big.add("a", &[7; 4096]).unwrap(); + let big = big.finish().unwrap(); + let foreign = ZipReader::new(&big).unwrap().entries[0].clone(); + let mut small = ZipWriter::new(); + small.add("a", b"x").unwrap(); + let small = small.finish().unwrap(); + let r = ZipReader::new(&small).unwrap(); + assert!(matches!(r.read(&foreign, usize::MAX), Err(FormatError::Corrupt(_)))); + } + #[test] fn offset_access_rejects_overflow() { assert!(u16_at(&[], usize::MAX).is_err()); diff --git a/crates/format/tests/corruption.rs b/crates/format/tests/corruption.rs index 2ef07bcd..d293abed 100644 --- a/crates/format/tests/corruption.rs +++ b/crates/format/tests/corruption.rs @@ -419,6 +419,15 @@ fn tile_coordinates_outside_the_i32_pixel_range_are_rejected() { } } +#[test] +fn an_unlimited_blob_budget_still_loads_blobs() { + // `max_blob_bytes + 1` overflowed (debug panic; release read zero bytes, failing every blob). + let doc = rich_doc(ColorMode::Rgb, SampleType::U8); + let bytes = save_to_bytes(&doc, &SaveOptions::default()).unwrap(); + let opts = LoadOptions { max_blob_bytes: usize::MAX, ..LoadOptions::default() }; + assert_eq!(load_from_bytes_with(&bytes, &opts).unwrap(), doc); +} + /// Rewrites the first pattern's declared size (its tiles stay as saved). fn with_pattern_size(w: u64, h: u64) -> Vec { rebuild(sample_cached(), |n, d| { From 423421a879858fbfe46ac701a082ba706055c5f3 Mon Sep 17 00:00:00 2001 From: null 00000111 <287216888+s17sh70x2jfl031ag@users.noreply.github.com> Date: Mon, 12 Oct 2026 07:19:06 -0700 Subject: [PATCH 84/92] Fuzz: ignore the same build leftovers in every fuzz crate (#3585) crates/raw/fuzz had no .gitignore, crates/psd/fuzz didn't ignore Cargo.lock and crates/format/fuzz didn't ignore coverage/, so running those fuzz targets left untracked files in the checkout. All five fuzz crates now ignore target/, corpus/, artifacts/, coverage/ and Cargo.lock, as codecs and affinity already did. --- crates/format/fuzz/.gitignore | 1 + crates/psd/fuzz/.gitignore | 1 + crates/raw/fuzz/.gitignore | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 crates/raw/fuzz/.gitignore diff --git a/crates/format/fuzz/.gitignore b/crates/format/fuzz/.gitignore index d932d310..fc87536a 100644 --- a/crates/format/fuzz/.gitignore +++ b/crates/format/fuzz/.gitignore @@ -2,3 +2,4 @@ target/ corpus/ artifacts/ Cargo.lock +coverage/ diff --git a/crates/psd/fuzz/.gitignore b/crates/psd/fuzz/.gitignore index 1a45eee7..5c404b95 100644 --- a/crates/psd/fuzz/.gitignore +++ b/crates/psd/fuzz/.gitignore @@ -2,3 +2,4 @@ target corpus artifacts coverage +Cargo.lock diff --git a/crates/raw/fuzz/.gitignore b/crates/raw/fuzz/.gitignore new file mode 100644 index 00000000..ab0eaa1a --- /dev/null +++ b/crates/raw/fuzz/.gitignore @@ -0,0 +1,5 @@ +target/ +corpus/ +artifacts/ +coverage/ +Cargo.lock From 0b935da8822f5294c22548f9facacf4c3fcd06e3 Mon Sep 17 00:00:00 2001 From: null 00000111 <287216888+s17sh70x2jfl031ag@users.noreply.github.com> Date: Mon, 12 Oct 2026 07:22:11 -0700 Subject: [PATCH 85/92] HEIF: move the heic-rs pin from 0.1.1 to 0.1.4 (#3637) heic-rs 0.1.2 to 0.1.4 fix six panics on malformed files, found by fuzzing: four in release builds (a uuid box too small for its extended type, a block starting right of the picture, a conformance window larger than the picture, and a reference row below the picture) and two with overflow checks on (a PCM bit depth above the sample bit depth, a slice QP out of range). The API, MSRV and output are unchanged. Both pins move together: crates/heif and the codecs fuzz target, which calls heic-rs directly. guarded() stays as the backstop it was meant to be. --- Cargo.lock | 4 ++-- crates/codecs/fuzz/Cargo.toml | 2 +- crates/heif/Cargo.toml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 160403c4..a3948361 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2331,9 +2331,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "heic-rs" -version = "0.1.1" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf9dde634bb6d5b718bacd01bef80192f2334306b2f785519a0136cca7b9618" +checksum = "8883c3bfa6b4ff19a40e52a6dc051c5612cbe21bf408fc6d4875e8dfd777cb66" dependencies = [ "rayon", ] diff --git a/crates/codecs/fuzz/Cargo.toml b/crates/codecs/fuzz/Cargo.toml index 9cbb3d98..62ec96c5 100644 --- a/crates/codecs/fuzz/Cargo.toml +++ b/crates/codecs/fuzz/Cargo.toml @@ -16,7 +16,7 @@ cargo-fuzz = true libfuzzer-sys = "0.4" photocraft-codecs = { path = "..", features = ["heif"] } # Called directly too: the codec turns its panics into errors (see decode_heif.rs). -heic-rs = "=0.1.1" +heic-rs = "=0.1.4" [profile.release] debug = 1 diff --git a/crates/heif/Cargo.toml b/crates/heif/Cargo.toml index f8ddf645..18210b0c 100644 --- a/crates/heif/Cargo.toml +++ b/crates/heif/Cargo.toml @@ -9,11 +9,11 @@ rust-version.workspace = true [dependencies] # Pure Rust, no unsafe. Pinned exactly: a young, single-owner crate that parses untrusted files; # moving the pin is a reviewed change (re-run the fuzz target and the heif corpus tests). -heic-rs = { version = "=0.1.1", default-features = false, features = ["std"] } +heic-rs = { version = "=0.1.4", default-features = false, features = ["std"] } # The tiles of a HEIC photo decode in parallel on native; wasm stays single-threaded. [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -heic-rs = { version = "=0.1.1", default-features = false, features = ["std", "parallel"] } +heic-rs = { version = "=0.1.4", default-features = false, features = ["std", "parallel"] } [lints] workspace = true From 019a391f40728f94dc8e1ce8f3bda65bead81fcf Mon Sep 17 00:00:00 2001 From: Valentin Klein Date: Mon, 12 Oct 2026 16:33:21 +0200 Subject: [PATCH 86/92] Codecs: decode only the requested EXR part; Cryptomatte uses the cumulative cap (#3721) (#3722) read_layer decoded every part and picked one; use a first-valid-layer reader that declines all other parts. Cryptomatte now goes through read_meta and read_layer. Enable exr/rayon on native targets. Co-authored-by: Claude Opus 5.5 --- Cargo.lock | 1 + crates/codecs/Cargo.toml | 2 ++ crates/codecs/src/codecs/exr.rs | 33 ++++++++++++++++----- crates/codecs/src/codecs/exr_cryptomatte.rs | 12 ++------ crates/codecs/tests/exr_multipart.rs | 29 ++++++++++++++++++ 5 files changed, 61 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a3948361..f17edd11 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1743,6 +1743,7 @@ dependencies = [ "miniz_oxide 0.8.9", "num-complex", "pulp", + "rayon-core", "smallvec", "zune-inflate", ] diff --git a/crates/codecs/Cargo.toml b/crates/codecs/Cargo.toml index a55dcf12..c462d0a3 100644 --- a/crates/codecs/Cargo.toml +++ b/crates/codecs/Cargo.toml @@ -36,6 +36,8 @@ photocraft-heif = { path = "../heif", optional = true } # Orientation is applied a band of rows per task on native; wasm stays single-threaded. [target.'cfg(not(target_arch = "wasm32"))'.dependencies] rayon.workspace = true +# EXR block (de)compression runs on the rayon pool natively; wasm stays single-threaded. +exr = { version = "1.73", default-features = false, features = ["rayon"] } [dev-dependencies] proptest.workspace = true diff --git a/crates/codecs/src/codecs/exr.rs b/crates/codecs/src/codecs/exr.rs index a4014db0..2506dd06 100644 --- a/crates/codecs/src/codecs/exr.rs +++ b/crates/codecs/src/codecs/exr.rs @@ -35,7 +35,7 @@ fn map_exr(e: exr::error::Error) -> CodecError { /// Read the headers without the `exr` crate's validation (it rejects deep parts outright), /// after checking every part's declared size against the limits, before any pixel allocation. -fn read_meta(bytes: &[u8], limits: &Limits) -> Result { +pub(super) fn read_meta(bytes: &[u8], limits: &Limits) -> Result { let meta = MetaData::read_from_buffered(Cursor::new(bytes), false).map_err(err)?; // Flat decoding reads every part at once, so the parts' sizes are also capped together. let mut total: u64 = 0; @@ -93,12 +93,31 @@ fn pick_part(meta: &MetaData) -> usize { best } -/// Decode the flat layers via the `exr` crate (it handles every flat compression) and -/// return the requested part's layer. -fn read_layer(bytes: &[u8], index: usize) -> Result>, CodecError> { - let image = - read().no_deep_data().largest_resolution_level().all_channels().all_layers().all_attributes().from_buffered(Cursor::new(bytes)).map_err(map_exr)?; - image.layer_data.into_iter().nth(index).ok_or_else(|| err(format!("part {index} is missing from the file"))) +/// Selects one part for the `exr` crate's first-valid-layer reader: `create_channels_reader` +/// is asked about the headers in file order and the first `Ok` wins, so every header before +/// `index` (and, harmlessly, those after it) is declined. Only the chosen part's chunks are +/// then decompressed and only its planes allocated; the other parts are skipped unread. +struct OnlyPart { + inner: C, + index: usize, + seen: std::cell::Cell, +} + +impl<'s, C: ReadChannels<'s>> ReadChannels<'s> for OnlyPart { + type Reader = C::Reader; + + fn create_channels_reader(&'s self, header: &exr::meta::header::Header) -> exr::error::Result { + let position = self.seen.get(); + self.seen.set(position.saturating_add(1)); + if position == self.index { self.inner.create_channels_reader(header) } else { Err(exr::error::Error::Invalid("part not requested".into())) } + } +} + +/// Decode one part's flat layer via the `exr` crate (it handles every flat compression). +/// Other parts are not decompressed, so an AOV file costs one part per request, not the file. +pub(super) fn read_layer(bytes: &[u8], index: usize) -> Result>, CodecError> { + let only = OnlyPart { inner: read().no_deep_data().largest_resolution_level().all_channels(), index, seen: std::cell::Cell::new(0) }; + only.first_valid_layer().all_attributes().from_buffered(Cursor::new(bytes)).map(|image| image.layer_data).map_err(map_exr) } fn layer_to_image(layer: &Layer>) -> Result { diff --git a/crates/codecs/src/codecs/exr_cryptomatte.rs b/crates/codecs/src/codecs/exr_cryptomatte.rs index f28c57ab..2fabd0c6 100644 --- a/crates/codecs/src/codecs/exr_cryptomatte.rs +++ b/crates/codecs/src/codecs/exr_cryptomatte.rs @@ -11,7 +11,6 @@ use std::io::Cursor; use exr::meta::MetaData; use exr::meta::attribute::AttributeValue; -use exr::prelude::{ReadChannels, ReadLayers, read}; use crate::Format; use crate::error::CodecError; @@ -200,7 +199,8 @@ pub(crate) fn decode(bytes: &[u8], layer_name: &str, limits: &Limits) -> Result< .iter() .find(|l| l.name.eq_ignore_ascii_case(layer_name)) .ok_or_else(|| CodecError::unsupported(F, format!("no Cryptomatte layer named {layer_name}")))?; - let meta = MetaData::read_from_buffered(Cursor::new(bytes), false).map_err(|e| CodecError::malformed(F, e))?; + // Also caps all parts' declared sizes together, like every other flat decode. + let meta = super::exr::read_meta(bytes, limits)?; if meta.requirements.has_deep_data { return Err(CodecError::unsupported(F, "this file has deep parts; Cryptomatte decoding stays with flat files")); } @@ -214,13 +214,7 @@ pub(crate) fn decode(bytes: &[u8], layer_name: &str, limits: &Limits) -> Result< let per_pixel = (layer.channels.len().max(1) as u64).saturating_mul(8).saturating_add(std::mem::size_of::>() as u64); limits.check_bytes(w32, h32, per_pixel)?; - let image = read().no_deep_data().largest_resolution_level().all_channels().all_layers().all_attributes().from_buffered(Cursor::new(bytes)).map_err( - |e| match e { - exr::error::Error::NotSupported(m) => CodecError::unsupported(F, format!("not supported: {m}")), - e => CodecError::malformed(F, e), - }, - )?; - let ex_layer = image.layer_data.get(layer.part).ok_or_else(|| CodecError::malformed(F, "the Cryptomatte part is missing"))?; + let ex_layer = super::exr::read_layer(bytes, layer.part)?; let mut ids: Vec> = vec![Vec::new(); layer.channels.len()]; let mut coverages: Vec> = vec![Vec::new(); layer.channels.len()]; diff --git a/crates/codecs/tests/exr_multipart.rs b/crates/codecs/tests/exr_multipart.rs index c8f9a3bc..f106d377 100644 --- a/crates/codecs/tests/exr_multipart.rs +++ b/crates/codecs/tests/exr_multipart.rs @@ -197,3 +197,32 @@ fn parts_are_capped_together() { let e = exr_info(&aov_file(), &limits).unwrap_err().to_string(); assert!(e.contains("across 3 parts"), "{e}"); } + +/// Two ZIP1 parts of 4x4 RGBA; every chunk of part 0 is then overwritten with garbage, so +/// inflating it fails. +fn file_with_corrupt_first_part() -> Vec { + let px = |k: f32| -> Vec<(&'static str, Vec)> { ["R", "G", "B", "A"].iter().map(|c| (*c, vec![k; 16])).collect() }; + let mut bytes = write_image(vec![layer_f32("first", Compression::ZIP1, &px(0.25)), layer_f32("second", Compression::ZIP1, &px(0.75))]); + let mut cursor = std::io::Cursor::new(&bytes[..]); + exr::meta::MetaData::read_from_buffered(&mut cursor, false).unwrap(); + let table = cursor.position() as usize; + // Part 0 owns the first four of the eight chunks (one scan line per ZIP1 block). + for i in 0..4 { + let at = table + i * 8; + let offset = u64::from_le_bytes(bytes[at..at + 8].try_into().unwrap()) as usize; + let size = u32::from_le_bytes(bytes[offset + 8..offset + 12].try_into().unwrap()) as usize; + bytes[offset + 12..offset + 12 + size].fill(0xA5); + } + bytes +} + +#[test] +fn decoding_one_part_does_not_decode_the_others() { + let bytes = file_with_corrupt_first_part(); + // Part 0 is unreadable ... + assert!(decode_exr_part(&bytes, 0, &DecodeOptions::default()).is_err()); + // ... but asking for part 1 must not touch it. + let img = decode_exr_part(&bytes, 1, &DecodeOptions::default()).expect("part 1 decodes on its own"); + assert_eq!((img.width(), img.height()), (4, 4)); + assert!(img.to_normalized().iter().all(|v| near(*v, 0.75)), "wrong pixels"); +} From a8b52f1dbfd4b7f0ace9c1ce0aaab22d5c6caa41 Mon Sep 17 00:00:00 2001 From: Valentin Klein Date: Mon, 12 Oct 2026 16:34:45 +0200 Subject: [PATCH 87/92] Codecs: enable JPEG and CCITT fax compression for TIFF (#3712) (#3727) Co-authored-by: Claude Opus 5.5 --- crates/codecs/Cargo.toml | 2 +- crates/codecs/tests/tiff_regressions.rs | 55 +++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/crates/codecs/Cargo.toml b/crates/codecs/Cargo.toml index c462d0a3..25f3f09b 100644 --- a/crates/codecs/Cargo.toml +++ b/crates/codecs/Cargo.toml @@ -22,7 +22,7 @@ heif = ["dep:photocraft-heif"] thiserror.workspace = true image = { workspace = true, features = ["gif", "bmp", "tga", "ico", "qoi", "hdr"] } png = "0.18" -tiff = { version = "0.11", default-features = false, features = ["deflate", "lzw"] } +tiff = { version = "0.11", default-features = false, features = ["deflate", "fax", "jpeg", "lzw"] } exr = { version = "1.73", default-features = false } half = "2" serde_json.workspace = true diff --git a/crates/codecs/tests/tiff_regressions.rs b/crates/codecs/tests/tiff_regressions.rs index a4524e08..a7c1aa48 100644 --- a/crates/codecs/tests/tiff_regressions.rs +++ b/crates/codecs/tests/tiff_regressions.rs @@ -1,3 +1,6 @@ +mod common; + +use common::tiffgen::*; use photocraft_codecs::{Image, decode, exif_orientation, upright_exif}; fn classic_white_is_zero() -> Vec { @@ -95,3 +98,55 @@ fn big_tiff_orientation_6_and_8_are_applied_to_decoded_pixels() { assert_eq!(image.data(), &upright, "orientation {orientation}"); } } + +fn with_compression(mut dir: Dir, code: u64) -> Dir { + for entry in &mut dir.entries { + if entry.0 == 259 { + entry.2 = vec![V::N(code)]; + } + } + dir +} + +#[test] +fn jpeg_compressed_tiff_decodes() { + // A flat mid-grey 16x16 image as a baseline JPEG stored in one strip (Compression = 7). + let mut jpeg = Vec::new(); + let gray = vec![100u8; 16 * 16]; + jpeg_encoder::Encoder::new(&mut jpeg, 95).encode(&gray, 16, 16, jpeg_encoder::ColorType::Luma).expect("encode the JPEG strip"); + let mut dir = with_compression(strips(16, 16, 8, 1, 1, 16, &[0; 256]), 7); + dir.chunks = vec![jpeg]; + let bytes = build(true, false, &[dir], &[0]).bytes; + + let image = decode(&bytes).expect("a JPEG-compressed TIFF should decode"); + assert_eq!(image.dimensions(), (16, 16)); + assert!(image.data().iter().all(|&v| v.abs_diff(100) <= 4), "{:?}", image.data().get(..4)); +} + +#[test] +fn ccitt_group4_tiff_decodes() { + // 8x3 bilevel: a white row, then two black rows. Bits: V0 | H(white 0, black 8) | V0 V0 | EOFB. + let bits = "1".to_string() + "001" + "00110101" + "000101" + "11" + "000000000001" + "000000000001"; + let mut data = Vec::new(); + for chunk in bits.as_bytes().chunks(8) { + let mut byte = 0u8; + for (i, c) in chunk.iter().enumerate() { + if *c == b'1' { + byte |= 0x80 >> i; + } + } + data.push(byte); + } + let mut dir = with_compression(strips(8, 3, 1, 1, 0, 3, &[0; 3]), 4); + dir.chunks = vec![data]; + let bytes = build(true, false, &[dir], &[0]).bytes; + + let image = decode(&bytes).expect("a CCITT G4 TIFF should decode"); + assert_eq!(image.dimensions(), (8, 3)); + let d = image.data(); + assert_eq!(d.len(), 24, "{d:?}"); + assert!(d[..8].iter().all(|&v| v == d[0]), "{d:?}"); + assert!(d[8..].iter().all(|&v| v == d[8]), "{d:?}"); + assert_ne!(d[0], d[8], "{d:?}"); + assert_eq!(d[0], 255, "white row of a WhiteIsZero image"); +} From dc35ce763009969434d873c2063f59d96660b52d Mon Sep 17 00:00:00 2001 From: Korg1ch <57859048+Korg1ch@users.noreply.github.com> Date: Mon, 12 Oct 2026 17:35:47 +0300 Subject: [PATCH 88/92] fix(linux): avoid duplicate AppImage desktop launcher (#3623) (#3641) --- packaging/linux/AppRun | 50 +++++++++++++------ .../linux/ai.storyteller.photocraft.desktop | 3 ++ packaging/linux/apprun-test.sh | 26 ++++++++-- 3 files changed, 61 insertions(+), 18 deletions(-) diff --git a/packaging/linux/AppRun b/packaging/linux/AppRun index e8543ee2..42008b17 100755 --- a/packaging/linux/AppRun +++ b/packaging/linux/AppRun @@ -35,25 +35,47 @@ integrate() { src_desktop="$APPDIR/usr/share/applications/$DESK_ID.desktop" [ -f "$src_desktop" ] || return 0 - # Rewrite Exec to this AppImage (the binary is not on the host PATH) and drop - # TryExec, which would hide the entry; everything else is shipped as packaged. + # If an external AppImage integrator (AppImageLauncher, appimaged, Gear Lever) is + # already managing this AppImage, do not write a second launcher (#3623); remove our + # own if left over from an earlier run, and still install the hicolor icons below. apps="$data/applications" mkdir -p "$apps" 2>/dev/null || return 0 - tmp="$apps/.$DESK_ID.tmp.$$" - esc="$(printf '%s' "$appimage" | sed 's/[\\&|]/\\&/g')" - if sed -e "s|^Exec=.*|Exec=\"$esc\" %F|" -e '/^TryExec=/d' "$src_desktop" 2>/dev/null >"$tmp"; then - if cmp -s "$tmp" "$apps/$DESK_ID.desktop"; then - rm -f "$tmp" - else - if mv -f "$tmp" "$apps/$DESK_ID.desktop" 2>/dev/null; then - command -v update-desktop-database >/dev/null 2>&1 && update-desktop-database "$apps" >/dev/null 2>&1 - else - rm -f "$tmp" + external=0 + if [ -n "${DESKTOPINTEGRATION:-}" ]; then + external=1 + else + for f in "$apps"/*.desktop; do + [ -f "$f" ] && [ "$f" != "$apps/$DESK_ID.desktop" ] || continue + if grep '^Exec=' "$f" 2>/dev/null | grep -Fq "$appimage"; then + external=1 + break fi + done + fi + if [ "$external" = 1 ]; then + if [ -f "$apps/$DESK_ID.desktop" ]; then + rm -f "$apps/$DESK_ID.desktop" 2>/dev/null || true + command -v update-desktop-database >/dev/null 2>&1 && update-desktop-database "$apps" >/dev/null 2>&1 fi else - rm -f "$tmp" - return 0 + # Rewrite Exec to this AppImage (the binary is not on the host PATH) and drop + # TryExec, which would hide the entry; everything else is shipped as packaged. + tmp="$apps/.$DESK_ID.tmp.$$" + esc="$(printf '%s' "$appimage" | sed 's/[\\&|]/\\&/g')" + if sed -e "s|^Exec=.*|Exec=\"$esc\" %F|" -e '/^TryExec=/d' "$src_desktop" 2>/dev/null >"$tmp"; then + if cmp -s "$tmp" "$apps/$DESK_ID.desktop"; then + rm -f "$tmp" + else + if mv -f "$tmp" "$apps/$DESK_ID.desktop" 2>/dev/null; then + command -v update-desktop-database >/dev/null 2>&1 && update-desktop-database "$apps" >/dev/null 2>&1 + else + rm -f "$tmp" + fi + fi + else + rm -f "$tmp" + return 0 + fi fi # Icons: per-file compare so an unchanged install costs a handful of cmp calls. diff --git a/packaging/linux/ai.storyteller.photocraft.desktop b/packaging/linux/ai.storyteller.photocraft.desktop index 70ce8214..a32b55ce 100644 --- a/packaging/linux/ai.storyteller.photocraft.desktop +++ b/packaging/linux/ai.storyteller.photocraft.desktop @@ -13,3 +13,6 @@ StartupWMClass=ai.storyteller.photocraft Categories=Graphics;2DGraphics;RasterGraphics;Photography; Keywords=photo;image;editor;psd;layers;retouch;paint; MimeType=application/x-photocraft;image/x-paintnet;image/openraster;image/vnd.adobe.photoshop;image/x-psd;image/x-psb;image/png;image/jpeg;image/tiff;image/webp;image/gif;image/bmp;image/x-tga;image/x-icon;image/vnd.microsoft.icon;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-exr;image/vnd.radiance;image/avif;image/qoi; +# AppRun registers the desktop entry and icons itself (#593); tell external +# AppImage integrators (AppImageLauncher, appimaged) not to add a duplicate (#3623). +X-AppImage-Integrate=false diff --git a/packaging/linux/apprun-test.sh b/packaging/linux/apprun-test.sh index 0c81a040..475fb5ee 100755 --- a/packaging/linux/apprun-test.sh +++ b/packaging/linux/apprun-test.sh @@ -48,6 +48,7 @@ expected_exec="Exec=\"$(readlink -f "$APPIMAGE")\" %F" grep -Fxq "$expected_exec" "$DESKTOP" || fail "Exec not rewritten: $(grep '^Exec=' "$DESKTOP")" grep -q '^TryExec=' "$DESKTOP" && fail "TryExec kept, the entry would be hidden" grep -Fxq "Icon=$APP_ID" "$DESKTOP" || fail "Icon line lost" +grep -Fxq "X-AppImage-Integrate=false" "$DESKTOP" || fail "X-AppImage-Integrate=false missing (#3623)" grep -Fxq 'Categories=Graphics;2DGraphics;RasterGraphics;Photography;' "$DESKTOP" || fail "metadata lines lost" if command -v desktop-file-validate >/dev/null; then desktop-file-validate "$DESKTOP" || fail "generated desktop entry is invalid" @@ -71,23 +72,40 @@ export APPIMAGE="$TMP/moved.AppImage" "$APPDIR/AppRun" >/dev/null || fail "launch after move exited non-zero" grep -Fxq "Exec=\"$(readlink -f "$APPIMAGE")\" %F" "$DESKTOP" || fail "Exec not refreshed after move" -# 6. Opt-out installs nothing. +# 6. External AppImage integrator (#3623): if another .desktop file in $XDG_DATA_HOME/applications +# already launches this AppImage (e.g. AppImageLauncher's appimagekit-*.desktop), AppRun removes +# its own duplicate .desktop entry while keeping the hicolor icons installed. +ext_desktop="$XDG_DATA_HOME/applications/appimagekit-photocraft.desktop" +printf '[Desktop Entry]\nType=Application\nName=PhotoCraft\nExec="%s" %%F\nIcon=%s\n' "$(readlink -f "$APPIMAGE")" "$APP_ID" >"$ext_desktop" +"$APPDIR/AppRun" >/dev/null || fail "launch with external integrator desktop entry exited non-zero" +[ ! -e "$DESKTOP" ] || fail "duplicate desktop entry kept alongside external integrator entry" +[ -f "$ext_desktop" ] || fail "external integrator desktop entry removed" +[ -f "$XDG_DATA_HOME/icons/hicolor/256x256/apps/$APP_ID.png" ] || fail "icons missing with external integrator" +rm -f "$ext_desktop" + +# 7. DESKTOPINTEGRATION set by an external integrator skips creating a second .desktop entry. +rm -rf "$XDG_DATA_HOME" +DESKTOPINTEGRATION=AppImageLauncher "$APPDIR/AppRun" >/dev/null || fail "DESKTOPINTEGRATION launch exited non-zero" +[ ! -e "$DESKTOP" ] || fail "DESKTOPINTEGRATION still wrote duplicate desktop entry" +[ -f "$XDG_DATA_HOME/icons/hicolor/256x256/apps/$APP_ID.png" ] || fail "icons not installed under DESKTOPINTEGRATION" + +# 8. Opt-out installs nothing. rm -rf "$XDG_DATA_HOME" PHOTOCRAFT_NO_DESKTOP_INTEGRATION=1 "$APPDIR/AppRun" >/dev/null || fail "opt-out launch exited non-zero" [ ! -e "$XDG_DATA_HOME" ] || fail "opt-out still integrated" -# 7. An unwritable data dir never blocks the launch. +# 9. An unwritable data dir never blocks the launch. mkdir -p "$TMP/ro" && chmod a-w "$TMP/ro" out="$(XDG_DATA_HOME="$TMP/ro/data" "$APPDIR/AppRun" out.txt)" || fail "launch blocked by unwritable data dir" [ "$out" = "stub: out.txt" ] || fail "stub not run against unwritable data dir: $out" chmod u+w "$TMP/ro" -# 8. No $APPIMAGE (extracted AppDir): launch only, nothing installed. +# 10. No $APPIMAGE (extracted AppDir): launch only, nothing installed. rm -rf "$XDG_DATA_HOME" env -u APPIMAGE "$APPDIR/AppRun" >/dev/null || fail "extracted-AppDir launch exited non-zero" [ ! -e "$XDG_DATA_HOME" ] || fail "integrated without $APPIMAGE" -# 9. A path that would need Exec escaping (here a `$`): launch only, nothing installed. +# 11. A path that would need Exec escaping (here a `$`): launch only, nothing installed. rm -rf "$XDG_DATA_HOME" odd="$TMP/odd\$(id).AppImage" : >"$odd" From f4fa53140cb005854021a8ef69b8b6a4c09e3ffc Mon Sep 17 00:00:00 2001 From: Streetblock Date: Mon, 12 Oct 2026 16:43:07 +0200 Subject: [PATCH 89/92] ops: count selection masks in history pixel budget (#3614) * ops: count selection masks in history pixel budget * test: expect unclipped HDR levels in float documents * web: optimize engine code for the wasm size budget --------- Co-authored-by: Brandon Thomas Co-authored-by: Claude Opus 5.5 --- crates/ops/src/lib.rs | 88 +++++++++++++++++++++++++++++++++++++++-- crates/ops/src/tiles.rs | 3 ++ 2 files changed, 88 insertions(+), 3 deletions(-) diff --git a/crates/ops/src/lib.rs b/crates/ops/src/lib.rs index 70cbebe0..2a82edb4 100644 --- a/crates/ops/src/lib.rs +++ b/crates/ops/src/lib.rs @@ -5,8 +5,8 @@ //! stores whole-document snapshots per transaction, which is simple, obviously correct, and the //! same approach Photoshop's History panel exposes to users (one state per step). //! -//! Memory is bounded by `max_states` plus an approximate byte budget. Only tiles *not shared* -//! with the current document count against it. +//! Memory is bounded by `max_states` plus an approximate byte budget. The current document's +//! tiles and tiles only history holds count against it, including selection masks. #![forbid(unsafe_code)] #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)] @@ -248,7 +248,7 @@ impl History { } } -/// Bytes of the pixel tiles of `doc` (layers, masks, alpha channels) not already in `seen`. +/// Bytes of the pixel tiles of `doc` (layers, masks, alpha channels, selection) not already in `seen`. fn tile_bytes(doc: &Document, seen: &mut HashSet) -> usize { let mut n = 0usize; tiles::surfaces(doc, |surface| { @@ -408,6 +408,85 @@ mod tests { assert_eq!(h.unique_bytes(&cur), 256 * 256 * 4); } + #[test] + fn selection_tiles_count_current_and_history_without_double_counting() { + use photocraft_doc::{PixelFormat, Surface}; + for depth in SampleType::ALL { + let mut doc = Document::new("selection", Size::new(300, 64), ColorMode::Rgb, depth); + let mut selection = Surface::new(PixelFormat::new(ColorMode::Grayscale, depth, false)); + selection.write_pixel(1, 1, &[1.0]); + selection.write_pixel(257, 1, &[1.0]); + doc.selection = Some(selection); + let mut cur = Arc::new(doc); + let tile = match depth { + SampleType::U8 => 65_536, + SampleType::U16 => 131_072, + SampleType::F32 => 262_144, + }; + let mut h = History { max_bytes: usize::MAX, ..History::default() }; + assert_eq!(h.pixel_bytes(&cur), 2 * tile, "current selection counts without any history"); + assert_eq!(h.unique_bytes(&cur), 0); + edit(&mut h, &mut cur, "Rename", |doc| doc.name = "renamed".into()); + assert_eq!(h.pixel_bytes(&cur), 2 * tile, "the shared selection tiles count once"); + edit(&mut h, &mut cur, "Selection", |doc| { + doc.selection.as_mut().unwrap().write_pixel(1, 1, &[0.5]); + }); + assert_eq!(h.pixel_bytes(&cur), 3 * tile, "only the changed selection tile is copied"); + assert_eq!(h.unique_bytes(&cur), tile); + h.trim(&cur); + assert_counter(&h, &cur); + let selected_value = cur.selection.as_ref().unwrap().sample_channel(1, 1, 0); + edit(&mut h, &mut cur, "Deselect", |doc| doc.selection = None); + assert_eq!(h.pixel_bytes(&cur), 3 * tile, "deselecting leaves the previous masks in history"); + assert_eq!(h.unique_bytes(&cur), 3 * tile); + assert_counter(&h, &cur); + cur = h.undo(cur).unwrap().0; + assert_eq!(cur.selection.as_ref().unwrap().sample_channel(1, 1, 0), selected_value); + assert_eq!(h.pixel_bytes(&cur), 3 * tile); + assert_eq!(h.unique_bytes(&cur), tile); + assert_counter(&h, &cur); + // Coalescing can change the current mask without recording another state. + Arc::make_mut(&mut cur).selection.as_mut().unwrap().write_pixel(257, 1, &[0.25]); + assert_eq!(h.pixel_bytes(&cur), 4 * tile); + assert_eq!(h.trim(&cur), 0); + assert_counter(&h, &cur); + cur = h.redo(cur).unwrap().0; + assert!(cur.selection.is_none()); + assert_eq!(h.pixel_bytes(&cur), 4 * tile); + assert_counter(&h, &cur); + } + } + + #[test] + fn selection_byte_budget_drops_old_masks_and_keeps_the_last_undo() { + use photocraft_doc::{PixelFormat, Surface}; + for depth in SampleType::ALL { + let mut doc = Document::new("selection", Size::new(64, 64), ColorMode::Rgb, depth); + doc.selection = Some(Surface::new(PixelFormat::new(ColorMode::Grayscale, depth, false))); + let mut cur = Arc::new(doc); + let tile = 256 * 256 * depth.bytes(); + let mut h = History::default(); + for i in 1..=6 { + edit(&mut h, &mut cur, "Selection", |doc| { + doc.selection.as_mut().unwrap().write_pixel(1, 1, &[i as f32 / 8.0]); + }); + } + assert_eq!(h.pixel_bytes(&cur), 6 * tile); + h.max_bytes = 3 * tile; + assert_eq!(h.trim(&cur), 4); + assert_eq!(h.past_len(), 2); + assert_eq!(h.pixel_bytes(&cur), 3 * tile); + assert_eq!(h.unique_bytes(&cur), 2 * tile); + assert_counter(&h, &cur); + h.max_bytes = 1; + assert_eq!(h.trim(&cur), 1); + assert_eq!(h.past_len(), 1, "the most recent undo survives even below one mask's size"); + assert_eq!(h.pixel_bytes(&cur), 2 * tile); + cur = h.undo(cur).unwrap().0; + assert_counter(&h, &cur); + } + } + fn assert_counter(h: &History, current: &Document) { let counter = h.tiles.as_ref().expect("budget initializes the counter"); let total = tile_bytes(current, &mut HashSet::new()).saturating_add(h.unique_bytes(current)); @@ -506,11 +585,13 @@ mod tests { fn counter_tracks_eviction_undo_redo_branching_purge_and_clones() { for depth in [SampleType::U8, SampleType::U16, SampleType::F32] { let mut cur = Arc::new(Document::with_background("h", Size::new(300, 64), ColorMode::Rgb, depth, Color::WHITE)); + Arc::make_mut(&mut cur).selection = Some(photocraft_doc::Surface::new(photocraft_doc::PixelFormat::GRAY8)); let mut h = History::new(4); h.max_bytes = usize::MAX; for i in 0..8 { edit(&mut h, &mut cur, "Paint", |doc| { doc.layers[0].surface_mut().unwrap().write_pixel(1, 1, &[i as f32 / 10.0, 0.0, 0.0, 1.0]); + doc.selection.as_mut().unwrap().write_pixel(1, 1, &[i as f32 / 10.0]); }); h.trim(&cur); if i >= 1 { @@ -547,6 +628,7 @@ mod tests { gray.write_pixel(1, 1, &[1.0]); doc.layers[0].mask = Some(LayerMask { surface: gray.clone(), ..LayerMask::reveal_all() }); doc.channels.push(AlphaChannel::new("alpha", gray.clone())); + doc.selection = Some(gray.clone()); doc.quick_mask = Some(AlphaChannel::new("quick", gray)); doc.layers.push(doc.layers[0].clone()); let mut cur = Arc::new(doc); diff --git a/crates/ops/src/tiles.rs b/crates/ops/src/tiles.rs index c4178b5b..feb639c8 100644 --- a/crates/ops/src/tiles.rs +++ b/crates/ops/src/tiles.rs @@ -30,6 +30,9 @@ pub(crate) fn surfaces(doc: &Document, mut visit: impl FnMut(&Surface)) { for channel in doc.channels.iter().chain(&doc.quick_mask) { visit(&channel.surface); } + if let Some(selection) = &doc.selection { + visit(selection); + } } impl Tiles { From 9163afbdcfa8f6ab5e7b6967c2aa98eab9d8c608 Mon Sep 17 00:00:00 2001 From: zenjabba Date: Mon, 12 Oct 2026 10:45:05 -0400 Subject: [PATCH 90/92] Verify PngSuite archives and cached corpus files (#3973) Co-authored-by: zenjabba <679864+zenjabba@users.noreply.github.com> --- xtask/pngsuite.sha256 | 178 +++++++++++++ xtask/src/corpus.rs | 538 +++++++++++++++++++++++++++++++++++++-- xtask/src/corpus_pins.rs | 4 + 3 files changed, 696 insertions(+), 24 deletions(-) create mode 100644 xtask/pngsuite.sha256 diff --git a/xtask/pngsuite.sha256 b/xtask/pngsuite.sha256 new file mode 100644 index 00000000..a13873a5 --- /dev/null +++ b/xtask/pngsuite.sha256 @@ -0,0 +1,178 @@ +71e1f5bf865131b5d9996e76a78372146283e5089e50f900ae927a6458b62101 PngSuite.LICENSE +a2853f2be68e460dcb9992819125b74503a01383e79f79a04b971ffa9d248544 PngSuite.README +6cf3bcd1757bfad2a7ce9c9659d4f609297a0828cafc7c9eddee18c5576ba9e9 PngSuite.png +9bf1c4610280efecc291361e2b7b026d602d03a7137f476ff84af626bb7b3a62 basi0g01.png +50ed4ff9c1c80578ae58ead6fb28ea2e44016b5b56a7b3e95c235ec86f97c0d8 basi0g02.png +0cce4212157dae7c0f71f5f72cef39cecab3347de455da0ace7de83eebd47849 basi0g04.png +b9300750e7414c9fed68cc7f4f531f5e2cdd2724f50142e8aa3a0070836bece9 basi0g08.png +d354026bdd0aa6ed7bedea7c92e5eef2ebbd4854848b8a0a48f562cc71bfe80f basi0g16.png +b2690d4475cdc39faf5a7d2de20de4e14eb96c6360fa791ec2003b4085ecacde basi2c08.png +ae13eba5fabbf7cbe8c01ec4458cdaa7e6bfdfcbd5109e831efaac9f39096027 basi2c16.png +8e1edfbc0382e0b545c70209271cedead2d530df1ce40f5296f0749226b36006 basi3p01.png +85f304eaaf6831b2bcc2c08892b947fef52f06337aaf23312d6326e367d73f77 basi3p02.png +78890ee2c4da71e460b5a1527efe7dc17d673ebe997f49ca1b4dcd7347d21e56 basi3p04.png +ca103eef7a7c50abc7af9d5ec0dc9fdc07668e2f030adbce226e050dcec9eea3 basi3p08.png +dfae01a4548e30519157bb51ce29d4de3b35b74288e9568b4d5911de01c6048b basi4a08.png +ef7df23ccd912309a4f89ca3c3094bf5ab55add25218e571e51cc6cb11cfad9e basi4a16.png +fe70ea20c8447e82abb7bc9dd05344a61a4631cc69e0974378df8f6263af0337 basi6a08.png +7fdd6bf08f04692bcf06b5c4262e7f76c49d8adb992789fd3f05aa0435645cd8 basi6a16.png +c8b1364d7771dd2f5a1b2d7d633abcf3f48dafee608558ecd2e5fc98f61894cd basn0g01.png +ca172e92d179c77b3d321ad501e452a59bdaafafde8ebd74fd0669c4eae58efc basn0g02.png +fb2d42c4c8f5c51590e675994a9b0c718fbf71c80e28142f231cfa7c5b0e26e8 basn0g04.png +268d061075d1dd2eeec62b31303d09f6998549e1bfb447a5f09c80a2b0978ac3 basn0g08.png +1a1fe155f40c11d79350b3f84c7eb2b29719037e57073cb7ae2ab9e8323f9360 basn0g16.png +c90e86090a625661b19960cafdde6e347d6e32d73837aaae533f66dd3f099506 basn2c08.png +1e1c28ec0ee5da6224404b4005076dd30e2335a1a80c0ca722046a245c4a2b3b basn2c16.png +c2d7cd682df5f74506b33a5d70c344aaee248fda79fdfef8e873426fd6f2b75b basn3p01.png +0466bb7ed9984cf03b70704564bcffab1df8ec0e8167473ba0f75e4fedce5a8f basn3p02.png +e1fc7be978d3149b98533d0076245ae64353b7967290f4204c1282ecb4ec1aba basn3p04.png +d58256cd2eb16b5740d4c1403d25ce43d8dd03e270627ab709d2fb141e3d904c basn3p08.png +7be24b618bfd437b921ae0caf9341d112338c6290cc62466deb19d2c7a512968 basn4a08.png +1c92ffd11d2fc89a36f170d0239668436407f5c8e3f8d93483fb3fc6bca361d7 basn4a16.png +559c594166eb156f461c9beff0f053196730dc998fdb0d2b801c89e6680860a5 basn6a08.png +8f9d81060aebf4576461403c5057de7f23f73157016b659402b906df805845aa basn6a16.png +dfae01a4548e30519157bb51ce29d4de3b35b74288e9568b4d5911de01c6048b bgai4a08.png +ef7df23ccd912309a4f89ca3c3094bf5ab55add25218e571e51cc6cb11cfad9e bgai4a16.png +559c594166eb156f461c9beff0f053196730dc998fdb0d2b801c89e6680860a5 bgan6a08.png +8f9d81060aebf4576461403c5057de7f23f73157016b659402b906df805845aa bgan6a16.png +71d041df5c8949ce07d5e93b3c9f752cefc75ef7326c49df05ae73915f1a755f bgbn4a08.png +c45de44d3442bd33072d68456541b10e0cc57c5d8bfc809208995d939091eb2d bggn4a16.png +2da3c3efa01bf166958852a104ece92daaede8ffb5e0452a55d40526258a8bf5 bgwn6a08.png +875bc2b44a4355551c51260def9664da68be1af8c14b82f76173aaf01ddb1929 bgyn6a16.png +c88909e74e039dd3df829bf24144b487171e53b17f5c5c07cbc08688247d24b5 ccwn2c08.png +dc365b39d49c287669d837872dd59aef30763a611dfc8c046c481e35e49a390a ccwn3p08.png +438018f19c85e582cb586ac7cca2220008ecb7fc70ce50e8f2a76b494c128a20 cdfn2c08.png +a068eaf1f7040490e08eda3259befb6689849dd0ff8bb4cc03c705d117cb2b9f cdhn2c08.png +ee08dfa303a3c09171280fc1821180dc0a4c3591af7e9077e8ce0435642c76d2 cdsn2c08.png +a849d89ba3d92146940d7c56d2fe74c9c3ec96725c7f24eefaf44160a6304de2 cdun2c08.png +587a8624228d3f605f475bd751a1f3a97f0bbab590c0ff518bce5da3abcb6f2b ch1n3p04.png +e3cace549047c6e5e693b9b135d53f7f9ca5b1088bf30cc408634598ba53758a ch2n3p08.png +79ccaf4abe5091e1f65f8a61496363ed3312ebb9ea1aaa98affadac3d98507de cm0n0g04.png +127bb50d224ac3ebff36160482a03b9e6686072e86c8ff4cd43e3ce2271b2315 cm7n0g04.png +774b384d0ad73698e7d93fc5a29976b332c619045e5966276c609b11459a4152 cm9n0g04.png +bc812de2b83abc9ae2a6d1ae01e91f9090214b9ed8fee1d56cdfea58f4f259d0 cs3n2c16.png +267104dced0858dd828cdd41edc0e87042c7094c77191565192a67045064b23f cs3n3p08.png +028fa49fbba3954c2eba27a4c3607196e87c1dae74192df3b3ad7afe5e0a3f0c cs5n2c08.png +a7a4021983d6b22685529cbafb65cd087c9e1af1c5d205c2e13e3efc4ae87b6a cs5n3p08.png +d90ddab7313e4e1fd7f20f16a6c546b449697fbcac1a7776298a74896f4662da cs8n2c08.png +5bffdb88e307a851f8e85b137a69c59e557a881db816e990061934c0155c894c cs8n3p08.png +081d1ec26b4157fbc032b76dc716321420f2d032a425de046557c7842766826d ct0n0g04.png +259116f8ecf849d83d824688eb02b4575aed11980f02ab6fb123281c25a6459d ct1n0g04.png +4583e63d1bdfa18b6abb47439dee9a73bed311ed1b0a71d22bed75fe4767832b cten0g04.png +d0607280c3539a8934c5cfd22788b382cdc31321cdedc75ae8a29e3948580ba6 ctfn0g04.png +5f4c87f5a8f589d029a908050880ac5d6aed3810e55e75444802d6d3fb27cf33 ctgn0g04.png +8ef799e59871755578e563c5b411bc3895c2f7112c115aaa921b6c04fe255bf2 cthn0g04.png +ca91332ecc04e5faac1f39ca4df4996b072a93f3e574e7f4b50d52aafbfe67b6 ctjn0g04.png +c0765e635a6423ec64f0314400c3df20745c4a4469ffcc323c7b00ba66b4aceb ctzn0g04.png +d04140d74bc60597c47b5aac371a3553d3add9354437bbd8c57007d94e197809 exif2c08.png +d055cc0bb505b37c6ecf88a808d71675eca5dd0ee683d70ebc9c0be0e1bb8e57 f00n0g08.png +0fe92b2aa2da04c885d1dbd85c834716f6cdd946364d97dcd597bb79d9e14427 f00n2c08.png +956ddaf133e6d9a8d36f1e00604d87fbc2d0295e933bb8caaef517e7d87e5342 f01n0g08.png +ef072ec6815ebf9b33e0553d2e4e4e7ed6911860a2512c67bcd10a9f0f09b9de f01n2c08.png +1f5b49c06ecc2a1756f0423b3de936bd18497866d035ac8eded78a6f17408a2c f02n0g08.png +ca4b937b3c587d5c007f193a2eec14dc96b0d23ff7d6aa9004e3badd1af9fe8f f02n2c08.png +d0563ae30c6ce7a01eae7a5cdc0ef780175bfa7653888ed93f17bef5fe4b2107 f03n0g08.png +2d101e3ef4f78a69437034671e93fe11faac0cfc4d44210dcca1b944caa886f7 f03n2c08.png +fec1a3c53833d0ddefa4486a98934c393cb4335b2dc31da70e6540a4686f1457 f04n0g08.png +c365c24153cb69fd3c162f00b296ae23a71a1595645d1aeb0ad23af680d7b4be f04n2c08.png +8ac0f095d2a943157e820fa121bccde08d5230af1b5830c3041d5f4da3524eba f99n0g04.png +3494b914dd1b094afa9a74a89bfa75219030e21af6fca3ed66c9d45032a047e9 g03n0g16.png +abce774b9624952c2d0c57ff681790ba620cf5616fe7e0ef0600600cdce3c22a g03n2c08.png +541389db0c72721c6c49501e1dbf6e32df41b4fcfa318676955e278f3f4332b3 g03n3p04.png +72350a2d9db2df09b626f1f1dd48061e9c749d471bf19814d2c5c10acbf007e5 g04n0g16.png +bfd3edfc4d85a43383556a51023533fa3888184aa53a6b43769910782beebfce g04n2c08.png +5ea85ebefb58b2ab113fc05bf1cb79ffb068359e3a5620843590a0a7b59bd49a g04n3p04.png +be19721d28e0b268af1e29e8190c952b94315bd08899383ae2c91e6dc8c4f889 g05n0g16.png +74ab5b8477992d65e220eeaff8df466522c1b392fa90c6f9935da5bdb7113c9d g05n2c08.png +2f46afd7ec15836b523cbce6965f34d89833b8d777afffaf0f53bce620d5f65e g05n3p04.png +9070f843981f765cc8e26a63751be5d58631d85a8a7b4e826358f80e8a679d03 g07n0g16.png +ca4cd32d222f65fb7beb7c9f40d8b6833b36d552b830ff1a1d67dae73b8ed0d8 g07n2c08.png +b8e7abeabcfd50b71cca78b6cdff7372310cfc179cd63304c3e904f469b333cb g07n3p04.png +a22486acb74ee5f947db3a20b1f314a9dd8aca3339840049ee559f4d676a6b5c g10n0g16.png +4ac23729aea109e8f6b1e831448115cf02dcd97559e9403847cbe6dd7e5c7347 g10n2c08.png +36cc2ea4b5b33cd18e0a01c7de85dbcaf7161d258cd0f2265a90cd835b15cf6d g10n3p04.png +1fae707d809296d2cf0d6aa653bead6199644fb1c859558ec7d2d69e709a423a g25n0g16.png +9b128cfa1bb417dd99251914d729062621fcea9f346168549b16a75fe030b0f6 g25n2c08.png +4197a0a25c4f74d42c2285d75b9fabe1eedbed45bc224ff1ec1784f5797e9dbf g25n3p04.png +1a1fe155f40c11d79350b3f84c7eb2b29719037e57073cb7ae2ab9e8323f9360 oi1n0g16.png +1e1c28ec0ee5da6224404b4005076dd30e2335a1a80c0ca722046a245c4a2b3b oi1n2c16.png +142bc4b1e9f8a9e3b0ba3d2c2025e485bf7e76df88f914bf8c9041b4562cc080 oi2n0g16.png +2c523f138e0ade1bed8f31d59ec0f34b82660b192d6af8b8f395f82b9ba9dabb oi2n2c16.png +aa2d77723ba44f654a41a2ab97e01271fe942fecd2f299c0a81da90acb2887ac oi4n0g16.png +661220a0ed03ca6d63ec8dcaac738d4a9fd089b491c40dd896267ffb6cf5015d oi4n2c16.png +ae70c9effd0d9957a0d42771bc987529a1f3715e068057fae63f0c7e50d5c53a oi9n0g16.png +fef98e9bebe6c4046c29f2568f7a735305c8661aa01f9c37a718135e5bc4f941 oi9n2c16.png +72406b6173ec20dd059e8cea594ef5bc8f81bac5e416e2b53058d2debd51d195 pp0n2c16.png +d5a6f964a601a5e1815525117c12c32b61e2aa09fd6040776d35f2f7115b7110 pp0n6a08.png +b321b9ac8f2aa641475b6936365954181726dcb8662dbf641284d82a83cc22a5 ps1n0g08.png +6c59d673032fe2d04dbd2ea91cc9bc7bebe7d5ab84911f00e36fb28994793576 ps1n2c16.png +bd2ae1b45fd771aaa8c57dccd183f3834fc9742f6dfc692606865049efb116e5 ps2n0g08.png +120c62ce9d014f7772c4b38a446991b5bbe6a22ef5ea59239d32e023bc167585 ps2n2c16.png +235eb82f1337e3fcefbdca566a53af3d3523db7588ba3cd7fa5dab19afe48a41 s01i3p01.png +6a4f6da9fe36d195219ad2beeac1a0423e2ee6de03dfb064a3b6fa31623eb230 s01n3p01.png +e7d26ab4b31e7066b0674a4374c093967a9f1761b96836aa3dbe624acd73ab52 s02i3p01.png +f4b324f2b1d013ee77f632e42129c7cd3eca55da846e775e744a1f224ad1efcd s02n3p01.png +4513dec80f54ffd04a28834b114254d6e6d66e52e32e0059174474f2fb15d6bc s03i3p01.png +4dee297bd7f747f87488509af11a1e1e0531fa67e6e8d0f8ab7f4df7940f0ff3 s03n3p01.png +918f94f3557e10de91efa680df507c8eafc347fa5023af43037701398128ad0f s04i3p01.png +e73c52f764b684ec5133cce11f7f18cc60065acdd308e2c3d871e0a792a1080e s04n3p01.png +77fe040e17167f9656afe46cf0031832e635745e4e7f19ba12dee32f5ec03d96 s05i3p02.png +1b9e244a5c1d6cc9830391fff4eac565ada026d000e60faf7525c8add6bdc726 s05n3p02.png +cf8d5fdb34c0afd38b1b4745bed6167771767ccdfe847c4d8766f7fcc5c41176 s06i3p02.png +5caabfc4b147fad5e49e558143faaab91888324240acf45e5db8fc49f7a7f667 s06n3p02.png +d9874bfad10353a9ea2876ee388c3e7f81f697ed141d0d79c5c2019d62a7a698 s07i3p02.png +e7d447394f5fa64c27353216af387352a77a1fb534922a2d974e60d965d4e414 s07n3p02.png +62adf855c6b1e3a007f9dcf3ce2ba244616c089269a511dd939e89a4b0853453 s08i3p02.png +544fdd476e566e8aef4c98604124ae05acef48be20d1aebb9b6674b08b2abbb6 s08n3p02.png +f2cf5b3109690704d106a0b22ea079e36064cc6077e1fb9a1ba87397d0bbcca1 s09i3p02.png +6be8f58b638e7f7114750f5796f66f650db8fb7242a36183850f02117f4eaa65 s09n3p02.png +a27e0dbf923ef868e7399560b76c23a50b2d8926cddd9775e2bc4e050273f205 s32i3p04.png +c80d9fc7ded0b7834ec11d0e324540c7be74016b61bc302a1d167218fa35fbf9 s32n3p04.png +cc6ad98dcf686d92f1165d951f90fac70e568cedb1fcbba33e8890d0e6cdad4d s33i3p04.png +998d08e084e3eea288984475bfed0d48ee2d8250e20b96755898b59152e36a34 s33n3p04.png +83eb2e82eb14ae3c608833ef371a6f472c4c6e63b7e9f4f92f5472f975793b97 s34i3p04.png +a25451168c0b03ab8f52dcc60c6b9c12bc5df5d55afabe1892b87d0a856bb4a0 s34n3p04.png +db5988c27ad577de1e494cb50229dc2772678531adde2db84493907eae003e54 s35i3p04.png +cd99fc4cc69bda1ff8e8697d8b423ae8d9e84a58ba1d2b480751953b6869e3b3 s35n3p04.png +a36b40927b730a31d60c7818fb4a32e67ace06393cdaa26edc09520b6cee066d s36i3p04.png +ebc08f6a1e0918c5d3a9a08e184c23019a3cf90d8843e4b71bf2ae16040b1a84 s36n3p04.png +565c79404c4b9e46c27edb2f93d7b26b93ec0a0481ab7a21fc405152a21f53ba s37i3p04.png +964078b1f3f472268b8ac97a8976b4d1cdb6a47e6243d67eddcb0205e65b9f61 s37n3p04.png +b107f120ffaffcb949ac4547e0f91555ac681f78c7e68c724e7ceddfd8e5387b s38i3p04.png +045b0f5ea35874741bf6cac40f2e63ec8726450ab241475df4b7e9303c39e339 s38n3p04.png +4b5a6d8c04c8c70e1de3bcb6f7b5cc3ba359b13e28de6f52e21a291d4bc8a937 s39i3p04.png +2115b6cad0140ea97fe6ec056b47307ef1e8b5c00db5f08707a0572b165e5f08 s39n3p04.png +48a3f19b5c3b2f7eca17fd34765a2a3e385d770f24c357bc66bd74417eb60a5a s40i3p04.png +c4598ea73b1ec015bef7dcfd7f67bc7bfc41546619953d1a92cd9b8657a7033a s40n3p04.png +c5e7eeaffa677bfac002ee968a0423e0fea3be7701d39ccd6a015df1d2d85e40 tbbn0g04.png +8fcfd031a5b716201854fdab25691feed6cd3ed7b713a51b94e1f43fc63fe0c1 tbbn2c16.png +8eb43a6020fda8ed7c8c9b88b974ef794ee8452db29212ae7e5c11003bfd76a3 tbbn3p08.png +49711ee271f96099521b83b75d58ed2f76d42ed46cb3c06656fde2cad697cf59 tbgn2c16.png +6f798628935a021fe446dce3d62861d1f7369aaf01bad10daa4917c5abccad7d tbgn3p08.png +8223d8b0c5f84b149f0c1f0e1f658346e07fcbd03ffc02b2e9eeea1481eb19bf tbrn2c08.png +01e86f108b244bdee4d72e384aced8a62369965ca2993ee6ef88f131c647f7d1 tbwn0g16.png +978b28cec43bd219517083b63661bb30a7b9cdf9fd4476ab4e70844565980d51 tbwn3p08.png +7b4eb64b4bd7eb36417752873ddaca027ce77a07f474b2af569f4eea1e984111 tbyn3p08.png +f05e317f64a038123faf96fdbd6fc3ab3eec14e1fc1eb87fd7da4d996be63526 tm3n3p02.png +a253e055d8cd94049cd95e9392e7aa60f3d5c922a8f0cccb84762b0c5f547545 tp0n0g08.png +5dced3fde56b950e61ce86f4ad54458336f66389ce8ca68524d4fd8ec546ff5b tp0n2c08.png +da40ddb18bd45db32ed03dc89e2250b096d808efe975a88477e4f5a91a4677c9 tp0n3p08.png +50bc927fe6cf1816454a7c27f8c743734be8db45e37e5ee3ede540f4e895e6c5 tp1n3p08.png +4059f7e6a1c5bac1801f70e09f9ec1e1297dcdce34055c13ab2703d6d9613c7e xc1n0g08.png +e252a0e7df3e794e52ce4a831edafef76e7043d0d8d84019db0f7fd0b30e20f4 xc9n2c08.png +3c0c2a68dd416a7be79400e0e2ceb358ba3191d5309d4bad9dd04b32ff6d5b60 xcrn0g04.png +71e4b2826f61556eda39f3a93c8769b14d3ac90f135177b9373061199dbef39a xcsn0g01.png +c1287690808e809dc5d4fb89d8a7fd69ed93521f290abd42021ca00a061a1ba4 xd0n2c08.png +00b53c3bbd0641454521b982bc6f6bcfda7c91f1874cefb3a9bac37d80a1a269 xd3n2c08.png +16e5b40fb2600db1af20fb79ff715c2869255e2d4bef20702f16534e5dd6a847 xd9n2c08.png +f9d1fb2a708703518368c392c74765a6e3e5b49dbb9717df3974452291032df9 xdtn0g01.png +318864720c8fc0dbe4884035f2183cc3bd3d92ec60d447879982942600e9fe2e xhdn0g08.png +968fd21abb8acf40fbca90676de3abcb3a6e35b01ba7a3b9190184eafb99c83d xlfn0g04.png +776701227c7094dd10b78f508430b8ea4f03471d072096382cbcca628dea1d2b xs1n0g01.png +9dd7e93ba9211f0caee09d8f12e37742936c469f45fcad21e577c9f0640cf99e xs2n0g01.png +166c8633d116d1c26631cb98f3a75340cf4385fa7ae6a67913bc78e709bcb30d xs4n0g01.png +7a380568beeac969908196ac89cd2347c96ac2f26fdc2b8e0314b62c59f0e308 xs7n0g01.png +e4767d3259e1b331c9ece9fb07fc30f385879ac12b3cd0e1cb923f3bfac81dcf z00n2c08.png +939abfc6e0a3e349bb5bcd8c4e427a6cdb2c7e0c23a773aefa1c4fc9f07e4cb4 z03n2c08.png +21652fe42f472acd83dcb207806add5737db0020b21d6b38b0a00be3e9e37990 z06n2c08.png +98d90a7e61aa1a9ac9d99af44dd25c70cd5a7b4a11a85da60f82923e18a78f9f z09n2c08.png diff --git a/xtask/src/corpus.rs b/xtask/src/corpus.rs index 43f943c8..e6c929a1 100644 --- a/xtask/src/corpus.rs +++ b/xtask/src/corpus.rs @@ -1,10 +1,15 @@ //! `cargo xtask corpus [...]` (fetch test corpora) and `cargo xtask test-corpus [...]` (fetch, //! then run the corpus tests). Pins: `corpus_pins.rs`. Docs: `docs/development.md` › Test corpora. -use std::path::PathBuf; -use std::process::Command; +use std::collections::BTreeMap; +use std::io::{Read, Write}; +use std::path::{Path, PathBuf}; +use std::process::{Child, Command, Stdio}; +use std::sync::atomic::{AtomicU64, Ordering}; -use crate::corpus_pins::{self, AG_PSD_COMMIT, HEIC_RS_COMMIT, OPENEXR_COMMIT, PHOTOCRAFT_CORPUS_COMMIT, PILLOW_HEIF_COMMIT, PNGSUITE_URL, PSD_TOOLS_COMMIT}; +use crate::corpus_pins::{ + self, AG_PSD_COMMIT, HEIC_RS_COMMIT, OPENEXR_COMMIT, PHOTOCRAFT_CORPUS_COMMIT, PILLOW_HEIF_COMMIT, PNGSUITE_SHA256, PNGSUITE_URL, PSD_TOOLS_COMMIT, +}; use crate::pinned::{PinnedCorpus, USER_AGENT}; use crate::{cargo, root, run}; @@ -119,7 +124,7 @@ fn status(present: bool) -> &'static str { fn list() { let corpus = root().join("corpus"); let png = corpus.join("pngsuite"); - let png_ok = pngsuite_count(&png) > 0; + let png_ok = verify_pngsuite(&png, PNGSUITE_MANIFEST).is_ok(); println!( "Test corpora live under {} (gitignored, never committed). The corpus tests are opt-in (cargo feature `corpus`) and fail, not skip, when a corpus is missing. CI always runs them. @@ -162,31 +167,212 @@ Pins: xtask/src/corpus_pins.rs. Moving one: change it, then -- --update-ma ); } -fn pngsuite_count(dir: &std::path::Path) -> usize { - std::fs::read_dir(dir).map(|d| d.flatten().filter(|e| e.path().extension().is_some_and(|x| x == "png")).count()).unwrap_or(0) +const PNGSUITE_MANIFEST: &str = include_str!("../pngsuite.sha256"); +const PNGSUITE_MAX_ARCHIVE_BYTES: u64 = 1024 * 1024; +const PNGSUITE_MAX_FILE_BYTES: u64 = 4 * 1024 * 1024; +static PNGSUITE_STAGE_ID: AtomicU64 = AtomicU64::new(0); + +/// Do not trust cached filenames, symlinks, or a file's size remaining unchanged during a read. +fn pngsuite_bytes(path: &Path, limit: u64) -> Result, String> { + let meta = std::fs::symlink_metadata(path).map_err(|e| format!("{}: {e}", path.display()))?; + if !meta.is_file() || meta.len() > limit { + return Err(format!("{}: expected a regular file of at most {limit} bytes", path.display())); + } + let mut bytes = Vec::new(); + std::fs::File::open(path) + .map_err(|e| format!("{}: {e}", path.display()))? + .take(limit + 1) + .read_to_end(&mut bytes) + .map_err(|e| format!("{}: {e}", path.display()))?; + if bytes.len() as u64 > limit { + return Err(format!("{}: exceeds {limit} bytes", path.display())); + } + Ok(bytes) } -/// PngSuite: 175 PNGs from a fixed release archive (skipped when already present). -fn fetch_pngsuite() -> Result<(), String> { - let corpus = root().join("corpus"); +fn verify_pngsuite(dir: &Path, manifest: &str) -> Result<(), String> { + let mut expected = BTreeMap::new(); + for line in manifest.lines() { + let Some((hash, name)) = line.split_once(" ") else { return Err("pngsuite: invalid manifest line".into()) }; + if hash.len() != 64 + || !hash.bytes().all(|c| c.is_ascii_hexdigit()) + || name.is_empty() + || name.contains("..") + || !name.bytes().all(|c| c.is_ascii_alphanumeric() || b"._-".contains(&c)) + || expected.insert(name, hash).is_some() + { + return Err("pngsuite: invalid manifest entry".into()); + } + } + if expected.is_empty() { + return Err("pngsuite: empty manifest".into()); + } + let meta = std::fs::symlink_metadata(dir).map_err(|e| format!("{}: {e}", dir.display()))?; + if !meta.is_dir() { + return Err(format!("{}: expected a regular directory", dir.display())); + } + let entries = std::fs::read_dir(dir).map_err(|e| format!("{}: {e}", dir.display()))?; + let mut seen = 0; + for entry in entries { + let entry = entry.map_err(|e| format!("{}: {e}", dir.display()))?; + let name = entry.file_name(); + let hash = name.to_str().and_then(|n| expected.get(n)).ok_or_else(|| format!("pngsuite: unexpected file {}", entry.path().display()))?; + let bytes = pngsuite_bytes(&entry.path(), PNGSUITE_MAX_FILE_BYTES)?; + if crate::sha256::hex(&bytes) != **hash { + return Err(format!("pngsuite: {}: sha256 mismatch", entry.path().display())); + } + seen += 1; + } + if seen != expected.len() { + return Err(format!("pngsuite: missing files ({seen} of {})", expected.len())); + } + Ok(()) +} + +struct PngSuiteStage { + path: PathBuf, + keep: bool, +} + +impl PngSuiteStage { + fn new(corpus: &Path) -> Result { + std::fs::create_dir_all(corpus).map_err(|e| format!("create {}: {e}", corpus.display()))?; + for _ in 0..100 { + let id = PNGSUITE_STAGE_ID.fetch_add(1, Ordering::Relaxed); + let path = corpus.join(format!(".pngsuite-{}-{id}", std::process::id())); + match std::fs::create_dir(&path) { + Ok(()) => return Ok(Self { path, keep: false }), + Err(e) if e.kind() == std::io::ErrorKind::AlreadyExists => {} + Err(e) => return Err(format!("create {}: {e}", path.display())), + } + } + Err("pngsuite: could not create a staging directory".into()) + } +} + +impl Drop for PngSuiteStage { + fn drop(&mut self) { + if !self.keep { + let _ = std::fs::remove_dir_all(&self.path); + } + } +} + +/// Keep the old cache until the verified replacement is in place. On a failed rollback its +/// backup remains in staging and the error names it, rather than deleting the only copy. +fn install_pngsuite( + dest: &Path, + files: &Path, + backup: &Path, + backup_retained: &mut bool, + mut rename: impl FnMut(&Path, &Path) -> std::io::Result<()>, +) -> Result<(), String> { + let had_cache = match std::fs::symlink_metadata(dest) { + Ok(_) => true, + Err(e) if e.kind() == std::io::ErrorKind::NotFound => false, + Err(e) => return Err(format!("{}: {e}", dest.display())), + }; + if had_cache { + rename(dest, backup).map_err(|e| format!("pngsuite: preserve {}: {e}", dest.display()))?; + *backup_retained = true; + } + if let Err(e) = rename(files, dest) { + if had_cache && let Err(restore) = rename(backup, dest) { + return Err(format!("pngsuite: install failed ({e}); restore failed ({restore}); old cache retained at {}", backup.display())); + } + *backup_retained = false; + return Err(format!("pngsuite: install failed: {e}")); + } + *backup_retained = false; + Ok(()) +} + +fn fetch_pngsuite_in( + corpus: &Path, + archive_hash: &str, + manifest: &str, + download: impl FnOnce(&Path) -> Result<(), String>, + extract: impl FnOnce(&Path, &Path) -> Result<(), String>, + rename: impl FnMut(&Path, &Path) -> std::io::Result<()>, +) -> Result<(), String> { let dest = corpus.join("pngsuite"); - let have = pngsuite_count(&dest); - if have >= 175 { - println!("pngsuite: {have} PNG files in {} already", dest.display()); + if verify_pngsuite(&dest, manifest).is_ok() { + println!("pngsuite: {} already matches its manifest", dest.display()); return Ok(()); } - std::fs::create_dir_all(&dest).map_err(|e| format!("create {}: {e}", dest.display()))?; - let tgz = corpus.join("PngSuite-2017jul19.tgz"); - let mut curl = Command::new("curl"); - curl.args(["-fsSL", "--retry", "3", "-A", USER_AGENT, "-o"]).arg(&tgz).arg(PNGSUITE_URL); - run(curl, &format!("curl {PNGSUITE_URL}"))?; - let mut tar = Command::new("tar"); - tar.arg("-xzf").arg(&tgz).arg("-C").arg(&dest); - run(tar, "tar -xzf PngSuite-2017jul19.tgz")?; - let _ = std::fs::remove_file(&tgz); - let n = pngsuite_count(&dest); - println!("pngsuite: {n} PNG files in {}", dest.display()); - if n == 0 { Err("no PNG files extracted".into()) } else { Ok(()) } + let mut stage = PngSuiteStage::new(corpus)?; + let archive = stage.path.join("archive.tgz"); + download(&archive)?; + let bytes = pngsuite_bytes(&archive, PNGSUITE_MAX_ARCHIVE_BYTES)?; + if crate::sha256::hex(&bytes) != archive_hash { + return Err("pngsuite: archive sha256 mismatch; nothing extracted".into()); + } + let files = stage.path.join("files"); + std::fs::create_dir(&files).map_err(|e| format!("create {}: {e}", files.display()))?; + extract(&archive, &files)?; + verify_pngsuite(&files, manifest)?; + let backup = stage.path.join("previous"); + install_pngsuite(&dest, &files, &backup, &mut stage.keep, rename)?; + println!("pngsuite: verified {}", dest.display()); + Ok(()) +} + +/// Older curl versions cannot enforce --max-filesize for unknown-length responses. Write +/// only the allowed prefix, then probe for excess without spooling that byte to disk. +fn copy_pngsuite_download(reader: &mut impl Read, writer: &mut impl Write) -> std::io::Result<()> { + std::io::copy(&mut reader.take(PNGSUITE_MAX_ARCHIVE_BYTES), writer)?; + let mut extra = [0; 1]; + loop { + match reader.read(&mut extra) { + Ok(0) => return Ok(()), + Ok(_) => return Err(std::io::Error::other(format!("pngsuite: archive exceeds {PNGSUITE_MAX_ARCHIVE_BYTES} bytes"))), + Err(e) if e.kind() == std::io::ErrorKind::Interrupted => {} + Err(e) => return Err(e), + } + } +} + +fn finish_pngsuite_download(child: &mut Child, mut reader: impl Read, writer: &mut impl Write) -> Result<(), String> { + let result = copy_pngsuite_download(&mut reader, writer).map_err(|e| format!("pngsuite: download: {e}")).and_then(|()| { + let status = child.wait().map_err(|e| format!("pngsuite: wait for curl: {e}"))?; + if status.success() { Ok(()) } else { Err(format!("pngsuite: curl failed: {status}")) } + }); + if result.is_err() { + let _ = child.kill(); + let _ = child.wait(); + } + result +} + +fn download_pngsuite(mut curl: Command, archive: &Path) -> Result<(), String> { + let mut file = std::fs::File::create(archive).map_err(|e| format!("create {}: {e}", archive.display()))?; + let mut child = curl.stdout(Stdio::piped()).spawn().map_err(|e| format!("pngsuite: start curl: {e}"))?; + let Some(stdout) = child.stdout.take() else { + let _ = child.kill(); + let _ = child.wait(); + return Err("pngsuite: curl stdout unavailable".into()); + }; + finish_pngsuite_download(&mut child, stdout, &mut file) +} + +/// PngSuite: fixed archive checked before tar; every cached file checked on each invocation. +fn fetch_pngsuite() -> Result<(), String> { + fetch_pngsuite_in( + &root().join("corpus"), + PNGSUITE_SHA256, + PNGSUITE_MANIFEST, + |archive| { + let mut curl = Command::new("curl"); + curl.args(["-fsSL", "--retry", "3", "--max-filesize", &PNGSUITE_MAX_ARCHIVE_BYTES.to_string(), "-A", USER_AGENT, "-o", "-", PNGSUITE_URL]); + download_pngsuite(curl, archive) + }, + |archive, files| { + let mut tar = Command::new("tar"); + tar.arg("-xzf").arg(archive).arg("-C").arg(files); + run(tar, "tar -xzf PngSuite-2017jul19.tgz") + }, + |from, to| std::fs::rename(from, to), + ) } /// Files changed relative to `origin/main` (committed, staged or not). @@ -286,4 +472,308 @@ mod tests { fn all_without_update_manifest_only_verifies() { assert!(calls(false, false).iter().all(|(_, u)| !*u)); } + + const FIXTURE_FILES: &[(&str, &[u8])] = &[("a.png", b"alpha"), ("b.png", b"beta"), ("PngSuite.LICENSE", b"fixture licence")]; + const FIXTURE_ARCHIVE: &[u8] = b"owned archive fixture"; + + struct Fixture(PathBuf); + + impl Fixture { + fn new() -> Self { + let id = PNGSUITE_STAGE_ID.fetch_add(1, Ordering::Relaxed); + let path = std::env::temp_dir().join(format!("photocraft-pngsuite-test-{}-{id}", std::process::id())); + std::fs::create_dir(&path).unwrap(); + Self(path) + } + + fn cache(&self) -> PathBuf { + self.0.join("pngsuite") + } + + fn old_cache(&self) { + std::fs::create_dir(self.cache()).unwrap(); + std::fs::write(self.cache().join("old.png"), b"old cache bytes").unwrap(); + } + + fn assert_old_cache(&self) { + assert_eq!(std::fs::read(self.cache().join("old.png")).unwrap(), b"old cache bytes"); + assert_eq!(std::fs::read_dir(&self.0).unwrap().count(), 1, "staging was not cleaned"); + } + } + + impl Drop for Fixture { + fn drop(&mut self) { + let _ = std::fs::remove_dir_all(&self.0); + } + } + + fn fixture_manifest() -> String { + FIXTURE_FILES.iter().map(|(name, bytes)| format!("{} {name}\n", crate::sha256::hex(bytes))).collect() + } + + fn fixture_extract(_: &Path, files: &Path) -> Result<(), String> { + for (name, bytes) in FIXTURE_FILES { + std::fs::write(files.join(name), bytes).map_err(|e| e.to_string())?; + } + Ok(()) + } + + fn fixture_download(archive: &Path) -> Result<(), String> { + std::fs::write(archive, FIXTURE_ARCHIVE).map_err(|e| e.to_string()) + } + + fn fixture_fetch(corpus: &Path) -> Result<(), String> { + fetch_pngsuite_in(corpus, &crate::sha256::hex(FIXTURE_ARCHIVE), &fixture_manifest(), fixture_download, fixture_extract, |from, to| { + std::fs::rename(from, to) + }) + } + + #[test] + fn pngsuite_cache_checks_bytes_names_and_regular_files() { + let f = Fixture::new(); + std::fs::create_dir(f.cache()).unwrap(); + fixture_extract(Path::new("unused"), &f.cache()).unwrap(); + assert!(verify_pngsuite(&f.cache(), &fixture_manifest()).is_ok()); + std::fs::write(f.cache().join("a.png"), b"changed").unwrap(); + assert!(verify_pngsuite(&f.cache(), &fixture_manifest()).unwrap_err().contains("sha256 mismatch")); + fixture_extract(Path::new("unused"), &f.cache()).unwrap(); + std::fs::remove_file(f.cache().join("a.png")).unwrap(); + assert!(verify_pngsuite(&f.cache(), &fixture_manifest()).unwrap_err().contains("missing files")); + fixture_extract(Path::new("unused"), &f.cache()).unwrap(); + std::fs::write(f.cache().join("extra.png"), b"extra").unwrap(); + assert!(verify_pngsuite(&f.cache(), &fixture_manifest()).unwrap_err().contains("unexpected file")); + std::fs::remove_file(f.cache().join("extra.png")).unwrap(); + std::fs::remove_file(f.cache().join("a.png")).unwrap(); + std::fs::create_dir(f.cache().join("a.png")).unwrap(); + assert!(verify_pngsuite(&f.cache(), &fixture_manifest()).unwrap_err().contains("regular file")); + } + + #[test] + fn pngsuite_valid_cache_needs_no_download_or_extraction() { + let f = Fixture::new(); + fixture_fetch(&f.0).unwrap(); + fetch_pngsuite_in( + &f.0, + "unused", + &fixture_manifest(), + |_| panic!("valid cache downloaded"), + |_, _| panic!("valid cache extracted"), + |_, _| panic!("valid cache renamed"), + ) + .unwrap(); + } + + #[test] + fn pngsuite_repairs_unverified_175_file_cache_and_removes_extras() { + let f = Fixture::new(); + std::fs::create_dir(f.cache()).unwrap(); + for i in 0..175 { + std::fs::write(f.cache().join(format!("fake-{i}.png")), b"not a PNG").unwrap(); + } + fixture_fetch(&f.0).unwrap(); + assert!(verify_pngsuite(&f.cache(), &fixture_manifest()).is_ok()); + assert_eq!(std::fs::read_dir(f.cache()).unwrap().count(), FIXTURE_FILES.len()); + assert_eq!(std::fs::read_dir(&f.0).unwrap().count(), 1); + } + + #[test] + fn pngsuite_unexpected_or_truncated_archive_never_reaches_extractor() { + for bad in [b"unexpected".as_slice(), &FIXTURE_ARCHIVE[..4]] { + let f = Fixture::new(); + f.old_cache(); + let e = fetch_pngsuite_in( + &f.0, + &crate::sha256::hex(FIXTURE_ARCHIVE), + &fixture_manifest(), + |a| std::fs::write(a, bad).map_err(|e| e.to_string()), + |_, _| panic!("unverified archive reached extractor"), + |_, _| panic!("unverified archive reached installation"), + ) + .unwrap_err(); + assert!(e.contains("archive sha256 mismatch")); + f.assert_old_cache(); + } + } + + #[test] + fn pngsuite_download_or_extraction_failure_keeps_old_cache() { + let f = Fixture::new(); + f.old_cache(); + assert!( + fetch_pngsuite_in( + &f.0, + "unused", + &fixture_manifest(), + |_| Err("offline".into()), + |_, _| panic!("failed download extracted"), + |_, _| panic!("failed download installed") + ) + .unwrap_err() + .contains("offline") + ); + f.assert_old_cache(); + assert!( + fetch_pngsuite_in( + &f.0, + &crate::sha256::hex(FIXTURE_ARCHIVE), + &fixture_manifest(), + fixture_download, + |_, files| { + std::fs::write(files.join("partial.png"), b"partial").unwrap(); + Err("extract failed".into()) + }, + |_, _| panic!("failed extraction installed") + ) + .unwrap_err() + .contains("extract failed") + ); + f.assert_old_cache(); + for extra in [false, true] { + let e = fetch_pngsuite_in( + &f.0, + &crate::sha256::hex(FIXTURE_ARCHIVE), + &fixture_manifest(), + fixture_download, + |a, files| { + fixture_extract(a, files)?; + if extra { + std::fs::write(files.join("extra.png"), b"extra").unwrap(); + } else { + std::fs::remove_file(files.join("a.png")).unwrap(); + } + Ok(()) + }, + |_, _| panic!("unverified extraction installed"), + ) + .unwrap_err(); + assert!(e.contains(if extra { "unexpected file" } else { "missing files" })); + f.assert_old_cache(); + } + } + + #[test] + fn pngsuite_failed_installation_restores_old_cache() { + for fail_backup in [false, true] { + let f = Fixture::new(); + f.old_cache(); + let e = fetch_pngsuite_in(&f.0, &crate::sha256::hex(FIXTURE_ARCHIVE), &fixture_manifest(), fixture_download, fixture_extract, |from, to| { + if (fail_backup && from == f.cache()) || (!fail_backup && from.file_name().is_some_and(|n| n == "files")) { + Err(std::io::Error::other("injected rename failure")) + } else { + std::fs::rename(from, to) + } + }) + .unwrap_err(); + assert!(e.contains("injected rename failure")); + f.assert_old_cache(); + } + } + + #[test] + fn pngsuite_failed_rollback_retains_and_names_the_backup() { + let f = Fixture::new(); + f.old_cache(); + let e = fetch_pngsuite_in(&f.0, &crate::sha256::hex(FIXTURE_ARCHIVE), &fixture_manifest(), fixture_download, fixture_extract, |from, to| { + if from == f.cache() { std::fs::rename(from, to) } else { Err(std::io::Error::other("injected install and rollback failure")) } + }) + .unwrap_err(); + let stage = std::fs::read_dir(&f.0).unwrap().next().unwrap().unwrap().path(); + let backup = stage.join("previous"); + assert!(e.contains(&backup.display().to_string()), "{e}"); + assert_eq!(std::fs::read(backup.join("old.png")).unwrap(), b"old cache bytes"); + std::fs::rename(backup, f.cache()).unwrap(); + } + + #[test] + fn pngsuite_reads_are_bounded_and_malformed_manifests_are_rejected() { + let f = Fixture::new(); + let file = f.0.join("large"); + std::fs::File::create(&file).unwrap().set_len(PNGSUITE_MAX_ARCHIVE_BYTES + 1).unwrap(); + assert!(pngsuite_bytes(&file, PNGSUITE_MAX_ARCHIVE_BYTES).unwrap_err().contains("regular file")); + for malformed in ["", "invalid", "00 a.png", &format!("{} ../outside\n", crate::sha256::hex(b""))] { + assert!(verify_pngsuite(&f.0, malformed).is_err()); + } + } + + #[test] + fn pngsuite_download_copy_accepts_boundary_and_never_writes_excess() { + let limit = PNGSUITE_MAX_ARCHIVE_BYTES as usize; + for len in [limit - 1, limit, limit + 1, limit * 2] { + let data = vec![0xa5; len]; + let mut out = Vec::new(); + let result = copy_pngsuite_download(&mut std::io::Cursor::new(&data), &mut out); + assert_eq!(result.is_ok(), len <= limit); + assert_eq!(out, data[..len.min(limit)]); + } + } + + // The ordinary test invocation returns immediately. Only this test's child command + // enables emission; it stays alive so cleanup must kill and reap that particular child. + #[test] + fn pngsuite_stream_fixture() { + if std::env::var_os("PHOTOCRAFT_PNGSUITE_STREAM_TEST").is_some() { + let mut out = std::io::stdout().lock(); + for _ in 0..256 { + let _ = out.write_all(&[0xa5; 8192]); + } + std::thread::park(); + } + } + + fn stream_child() -> Child { + Command::new(std::env::current_exe().unwrap()) + .args(["--exact", "corpus::tests::pngsuite_stream_fixture", "--nocapture"]) + .env("PHOTOCRAFT_PNGSUITE_STREAM_TEST", "1") + .stdout(Stdio::piped()) + .stderr(Stdio::null()) + .spawn() + .unwrap() + } + + #[test] + fn pngsuite_oversize_and_io_failures_kill_and_reap_only_the_download_child() { + struct FailedRead; + impl Read for FailedRead { + fn read(&mut self, _: &mut [u8]) -> std::io::Result { + Err(std::io::Error::other("injected read failure")) + } + } + struct FailedWrite; + impl Write for FailedWrite { + fn write(&mut self, _: &[u8]) -> std::io::Result { + Err(std::io::Error::other("injected write failure")) + } + fn flush(&mut self) -> std::io::Result<()> { + Ok(()) + } + } + let mut child = stream_child(); + let stdout = child.stdout.take().unwrap(); + let mut out = Vec::new(); + assert!(finish_pngsuite_download(&mut child, stdout, &mut out).unwrap_err().contains("archive exceeds")); + assert_eq!(out.len() as u64, PNGSUITE_MAX_ARCHIVE_BYTES); + assert!(child.try_wait().unwrap().is_some()); + + let mut child = stream_child(); + assert!(child.try_wait().unwrap().is_none()); + assert!(finish_pngsuite_download(&mut child, FailedRead, &mut Vec::new()).unwrap_err().contains("injected read failure")); + assert!(child.try_wait().unwrap().is_some()); + + let mut child = stream_child(); + let stdout = child.stdout.take().unwrap(); + assert!(finish_pngsuite_download(&mut child, stdout, &mut FailedWrite).unwrap_err().contains("injected write failure")); + assert!(child.try_wait().unwrap().is_some()); + } + + #[cfg(unix)] + #[test] + fn pngsuite_cache_rejects_symlinks_even_when_target_bytes_match() { + let f = Fixture::new(); + std::fs::create_dir(f.cache()).unwrap(); + fixture_extract(Path::new("unused"), &f.cache()).unwrap(); + std::fs::write(f.0.join("target"), b"alpha").unwrap(); + std::fs::remove_file(f.cache().join("a.png")).unwrap(); + std::os::unix::fs::symlink(f.0.join("target"), f.cache().join("a.png")).unwrap(); + assert!(verify_pngsuite(&f.cache(), &fixture_manifest()).unwrap_err().contains("regular file")); + } } diff --git a/xtask/src/corpus_pins.rs b/xtask/src/corpus_pins.rs index b8d37704..91741270 100644 --- a/xtask/src/corpus_pins.rs +++ b/xtask/src/corpus_pins.rs @@ -40,6 +40,10 @@ pub const ASSET_STORE_TEMPLATE_COMMIT: &str = "f671981ee89d15526285b3cc87b4393d3 pub const AFFINITY_SAMPLES_COMMIT: &str = "96aca6bd86bbe7a677f1cf0630bd832d23943be8"; /// PngSuite (public domain), a fixed release archive. pub const PNGSUITE_URL: &str = "http://www.schaik.com/pngsuite/PngSuite-2017jul19.tgz"; +/// Fixed archive, corroborated by HTTPS records in opencodecs at 6f070029 and rivet-png at +/// 134faad8 (corpus/checksums.json and tests/pngsuite/SHA256SUMS). Check the legacy HTTP +/// download against this committed digest before extraction. +pub const PNGSUITE_SHA256: &str = "0294b244c95a8342c01b00010cf34abdcabc7c6a34fd0fe1bd963917537bfdc8"; /// `corpus/photoshop`: 258 PSDs authored with Photoshop by the photocraft-corpus generator. pub const PHOTOSHOP: PinnedCorpus = PinnedCorpus { From 67e4b8a499b55ef728b1da700005382c45e4677d Mon Sep 17 00:00:00 2001 From: Sean Dellis <1584916+seandellis@users.noreply.github.com> Date: Mon, 12 Oct 2026 09:52:19 -0500 Subject: [PATCH 91/92] =?UTF-8?q?feat:=20Alt+Cancel=20=E2=86=92=20Reset=20?= =?UTF-8?q?for=20opt-in=20command=20dialogs=20(#3871)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update .gitignore and add UI Dialogs documentation - Added .specstory, .private, and .vscode to .gitignore to exclude additional files from version control. - Introduced a new documentation file, ui-dialogs.md, detailing the architecture, rules, and usage of modal and modeless dialogs in the egui shell, mirroring Photoshop's functionality. * Enhance UI Dialogs documentation in ui-dialogs.md - Expanded the section on command routing and dialog types, clarifying the roles of various dialog kinds and their associated modules. - Improved descriptions of routing markers and private keys, ensuring better understanding of the dialog architecture and usage. - Updated the menu command entry details to reflect changes in module organization and functionality. * Implement Alt+Cancel (Reset) functionality for various UI dialogs - Introduced a new module `dialog_alt_reset` to handle the Alt+Cancel behavior, allowing users to reset dialog fields to their original values while keeping the dialog open. - Updated multiple dialog modules to support this feature, including adjustments for color pickers, sizing, and guide layouts. - Added tests to ensure that the reset functionality correctly restores original values and maintains dialog state. - Enhanced documentation to reflect the new Alt+Reset behavior and its implementation details across different dialog types. * Update manual UI testing command to include build timing summary - Modified the `manual-ui-testing` command in `.cargo/config.toml` to include the `--timings` flag, enabling the generation of a build timing summary after compilation and linking. - Refactored the `reset_fields` function in `filter_dialog.rs` for improved readability by consolidating the retrieval of the `spec` variable into a single line, enhancing code clarity. * Layers panel: dragging the vector mask to the Trash asks to delete just the mask (#3119) (#3125) * Layers panel: Shift+Plus/Minus cycle blend modes; effects dropped on the Trash are deleted (#3102) - blend_keys.rs: Shift+Plus / Shift+Minus step to the next / previous blend mode, wrapping: the brush's mode with the Brush or Pencil (tools.setBrush), the Gradient's with the Gradient tool, otherwise the active layer's (layer.setProps; groups include Pass Through, the Background is left alone). One undo step per press. - panels.rs: an effect row dragged onto the footer's Delete button deletes that effect, the "Effects" row clears the whole style (layer.layerStyle.clear). - engine: layer.layerStyle.clear takes an optional "effect" index ("Delete Effect" step); bad indices and layers return Err. - scorecard UI-217-14 -> done (its wheel, footer drop and thumbnail checker parts were already on main via #1961, #965). Co-Authored-By: Claude Opus 5.5 * Layers panel: Shift+Plus/Minus step the blend mode on a German layout too (#3102) On layouts with a key of its own for `+` (German, Italian, Spanish) Shift+`+` types `*`, which egui has no key for, so egui-winit reports the physical key: `]` on German. That matched Shift+] (Increase Brush Hardness) before the blend keys ever saw it. Shift+`-` types `_` and arrives as the physical `/`. shortcuts::layout_symbols now turns such a fallback press (Shift, the key equal to its physical key, not a digit, next to the text `*` or `_`) into `+` / `-` before any shortcut is dispatched. A US Shift+] still arrives as `}` and keeps raising the hardness; US Shift+8 (`*`) stays a digit for the opacity keys. Co-Authored-By: Claude Opus 5.5 * Shortcuts: Ö / # are the brush keys on a German layout (#3109) Photoshop's German shortcuts step the brush size with Ö / # and the hardness with Shift+Ö / Shift+#, since [ and ] need AltGr there (and that press carries Alt on the Mac and Windows, which the shortcut match rejects). egui can't name ö or #, so they arrived as the physical ; and \ and matched nothing; Shift+# types ' and arrived as Quote. shortcuts::layout_symbols (from #3102) now reads a table of typed symbol and Shift: ö / Ö -> [, # / ' -> ], next to * -> + and _ -> -. It runs at the top of shortcuts::handle (unless a text field has focus), so Liquify's and the Magnetic Lasso's [ ] get the German keys too. Only presses whose key egui took from the physical key or from that very text change, and never digits. Co-Authored-By: Claude Opus 5.5 * Layers panel: a mask dragged onto the Trash asks to apply or delete it (#3113) A drag that started on a layer's mask thumbnail dragged the whole row, and dropping it on the Trash deleted the layer. Now a drag from the pixel mask thumbnail (where it was drawn last frame) drags the mask: it shows a "Layer Mask" ghost and starts neither a layer reorder nor a cross-document transfer. Dropped on the Trash it opens Photoshop's prompt "Apply mask to layer before removing?" with Apply (layer.layerMask.apply, greyed out where it can't run), Delete (layer.layerMask.delete) and Cancel. Clicking the Trash still deletes the targeted mask at once (#2197). The prompt (mask_trash_prompt.rs) is an ordinary dialog: ui.dialog.confirm applies, ui.dialog.set {"choice": "delete"} + confirm deletes, cancel keeps. Two new strings in all 16 catalogs. Co-Authored-By: Claude Opus 5.5 * Layers panel: dragging the vector mask to the Trash asks to delete just the mask (#3119) A drag that started on a row's vector mask thumbnail picked up the whole layer row, so dropping it on the Trash deleted the layer. The mask drag from #3113 now covers both thumbnails: a vector mask dropped on the Trash opens Photoshop's "Delete the vector mask?" (OK / Cancel), and OK runs layer.vectorMask.delete. Clicks on the thumbnail are unchanged. Co-Authored-By: Claude Opus 5.5 * Brush keys: layout table plus bracket-position fallback for every layout (#3109) Co-Authored-By: Claude Opus 5.5 * layout_keys: drop unused field, fmt Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 Co-authored-by: Brandon Thomas * Interface: an Enable Animations preference (#3273) (#3276) Preferences › Interface › Enable animations (interface.enableAnimations, on by default). Off, prefs_ui::sync_animations sets egui's animation_time to 0 and scroll_animation to none in both the dark and light styles, so menus, popups and collapsing sections change at once and scroll areas jump. It is re-applied each frame, so a theme change keeps it. Translated in all 16 catalogs; the scorecard row UI-217-10 goes to partial. Co-authored-by: Claude Opus 5.5 Co-authored-by: Brandon Thomas * Edit > Copy takes a targeted layer mask, so masks travel between layers and documents (#2928) (#3267) * automation: export layers, data sets and CSVs through the granted roots (#3216) (#3230) * automation: doc.place reads a file through the read root (#2810) file.placeEmbedded takes an ambient path, so automation refuses it and an agent could not place a file into the open document at all. doc.place resolves the path beneath the read root the way doc.open does and hands the bytes it already read to the public file_cmds::place_bytes, so the existing cap-std rules stay the only path rules: no new scope logic, and the ambient command keeps its refusal. Trusted-local callers still run the command. * automation: export layers, data sets and CSVs through the roots (#3216) file.export.layersToFiles and file.export.dataSetsAsFiles take an ambient dir, file.import.variableDataSets an ambient path, so all three are refused in automation even for files inside the granted roots, and an agent could not export a single file or a data set at all. Both halves already existed: the engine writes bytes it has just encoded (save_doc is encode + write_file, and the data-set exporter encodes with photocraft_io::export before writing), and the automation side already holds a write capability — AuthorizedWorkspace::export_sequence creates the directory, refuses to overwrite, accepts only single-component names and removes every file it created when a step fails, which is what Render Video uses. So each command body moves behind the same sink callback render_video_with takes: the command keeps writing the bytes it is handed to its dir, the new methods write the very same bytes through the root, and the two implementations cannot drift. --------- Co-authored-by: switch87 <8284204+switch87@users.noreply.github.com> Co-authored-by: Brandon Thomas Co-authored-by: Claude Opus 5.5 * Type: fall back to installed Khmer, Lao and Burmese fonts (#218) (#3259) Text in these scripts drew .notdef boxes although the OS had a font for them. Detection was never the problem: the system font scan loads them, and asking for one by name shapes correctly. The fallback stack is a list of family names intersected with the installed fonts, and it had no entry for any of the three, so an installed Khmer, Lao or Burmese font could not be reached from a Latin-only face. - photocraft-text: KHMER_FAMILIES, LAO_FAMILIES and MYANMAR_FAMILIES join fallback_candidates next to THAI_FAMILIES; the web build's served-font scripts gain Khmr, Laoo and Mymr (with their ranges and languages). - photocraft-ui-egui: the UI's lazy loader had one non-CJK slot (Thai). It becomes a LazyScript slot table, so the three scripts are data rather than a third and fourth copy of the same state machine. - Tests assert detection and selection separately, so a future failure names its layer, and skip when a machine lacks the script's font. Co-authored-by: Raccoon <235524086+RaccoonPie-314@users.noreply.github.com> Co-authored-by: Brandon Thomas Co-authored-by: Claude Opus 5.5 * Curves: pencil mode, Smooth and Edit points (#3088) (#3108) * Curves: pencil mode, Smooth and Edit points (#3088) The Curves editor (Image > Adjustments dialog and the adjustment layer's Properties panel) gains Photoshop's "Edit points to modify the curve" and "Draw to modify the curve" buttons plus Smooth, with tooltips. A drawn curve is a 256-level map per channel, evaluated piecewise-linearly. - doc: Adjustment::Curves gains `pencil` (serde default), with curve_map / curve_map_outputs helpers. - compose: curve_map_lut / curve_lut_mode for drawn curves. - engine: curves params take `pencil` and `smooth`; channels accept 256-level maps; switching modes draws the spline into maps or fits up to 16 points to the drawing. Eyedroppers fit points first. - io: the PSD `curv` map flag (first byte, psd-tools `is_map`) was read as padding, so pencil curves from Photoshop were misparsed; they are now read and written as 256-byte maps, and smart-filter Curves use `Mpng`. - scorecard UI-217-15 note updated. Co-Authored-By: Claude Opus 5.5 * Merge upstream/main: Curves in new compose/gpu HDR tests gets the pencil field (#3088) Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 Co-authored-by: Brandon Thomas * fix(io): smooth PSD gradients no longer overshoot their stops (#3028) (#3285) The Catmull-Rom tangents used for Smoothness are derived from the neighbouring stops, so a segment between two equal-coloured stops (a flat plateau) picked up a non-zero tangent and dipped below its own colour. In the Gradient Map from #3028 the 27%-53% plateau (#1c1c1c) rendered about 19/255 too dark. Bound each interpolated channel to the range of the segment's two end colours. Smoothness still bends the ramp, but never invents a colour outside the segment, so plateaus stay exactly flat. The regression test uses the four stop positions and grey values from the issue (synthetic, no artwork) and fails without the clamp. * Codecs: decode PNM straight into the budgeted output buffer (#2938) (#3291) Limits::max_alloc budgets the decoded pixel buffer, but the PNM decoder collected one u32 per sample first (4x an 8-bit image, plus a u16 copy for 16-bit) and PFM built a Vec beside the output bytes. Samples are now rescaled and written straight into the native-endian output buffer (reserved fallibly), so the only header-sized allocation is the one Limits::check already charged. Co-authored-by: Claude Opus 5.5 * Properties: Curves adjustment layers get the black/gray/white eyedroppers (#3110) (#3115) * Curves: pencil mode, Smooth and Edit points (#3088) The Curves editor (Image > Adjustments dialog and the adjustment layer's Properties panel) gains Photoshop's "Edit points to modify the curve" and "Draw to modify the curve" buttons plus Smooth, with tooltips. A drawn curve is a 256-level map per channel, evaluated piecewise-linearly. - doc: Adjustment::Curves gains `pencil` (serde default), with curve_map / curve_map_outputs helpers. - compose: curve_map_lut / curve_lut_mode for drawn curves. - engine: curves params take `pencil` and `smooth`; channels accept 256-level maps; switching modes draws the spline into maps or fits up to 16 points to the drawing. Eyedroppers fit points first. - io: the PSD `curv` map flag (first byte, psd-tools `is_map`) was read as padding, so pencil curves from Photoshop were misparsed; they are now read and written as 256-byte maps, and smart-filter Curves use `Mpng`. - scorecard UI-217-15 note updated. Co-Authored-By: Claude Opus 5.5 * Properties: Curves adjustment layers get the black/gray/white eyedroppers (#3110) The Set Black/Neutral Gray/White Point pickers existed only in the Image > Adjustments > Curves dialog (#873). The Properties editor of a Curves adjustment layer now has them too (layer_picker.rs): with one armed, a click on the image runs one layer.setAdjustment with the new `eyedropper` param, which samples the image below the layer (the layer hidden, like its Properties histogram) at the Eyedropper's Sample Size, so a repeated click keeps the curve and the edit is one undoable, recordable step agents can send directly. Esc, another tool or another layer disarms it; ui.pointer and ui.inspect (`layerPicker`) cover it. Scorecard UI-217-15 is done. Co-Authored-By: Claude Opus 5.5 * Merge upstream/main: Curves in new compose/gpu HDR tests gets the pencil field (#3088) Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 Co-authored-by: Brandon Thomas * Format: admit the declared .pcraft canvas before loading it (#2935) (#3295) * Format: admit the declared .pcraft canvas before loading it (#2935) A .pcraft manifest's canvas size was copied into the Document unchecked, so a few bytes of JSON could declare a 300000x300000 (or u32::MAX) canvas that the CPU reduction, thumbnails and display textures then work against in proportion to its area. The loader now refuses an empty canvas, a side above 300000 (Photoshop's PSB limit, as for PSD and file.new) and an area above 4 gigapixels, right after reading the manifest and before any tile or blob is decoded. Both limits are LoadOptions fields so trusted callers can change them. Co-Authored-By: Claude Opus 5.5 * Format: admit every canvas the app can create on .pcraft load (#2935) The default pixel budget was 2^32 (65536 x 65536), but file.new, Canvas Size, Image Size with Resample off and PSB import all reach 300000 x 300000, so a document a user could create and save would not reopen. The default is now the full 300000^2 PSB canvas; the side limit still refuses anything larger, and callers handling untrusted files can lower either budget. Loading stays proportional to the file: layers keep only the tiles the bundle holds, so a huge declared canvas allocates nothing for its area. A compile-time assert in document_preset_cmds ties file.new's MAX_DIMENSION to the loader's defaults. Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 * fix(format): save the target file name in native bundle manifests (#3312) (#3319) * Levels: black, gray and white point eyedroppers (#3116) (#3128) * Curves: pencil mode, Smooth and Edit points (#3088) The Curves editor (Image > Adjustments dialog and the adjustment layer's Properties panel) gains Photoshop's "Edit points to modify the curve" and "Draw to modify the curve" buttons plus Smooth, with tooltips. A drawn curve is a 256-level map per channel, evaluated piecewise-linearly. - doc: Adjustment::Curves gains `pencil` (serde default), with curve_map / curve_map_outputs helpers. - compose: curve_map_lut / curve_lut_mode for drawn curves. - engine: curves params take `pencil` and `smooth`; channels accept 256-level maps; switching modes draws the spline into maps or fits up to 16 points to the drawing. Eyedroppers fit points first. - io: the PSD `curv` map flag (first byte, psd-tools `is_map`) was read as padding, so pencil curves from Photoshop were misparsed; they are now read and written as 256-byte maps, and smart-filter Curves use `Mpng`. - scorecard UI-217-15 note updated. Co-Authored-By: Claude Opus 5.5 * Properties: Curves adjustment layers get the black/gray/white eyedroppers (#3110) The Set Black/Neutral Gray/White Point pickers existed only in the Image > Adjustments > Curves dialog (#873). The Properties editor of a Curves adjustment layer now has them too (layer_picker.rs): with one armed, a click on the image runs one layer.setAdjustment with the new `eyedropper` param, which samples the image below the layer (the layer hidden, like its Properties histogram) at the Eyedropper's Sample Size, so a repeated click keeps the curve and the edit is one undoable, recordable step agents can send directly. Esc, another tool or another layer disarms it; ui.pointer and ui.inspect (`layerPicker`) cover it. Scorecard UI-217-15 is done. Co-Authored-By: Claude Opus 5.5 * Levels: black, gray and white point eyedroppers (#3116) Image > Adjustments > Levels and a Levels adjustment layer's Properties panel get Photoshop's Set Black/Neutral Gray/White Point eyedroppers. Black/white move each channel's input black/white to the sample, gray sets each channel's midtone gamma so the sample turns neutral at its luma (Grayscale: composite input, no gray). The engine takes the same `eyedropper` param as Curves on image.adjustments.levels, layer.newAdjustmentLayer.levels and layer.setAdjustment. On a smart object, image.adjustments.levels/curves with `eyedropper` now record the resolved adjustment as the smart filter instead of the raw sample, which re-rendered as an identity (#3127). Co-Authored-By: Claude Opus 5.5 * Merge upstream/main: Curves in new compose/gpu HDR tests gets the pencil field (#3088) Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 Co-authored-by: Brandon Thomas * Puppet Warp: the mesh follows the object outline (#3105) (#3117) The mesh was every square grid cell touching the layer's opaque pixels: a staircase up to a cell outside the shape, and shapes closer than about a cell shared cells, so pinning one dragged the other along. build_mesh now traces the outline of the opaque region grown (or shrunk) by Expansion from a signed distance field, simplifies it (Douglas-Peucker, corners kept), splits its sides to the Density spacing, fills the inside with a triangular lattice and triangulates the points (Bowyer-Watson Delaunay, outline sides recovered by midpoint splits), keeping the triangles inside the outline. Separate shapes get separate meshes, so an unpinned one stays put, as in Photoshop. Vertices are numbered in reverse Cuthill-McKee order to keep the solver's banded factor narrow, and the density's spacing counts the grown region so a large Expansion on a small layer no longer builds tens of thousands of vertices. Scorecard TOOL-214-6 done; docs/gaps.md G7 updated. Co-authored-by: Claude Opus 5.5 Co-authored-by: Brandon Thomas * Clone Source: W/H link and overlay blend modes (#3298) (#3310) The Clone Source panel gets Photoshop's W/H chain (Maintain aspect ratio): with it on, a new W or H scales the other by the same factor. cloneSource.set takes "linked" and cloneSource.list reports it. The overlay's Darken, Lighten and Difference modes were stored but never drawn. draw_clone_preview now blends the source with the composite under the brush (clone_source::overlay_blend), so Difference goes black where source and image line up. Co-authored-by: Claude Opus 5.5 * Vanishing Point: on-canvas plane editor with Create/Edit Plane, grid and paste (#3122) (#3133) Filter > Vanishing Point now opens a dialog mode on the canvas instead of the generic parameter dialog: - Create Plane (C): four clicks, in any order, make a plane (corners are normalised clockwise from the top-left, the order paste expects). - Edit Plane (V): drag corner nodes, or edge nodes to slide an edge along the plane's own perspective; click a plane to select it, Delete removes it. - The plane grid is drawn at the Grid Size, in the accent colour when the plane is valid, warning yellow when its perspective is doubtful and red (outline only) when the quad isn't convex (VpPlane::check). - With an image on the clipboard the selected plane previews it pasted in perspective; drag to move it, Width sets its size, New Layer renders it on a new layer. OK / Enter runs filter.vanishingPoint with the planes and the paste as one history step; the control channel drives the same session through {"ui": {...}}. The engine now rejects a drawn plane whose corners don't form a convex quad (bow-tie, dented) instead of warping along it. Co-authored-by: Claude Opus 5.5 Co-authored-by: Brandon Thomas * Let `[` shrink the brush to 1 px (#3229) (#3332) `[` steps the brush size down by 25 %, rounded: from 2 px that is 1.6, which rounds back to 2, so the key never reached 1 px and pixel artists had to type the size. `]` already grows by at least a pixel; `[` now shrinks by at least a pixel the same way, still never below 1 px. * MCP: command_batch says it is not atomic, and the docs explain recovery (#3338) Agents read the tool description, not docs/mcp.md, and the command_batch description only said it stops at the first error. It now also says the steps run in order and that earlier successful steps stay applied: there is no rollback. docs/mcp.md gives the stop_on_error default and a recovery recipe: inspect with doc_inspect, undo with edit.undo once per history entry (undo does not reverse files written to disk), or experiment on a copy made with image.duplicate or history.newDocument. A test checks the listed description. Claude-Session: https://claude.ai/code/session_01BSB7fMQUccqFQekksDGWpo Co-authored-by: Claude Opus 5.5 --------- Co-authored-by: Valentin Klein Co-authored-by: Claude Opus 5.5 Co-authored-by: Brandon Thomas Co-authored-by: Vikram Bhaskaran Co-authored-by: Gert Pellin - GPE Co-authored-by: switch87 <8284204+switch87@users.noreply.github.com> Co-authored-by: RaccoonPie-314 Co-authored-by: Raccoon <235524086+RaccoonPie-314@users.noreply.github.com> Co-authored-by: Sir Starch Co-authored-by: Nigel Ihza Firdausy <106657905+Ni-zav@users.noreply.github.com> Co-authored-by: myangaa1 <58806636+myangaa1@users.noreply.github.com> Co-authored-by: KnottyDyes <47539659+KnottyDyes@users.noreply.github.com> --- crates/ui-egui/src/adjust_dialog.rs | 51 +++-- crates/ui-egui/src/adjust_editors.rs | 8 + crates/ui-egui/src/color_picker_ui.rs | 21 ++ crates/ui-egui/src/dialog_alt_reset.rs | 93 +++++++++ crates/ui-egui/src/dialogs.rs | 5 +- crates/ui-egui/src/fill_ui.rs | 23 +- crates/ui-egui/src/fill_ui_tests.rs | 16 ++ crates/ui-egui/src/filter_dialog.rs | 123 +++++++---- crates/ui-egui/src/guide_layout_ui.rs | 27 +++ crates/ui-egui/src/guide_layout_ui/tests.rs | 17 ++ crates/ui-egui/src/lib.rs | 1 + crates/ui-egui/src/sizing.rs | 38 ++++ crates/ui-egui/src/variables_ui.rs | 23 ++ crates/ui-egui/src/view_cmds.rs | 35 +++- docs/ui-dialogs.md | 219 ++++++++++++++++++++ 15 files changed, 646 insertions(+), 54 deletions(-) create mode 100644 crates/ui-egui/src/dialog_alt_reset.rs create mode 100644 docs/ui-dialogs.md diff --git a/crates/ui-egui/src/adjust_dialog.rs b/crates/ui-egui/src/adjust_dialog.rs index 7c978353..a9235881 100644 --- a/crates/ui-egui/src/adjust_dialog.rs +++ b/crates/ui-egui/src/adjust_dialog.rs @@ -134,19 +134,33 @@ fn dialog_mem(kind: &str) -> egui::Id { egui::Id::new(("adjust-dialog", kind)) } -/// Whether holding Alt turns the dialog's Cancel into Reset. Measured in Photoshop 25.4 for Color -/// Balance; other kinds keep Cancel until checked against Photoshop. +/// Whether holding Alt turns Cancel into Reset for this adjustment dialog (every kind). pub fn resets(fields: &Map) -> bool { - fields.get("__adjust").and_then(Value::as_str) == Some("colorBalance") + owns(fields) } -/// Alt+Cancel (Reset): back to the defaults Photoshop's Reset restores, dialog stays open. -pub fn reset(ctx: &egui::Context, fields: &mut Map) { - if !resets(fields) { +/// Alt+Cancel (Reset): engine defaults for the kind; Color Balance keeps Preserve Luminosity and +/// shows Midtones (Photoshop 25.4). Dialog stays open. +pub fn reset(app: &PhotocraftApp, ctx: &egui::Context, fields: &mut Map) { + if !owns(fields) { return; } + let kind = fields.get("__adjust").and_then(Value::as_str).unwrap_or_default().to_string(); + let mode = app.session.active().map_or(photocraft_doc::ColorMode::Rgb, |s| s.doc.mode); + // Color Balance: Photoshop keeps the user's Preserve Luminosity across Reset. + let preserve = if kind == "colorBalance" { fields.get("preserveLuminosity").cloned() } else { None }; + let Ok(defaults) = photocraft_engine::adjust_params::default_for(&kind, mode) else { return }; + let values = photocraft_engine::adjust_params::to_params(&defaults); + // Replace parameter keys; keep private `__` chrome (preview, command, …). + fields.retain(|k, _| k.starts_with("__")); + if let Value::Object(v) = values { + fields.extend(v); + } + if let Some(p) = preserve { + fields.insert("preserveLuminosity".into(), p); + } let mut values = crate::filter_dialog::params_of(fields); - adjust_editors::reset_color_balance(ctx, dialog_mem("colorBalance"), &mut values); + adjust_editors::reset_adjustment_editor(ctx, &kind, dialog_mem(&kind), &mut values); if let Value::Object(v) = values { fields.extend(v); } @@ -390,16 +404,29 @@ mod tests { assert!(h.state().ui.dialogs.is_empty(), "Cancel closes"); } - /// Alt+Cancel is Reset only where it was checked against Photoshop. + /// Every adjustment kind opts into Alt+Reset; Levels restores engine defaults and stays open. #[test] - fn other_adjustment_dialogs_keep_cancel_under_alt() { + fn levels_alt_reset_restores_defaults() { use egui_kittest::kittest::Queryable; let mut h = Harness::builder().with_size(egui::vec2(1200.0, 900.0)).build_ui_state(|ui, app| crate::dialogs::show(app, ui.ctx()), app_with_image()); PhotocraftApp::setup_context(&h.ctx, crate::theme::ThemeKind::ALL[0]); - open(h.state_mut(), "image.adjustments.levels").unwrap(); - h.event(egui::Event::ModifiersChanged(egui::Modifiers::ALT)); - h.run_steps(3); + let id = open(h.state_mut(), "image.adjustments.levels").unwrap(); + h.state_mut().ui.dialog_mut(id).unwrap().fields.insert("inBlack".into(), json!(30)); + h.state_mut().ui.dialog_mut(id).unwrap().fields.insert("gamma".into(), json!(1.3)); + h.run_steps(2); assert!(h.query_by_label("Cancel").is_some() && h.query_by_label("Reset").is_none()); + h.event(egui::Event::ModifiersChanged(egui::Modifiers::ALT)); + h.run_steps(2); + let reset = h.get_by_label("Reset").rect(); + assert!(h.query_by_label("Cancel").is_none()); + let click = + |pressed| egui::Event::PointerButton { pos: reset.center(), button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::ALT }; + input(&mut h, egui::Modifiers::ALT, &[egui::Event::PointerMoved(reset.center()), click(true), click(false)]); + assert!(h.state().ui.dialogs.iter().any(|d| d.id == id), "Reset keeps the dialog open"); + let defaults = + photocraft_engine::adjust_params::to_params(&photocraft_engine::adjust_params::default_for("levels", photocraft_doc::ColorMode::Rgb).unwrap()); + assert_eq!(field(&h, id, "inBlack"), defaults["inBlack"]); + assert_eq!(field(&h, id, "gamma"), defaults["gamma"]); } fn sample_params(kind: &str) -> Value { diff --git a/crates/ui-egui/src/adjust_editors.rs b/crates/ui-egui/src/adjust_editors.rs index 4d25d822..84fab70b 100644 --- a/crates/ui-egui/src/adjust_editors.rs +++ b/crates/ui-egui/src/adjust_editors.rs @@ -1019,6 +1019,14 @@ pub fn reset_color_balance(ctx: &egui::Context, mem: egui::Id, v: &mut Value) { ctx.data_mut(|d| d.insert_temp(color_balance_tone_id(mem), 1usize)); } +/// Kind-specific editor memory after Alt+Reset (or Properties Reset to defaults). Color Balance +/// shows Midtones; other kinds have no dialog-local temp to clear yet. +pub fn reset_adjustment_editor(ctx: &egui::Context, kind: &str, mem: egui::Id, v: &mut Value) { + if kind == "colorBalance" { + reset_color_balance(ctx, mem, v); + } +} + fn color_balance(ui: &mut egui::Ui, v: &mut Value, cx: &EditorCx) -> Edit { let tone_id = color_balance_tone_id(cx.mem); let mut tone_ix: usize = ui.data(|d| d.get_temp(tone_id)).unwrap_or(1); diff --git a/crates/ui-egui/src/color_picker_ui.rs b/crates/ui-egui/src/color_picker_ui.rs index cfa7183a..e9729eab 100644 --- a/crates/ui-egui/src/color_picker_ui.rs +++ b/crates/ui-egui/src/color_picker_ui.rs @@ -298,6 +298,15 @@ pub fn owns(f: &Map) -> bool { f.contains_key("__colorPicker") } +/// Alt+Cancel (Reset): restore the colour from when the picker opened (same as clicking Current). +pub fn reset(f: &mut Map) { + if !owns(f) { + return; + } + let orig = f.get("__orig").and_then(Value::as_str).and_then(parse_hex).unwrap_or([0.0; 3]); + set_rgb(f, orig, Keep::Nothing); +} + /// The Color Picker, when it is the top dialog (another dialog opened over it takes the input). pub fn top(app: &PhotocraftApp) -> Option { app.ui.dialogs.last().filter(|d| owns(&d.fields)).map(|d| d.id) @@ -833,6 +842,18 @@ mod tests { assert_eq!(hex([h.state().session.tools.foreground[0], h.state().session.tools.foreground[1], h.state().session.tools.foreground[2]]), "#ff8800"); } + #[test] + fn alt_reset_restores_orig_color() { + let mut app = PhotocraftApp::new(photocraft_engine::Session::new(), crate::Services::default()); + app.session.tools.foreground = [0.2, 0.4, 0.6, 1.0]; + let id = open(&mut app, "foreground"); + let f = &mut app.ui.dialog_mut(id).unwrap().fields; + f.insert("color".into(), json!("#ff0000")); + reset(f); + assert_eq!(f["color"], json!(hex([0.2, 0.4, 0.6]))); + assert_eq!(f["__orig"], json!(hex([0.2, 0.4, 0.6]))); + } + #[test] fn lab_and_cmyk_fields_take_multi_digit_values() { let base = parse_hex("#336699").unwrap(); diff --git a/crates/ui-egui/src/dialog_alt_reset.rs b/crates/ui-egui/src/dialog_alt_reset.rs new file mode 100644 index 00000000..71e52ac8 --- /dev/null +++ b/crates/ui-egui/src/dialog_alt_reset.rs @@ -0,0 +1,93 @@ +//! Alt+Cancel → Reset for command dialogs that opt in. +//! +//! Holding Alt in the dialog chrome relabels Cancel as Reset and, on click, restores the dialog's +//! fields without closing it (Photoshop). Each marker implements its own `reset`; this module only +//! dispatches. Esc stays Cancel (`Modifiers::NONE` in the frame). Opt out with `"__altReset": false`. + +use serde_json::{Map, Value}; + +use crate::PhotocraftApp; + +/// Whether holding Alt turns Cancel into Reset for this dialog's fields. +pub fn supported(fields: &Map) -> bool { + if fields.get("__altReset") == Some(&Value::Bool(false)) { + return false; + } + match_arm(fields).is_some() +} + +/// Apply Reset in place. No-op when the dialog has not opted in. +pub fn apply(app: &mut PhotocraftApp, ctx: &egui::Context, fields: &mut Map) { + if fields.get("__altReset") == Some(&Value::Bool(false)) { + return; + } + // Dispatch order matches `dialogs::show` so `__adjust` wins over `__filter`. + if crate::guide_layout_ui::owns(fields) { + crate::guide_layout_ui::reset(app, fields); + } else if crate::fill_ui::owns(fields) { + crate::fill_ui::reset(app, fields); + } else if crate::variables_ui::owns(fields) { + crate::variables_ui::reset(fields); + } else if crate::color_picker_ui::owns(fields) { + crate::color_picker_ui::reset(fields); + } else if fields.contains_key("__sizing") { + crate::sizing::reset(fields); + } else if crate::adjust_dialog::owns(fields) { + crate::adjust_dialog::reset(app, ctx, fields); + } else if fields.contains_key("__filter") { + crate::filter_dialog::reset_fields(app, fields); + } else if fields.contains_key("__form") { + crate::view_cmds::reset_form(fields); + } +} + +/// First matching opt-in arm, if any (same order as [`apply`]). +fn match_arm(fields: &Map) -> Option<&'static str> { + if crate::guide_layout_ui::owns(fields) { + Some("guideLayout") + } else if crate::fill_ui::owns(fields) { + Some("fill") + } else if crate::variables_ui::owns(fields) && fields.contains_key("__variablesOrig") { + Some("variables") + } else if crate::color_picker_ui::owns(fields) { + Some("colorPicker") + } else if fields.contains_key("__sizing") { + Some("sizing") + } else if crate::adjust_dialog::owns(fields) { + Some("adjust") + } else if fields.contains_key("__filter") { + Some("filter") + } else if fields.contains_key("__form") && fields.contains_key("__formOrig") { + Some("form") + } else { + None + } +} + +#[cfg(test)] +mod tests { + use super::*; + use serde_json::json; + + #[test] + fn alt_reset_false_opts_out() { + let mut f = Map::new(); + f.insert("__adjust".into(), json!("levels")); + f.insert("__altReset".into(), json!(false)); + assert!(!supported(&f)); + } + + #[test] + fn adjust_marker_opts_in() { + let mut f = Map::new(); + f.insert("__adjust".into(), json!("levels")); + assert!(supported(&f)); + } + + #[test] + fn bare_confirm_does_not_opt_in() { + let mut f = Map::new(); + f.insert("__command".into(), json!("edit.purge")); + assert!(!supported(&f)); + } +} diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs index 2765d0e2..1573d5ec 100644 --- a/crates/ui-egui/src/dialogs.rs +++ b/crates/ui-egui/src/dialogs.rs @@ -310,7 +310,8 @@ pub fn show(app: &mut PhotocraftApp, ctx: &egui::Context) { let can_ok = crate::crop_presets::can_confirm(app, &fields); let ok = DialogButton::new(ButtonRole::Default, ok_label, 84.0).enabled(can_ok); // Photoshop: holding Alt turns Cancel into Reset (the dialog stays open). - let reset = ui.input(|i| i.modifiers.alt) && crate::adjust_dialog::resets(&fields); + // Dialogs opt in via `dialog_alt_reset::supported` (per marker). + let reset = ui.input(|i| i.modifiers.alt) && crate::dialog_alt_reset::supported(&fields); let cancel_label = if reset { tl!("Reset") } else if d.kind == DialogKind::NewDocument { @@ -337,7 +338,7 @@ pub fn show(app: &mut PhotocraftApp, ctx: &egui::Context) { dialog_buttons(ui, &[ok, cancel]) }; match clicked { - Some(ButtonRole::Cancel) if reset => crate::adjust_dialog::reset(ui.ctx(), &mut fields), + Some(ButtonRole::Cancel) if reset => crate::dialog_alt_reset::apply(app, ui.ctx(), &mut fields), Some(ButtonRole::Cancel) => outcome = Some(false), Some(ButtonRole::Apply) => apply_requested = true, Some(_) => outcome = Some(true), diff --git a/crates/ui-egui/src/fill_ui.rs b/crates/ui-egui/src/fill_ui.rs index c44c4b57..faa917f0 100644 --- a/crates/ui-egui/src/fill_ui.rs +++ b/crates/ui-egui/src/fill_ui.rs @@ -53,8 +53,8 @@ fn valid(app: &PhotocraftApp, key: &str, v: &Value) -> bool { } } -/// The dialog's fields: Photoshop's defaults, overridden by the last choices. -pub fn fields(app: &PhotocraftApp) -> Map { +/// Photoshop's Fill defaults (no last-used prefs). Used by open and Alt+Reset. +pub fn default_fields(app: &PhotocraftApp) -> Map { let mut f = Map::new(); f.insert(MARK.into(), json!(true)); f.insert("__command".into(), json!(COMMAND)); @@ -68,6 +68,12 @@ pub fn fields(app: &PhotocraftApp) -> Map { f.insert("mode".into(), json!("normal")); f.insert("opacity".into(), json!(100.0)); f.insert("preserveTransparency".into(), json!(false)); + f +} + +/// The dialog's fields: Photoshop's defaults, overridden by the last choices. +pub fn fields(app: &PhotocraftApp) -> Map { + let mut f = default_fields(app); if let Some(Value::Object(saved)) = app.session.prefs().dialogs.get(COMMAND) { for k in KEYS { if let Some(v) = saved.get(k).filter(|v| valid(app, k, v)) { @@ -78,6 +84,19 @@ pub fn fields(app: &PhotocraftApp) -> Map { f } +/// Alt+Cancel (Reset): Photoshop Fill defaults, not last-used prefs. Dialog stays open. +pub fn reset(app: &PhotocraftApp, fields: &mut Map) { + if !owns(fields) { + return; + } + let defaults = default_fields(app); + for k in KEYS { + if let Some(v) = defaults.get(k) { + fields.insert(k.into(), v.clone()); + } + } +} + /// Open the Fill dialog; returns its id. pub fn open(app: &mut PhotocraftApp) -> u64 { let f = fields(app); diff --git a/crates/ui-egui/src/fill_ui_tests.rs b/crates/ui-egui/src/fill_ui_tests.rs index aa5f2772..5d353127 100644 --- a/crates/ui-egui/src/fill_ui_tests.rs +++ b/crates/ui-egui/src/fill_ui_tests.rs @@ -74,6 +74,22 @@ fn mode_opacity_and_preserve_transparency() { assert!(close(px(&app, 5, 5), [0.5, 0.5, 0.5, 1.0])); } +#[test] +fn alt_reset_restores_photoshop_defaults_not_last_used() { + let mut app = app(); + // Remember a non-default choice, then open (which restores it) and Reset. + fill(&mut app, json!({"contents": "white", "opacity": 40})).unwrap(); + let id = open(&mut app); + assert_eq!(app.ui.dialog_mut(id).unwrap().fields["opacity"].as_f64(), Some(40.0)); + let mut fields = app.ui.dialog_mut(id).unwrap().fields.clone(); + reset(&app, &mut fields); + app.ui.dialog_mut(id).unwrap().fields = fields; + let f = &app.ui.dialog_mut(id).unwrap().fields; + assert_eq!(f["opacity"].as_f64(), Some(100.0)); + assert_eq!(f["contents"], json!("foreground")); + assert!(app.ui.dialogs.iter().any(|d| d.id == id)); +} + #[test] fn choices_persist_across_restarts() { let mut app = app(); diff --git a/crates/ui-egui/src/filter_dialog.rs b/crates/ui-egui/src/filter_dialog.rs index 5f2f853f..29fc436e 100644 --- a/crates/ui-egui/src/filter_dialog.rs +++ b/crates/ui-egui/src/filter_dialog.rs @@ -327,6 +327,70 @@ pub(crate) fn remember(app: &mut PhotocraftApp, command: &str, fields: &Map Option { + Some(match &p.kind { + Kind::Range { default, .. } if command == "image.mode.indexedColor" && p.key == "colors" => json!(default.round().clamp(2.0, 256.0) as u32), + Kind::Range { default, .. } => json!(default), + Kind::Choice { options, default } => { + let initial = default.as_deref().or_else(|| options.first().map(String::as_str)).unwrap_or(""); + json!(initial) + } + Kind::Bool(default) => json!(default), + Kind::Int { default } => json!(default), + Kind::Text => json!(""), + Kind::Document => json!(-1), + // Identity kernel: 1 in the centre. + Kind::Grid(n) => json!((0..*n).map(|i| i64::from(i == *n / 2)).collect::>()), + Kind::Color(Some(rgb)) => json!(crate::color_picker_ui::hex(*rgb)), + Kind::Color(None) => return None, + // Colour inputs come from the current swatches, so the proxy preview matches the result. + Kind::Json if p.key == "foreground" => json!(app.session.tools.foreground), + Kind::Json if p.key == "background" => json!(app.session.tools.background), + Kind::Json => return None, + }) +} + +/// Command-specific open defaults (ruler straighten, warp from layer, …), not remembered prefs. +fn apply_command_defaults(app: &PhotocraftApp, command: &str, fields: &mut Map) { + if command == "image.rotation.arbitrary" { + straighten_defaults(app, fields); + } + if command == "type.warpText" { + warp_defaults(app, fields); + } + // Photoshop's Pattern Name dialog starts from the name the pattern would get anyway. + if command == "edit.definePattern" { + fields.insert("name".into(), json!(photocraft_engine::pattern_cmds::default_name(&app.session))); + } + if command == "layer.layerStyle.globalLight" { + global_light_defaults(app, fields); + } + if command == "view.proofSetup" { + proof_setup_defaults(app, fields); + } +} + +/// Alt+Cancel (Reset): schema defaults + command hooks, without last-used remembered prefs. +pub fn reset_fields(app: &PhotocraftApp, fields: &mut Map) { + if !fields.contains_key("__filter") || fields.contains_key("__adjust") { + return; + } + let Some(command) = fields.get("__command").and_then(Value::as_str).map(str::to_owned) else { return }; + let spec = + fields.get("__spec").and_then(Value::as_str).map(str::to_owned).or_else(|| photocraft_engine::commands::find(&command).map(|c| c.params.to_owned())); + let Some(spec) = spec else { return }; + // Drop user params; keep private `__` chrome (and fixed keys outside the schema for `__spec`). + let schema_keys: std::collections::HashSet = parse_spec(&spec).into_iter().map(|p| p.key).collect(); + fields.retain(|k, _| k.starts_with("__") || !schema_keys.contains(k)); + for p in parse_spec(&spec) { + if let Some(v) = default_value(app, &command, &p) { + fields.insert(p.key, v); + } + } + apply_command_defaults(app, &command, fields); +} + pub fn open(app: &mut PhotocraftApp, command: &str) -> Option { let spec = photocraft_engine::commands::find(command)?; let mut fields = Map::new(); @@ -338,45 +402,12 @@ pub fn open(app: &mut PhotocraftApp, command: &str) -> Option { fields.insert("__preview".into(), json!(true)); } for p in parse_spec(spec.params) { - let v = match &p.kind { - Kind::Range { default, .. } if command == "image.mode.indexedColor" && p.key == "colors" => json!(default.round().clamp(2.0, 256.0) as u32), - Kind::Range { default, .. } => json!(default), - Kind::Choice { options, default } => { - let initial = default.as_deref().or_else(|| options.first().map(String::as_str)).unwrap_or(""); - json!(initial) - } - Kind::Bool(default) => json!(default), - Kind::Int { default } => json!(default), - Kind::Text => json!(""), - Kind::Document => json!(-1), - // Identity kernel: 1 in the centre. - Kind::Grid(n) => json!((0..*n).map(|i| i64::from(i == *n / 2)).collect::>()), - Kind::Color(Some(rgb)) => json!(crate::color_picker_ui::hex(*rgb)), - Kind::Color(None) => continue, - // Colour inputs come from the current swatches, so the proxy preview matches the result. - Kind::Json if p.key == "foreground" => json!(app.session.tools.foreground), - Kind::Json if p.key == "background" => json!(app.session.tools.background), - Kind::Json => continue, - }; - fields.insert(p.key, v); + if let Some(v) = default_value(app, command, &p) { + fields.insert(p.key, v); + } } restore_remembered(app, command, spec.params, &mut fields); - if command == "image.rotation.arbitrary" { - straighten_defaults(app, &mut fields); - } - if command == "type.warpText" { - warp_defaults(app, &mut fields); - } - // Photoshop's Pattern Name dialog starts from the name the pattern would get anyway. - if command == "edit.definePattern" { - fields.insert("name".into(), json!(photocraft_engine::pattern_cmds::default_name(&app.session))); - } - if command == "layer.layerStyle.globalLight" { - global_light_defaults(app, &mut fields); - } - if command == "view.proofSetup" { - proof_setup_defaults(app, &mut fields); - } + apply_command_defaults(app, command, &mut fields); if parse_spec(spec.params).iter().any(|p| p.kind == Kind::Document) { // The document picker lists every open document (params refer to them by index). let names: Vec = app.session.documents().iter().map(|d| d.doc.name.clone()).collect(); @@ -818,6 +849,24 @@ mod tests { assert_eq!(fields["radius"], json!(2.0)); } + #[test] + fn alt_reset_restores_schema_defaults_not_remembered() { + let mut app = PhotocraftApp::new(photocraft_engine::Session::new(), Default::default()); + app.session.prefs.edit(|prefs| { + prefs.dialogs.insert("filter.blur.gaussianBlur".into(), json!({"radius": 11.0})); + }); + let id = open(&mut app, "filter.blur.gaussianBlur").unwrap(); + assert_eq!(app.ui.dialog_mut(id).unwrap().fields["radius"], json!(11.0)); + let mut fields = app.ui.dialog_mut(id).unwrap().fields.clone(); + reset_fields(&app, &mut fields); + app.ui.dialog_mut(id).unwrap().fields = fields; + let f = &app.ui.dialog_mut(id).unwrap().fields; + // Registry default for gaussian blur radius is 1. + assert_eq!(f["radius"], json!(1.0)); + assert!(f.contains_key("__filter")); + assert!(app.ui.dialogs.iter().any(|d| d.id == id)); + } + #[test] fn remembering_dialogs_never_persists_paths_or_document_indices() { let mut app = PhotocraftApp::new(photocraft_engine::Session::new(), Default::default()); diff --git a/crates/ui-egui/src/guide_layout_ui.rs b/crates/ui-egui/src/guide_layout_ui.rs index d6c5c9fd..9117baa8 100644 --- a/crates/ui-egui/src/guide_layout_ui.rs +++ b/crates/ui-egui/src/guide_layout_ui.rs @@ -31,6 +31,33 @@ pub fn owns(f: &Map) -> bool { f.contains_key(MARK) } +/// Alt+Cancel (Reset): factory New Guide Layout values, not the last-used remembered layout. +pub fn reset(app: &PhotocraftApp, f: &mut Map) { + if !owns(f) { + return; + } + let Value::Object(defaults) = crate::view_cmds::default_guide_layout() else { return }; + // Drop layout params and interactive toggles; keep dialog chrome (`__command`, …). + f.retain(|k, _| { + k.starts_with("__") + && !matches!( + k.as_str(), + "__preset" | "__columnsEnabled" | "__rowsEnabled" | "__marginEnabled" | "__previewGuides" | "__previewParams" | "__previewSource" + ) + }); + f.extend(defaults); + f.insert("color".into(), json!(app.session.prefs().guides_grid_and_slices.guide_color)); + f.insert("target".into(), json!("document")); + f.insert("__preset".into(), json!("custom")); + f.insert("width".into(), Value::Null); + f.insert("height".into(), Value::Null); + let margin = f.get("margin").cloned().unwrap_or(json!(0)); + if !margin.is_array() { + f.insert("margin".into(), json!([margin.clone(), margin.clone(), margin.clone(), margin])); + } + f.insert("__preview".into(), json!(true)); +} + fn on(f: &Map, key: &str, fallback: bool) -> bool { f.get(key).and_then(Value::as_bool).unwrap_or(fallback) } diff --git a/crates/ui-egui/src/guide_layout_ui/tests.rs b/crates/ui-egui/src/guide_layout_ui/tests.rs index 17abf3e3..6ac36cb1 100644 --- a/crates/ui-egui/src/guide_layout_ui/tests.rs +++ b/crates/ui-egui/src/guide_layout_ui/tests.rs @@ -84,6 +84,23 @@ fn app() -> PhotocraftApp { PhotocraftApp::new(session, crate::Services::default()) } +#[test] +fn alt_reset_restores_factory_layout() { + let mut app = app(); + let id = open(&mut app); + let mut fields = app.ui.dialog_mut(id).unwrap().fields.clone(); + fields.insert("columns".into(), json!(3)); + fields.insert("gutter".into(), json!(99)); + fields.insert("__preset".into(), json!("twoColumn")); + reset(&app, &mut fields); + app.ui.dialog_mut(id).unwrap().fields = fields; + let f = &app.ui.dialog_mut(id).unwrap().fields; + assert_eq!(f["columns"], json!(8)); + assert_eq!(f["gutter"], json!(20)); + assert_eq!(f["__preset"], json!("custom")); + assert!(app.ui.dialogs.iter().any(|d| d.id == id)); +} + fn draw(app: &mut PhotocraftApp, id: u64) { let mut f = app.ui.dialog_mut(id).unwrap().fields.clone(); let ctx = egui::Context::default(); diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs index d6309afc..08e3464d 100644 --- a/crates/ui-egui/src/lib.rs +++ b/crates/ui-egui/src/lib.rs @@ -61,6 +61,7 @@ pub mod crop_size; pub mod crop_straighten; pub mod crop_ui; pub mod delete_layer_prompt; +pub mod dialog_alt_reset; pub mod dialog_blend_ui; pub mod dialogs; pub mod direct_select; diff --git a/crates/ui-egui/src/sizing.rs b/crates/ui-egui/src/sizing.rs index a0fb7557..f4a9f54f 100644 --- a/crates/ui-egui/src/sizing.rs +++ b/crates/ui-egui/src/sizing.rs @@ -46,6 +46,28 @@ pub fn is_sizing(command: &str) -> bool { matches!(command, "image.imageSize" | "image.canvasSize") } +/// Alt+Cancel (Reset): restore the dimensions and options from when the dialog opened. +pub fn reset(f: &mut Map) { + if !f.contains_key("__sizing") { + return; + } + let w = num(f, "__origW"); + let h = num(f, "__origH"); + f.insert("width".into(), json!(w)); + f.insert("height".into(), json!(h)); + if f.get("__command").and_then(Value::as_str) == Some("image.imageSize") { + f.insert("resolution".into(), json!(num(f, "__origRes"))); + f.insert("__constrain".into(), json!(true)); + if let Some(r) = f.get("__resample").cloned() { + f.insert("resample".into(), r); + } + } else { + f.insert("relative".into(), json!(false)); + f.insert("anchor".into(), json!("center")); + f.insert("extensionColor".into(), json!("background")); + } +} + pub fn open(app: &mut PhotocraftApp, command: &str) -> Option { let unit = pref_unit(app.session.prefs().units_and_rulers.rulers); let resample = pref_resample(app.session.prefs().general.image_interpolation); @@ -443,6 +465,22 @@ mod tests { assert_eq!(app.session.active().unwrap().doc.size, photocraft_doc::Size::new(120, 50)); } + #[test] + fn alt_reset_restores_open_dimensions() { + let mut app = PhotocraftApp::new(photocraft_engine::Session::new(), crate::Services::default()); + app.session.execute("file.new", json!({"width": 200, "height": 100, "resolution": 72})).unwrap(); + let id = open(&mut app, "image.imageSize").unwrap(); + let d = app.ui.dialog_mut(id).unwrap(); + d.fields.insert("width".into(), json!(50)); + d.fields.insert("height".into(), json!(25)); + d.fields.insert("resolution".into(), json!(300)); + d.fields.insert("__constrain".into(), json!(false)); + reset(&mut d.fields); + assert_eq!((num(&d.fields, "width"), num(&d.fields, "height"), num(&d.fields, "resolution")), (200.0, 100.0, 72.0)); + assert_eq!(d.fields.get("__constrain"), Some(&json!(true))); + assert!(app.ui.dialogs.iter().any(|x| x.id == id), "reset leaves the dialog open"); + } + /// The dialog starts on Preferences › General › Image Interpolation: Bicubic Automatic opens /// as Automatic and the others as themselves (Bicubic Sharper used to open as Lanczos). #[test] diff --git a/crates/ui-egui/src/variables_ui.rs b/crates/ui-egui/src/variables_ui.rs index fc10df40..a4700cdd 100644 --- a/crates/ui-egui/src/variables_ui.rs +++ b/crates/ui-egui/src/variables_ui.rs @@ -17,6 +17,16 @@ pub fn owns(fields: &Map) -> bool { fields.contains_key("__variables") } +/// Alt+Cancel (Reset): restore `__variables` from the open-time snapshot. +pub fn reset(fields: &mut Map) { + if !owns(fields) { + return; + } + if let Some(orig) = fields.get("__variablesOrig").cloned() { + fields.insert("__variables".into(), orig); + } +} + /// Layers available to bind, top to bottom: (id, display name, is-text). fn layer_options(app: &PhotocraftApp) -> Vec<(u64, String, bool)> { let Some(st) = app.session.active() else { return Vec::new() }; @@ -31,6 +41,8 @@ pub fn menu(app: &mut PhotocraftApp, id: &str, params: &Value) -> Option Option Value { +/// Factory New Guide Layout values (Alt+Reset and a fresh ViewOptions). +pub(crate) fn default_guide_layout() -> Value { json!({"columns": 8, "gutter": 20, "rows": 0, "rowGutter": 0, "margin": 0, "centerColumns": false, "clearExisting": false}) } @@ -933,9 +934,22 @@ fn form(app: &mut PhotocraftApp, command: &str, label: &str, fields: Value, choi if let Value::Object(m) = fields { f.extend(m); } + // Snapshot user-facing params at open so Alt+Reset can restore them. + let orig: Map = f.iter().filter(|(k, _)| !k.starts_with("__")).map(|(k, v)| (k.clone(), v.clone())).collect(); + f.insert("__formOrig".into(), Value::Object(orig)); app.ui.open_dialog(DialogKind::Command, f) } +/// Alt+Cancel (Reset): restore the `__form` params captured at open. +pub fn reset_form(f: &mut Map) { + if !f.contains_key("__form") { + return; + } + let Some(Value::Object(orig)) = f.get("__formOrig").cloned() else { return }; + f.retain(|k, _| k.starts_with("__")); + f.extend(orig); +} + fn label_of(key: &str) -> String { let mut out = String::new(); for (i, c) in key.chars().enumerate() { @@ -971,6 +985,25 @@ mod label_tests { } } +#[cfg(test)] +mod form_reset_tests { + use super::*; + use serde_json::json; + + #[test] + fn alt_reset_restores_form_orig() { + let mut app = PhotocraftApp::new(photocraft_engine::Session::new(), crate::Services::default()); + let id = form(&mut app, "test.form", "Test", json!({"radius": 5.0, "on": true}), json!({})); + let f = &mut app.ui.dialog_mut(id).unwrap().fields; + f.insert("radius".into(), json!(99.0)); + f.insert("on".into(), json!(false)); + reset_form(f); + assert_eq!(f["radius"], json!(5.0)); + assert_eq!(f["on"], json!(true)); + assert!(f.contains_key("__formOrig")); + } +} + /// Body of a `__form` dialog: text fields, number fields, checkboxes and `__choices` dropdowns. pub fn form_body(ui: &mut egui::Ui, f: &mut Map) { let choices = f.get("__choices").cloned().unwrap_or(Value::Null); diff --git a/docs/ui-dialogs.md b/docs/ui-dialogs.md new file mode 100644 index 00000000..30db03fd --- /dev/null +++ b/docs/ui-dialogs.md @@ -0,0 +1,219 @@ +# Dialogs + +Modal and modeless parameter windows in the egui shell. They mirror Photoshop: no dimmed backdrop, +canvas pan/zoom under an open dialog, Tab cycles text and number fields only, Esc cancels, Enter +confirms when OK is enabled. Automation drives the same `fields` map as the UI (`ui.dialog.*` in +[`control-protocol.md`](control-protocol.md)). + +## Architecture + +| Piece | Location | Role | +|---|---|---| +| Frame, routing, OK/Cancel/Esc, stacking | `crates/ui-egui/src/dialogs.rs` | Single hub for every `UiState::dialogs` entry | +| Alt+Cancel → Reset (opt-in) | `crates/ui-egui/src/dialog_alt_reset.rs` | Relabels Cancel while Alt is held; dispatches per-marker `reset` | +| Tab-through-fields | `crates/ui-egui/src/field_tab.rs` | Photoshop-style Tab / ⇧Tab (tests in same file) | +| State | `crates/ui-egui/src/state.rs` | `Dialog`, `DialogKind`, `open_dialog` | +| Button row | `crates/ui-egui/src/widgets.rs` | `dialog_buttons`, `focus_first_field`; `number_edit` registers for Tab | +| Menu / command entry | `dialogs::open_command_dialog`, `menus.rs` | Picks a dedicated module, schema dialog, or bare confirm | +| Filters | `filter_dialog.rs` | Schema from engine params, live preview | +| Adjustments | `adjust_dialog.rs` | Shared editors with Properties; preview via `adjust_preview` | +| Generic forms | `view_cmds.rs` | `__form` grids for simple command params | +| Dedicated bodies | See **Command routing** below | `body` + usually `open` / `confirm` | + +**Routing.** Non-command kinds use `DialogKind` alone. `DialogKind::Command` bodies are chosen by +marker keys on `fields` (`owns()` or `contains_key("__export")`, etc.); **first match in +`dialogs::show` wins**, so new markers must not collide with an earlier arm. `show`, `confirm`, and +`cancel` share the same dispatch table—wire all three when adding a dialog. + +**Field contract.** `Dialog.fields` is a JSON map: command parameters agents read and write, plus +private keys prefixed with `__`. Never use `__` for user-facing or engine params. + +### `DialogKind` (top-level stack) + +| Kind | Body module | Typical entry | +|---|---|---| +| `NewDocument` | `new_doc_ui.rs` | File › New, `file.new` with no size params | +| `About` | `dialogs.rs` (About / Contributors / Models tabs) | Help › About PhotoCraft; `systemInfo: true` → System Info variant | +| `Command` | Routed—see below | Most menu commands with parameters | +| `LayerStyle` | `layer_style.rs` | Layer › Layer Style… | +| `Error` | inline in `dialogs.rs` | `message` field only (e.g. move lock, locked transform) | + +### Command routing (`DialogKind::Command`) + +Dispatch order matches `dialogs::show` in `dialogs.rs` (check earlier rows before adding a marker). + +| Match | Module | Role | +|---|---|---| +| `__guideLayout` | `guide_layout_ui.rs` | View › New Guide Layout… | +| `__fill` | `fill_ui.rs` | Edit › Fill… | +| `__patternFill` | `pattern_fill_ui.rs` | Pattern Fill layer / New Fill Layer › Pattern… | +| `__stroke` | `stroke_ui.rs` | Edit › Stroke… | +| `__createShape` | `shape_dialog.rs` | Click-with-shape-tool creation (rectangle, ellipse, …) | +| `__deleteLayer` | `delete_layer_prompt.rs` | Layers panel trash confirmation | +| `__newLayer` | `new_layer_ui.rs` | Layer › New › Layer… (⇧⌘N) | +| `__rasterize` | `rasterize_prompt.rs` | Rasterize-before-paint prompt | +| `__resetAllTools` | `tool_reset.rs` | Reset All Tools confirmation | +| `__cropPresetNew` / `__cropPresetDelete` | `crop_presets.rs` | New / delete crop preset | +| `__variables` | `variables_ui.rs` | Image › Variables (Define, Data Sets, Apply) | +| `__web` / `__print` | `file_ui.rs` | Save for Web, Print | +| `__colorPicker` | `color_picker_ui.rs` | Foreground/background, nested field/command pickers (see nested keys below) | +| `__colorRange` | `color_range_ui.rs` | Select › Color Range… | +| `__prefsui` | `prefs_ui.rs` | Edit › Preferences… and related preset/import subdialogs | +| `__export` | `export_dialog.rs` | Export As (document or layer) | +| `__sizing` | `sizing.rs` | Image › Image Size… / Canvas Size… | +| `__adjust` | `adjust_dialog.rs` | Image › Adjustments… (also sets `__filter` + `__preview` for live preview) | +| `__filter` | `filter_dialog.rs` (+ `select_mask_view.rs` when `__command` is `select.refineEdge`) | Filter Gallery commands, Edit › Color Settings…, Select and Mask, and other schema dialogs | +| `__form` | `view_cmds.rs` | Simple param grids (e.g. slice options, many Image › Apply Image-style commands) | +| (none of the above) | — | **Bare confirm**: title + OK/Cancel only; OK runs `__command` with fields via generic `confirm` | + +**Menu shortcut.** `dialogs::open_command_dialog` opens guide layout, stroke, and color range +directly; then tries `adjust_dialog::open`, then `filter_dialog::open`; otherwise a bare confirm +with `__command` + `__label`. Other dedicated modules are opened from `menus.rs`, tools, or panel +actions with their marker already set. + +### Shared private keys + +| Key | Meaning | +|---|---| +| `__command` | Engine command id run on OK (bare confirm, filters, sizing, …) | +| `__label` | Menu/catalog label for the title | +| `__document` | Target document id (validate staleness) | +| `__dialog` / `__field` | Nested color picker: parent dialog id and field name to write on OK | +| `__params` | Extra command params for command-targeted color pickers | +| `__preview` | Live canvas preview enabled (filters and adjustments) | +| `__choices` | Dropdown options for `__form` dialogs | +| `__filter` | Filter-schema body (`filter_dialog`); also set on adjustments for preview plumbing | +| `__adjust` | Image › Adjustments editor kind (`adjust_dialog`) | +| `__form` | Generic `view_cmds::form_body` | +| `__formOrig` | Snapshot of non-`__` params at open; Alt+Reset restores it for `__form` dialogs | +| `__variablesOrig` | Snapshot of `__variables` at open; Alt+Reset restores it | +| `__altReset` | Set to `false` to opt a dialog out of Alt+Cancel → Reset | +| `__export` | Export As | +| `__sizing` | Image Size / Canvas Size | + +### Routing markers (dedicated `Command` bodies) + +| Key | Module | +|---|---| +| `__guideLayout` | `guide_layout_ui` | +| `__fill` | `fill_ui` | +| `__patternFill` | `pattern_fill_ui` | +| `__stroke` | `stroke_ui` | +| `__createShape` | `shape_dialog` | +| `__deleteLayer` | `delete_layer_prompt` | +| `__newLayer` | `new_layer_ui` | +| `__rasterize` | `rasterize_prompt` | +| `__resetAllTools` | `tool_reset` | +| `__cropPresetNew`, `__cropPresetDelete` | `crop_presets` | +| `__variables` | `variables_ui` | +| `__web`, `__print` | `file_ui` | +| `__colorPicker` | `color_picker_ui` | +| `__colorRange` | `color_range_ui` | +| `__prefsui` | `prefs_ui` (string sub-kind: `prefs`, `presetsIO`, …) | + +### Nested color pickers (`__colorPicker` on the stack) + +Same hub entry as standalone pickers; `color_picker_ui::confirm` branches on extra keys: + +| Extra key | Behaviour | +|---|---| +| `__layerStyleColor` | Layer Style child; OK writes effect colour on parent `LayerStyle` dialog | +| `__textStyleColor` | Character/paragraph style colour (type panels) | +| `__shapeFill` | Shape layer solid fill via `shape.edit` | +| `__command` = `layer.fill.solidColor.set` | Solid Color fill layer (no `__shapeFill`) | +| `__dialog` + `__field` | OK updates one field on a parent command dialog (e.g. Fill › Color…) | + +## Parallel modal systems (not the main stack) + +| System | Location | When | +|---|---|---| +| Unsaved changes | `discard_ui.rs` | Close, Revert, Close Others/All, Exit—Save / Don't Save / Cancel | +| Shell dialog | `control.rs`, `ui.inspect` id `"shell"` | Workspace, custom pixel aspect, show-extras options | +| Camera Raw | `camera_raw_ui.rs` | Separate OS window on desktop; see control-protocol § Camera Raw | +| Error message | `DialogKind::Error` | e.g. `move_lock`—message + OK | +| Nested pickers | `color_picker_ui` (+ markers in **Nested color pickers**) | Stack on parent; parent confirm refused while child open | + +## Rules + +### Architecture and commands + +1. **Thin UI, engine command on OK.** Run `app.run` or a dedicated `*_ui::confirm`; one history step unless the command itself batches. +2. **Register in the hub.** Add `owns()` (or a stable marker), `body()`, `open()` if needed, and matching arms in `dialogs::show`, `confirm`, and `cancel` (and `open_command_dialog` when menu-driven). +3. **Extend existing paths first.** Filters → `filter_dialog`; adjustments → `adjust_dialog`; simple param grids → `__form`; avoid a second modal stack unless product needs Camera Raw–level UX. +4. **`fields` is the automation contract.** Anything agents must drive lives in named fields, not only in local egui state. +5. **Remember last-used values** after successful OK where Photoshop does (`filter_dialog::remember`, prefs `dialogs["…"]`, module-specific helpers). + +### Chrome and layout + +6. **Use `dialog_buttons`** for OK / Cancel / Apply—platform order via `ButtonRole` (macOS default action in the corner). +7. **Respect width rules** in `dialogs::show` unless `file_ui::dialog_width`, color picker, or kind-specific mins apply (typical 380–440; Layer Style / export / picker up to 600; New Document 800). +8. **Scroll long bodies** inside the content (`DIALOG_CHROME` for filters); title and button row stay visible. +9. **Transparent backdrop**—no dimming; previews are judged at true contrast. +10. **Position:** first open centered; then persist offset (`place_id` per command or kind); title bar drag; clamp on screen. +11. **Stacking:** only the **top** dialog is interactive; non-top instances render disabled; raise the live dialog if an older modal steals focus. + +### Keyboard and focus + +12. **Tab / ⇧Tab:** text and number fields only. Frame calls `field_tab::begin` / `end`; each field calls `field_tab::register` (`number_edit` does this; custom `TextEdit` must register manually). +13. **Do not rely on egui default Tab** through sliders, dropdowns, checkboxes, or preset cards. +14. **Open on first value:** `first_field_focused` + `widgets::focus_first_field` for value-first dialogs (most filters; Image/Canvas Size; not Select and Mask view keys). +15. **Select-all on focus** when reached via Tab or field arrows (`field_tab::select_all`; see `value_field`, `new_doc_ui`). +16. **Enter** confirms when OK is enabled (`can_ok`); exceptions must be explicit (`guide_layout_ui`, color picker). +17. **Esc** on topmost dialog with no popup open → Cancel. **Click outside does not dismiss** (canvas may still pan/zoom via `free_pointer_over`, `pan_delta`, `free_press`). Esc ignores Alt (it does not become Reset). +18. **Alt** turns Cancel into **Reset** when the dialog opts in via `dialog_alt_reset::supported` (dialog stays open). Opt-in markers: `__guideLayout`, `__fill`, `__variables`, `__colorPicker`, `__sizing`, `__adjust` (all kinds), `__filter`, `__form`. Each module implements its own `reset`; set `"__altReset": false` to disable. + +### Canvas and preview + +19. **Live preview** for filters/adjustments uses `filter_preview` / `adjust_preview`; `cancel()` clears preview and related shell state. +20. **Under-dialog canvas** respects dialog rects and open popups; Hand / Space / middle-button pan on free canvas only. + +### Labels and i18n + +21. **Titles:** command dialogs use `__label` (catalogued; trailing `…` stripped in chrome); fixed kinds use `dialogs::title` + `tl!`. +22. **User-visible strings:** `tl!("…")`; command labels from the menu catalog where possible. + +### Confirm / cancel safety + +23. **Child dialogs first**—refuse parent confirm if a nested color picker is open; cancel parent closes children where implemented. +24. **Validate before close** when params can be inconsistent (`guide_layout_ui::validate` in `confirm`). +25. **Disable OK** when required input is missing (`crop_presets::can_confirm`, Preferences Apply when unchanged). +26. **Preferences over control:** whole-dialog OK/Apply may be refused; safe single prefs via `prefs.set` (see control-protocol). + +### Testing + +27. **egui_kittest:** open dialog, `run_steps`, key presses, assert `fields` or accessibility roles (`field_tab` tests are the reference harness). +28. **Tab-order regressions:** add tests when a dialog gains multiple text/number fields. +29. **Filter preview:** `dialogs.rs` tests for preview persistence across background jobs. + +### Anti-patterns + +30. No panics in `body` / `confirm` on bad input—errors to status or validation. +31. No hard-coded colours or radii—`theme::Tokens` and `widgets.rs`. +32. Do not skip `confirm` dispatch—Enter and `ui.dialog.confirm` use it. +33. Do not expect click-outside-to-close on `egui::Modal`. +34. Do not register sliders or dropdowns for `field_tab` unless product explicitly changes Photoshop parity. + +## Adding a command dialog (checklist) + +1. Choose path: see **Command routing** (`adjust_dialog`, `filter_dialog`, `__form`, `__sizing`, …, or new `*_ui` with a unique marker). +2. `open`: build `fields` (`__command`, `__label`, params, marker); `app.ui.open_dialog(DialogKind::Command, f)`. +3. `body(app, ui, &mut fields)`—mutate `fields` only; use shared widgets. +4. `confirm` / `cancel` arms in `dialogs.rs` (or delegate to module `confirm`). +5. Tab: register every text/number field; use `value_field` / `number_edit` where possible. +6. **Alt+Reset (optional):** implement `reset` on the module and add an arm in `dialog_alt_reset` (same dispatch order as `dialogs::show`). Snapshot open values under a `__*Orig` key when Reset should restore “as opened” rather than factory defaults. +7. Tests: at least open + confirm or Tab sequence if non-trivial; if Alt+Reset is supported, assert Reset restores fields and leaves the dialog open. +8. If menu-visible: command already in engine; menu id opens dialog via existing menu wiring. + +## Known gaps + +- **Tab registration** for plain `TextEdit` is manual; generic `__form` string fields may not join `field_tab` unless wired. +- **“Dialog module”** is any UI routed from `dialogs::show`, not only files named `*dialog*`. +- **Numeric field parity** (units in expressions, scrubby labels) is tracked in [`ui-parity.md`](ui-parity.md) (Navigation / numeric fields), not duplicated here. + +## Revision history + +| Date | Change | +|---|---| +| 2026-10-11 | Initial doc from dialog codebase audit | +| 2026-10-11 | Document all `DialogKind` values and `Command` routing markers | +| 2026-10-11 | Alt+Cancel → Reset hub (`dialog_alt_reset`); opt-in markers | From b3309e27d736a6de9f865390292ccfa2f86a3871 Mon Sep 17 00:00:00 2001 From: Ufuk Efe Date: Mon, 12 Oct 2026 18:01:46 +0300 Subject: [PATCH 92/92] i18n(tr): add Turkish UI translation catalog (#3809) Add Turkish (tr) translation catalog covering 100% of measured UI strings (1,727/1,727 keys, 3,731 catalog entries). - Register Turkish language in crates/ui-egui/src/i18n/mod.rs with complete_menus: true and plural_none - Add tr.tsv translation catalog - Add negotiation and coverage tests in system.rs, mod.rs and i18n_coverage.rs - Add MIT OR Apache-2.0 notice in LICENSE-translations.txt - Update docs/localization-parity.md Co-authored-by: Brandon Thomas Co-authored-by: Claude Opus 5.5 --- ATTRIBUTION.md | 1 + .../ui-egui/src/i18n/LICENSE-translations.txt | 5 +- crates/ui-egui/src/i18n/mod.rs | 7 +- crates/ui-egui/src/i18n/system.rs | 1 + crates/ui-egui/src/i18n/tr.tsv | 3784 +++++++++++++++++ docs/localization-parity.md | 4 +- xtask/src/i18n_coverage.rs | 1 + 7 files changed, 3800 insertions(+), 3 deletions(-) create mode 100644 crates/ui-egui/src/i18n/tr.tsv diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md index 9fc1fa26..7aece035 100644 --- a/ATTRIBUTION.md +++ b/ATTRIBUTION.md @@ -20,6 +20,7 @@ next to them. | `crates/ui-egui/src/i18n/uk.tsv` | Ukrainian UI translations | PhotoCraft contributors | Original translations of PhotoCraft's English labels | MIT OR Apache-2.0, [`LICENSE-translations.txt`](crates/ui-egui/src/i18n/LICENSE-translations.txt) | | `crates/ui-egui/src/i18n/cs.tsv` | Czech UI translations | PhotoCraft contributors | Original translations of PhotoCraft's English labels | MIT OR Apache-2.0, [`LICENSE-translations.txt`](crates/ui-egui/src/i18n/LICENSE-translations.txt) | | `crates/ui-egui/src/i18n/vi.tsv` | Vietnamese UI translations | PhotoCraft contributors | Original translations of PhotoCraft's English labels | MIT OR Apache-2.0, [`LICENSE-translations.txt`](crates/ui-egui/src/i18n/LICENSE-translations.txt) | +| `crates/ui-egui/src/i18n/tr.tsv` | Turkish UI translations | PhotoCraft contributors | Original translations of PhotoCraft's English labels | MIT OR Apache-2.0, [`LICENSE-translations.txt`](crates/ui-egui/src/i18n/LICENSE-translations.txt) | | `assets/fonts/Inter-Regular.ttf`, `Inter-Medium.ttf`, `Inter-SemiBold.ttf` | Inter 4.001 (UI font) | The Inter Project Authors (Rasmus Andersson) | | SIL OFL 1.1, [`assets/fonts/OFL-Inter.txt`](assets/fonts/OFL-Inter.txt) | | `assets/fonts/JetBrainsMono-Regular.ttf` | JetBrains Mono 2.305 (numeric font) | The JetBrains Mono Project Authors | | SIL OFL 1.1, [`assets/fonts/OFL-JetBrainsMono.txt`](assets/fonts/OFL-JetBrainsMono.txt) | | `assets/icons/*.svg` except `slice-knife.svg`, `sampler.svg`, `artboard.svg`, `perspective-crop.svg`, `frame-placeholder.svg`, `type-mask.svg`, `type-mask-vertical.svg`, `clip-below.svg`, `clip-release.svg`, `layer-mask.svg`, `adjustment-layer.svg`, `brush-replace.svg`, `eraser-background.svg`, `eraser-magic.svg`, `lasso-magnetic.svg`, `direct-select.svg`, `convert-point.svg`, `pen-add-anchor.svg`, `pen-delete-anchor.svg`, `pen-freeform.svg`, `pen-curvature.svg`, `bandage-sparkle.svg`, `painting-symmetry.svg`, `symmetry-*.svg` and `marquee-{row,column}.svg` (113 files; `star-filled.svg` is `star.svg` with a solid fill) | Lucide icons | Lucide Icons and Contributors | (`icons/.svg`; `align-*` are now named `text-align-*` upstream) | ISC, [`assets/icons/LICENSE-lucide.txt`](assets/icons/LICENSE-lucide.txt) | diff --git a/crates/ui-egui/src/i18n/LICENSE-translations.txt b/crates/ui-egui/src/i18n/LICENSE-translations.txt index bf2f8caa..eae278e4 100644 --- a/crates/ui-egui/src/i18n/LICENSE-translations.txt +++ b/crates/ui-egui/src/i18n/LICENSE-translations.txt @@ -1,4 +1,4 @@ -PhotoCraft's Korean, German, Brazilian Portuguese, Italian, Ukrainian, Dutch and Czech UI translation catalogs are +PhotoCraft's Korean, German, Brazilian Portuguese, Italian, Ukrainian, Dutch, Czech and Turkish UI translation catalogs are licensed under MIT OR Apache-2.0, at your option. The full license texts are in ../../../../LICENSE-MIT and ../../../../LICENSE-APACHE. @@ -22,3 +22,6 @@ PhotoCraft's English labels; no proprietary translation resources were used. Czech translations: PhotoCraft contributors, original translations of PhotoCraft's English labels; no proprietary translation resources were used. + +Turkish translations: PhotoCraft contributors, original translations of +PhotoCraft's English labels; no proprietary translation resources were used. diff --git a/crates/ui-egui/src/i18n/mod.rs b/crates/ui-egui/src/i18n/mod.rs index ecf21f46..be8cb5c1 100644 --- a/crates/ui-egui/src/i18n/mod.rs +++ b/crates/ui-egui/src/i18n/mod.rs @@ -141,7 +141,7 @@ fn inflate(source: &[u8]) -> Result { } /// The registry. English first: it is the fallback and the source language. -pub static LANGUAGES: [LangInfo; 18] = [ +pub static LANGUAGES: [LangInfo; 19] = [ LangInfo { code: "en", name: "English", source: b"", plural: plural_one_other, complete_menus: false, catalog: OnceLock::new() }, LangInfo { code: "ja", name: "日本語", source: catalog!("ja"), plural: plural_none, complete_menus: true, catalog: OnceLock::new() }, LangInfo { code: "zh-hans", name: "简体中文", source: catalog!("zh-hans"), plural: plural_none, complete_menus: true, catalog: OnceLock::new() }, @@ -164,6 +164,8 @@ pub static LANGUAGES: [LangInfo; 18] = [ // Dutch; `nl-NL` and `nl-BE` locales both resolve here. LangInfo { code: "nl", name: "Nederlands", source: catalog!("nl"), plural: plural_one_other, complete_menus: true, catalog: OnceLock::new() }, LangInfo { code: "it", name: "Italiano", source: catalog!("it"), plural: plural_one_other, complete_menus: true, catalog: OnceLock::new() }, + // Turkish; `tr`, `tr-TR` and `tr_TR` locales resolve here. + LangInfo { code: "tr", name: "Türkçe", source: catalog!("tr"), plural: plural_none, complete_menus: true, catalog: OnceLock::new() }, // Vietnamese; `vi-VN` resolves here. LangInfo { code: "vi", name: "Tiếng Việt", source: catalog!("vi"), plural: plural_none, complete_menus: true, catalog: OnceLock::new() }, ]; @@ -418,6 +420,9 @@ mod tests { assert_eq!(lang_from_tag("it-CH"), Lang::from_code("it")); assert_eq!(lang_from_tag("nl_NL.UTF-8"), Lang::from_code("nl")); assert_eq!(lang_from_tag("nl-BE"), Lang::from_code("nl")); + assert_eq!(lang_from_tag("tr_TR.UTF-8"), Lang::from_code("tr")); + assert_eq!(lang_from_tag("tr-TR"), Lang::from_code("tr")); + assert_eq!(lang_from_tag("tr"), Lang::from_code("tr")); // Traditional Chinese: by region, by script, and with a region after the script. assert_eq!(lang_from_tag("zh_TW.UTF-8"), Some(ZH())); assert_eq!(lang_from_tag("zh-TW"), Some(ZH())); diff --git a/crates/ui-egui/src/i18n/system.rs b/crates/ui-egui/src/i18n/system.rs index 4fb0404f..68afea8d 100644 --- a/crates/ui-egui/src/i18n/system.rs +++ b/crates/ui-egui/src/i18n/system.rs @@ -96,6 +96,7 @@ mod tests { (vec!["pt-PT"], "pt-br"), (vec!["it-IT", "en-US"], "it"), (vec!["nl-BE", "fr-BE"], "nl"), + (vec!["tr-TR", "en-US"], "tr"), (vec![], "en"), ] { with_system_tags(&tags, || assert_eq!(system_lang().code(), expected)); diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv new file mode 100644 index 00000000..617ad81f --- /dev/null +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -0,0 +1,3784 @@ +# Turkish (tr) catalog. Columns, separated by a TAB: context source translation +# (the format is described in ja.tsv). +# +# Clean-room: every entry was written from the plain meaning of the English label using ordinary +# Turkish computing vocabulary (katman, seçim, maske, ayar katmanı, fırça, degrade ...). No +# proprietary localisation resource, string table or product UI was consulted or copied; add +# entries the same way. Product and technology names (PhotoCraft, ArtCraft, OpenType, CMYK, Lab ...) +# stay as they are; the trailing "…" of dialog commands is kept. +# + Rows Satırlar + Number Sayı + Top: Üst: + Left: Sol: + Bottom: Alt: + Right: Doğru: + Target: Hedef: + Selected Artboards Seçilen Çalışma Yüzeyleri + Center Columns Merkezi Sütunlar + Clear Existing Guides Mevcut Kılavuzları Temizle + Invalid guide layout Geçersiz kılavuz düzeni + Leave empty for automatic size Otomatik boyut için boş bırakın + 5 Columns, 3 Rows 5 Sütun, 3 Satır + 8 Columns 8 Sütun + 12 Columns 12 Sütun + File Dosya + Edit Düzen + Image Görüntü + Layer Katman + Type Metin + Select Seç + Scope Kapsam + Top Left Sol Üst + Top Right Sağ Üst + Bottom Left Sol Alt + Bottom Right Sağ Alt + Filter Filtre + View Görünüm + Window Pencere + Help Yardım + (coming soon) (yakında) + New… Yeni… + New from Clipboard Pano'dan yeni + Open… Aç… + Open As… Farklı Aç… + Open EXR Parts… EXR Parçalarını açın… + Add beauty precomp from the AOVs AOV'lerden güzellik ön kompozisyonu ekleyin + Both Her ikisi de + Left Sol + Right Sağ + Open Recent Son Kullanılanları Aç + Clear Recent Files Son Dosyaları Temizle + Remove from Recent En Son'dan kaldır + Remove {name} from Recent {name} öğesini En Son'dan kaldır + Close Kapat + Minimize Küçült + Maximize Büyüt + Restore Geri yükle + Close All Tümünü Kapat + Close Others Diğerlerini Kapat + Save Kaydet + Save As… Farklı Kaydet… + Save a Copy… Bir Kopyasını Kaydet… + Revert Geri Döndür + Export Dışa Aktar + Quick Export as PNG PNG Olarak Hızlı Dışa Aktarma + Export As… Farklı Dışa Aktar… + Export Preferences… Dışa Aktarma Tercihleri… + Save for Web (Legacy)… Web İçin Kaydet (Eski)… + Artboards to Files… Çalışma Yüzeylerinden Dosyalara… + Artboards to PDF… Çalışma yüzeylerinden PDF'ye… + Layers to Files… Katmanlardan Dosyalara… + Layer Comps to Files… Dosyalara Katman Kompozisyonları… + Color Lookup Tables… Renk Arama Tabloları… + Data Sets as Files… Dosya Olarak Veri Kümeleri… + Paths to Illustrator… İllüstratöre Giden Yollar… + Render Video… Videoyu Oluştur… + Generate Oluştur + Image Assets Resim Varlıkları + Place Embedded… Gömülü Olarak Yerleştir… + Place Linked… Bağlantılı Olarak Yerleştir… + Package… Paketle… + Automate Otomatikleştir + Batch… Toplu… + Create Droplet… Damlacık oluştur… + Crop and Straighten Photos Fotoğrafları Kırp ve Düzelt + Contact Sheet II… İletişim Sayfası II… + Conditional Mode Change… Koşullu Mod Değişikliği… + Fit Image… Resmi Sığdır… + Lens Correction… Mercek Düzeltme… + Merge to HDR Pro… HDR Pro'ya Birleştir… + Photomerge… Fotoğraf Birleştir… + Scripts Komut dosyaları + Image Processor… Görüntü İşlemcisi… + Delete All Empty Layers Tüm Boş Katmanları Sil + Flatten All Layer Effects Tüm Katman Efektlerini Düzleştir + Flatten All Masks Tüm Maskeleri Düzleştir + Script Events Manager… Komut Dosyası Olay Yöneticisi… + Import İthalat + Browse… Göz at… + Reveal in Finder Finder'da Göster + Show in Explorer Explorer'da Göster + Show in Folder Klasörde Göster + File Info… Dosya Bilgileri… + Print… Yazdır… + Print One Copy Bir Kopya Yazdır + Exit Çıkış + Undo Geri Al + Redo Yinele + Toggle Last State Son Durumu Değiştir + Fade… Solmaya… + Cut Kes + Copy Kopyala + Copy Merged Birleştirilmiş Olarak Kopyala + Paste Yapıştır + Paste Special Özel Yapıştır + Paste in Place Yerine Yapıştır + Paste Into İçine Yapıştır + Paste Outside Dışına Yapıştır + Paste Lorem Ipsum Lorem Ipsum'u Yapıştır + Clear Temizle + Search… Ara… + Check Spelling… Yazımı Denetle… + Find and Replace Text… Metni Bul ve Değiştir… + Fill… Doldur… + Stroke… Kontur… + Content-Aware Fill… İçeriğe Uygun Dolgu… + Delete and Fill Selection Seçimi Sil ve Doldur + Content-Aware Scale İçeriğe Uygun Ölçek + Puppet Warp Kukla Çözgü + Perspective Warp Perspektif Çarpıtma + Free Transform Serbest Dönüştürme + Free Transform a Copy Bir Kopyayı Ücretsiz Dönüştürme + Transform Dönüştür + Again Yinele + Transform Again on a Copy Bir Kopyada Yeniden Dönüştür + Scale Ölçekle + Rotate Döndür + Skew Eğ + Distort Çarpıt + Perspective Perspektif + Warp Deforme Et + Flip Horizontal Yatay Çevir + Flip Vertical Dikey Çevir + Rotate 180° 180° Döndür + Rotate 90° Clockwise 90° Saat Yönünde Döndür + Rotate 90° Counter Clockwise 90° Saat Yönünün Tersine Döndür + 180° 180° + 90° Clockwise 90° Saat Yönünde + 90° Counter Clockwise 90° Saat Yönünün Tersine + Arbitrary… Keyfi… + Auto-Align Layers… Katmanları Otomatik Hizala… + Auto-Blend Layers… Katmanları Otomatik Karıştır… + Define Brush Preset… Fırça Ön Ayarını Tanımla… + Define Pattern… Deseni Tanımla… + Define Custom Shape… Özel Şekil Tanımlayın… + Purge Temizle + Clipboard Pano + Histories Geçmiş + Video Cache Video Önbelleği + All Tümü + Presets Ön ayarlar + Preset Manager… Ön Ayar Yöneticisi… + Migrate Presets Ön Ayarları Taşı + Export/Import Presets… Ön Ayarları Dışa/İçe Aktar… + Color Settings… Renk Ayarları… + Assign Profile… Profil Ata… + Convert to Profile… Profile Dönüştür… + Keyboard Shortcuts… Klavye Kısayolları… + Menus… Menüler… + Toolbar… Araç Çubuğu… + Preferences Tercihler + General… Genel… + Interface… Arayüz… + Workspace… Çalışma alanı… + Tools… Araçlar… + History Log… Geçmiş Günlüğü… + File Handling… Dosya İşleme… + Export… İhracat… + Performance… Performans… + Scratch Disks… Kazı Diskleri… + Cursors… İmleçler… + Transparency & Gamut… Şeffaflık ve Gamut… + Units & Rulers… Birimler ve Cetveller… + Guides, Grid & Slices… Kılavuzlar, Izgaralar ve Dilimler… + Plug-ins… Eklentiler… + Type… Tür… + Enhanced Controls… Gelişmiş Kontroller… + Camera Raw… Kamera Raw… + Raw Defaults… Ham Varsayılanlar… + Integrations… Entegrasyonlar… + AI Integrations… Yapay Zeka Entegrasyonları… + Install Plug-in… Eklentiyi Yükle… + Language Options Dil Seçenekleri + Settings… Ayarlar… + Mode Mod + Bitmap Bit eşlem + Grayscale Gri tonlamalı + Duotone Çift tonlu + Indexed Color İndekslenmiş Renk + RGB Color RGB Rengi + CMYK Color CMYK Rengi + Lab Color Laboratuvar Rengi + Multichannel Çok kanallı + 8 Bits/Channel 8 Bit/Kanal + 8 bit 8 bit + Integer Tamsayı + 16 Bits/Channel 16 Bit/Kanal + 16 bit 16 bit + 32 Bits/Channel 32 Bit/Kanal + 32 bit (float) 32 bit (kayan) + Floating point Kayan nokta + Color Table… Renk Tablosu… + Bitmap… Bit eşlem… + Duotone… Çift tonlu… + Indexed Color… İndekslenmiş Renk… + Adjustments Ayarlamalar + Brightness/Contrast… Parlaklık/Kontrast… + Levels… Düzeyler… + Curves… Eğriler… + Exposure… Pozlama… + Vibrance… Titreşim… + Hue/Saturation… Renk Tonu/Doygunluk… + Color Balance… Renk Dengesi… + Black & White… Siyah ve Beyaz… + Photo Filter… Fotoğraf Filtresi… + Channel Mixer… Kanal Karıştırıcı… + Color Lookup… Renk Arama… + Invert Tersine Çevir + Posterize… Posterleştir… + Threshold… Eşik… + Gradient Map… Degrade Eşlemesi… + Selective Color… Seçici Renk… + Shadows/Highlights… Gölgeler/Vurgular… + HDR Toning… HDR Tonlama… + Desaturate Doygunluğu Azalt + Match Color… Rengi Eşleştir… + Replace Color… Rengi Değiştir… + Equalize Eşitle + Auto Tone Otomatik Ton + Auto Contrast Otomatik Kontrast + Auto Color Otomatik Renk + Image Size… Görüntü Boyutu… + Canvas Size… Tuval Boyutu… + Image Rotation Görüntü Döndürme + Flip Canvas Horizontal Kanvası Yatay Çevir + Flip Canvas Vertical Kanvası Dikey Çevir + Crop Kırp + Trim… Kırp (Kenar)… + Reveal All Tümünü Göster + Duplicate… Çoğalt… + Apply Image… Resmi Uygula… + Calculations… Hesaplamalar… + Variables Değişkenler + Define… Tanımla… + Data Sets… Veri Setleri… + Apply Data Set… Veri Kümesini Uygula… + Variable Data Sets… Değişken Veri Setleri… + Trap… Tuzak… + Analysis Analiz + Set Measurement Scale… Ölçüm Ölçeğini Ayarla… + Select Data Points… Veri Noktalarını Seçin… + Record Measurements Ölçümleri Kaydet + Ruler Tool Cetvel Aracı + Count Tool Sayma Aracı + Place Scale Marker… Ölçek İşaretçisini Yerleştirin… + Custom… Özel… + New Yeni + Layer… Katman… + Group… Grup… + Group from Layers… Katmanlardan Grup… + Artboard… Çalışma yüzeyi… + Artboard from Group… Gruptan çalışma yüzeyi… + Artboard from Layers… Katmanlardan Çalışma Yüzeyi… + Layer via Copy Kopyalama yoluyla katman + Layer via Cut Kesim Yoluyla Katman + Layer From Background… Arka Plandan Katman… + Layer from Background… Arka Plandan Katman… + Background From Layer Katmandan Arka Plan + New Shape Layer Yeni Şekil Katmanı + New Type Layer Yeni Tip Katmanı + New Fill Layer Yeni Dolgu Katmanı + New Adjustment Layer Yeni Ayarlama Katmanı + New Layer Based Slice Yeni Katman Tabanlı Dilim + New Smart Object via Copy Kopyalama Yoluyla Yeni Akıllı Nesne + New Blank Video Layer Yeni Boş Video Katmanı + New Video Layer from File… Dosyadan Yeni Video Katmanı… + Duplicate Layer… Katmanı Çoğalt… + Delete Layer Katmanı Sil + Delete Sil + Rename Layer Katmanı Yeniden Adlandır + Create Layer Katman Oluştur + Layer Style Katman Stili + Blending Options… Karışım Seçenekleri… + Bevel & Emboss… Eğim ve Kabartma… + Use Global Light Global Light'ı kullanın + Inner Shadow… İç Gölge… + Inner Glow… İç Işıma… + Satin… Saten… + Color Overlay… Renk Kaplama… + Gradient Overlay… Degrade Kaplama… + Pattern Overlay… Desen Kaplama… + Outer Glow… Dış Işıma… + Drop Shadow… Alt Gölge… + Copy Layer Style Katman Stilini Kopyala + Paste Layer Style Katman Stilini Yapıştır + Clear Layer Style Katman Stilini Temizle + Global Light… Küresel Işık… + Hide All Effects Tüm Efektleri Gizle + Scale Effects… Ölçek Etkileri… + Smart Filter Akıllı Filtre + Convert for Smart Filters Akıllı Filtreler için Dönüştürme + Clear Smart Filters Akıllı Filtreleri Temizle + Disable Smart Filters Akıllı Filtreleri Devre Dışı Bırak + Delete Filter Mask Filtre Maskesini Sil + Disable Filter Mask Filtre Maskesini Devre Dışı Bırak + Solid Color… Düz Renk… + Gradient… Gradyan… + Pattern… Desen… + Layer Mask Katman Maskesi + Vector Mask vektör maskesi + Reveal Selection Seçimi Göster + Hide Selection Seçimi Gizle + Hide All Tümünü Gizle + From Transparency Şeffaflıktan + Delete Vector Mask Vektör Maskesini Sil + Enable Layer Mask Katman Maskesini Etkinleştir + Disable Layer Mask Katman Maskesini Devre Dışı Bırak + Enable Vector Mask Vektör Maskesini Etkinleştir + Link Layer Mask Bağlantı Katmanı Maskesi + Unlink Layer Mask Katman Maskesinin Bağlantısını Kaldır + Link Vector Mask Bağlantı Vektör Maskesi + Add Vector Mask Vektör Maskesi Ekle + Vector Mask from Current Path Geçerli Yoldan Vektör Maskesi + Create Clipping Mask Kırpma Maskesi Oluştur + Release Clipping Mask Kırpma Maskesini Serbest Bırakın + Smart Objects Akıllı Nesneler + Smart Object Akıllı Nesne + Convert to Smart Object Akıllı Nesneye Dönüştür + Convert to Embedded Gömülüye Dönüştür + Convert to Layers Katmanlara Dönüştür + Convert to Linked… Bağlantılıya Dönüştür… + Edit Contents İçeriği Düzenle + Replace Contents… İçeriği Değiştir… + Relink to File… Dosyaya Yeniden Bağla… + Export Contents… İçeriği Dışa Aktar… + Update Modified Content Değiştirilen İçeriği Güncelle + Update All Modified Content Değiştirilen Tüm İçeriği Güncelle + Stack Mode Yığın Modu + Entropy Entropi + Kurtosis Basıklık + Maximum Maksimum + Mean ortalama + Median Medyan + Minimum Asgari + Range Aralık + Skewness çarpıklık + Standard Deviation Standart Sapma + Summation Toplama + Variance Varyans + Video Layers Video Katmanları + Interpret Footage… Görüntüyü Yorumla… + Replace Footage… Görüntüyü Değiştir… + Reload Frame Çerçeveyi Yeniden Yükle + Show Altered Video Değiştirilen Videoyu Göster + Restore Frame Çerçeveyi Geri Yükle + Restore All Frames Tüm Çerçeveleri Geri Yükle + Insert Blank Frame Boş Çerçeve Ekle + Delete Frame Çerçeveyi Sil + Duplicate Frame Çerçeveyi Çoğalt + Frame from Layers Katmanlardan Çerçeve + Video Frames to Layers… Video Karelerinden Katmanlara… + Rasterize Rasterleştir + Rasterize Type Rasterleştirme Türü + Rasterize Type Layer Tip Katmanını Rasterleştir + Rasterize Shape Şekli Rasterleştir + New Guide Layout… Yeni Kılavuz Düzeni… + New Guides From Shape Shape'den Yeni Kılavuzlar + Lock Layers… Katmanları Kilitle… + Link Layers Katmanları Bağla + Select Linked Layers Bağlantılı Katmanları Seçin + Merge Layers Katmanları Birleştir + Merge Down Aşağı Birleştir + Merge Visible Görünürleri Birleştir + Stamp Visible Damga Görünür + Select Layer Above Yukarıdaki Katmanı Seçin + Select Layer Below Aşağıdaki Katmanı Seçin + Select Top Layer Üst Katmanı Seçin + Select Bottom Layer Alt Katmanı Seçin + Add Layer Above to Selection Seçime Yukarıdaki Katmanı Ekle + Add Layer Below to Selection Aşağıdaki Katmanı Seçime Ekle + Stamp Down Damgalama + Flatten Image Görüntüyü Düzleştir + Matting Paspas + Color Decontaminate… Renkli Dekontamine… + Remove Black Matte Siyah Matı Kaldır + Remove White Matte Beyaz Matı Kaldır + Defringe… Borcu kaldır… + Group Layers Grup Katmanları + Ungroup Layers Katmanların Grubunu Çöz + Hide Layers Katmanları Gizle + Arrange Sırala + Bring to Front En Öne Getir + Bring Forward Öne Getir + Send Backward Arkaya Gönder + Send to Back En Arkaya Gönder + Reverse Ters + Combine Shapes Şekilleri Birleştir + Unite Shapes Şekilleri Birleştir + Subtract Front Shape Ön Şekli Çıkart + Intersect Shape Areas Şekil Alanlarını Kesiş + Exclude Overlapping Shapes Çakışan Şekilleri Hariç Tut + Merge Shape Components Şekil Bileşenlerini Birleştir + Align Hizala + Top Edges Üst Kenarlar + Vertical Centers Dikey Merkezler + Bottom Edges Alt Kenarlar + Left Edges Sol Kenarlar + Horizontal Centers Yatay Merkezler + Right Edges Sağ Kenarlar + Distribute Dağıt + Vertically Dikey olarak + Horizontally Yatay olarak + Layer Edges Katman Kenarları + Isolate Layers Katmanları Yalıt + Layer Content Options… Katman İçerik Seçenekleri… + Fill Content İçeriği Doldur + Deselect Layers Katmanların Seçimini Kaldır + Find Layers Katmanları Bul + Layer Comps Katman Kompozisyonları + Layers Katmanlar + All Layers Tüm Katmanlar + Hidden Layers Gizli Katmanlar + Mask All Objects Tüm Nesneleri Maskele + Subject Konu + Sky Gökyüzü + Panels Paneller + Character Panel Karakter Paneli + Paragraph Panel Paragraf Paneli + Character Styles Panel Karakter Stilleri Paneli + Paragraph Styles Panel Paragraf Stilleri Paneli + Glyphs Panel Glifler Paneli + Anti-Alias Kenar Yumuşatma + Sharp Keskin + Crisp Çıtır + Strong Güçlü + Smooth Pürüzsüz + Windows LCD Windows LCD'si + Windows Windows + Orientation Oryantasyon + Horizontal Yatay + Vertical Dikey + OpenType OpenType + Standard Ligatures Standart Bitişik Harfler + Contextual Alternates Bağlamsal Alternatifler + Discretionary Ligatures İsteğe Bağlı Bitişik Harfler + Swash çalkalama + Oldstyle Eski tarz + Stylistic Alternates Stilistik Alternatifler + Titling Alternates Başlık Alternatifleri + Ornaments Süsler + Ordinals Sıra Sayıları + Fractions Kesirler + Create Work Path İş Yolu Oluştur + Convert to Shape Şekle Dönüştür + Warp Text… Metni Çözgü… + Convert to Point Text Nokta Metnine Dönüştür + Convert to Paragraph Text Paragraf Metnine Dönüştür + Default Features Varsayılan Özellikler + East Asian Features Doğu Asya Özellikleri + Middle Eastern Features Orta Doğu Özellikleri + Middle Eastern & South Asian Composer Orta Doğulu ve Güney Asyalı Besteci + Update All Text Layers Tüm Metin Katmanlarını Güncelle + Replace All Missing Fonts Tüm Eksik Yazı Tiplerini Değiştir + Resolve Missing Fonts… Eksik Yazı Tiplerini Çözün… + Font Preview Size Yazı Tipi Önizleme Boyutu + None Yok + Small Küçük + Medium Orta + Large Büyük + Extra Large Ekstra Büyük + Huge Devasa + Load Default Type Styles Varsayılan Yazım Stillerini Yükle + Save Default Type Styles Varsayılan Yazım Stillerini Kaydet + Deselect Seçimi Kaldır + Reselect Yeniden Seç + Inverse Ters Çevir + Inverse Selection Ters Seçim + Similar Benzer + Color Range… Renk Aralığı… + Focus Area… Odaklanma Alanı… + Select and Mask… Seç ve Maskele… + Smart Radius Akıllı Yarıçap + Shift Edge Kenarı Kaydır + Decontaminate Dekontaminasyon + Refine Edge Kenarı İyileştir + Modify Değiştir + Border… Kenarlık… + Smooth… Düzelt… + Expand… Genişlet… + Contract… Daralt… + Feather… Geçiş Yumuşatma… + Grow Büyüt + Transform Selection Seçimi Dönüştür + Edit in Quick Mask Mode Hızlı Maske Modunda Düzenleme + Load Selection… Seçimi Yükle… + Save Selection… Seçimi Kaydet… + Match All Tümünü Eşleştir + Last Filter Son Filtre + Filter Gallery… Galeriyi Filtrele… + Adaptive Wide Angle… Uyarlanabilir Geniş Açı… + Camera Raw Filter… Camera Raw Filtresi… + Liquify… Sıvılaştır… + Vanishing Point… Ufuk Noktası… + Blur Bulanıklaştırma + Blur Gallery Bulanıklaştırma Galerisi + Field Blur… Alan Bulanıklığı… + Iris Blur… İris Bulanıklığı… + Tilt-Shift… Tilt-Shift… + Path Blur… Yol Bulanıklığı… + Spin Blur… Döndürme Bulanıklığı… + Blur More Daha Fazla Bulanıklaştır + Box Blur… Kutu Bulanıklığı… + Gaussian Blur… Gauss Bulanıklığı… + Lens Blur… Mercek Bulanıklığı… + Motion Blur… Hareket Bulanıklığı… + Radial Blur… Radyal Bulanıklık… + Shape Blur… Şekil Bulanıklığı… + Smart Blur… Akıllı Bulanıklaştırma… + Surface Blur… Yüzey Bulanıklığı… + Average Ortalama + Displace… Yer değiştir… + Pinch… Tut… + Polar Coordinates… Kutupsal Koordinatlar… + Ripple… Dalgalanma… + Shear… Kesme… + Spherize… Küreselleştir… + Twirl… Döndür… + Wave… Dalga… + ZigZag… ZigZag… + Noise Gürültü + Add Noise… Gürültü Ekle… + Despeckle Benek giderme + Dust & Scratches… Toz ve Çizikler… + Median… Medyan… + Reduce Noise… Gürültüyü Azaltın… + Pixelate Pikselleştir + Color Halftone… Renk Yarım Tonu… + Crystallize… Kristalleşin… + Facet Faset + Fragment Parça + Mezzotint… Mezzotint… + Mosaic… Mozaik… + Pointillize… Noktalaştırın… + Render İşleme + Clouds Bulutlar + Difference Clouds Fark Bulutları + Fibers… Lifler… + Flame… Alev… + Lens Flare… Mercek Parlaması… + Lighting Effects… Aydınlatma Efektleri… + Relight… Yeniden aydınlat… + Picture Frame… Resim Çerçevesi… + Tree… Ağaç… + Sharpen Keskinleştir + Sharpen Edges Kenarları Keskinleştirin + Sharpen More Daha Fazla Keskinleştir + Smart Sharpen… Akıllı Keskinleştirme… + Unsharp Mask… Keskinliği Azaltma Maskesi… + High Pass… Yüksek Geçiş… + Stylize Stilize Et + Diffuse… Yaygın… + Emboss… Kabartma… + Extrude… Ekstrüzyon… + Find Edges Kenarları Bul + Oil Paint… Yağlı Boya… + Solarize Solarizasyon + Tiles… Fayans… + Trace Contour… Konturu İzle… + Wind… Rüzgar… + Video video + De-Interlace… Taramasızlaştırma… + NTSC Colors NTSC Renkleri + Other Diğer + Maximum… Maksimum… + Minimum… Asgari… + Offset… Ofset… + Plug-ins Eklentiler + Proof Setup Prova Kurulumu + Proof Colors Prova Renkleri + Gamut Warning Gamut Uyarısı + Working CMYK CMYK'de çalışıyor + Working Cyan Plate Çalışan Camgöbeği Plaka + Working Magenta Plate Çalışan Macenta Plaka + Working Yellow Plate Sarı Plaka Çalışması + Working Black Plate Siyah Plaka Çalışma + Working CMY Plate Çalışan CMY Plakası + Legacy Macintosh RGB Eski Macintosh RGB + Internet Standard RGB İnternet Standardı RGB + Monitor RGB RGB'yi izleyin + Color Blindness — Protanopia-type Renk Körlüğü — Protanopi tipi + Color Blindness — Deuteranopia-type Renk Körlüğü – Döteranopi tipi + Zoom In Yakınlaştır + Zoom Out Uzaklaştır + Fit on Screen Ekrana Sığdır + Fit Layer(s) on Screen Katmanları Ekrana Sığdır + Fit Artboard on Screen Çalışma Yüzeyini Ekrana Sığdır + 100% 100% + 200% 200% + Print Size Baskı Boyutu + Pixel Aspect Ratio Piksel En Boy Oranı + Pixel Aspect Ratio Correction Piksel En Boy Oranı Düzeltme + Custom Pixel Aspect Ratio… Özel Piksel En Boy Oranı… + Square Kare + D1/DV NTSC (0.91) D1/DV NTSC (0,91) + D1/DV NTSC Widescreen (1.21) D1/DV NTSC Geniş Ekran (1.21) + D1/DV PAL (1.09) D1/DV PAL (1,09) + D1/DV PAL Widescreen (1.46) D1/DV PAL Geniş Ekran (1,46) + Anamorphic 2:1 (2) Anamorfik 2:1 (2) + HDV 1080/DVCPRO HD 720 (1.33) HDV 1080/DVCPRO HD 720 (1,33) + DVCPRO HD 1080/HDV 1080 (1.5) DVCPRO HD 1080/HDV 1080 (1,5) + 32-bit Preview Options… 32-bit Önizleme Seçenekleri… + Screen Mode Ekran Modu + Standard Screen Mode Standart Ekran Modu + Full Screen Mode With Menu Bar Menü Çubuklu Tam Ekran Modu + Full Screen Mode Tam Ekran Modu + Cycle Screen Mode Döngü Ekranı Modu + Show Göster + Extras Ekstralar + Selection Edges Seçim Kenarları + Target Path Hedef Yolu + Current Path Geçerli Yol + Grid Izgara + Guides Kılavuzlar + Canvas Guides Kanvas Kılavuzları + Artboard Guides Çalışma Yüzeyi Kılavuzları + Count Sayım + Smart Guides Akıllı Kılavuzlar + Slices Dilimler + Notes Notlar + Pixel Grid Piksel Izgarası + Pixel Art Piksel Sanatı + Pixel Art Preview Piksel Sanat Önizlemesi + Pattern Preview Desen Önizlemesi + Brush Preview Fırça Önizlemesi + Mesh ağ + Edit Pins Pinleri Düzenle + Document Bounds Belge Sınırları + Show Extras Options… Ekstra Seçeneklerini Göster… + Rulers Cetveller + Snap Yapış + Snap To Şuna Yapış + Lock Guides Kılavuzları Kilitle + Clear Guides Kılavuzları Temizle + Clear Selected Artboard Guides Seçilen Çalışma Yüzeyi Kılavuzlarını Temizle + Clear Canvas Guides Şeffaf Kanvas Kılavuzları + New Guide… Yeni Kılavuz… + Lock Slices Dilimleri Kilitle + Clear Slices Dilimleri Temizle + Match Zoom Yakınlaştırmayı Eşleştir + Match Location Eşleşme Konumu + Match Rotation Maç Rotasyonu + Cascade Çağlayan + Tile Fayans + Tile All Horizontally Tümünü Yatay Olarak Döşe + Tile All Vertically Tümünü Dikey Olarak Döşe + 2-up Horizontal 2'li Yatay + 2-up Vertical 2'li Dikey + 3-up Horizontal 3'lü Yatay + 3-up Stacked 3'lü Yığılmış + 3-up Vertical 3'lü Dikey + 4-up 4'lü + 6-up 6'lı + Consolidate All to Tabs Tümünü Sekmelerde Birleştir + Float in Window Pencerede Kaydır + Float All in Windows Tümünü Windows'ta Kaydır + New Window for Document Belge için Yeni Pencere + Workspace Çalışma alanı + Essentials Temel bilgiler + Graphic and Web Grafik ve Web + Painting Boyama + Photography Fotoğrafçılık + New Workspace… Yeni Çalışma Alanı… + Delete Workspace… Çalışma Alanını Sil… + Reset Workspace Çalışma Alanını Sıfırla + Reset Tool Aracı Sıfırla + Reset All Tools Tüm Araçları Sıfırla + Reset all tools to their default settings? Tüm araçlar varsayılan ayarlarına sıfırlansın mı? + Lock Workspace Çalışma Alanını Kilitle + Theme Tema + Pro Theme Profesyonel Tema + Pro Medium Gray Theme Pro Orta Gri Tema + Pro Light Gray Theme Pro Açık Gri Tema + Pro Light Theme Profesyonel Işık Teması + Studio Theme Stüdyo Teması + Studio Light Theme Stüdyo Işık Teması + Classic Theme Klasik Tema + Solarized dark Solarize karanlık + Solarized Dark Theme Solarize Karanlık Tema + Breeze dark Esinti karanlık + Breeze Dark Theme Esinti Koyu Tema + Breeze light Esinti ışığı + Breeze Light Theme Esinti Işık Teması + Adwaita Light Theme Adwaita Işık Teması + Adwaita Dark Theme Adwaita Karanlık Tema + Adwaita Adwaita + Adwaita dark Adwaita karanlık + Next Theme Sonraki Tema + Actions Eylemler + Brush Settings Fırça Ayarları + Brushes Fırçalar + Channels Kanallar + Character Karakter + Character Styles Karakter Stilleri + Clone Source Klon Kaynağı + Color Renk + Glyphs Glifler + Gradients Degradeler + Histogram Histogram + History Tarih + Info Bilgi + Measurement Log Ölçüm Günlüğü + Modifier Keys Değiştirici Tuşlar + Navigator Gezgin + Options Seçenekler + Paragraph Paragraf + Paragraph Styles Paragraf Stilleri + Paths Yollar + Patterns Desenler + Properties Özellikler + Shapes Şekiller + Styles Stiller + Swatches Renk Örnekleri + Timeline Zaman çizelgesi + Tool Presets Araç Ön Ayarları + Tools Araçlar + About PhotoCraft PhotoCraft Hakkında + PhotoCraft Website PhotoCraft Web Sitesi + PhotoCraft on GitHub GitHub'da PhotoCraft + ArtCraft Website ArtCraft Web Sitesi + Join the ArtCraft Discord… ArtCraft Discord'una katılın… + Report an Issue… Bir Sorun Bildirin… + WIA Support… WIA Desteği… + Apply Uygula + HSB/HSL HSB/HSL + Invert… Ters çevir… + Load Files into Stack… Dosyaları Yığına Yükle… + Motion Hareket + Notes… Notlar… + Other… Diğer… + Remove Warp Split Warp Split'i Kaldır + Shape Şekil + Split Warp Crosswise Çözgüyü Çapraz Olarak Böl + Split Warp Horizontally Çözgüyü Yatay Olarak Böl + Split Warp Vertically Çözgüyü Dikey Olarak Böl + Statistics… İstatistikler… + Refine Strokes Konturları İyileştir +@plural {n} item|{n} items {n} öğe + Auto Otomatik + (print to the printer) (yazıcıya yazdırın) + + Add variable + Değişken ekle + 30 frames @ 30 fps 30 kare @ 30 fps + 3D LUT File 3D LUT Dosyası + Absolute Mutlak + Absolute Colorimetric Mutlak Kolorimetrik + Action Eylem + Adaptive Uyarlanabilir + Adaptive Wide Angle isn't open Uyarlanabilir Geniş Açı açık değil + Add Ekle + Add Layer Mask Katman Maskesi Ekle + Add Stop Durak Ekle + Add a layer style Katman stili ekleme + Add a mask (from the selection; {key} inverts) Bir maske ekleyin (seçimden; {key} tersine çevirir) + Add an adjustment Düzenleme ekle + Add disk Disk ekle + Add space after paragraph Paragraftan sonra boşluk ekle + Add space before paragraph Paragraftan önce boşluk ekleyin + Add to Sample Örneğe Ekle + Add to selection ({key}) Seçime ekle ({key}) + Adjust for Zoom Yakınlaştırma için Ayarlama + Adjustment visible Ayar görünür + Adobe RGB (1998) compatible Adobe RGB (1998) uyumlu + Align and Distribute Hizala ve Dağıt + Align and distribute Hizala ve dağıt + Align horizontal centers Yatay merkezleri hizalayın + Align left edges Sol kenarları hizala + Align right edges Sağ kenarları hizalayın + Aligned Hizalı + All Caps Tamamı Büyük Harf + All Slices Tüm Dilimler + All User Slices Tüm Kullanıcı Dilimleri + All shortcuts reset to PhotoCraft defaults. Tüm kısayollar PhotoCraft varsayılanlarına sıfırlanır. + Alt Alternatif + Always use pressure for opacity Opaklık için her zaman baskıyı kullanın + Always use pressure for size Her zaman boyuta göre baskı kullanın + Amount Tutar + Anchor: Çapa: + Angle Açı + Angle Gradient Açı Gradyanı + Angle Jitter Açı Değişimi + Answer the unsaved-changes prompt first Önce kaydedilmemiş değişiklikler istemini yanıtlayın + Anti-alias Kenar yumuşatma + Appearance Görünüm + Appearance (Layer Style) Görünüm (Katman Stili) + Apply Layer Mask Katman Maskesini Uygula + Apply Per Tip İpucu Başına Uygula + Apply next selected layer comp Sonraki seçilen katman kompozisyonunu uygula + Apply previous selected layer comp Önceki seçilen katman kompozisyonunu uygula + Artboard Çalışma yüzeyi + Artboard Background Color Çalışma Yüzeyi Arka Plan Rengi + Assign working space Çalışma alanı atayın + Author: Yazar: + Auto Hide Otomatik Gizle + Auto-Select: Otomatik Seç: + Automatically level near-horizontal line segments Yataya yakın çizgi bölümlerini otomatik olarak hizalayın + Automatically straighten and level Otomatik olarak düzeltin ve seviyelendirin + Automatically straighten near-vertical line segments Dikeye yakın çizgi bölümlerini otomatik olarak düzelt + Background Arka plan + Background Color Arka Plan Rengi + Background Contents Arka Plan İçeriği + Balance Bakiye + Baseline Temel + Baseline shift Taban çizgisi kayması + Basic Temel + Before (Y) Önce (Y) + Begin recording Kaydı başlat + Bend: Bükülme: + Bicubic Bikübik + Bicubic (smooth gradients) Bikübik (düzgün degradeler) + Bicubic Smoother (enlargement) Bikübik Pürüzsüzleştirici (büyütme) + Bicubic Sharper (reduction) Bikübik Daha Keskin (azaltma) + Bilinear Çift doğrusal + Black Siyah + Black & White Siyah Beyaz + Black Point Compensation Kara Nokta Telafisi + Black, White Siyah, Beyaz + Blacks Siyahlar + Blending Karıştırma + Blending Options Karıştırma Seçenekleri + Blue Mavi + Blue, Red, Yellow Mavi, Kırmızı, Sarı + Both Axes Her İki Eksen + Bottom Alt + Brightness Parlaklık + Brightness Jitter Parlaklık Değişimi + Brightness/Contrast Parlaklık/Kontrast + Bring the selected pin forward Seçilen pini öne getir + Brush Preset picker Fırça Ön Ayarı seçici + Brush Reconstruct Options Fırçayla Yeniden Yapılandırma Seçenekleri + Brush Tool Options Fırça Aracı Seçenekleri + Cache Level: Önbellek Düzeyi: + Camera Raw isn't open Camera Raw açık değil + Cancel İptal + Reset Sıfırla + Cancel (Esc) İptal (Esc) + Cancel any current edits (Esc) Mevcut düzenlemeleri iptal et (Esc) + Cancel current crop operation (Esc) Geçerli kırpma işlemini iptal et (Esc) + Cancel transform (Esc) Dönüşümü iptal et (Esc) + Cancel warp (Esc) Çözgüyü iptal et (Esc) + Canvas Kanvas + Canvas extension color: Kanvas uzatma rengi: + Capture Yakala + Capture the visibility, position and style of every layer with + below, then switch between versions. Aşağıdaki + ile her katmanın görünürlüğünü, konumunu ve stilini yakalayın, ardından sürümler arasında geçiş yapın. + Catch-up on Stroke End Strok Sonunda Yakalama + Center Merkez + Center Crop Marks Orta Kırpma İşaretleri + Center text Metni ortala + Change Değiştir + Change All Tümünü Değiştir + Change Screen Mode (F) Ekran Modunu Değiştir (F) + Change To: Şuna Değiştir: + Channel Mixer Kanal Mikseri + Channel: Kanal: + Check All Layers Tüm Katmanları Kontrol Et + Check Spelling Yazımı Kontrol Et + Clarity Netlik + Clear All Tümünü Temizle + Clear Override Geçersiz Kılmayı Temizle + Clear Samples Örnekleri Temizle + Click sets foreground · right-click sets background Ön planı ayarlar'a tıklayın · arka planı sağ tıklayın + Click the first point or press {key} to close · Esc cancels Kapatmak için ilk noktayı tıklayın veya {key} tuşuna basın · Esc iptal eder + Click to add a point · drag off or {key}-click or Delete to remove Nokta eklemek için tıklayın · sürükleyin veya {key} tuşuna basıp tıklayın veya kaldırmak için Sil + Click to apply, {key}-click to clear overrides, double-click for Style Options Uygulamak için tıklayın, geçersiz kılmaları temizlemek için {key}-tıklayın, Stil Seçenekleri için çift tıklayın + Click to edit the gradient Degradeyi düzenlemek için tıklayın + Click to restore the current colour Mevcut rengi geri yüklemek için tıklayın + Click to zoom in · {key}-click to zoom out · drag right/left to zoom in/out Yakınlaştırmak için tıklayın · {key}-uzaklaştırmak için tıklayın · yakınlaştırmak/uzaklaştırmak için sağa/sola sürükleyin + Click with the Note tool to add a note. Not eklemek için Not aracıyla tıklayın. + Click: corner · Drag: smooth · Click first point: close · {key} finish · Esc cancel Tıklayın: köşe · Sürükleyin: pürüzsüz · İlk noktaya tıklayın: kapat · {key} bitiş · Esc iptal + Click: corner · Drag: smooth · {alt}-drag: break handle · Click or drag first point: close · {key} finish · Esc cancel Tıklayın: köşe · Sürükleyin: pürüzsüz · {alt}-sürükleyin: tutamacı kırın · İlk noktayı tıklayın veya sürükleyin: kapat · {key} bitiş · Esc iptal + Clip to layer below Aşağıdaki katmana klip + Clipped Kırpılmış + Close Style Options Stil Seçeneklerini Kapat + Cmd Komut + Coated CMYK Kaplamalı CMYK + Color & Swatches Renk ve Renk Örnekleri + Color Balance Renk Dengesi + Color Detail Renk Detayı + Color Grading Renk Derecelendirmesi + Color Lookup Renk Arama + Color Management Renk Yönetimi + Color Mixer Renk Karıştırıcı + Color Mode Renk Modu + Color Priority Renk Önceliği + Color Range preview Renk Aralığı önizlemesi + Color: Renk: + Colorize Renklendir + Colors Renkler + Commit Perspective Warp ({key}) Perspektif Çarpıtma İşlemi ({key}) + Commit Puppet Warp ({key}) Kukla Çarpıtma İşlemi ({key}) + Commit any current edits ({key}) Mevcut düzenlemeleri tamamlayın ({key}) + Commit current crop operation ({key}) Geçerli kırpma işlemini gerçekleştir ({key}) + Commit transform ({key}) Dönüşümü kaydet ({key}) + Commit warp ({key}) Çözgü gerçekleştir ({key}) + Constant Sabit + Constrain proportions Oranları sınırla + Contact Sheet II İletişim Sayfası II + Content-Aware İçeriğe Duyarlı + Contiguous Bitişik + Contrast Kontrast + Control: Kontrol: + Convert document's colors to the working space Belgenin renklerini çalışma alanına dönüştürün + Convert to sRGB sRGB'ye dönüştür + Copies Kopyalar + Copper Bakır + Copyright Telif hakkı + Copyright and Contact Info Telif Hakkı ve İletişim Bilgileri + Corner Crop Marks Köşe Kırpma İşaretleri + Corner radius Köşe yarıçapı + Correction Düzeltme + Count Jitter Titreşimi say + Create Oluştur + Create Droplet Damlacık Oluştur + Create Texture Doku Oluştur + Create Video Timeline Video Zaman Çizelgesi Oluşturun + Create a new count group Yeni bir sayım grubu oluşturun + Create a new document or open an existing file. Yeni bir belge oluşturun veya mevcut bir dosyayı açın. + Create a new group Yeni bir grup oluştur + Create a new layer Yeni bir katman oluştur + Create new action Yeni eylem oluştur + Create new channel Yeni kanal oluştur + Create new document from current state Mevcut durumdan yeni belge oluştur + Create new fill or adjustment layer Yeni dolgu veya ayarlama katmanı oluştur + Create new gradient Yeni degrade oluştur + Create new group Yeni grup oluştur + Create new layer comp Yeni katman kompozisyonu oluştur + Create new pattern from the selection Seçimden yeni desen oluştur + Create new shape from the current path Geçerli yoldan yeni şekil oluştur + Create new snapshot Yeni anlık görüntü oluştur + Create new style (from the selected type) Yeni stil oluştur (seçilen türden) + Create new style from the selected layer Seçilen katmandan yeni stil oluştur + Create new tool preset Yeni araç ön ayarı oluştur + Crop Factor Mahsul Faktörü + Ctrl Ctrl + Current & Below Güncel ve Aşağıda + Current Layer Geçerli Katman + Current Size Mevcut Boyut + Current Tool Only Yalnızca Geçerli Araç + Curve Eğri + Curves Eğriler + Custom Özel + Custom Shapes Özel Şekiller + Cyan Camgöbeği + Cyan · Red Camgöbeği · Kırmızı + Darken Koyulaştır + Darks Karanlıklar + Data Sets Veri Setleri + Default Varsayılan + Default colours (D) Varsayılan renkler (D) + Default printer Varsayılan yazıcı + Default restored. Varsayılan geri yüklendi. + Define Tanımla + Define at least one variable first. İlk önce en az bir değişken tanımlayın. + Dehaze Buğu giderme + Delete Cropped Pixels Kırpılmış Pikselleri Sil + Delete Group Grubu Sil + Delete Layer Mask Katman Maskesini Sil + Delete Layers Katmanları Sil + Delete Shortcut Kısayolu Sil + Delete Timeline Zaman Çizelgesini Sil + Delete Tool Preset Araç Ön Ayarını Sil + Delete count group Sayım grubunu sil + Delete current channel Mevcut kanalı sil + Delete current state Mevcut durumu sil + Delete effect layer Efekt katmanını sil + Delete layer ‘{name}’? '{name}' katmanı silinsin mi? + Delete {count} layers? {names} {count} katman silinsin mi? {names} + Delete layer? Katman silinsin mi? + The document is closed Belge kapatıldı + The document or selected layers changed. Please request deletion again. Belge veya seçilen katmanlar değişti. Lütfen tekrar silme talebinde bulunun. + Missing delete command Silme komutu eksik + Invalid delete command Geçersiz silme komutu + Layer deleted, but confirmation preference could not be saved: {error} Katman silindi ancak onay tercihi kaydedilemedi: {error} + Delete layer Katmanı sil + Delete layer comp Katman kompozisyonunu sil + Delete note Notu sil + Delete selected measurements Seçilen ölçümleri sil + Delete style Stili sil + Delete tool preset Araç ön ayarını sil + Density Yoğunluk + Density: Yoğunluk: + Depth Derinlik + Depth Jitter Derinlik Değişimi + Description Açıklama + Deselect All Tümünün Seçimini Kaldır + Detail Detay + Diamond Gradient Elmas Degrade + Difference Fark + Diffusion Difüzyon + Discard the embedded profile (don't color manage) Gömülü profili atın (renk yönetimi yapmayın) + Discontiguous bitişik değil + Discord Discord + Dismiss Reddet + Display P3 Display P3 + Display Text Metni Görüntüle + Dither Titreşim + Divide… Böl… + Document Belge + Don't Save Kaydetme + No Hayır + Yes Evet + Done Bitti + Dots Noktalar + Drag a rectangle around the object Nesnenin çevresine bir dikdörtgen sürükleyin + Drag on the image to add a constraint; Shift for horizontal/vertical; right-click to delete. Kısıtlama eklemek için resmin üzerine sürükleyin; Yatay/dikey için kaydırma; silmek için sağ tıklayın. + Drag to move the active shape's path or the Work Path Etkin şeklin yolunu veya Çalışma Yolunu taşımak için sürükleyin + Click: select anchor · Drag: move anchor, handle or segment · {shift}-click: add · {alt}-click: whole subpath Tıklayın: çapayı seçin · Sürükleyin: çapayı, tutamacı veya parçayı taşıyın · {shift}-tıklayın: ekleyin · {alt}-tıklayın: alt yolun tamamı + Draw with the Pen tool (P) or make a work path from a selection. Kalem aracıyla (P) çizim yapın veya seçimden bir çalışma yolu oluşturun. + Drop an image or PSD anywhere to open it. Açmak için bir görüntüyü veya PSD'yi herhangi bir yere bırakın. + Native file drag-and-drop is unavailable Yerel dosya sürükle ve bırak özelliği kullanılamıyor + Native file drag-and-drop is not supported on Wayland yet. Use File › Open, or copy the image in your file manager and paste it with {paste}. Yerel dosya sürükle ve bırak özelliği henüz Wayland'de desteklenmiyor. Dosyayı Kullan › Aç veya resmi dosya yöneticinize kopyalayıp {paste} ile yapıştırın. + To drop files, start PhotoCraft under XWayland: `{command}` Dosyaları bırakmak için XWayland altında PhotoCraft'ı başlatın: `{command}` + Or set Preferences › Performance › Linux display server to X11: PhotoCraft then always starts under XWayland. Veya Tercihler › Performans › Linux görüntüleme sunucusunu X11: PhotoCraft olarak ayarlayın, ardından her zaman XWayland altında başlar. + Edit › Paste Düzenle › Yapıştır + Duplicate Layers… Katmanları Çoğalt… + Duplicate style Yinelenen stil + Edit Toolbar… Araç Çubuğunu Düzenle… + Use File › Open, or paste a copied image with {paste}. Dosya › Aç'ı kullanın veya kopyalanan görüntüyü {paste} ile yapıştırın. + Edit in Quick Mask Mode (Q) Hızlı Maske Modunda Düzenleme (Q) + Edit in Standard Mode (Q) Standart Modda Düzenleme (Q) + Effects Efektler + Embed Color Profile Renk Profilini Göm + Embedded Profile Mismatch Gömülü Profil Uyuşmazlığı + Enable airbrush-style build-up effects Airbrush stili oluşturma efektlerini etkinleştirin + Enhance Edge Kenarı Geliştir + Entire Font Yazı Tipinin Tamamı + Exact tam + Expansion: Genişleme: + Export Presets Ön Ayarları Dışa Aktarma + Export selected measurements (CSV) Seçilen ölçümleri dışa aktar (CSV) + Exposure Pozlama + Exposure and Gamma Pozlama ve Gama + Exposure: Pozlama: + Eyedropper Damlalık + Factor: Faktör: + Faux Bold Sahte Kalın + Faux Italic Sahte İtalik + Feather Tüy + Fewer Points Daha Az Puan + File Settings Dosya Ayarları + Fill Doldur + Fill: Doldurun: + Filter for adjustment layers Ayarlama katmanları için filtre + Filter for pixel layers Piksel katmanları için filtre + Filter for shape layers Şekil katmanları için filtre + Filter for smart objects Akıllı nesneler için filtre + Filter for type layers Yazım katmanları için filtre + Filter: Filtre: + Finger Painting Parmak Boyama + Fisheye Balıkgözü + Fit Uygun + Fit Screen Ekrana Sığdır + Fill Screen Doldurma Ekranı + Fit in View Görünüme Sığdır + Fixed Sabit + Fixed Ratio Sabit Oran + Fixed Size Sabit Boyut + Flip Çevir + Flip X X'i Çevir + Flip X Jitter X Değişimini Çevir + Flip Y Y Çevirme + Flip Y Jitter Çevir Y Titreşimi + Flow Akış + Flow Jitter Akış Değişimi + Focal Length Odak Uzunluğu + Font Yazı tipi + Font Size: Yazı Tipi Boyutu: + Font size Yazı tipi boyutu + Foreground Ön plan + Foreground to Background Ön Plandan Arka Plana + Foreground/Background Jitter Ön Plan/Arka Plan Değişimi + Format Biçim + Frame from Layers… Katmanlardan Çerçeve… + Free Ücretsiz + Full Spherical Tam Küresel + Fuzziness: Bulanıklık: + GPU GPU + Gamma Correction Gama Düzeltmesi + Gamma: Gama: + Global Küresel + Glow Color Parıltılı Renk + Gradient Map Gradyan Haritası + Grain Tahıl + Gray Gri + Gray Gamma 2.2 Gri Gama 2.2 + Green Yeşil + Group Grup + Hardness Sertlik + Heart Kalp + Height Yükseklik + Height: Yükseklik: + Hide Auto Slices Otomatik Dilimleri Gizle + Hide Properties Özellikleri Gizle + Highlight Compression Sıkıştırmayı Vurgula + Highlight Priority Önceliği Vurgula + Highlights Öne Çıkanlar + Home Ana sayfa + Horizontal scale Yatay ölçek + Hue Renk Tonu + Hue Jitter Ton Değişimi + Hue/Saturation Ton/Doygunluk + Hyphenate Tireleme + Ignore Yoksay + Ignore All Tümünü Yoksay + Image Size Resim Boyutu + Import Brushes… Fırçaları İçe Aktar… + Import brushes (.abr) Fırçaları içe aktar (.abr) + Import Presets Ön Ayarları İçe Aktar + Imported İthal + Indent First Önce Girintiyi Girin + Indent Left Sola Girinti + Indent Right Sağa Girinti + Indent first line İlk satıra girinti koy + Indent left margin Sol kenar boşluğunu girintile + Indent right margin Sağ kenar boşluğuna girinti + Input: Giriş: + Inside İçeride + Interlaced Taramalı + Interpolation: Enterpolasyon: + Intersect with selection ({key}) Seçimle kesiştir ({key}) + Invert All Tümünü Ters Çevir + Invert has no settings. Tersine çevirmenin hiçbir ayarı yoktur. + Italic italik + Join us on Discord Discord'da bize katılın + Justify all Hepsini gerekçelendir + Justify last centered Son ortayı iki yana yasla + Justify last left Son sola yasla + Justify last right Son sağa yasla + Kerning Karakter Aralığı + Keyboard Shortcuts Klavye Kısayolları + Keyboard Shortcuts and Menus Klavye Kısayolları ve Menüler + Kind tür + Label Size Etiket Boyutu + Labels Etiketler + Lanczos (sharp) Lanczos (keskin) + Landscape Manzara + Last Document State Son Belge Durumu + Layout Düzen + Leading Lider + Leading (set to the font size × auto-leading when Auto) Satır Aralığı (Otomatik olduğunda yazı tipi boyutu × otomatik satır aralığına ayarlanır) + Leave as is (don't color manage) Olduğu gibi bırakın (renk yönetimi yapmayın) + Left align text Metni sola hizala + Length: Uzunluk: + Level Seviye + Levels Seviyeler + Lighten Açıklaştır + Lightness hafiflik + Lights Işıklar + Limits: Sınırlar: + Linear Gradient Doğrusal Degrade + Link layers Katmanları bağlayın + Link width and height Bağlantı genişliği ve yüksekliği + Liquify is not open Sıvılaştırma açık değil + Load Yükle + Load 3D LUT… 3D LUT'u yükleyin… + Load channel as selection Kanalı seçim olarak yükle + Load… Yükle… + Localized Color Clusters Yerelleştirilmiş Renk Kümeleri + Lock Kilit + Lock all Tümünü kilitle + Lock image pixels Resim piksellerini kilitle + Lock layer Katmanı kilitle + Lock position Kilit konumu + Lock transparent pixels Şeffaf pikselleri kilitle + Lock: Kilit: + Logical Length: Mantıksal Uzunluk: + Logical Units: Mantıksal Birimler: + Luminance parlaklık + Luminance Detail Parlaklık Detayı + Magenta Macenta + Magenta · Green Macenta · Yeşil + Maintain aspect ratio En boy oranını koru + Marker Size İşaretleyici Boyutu + Mask All Tümünü Maskele + Mask Options Maske Seçenekleri + Masking Maskeleme + Master Usta + Matte Mat + Median: Medyan: + Menus Menüler + Mesh Size Örgü Boyutu + Metadata Meta veriler + Metrics Metrikler + Midpoint Orta nokta + Midtones Orta tonlar + Midtones from: Orta tonlar: + Midtones to: Orta tonlar: + Minimum Depth Minimum Derinlik + Minimum Diameter Minimum Çap + Minimum Roundness Minimum Yuvarlaklık + Mode: Mod: + Monochrome Tek renkli + More Points Daha Fazla Puan + Move effect layer down Efekt katmanını aşağı taşı + Move effect layer up Efekt katmanını yukarı taşı + Move to Şuraya taşı: + Name Ad + Name: Ad: + Nearest Neighbor En Yakın Komşu + Nearest Neighbor (hard edges) En Yakın Komşu (sert kenarlar) + New Size Yeni Boyut + New document… Yeni belge… + New effect layer Yeni efekt katmanı + New selection Yeni seçim + Next frame Sonraki kare + Next note Sonraki not + No Color Renk Yok + No Color Management Renk Yönetimi Yok + No Dither Titreşim Yok + No author Yazar yok + No character style Karakter stili yok + No document Belge yok + No matching commands Eşleşen komut yok + No presets for the current tool. Geçerli araç için ön ayar yok. + No presets of this type. Bu türden ön ayar yok. + No properties Mülk yok + No tool presets. Araç ön ayarı yok. + Noise Reduction Gürültü Azaltma + Normal Normal + Not in Dictionary: Sözlükte Yok: + OK Tamam + Offset Ofset + Only Web Colors Yalnızca Web Renkleri + Opacity Opaklık + Opacity Jitter Opaklık Değişimi + Opacity: Opaklık: + Open a document to define variables. Değişkenleri tanımlamak için bir belge açın. + Open a document to select a colour range. Bir renk aralığı seçmek için bir belge açın. + Open a document to use the timeline. Zaman çizelgesini kullanmak için bir belge açın. + Optical Optik + Optimized Optimize edilmiş + Option-click to define a source point to clone from Kopyalanacak bir kaynak noktası tanımlamak için Option tuşunu basılı tutarak tıklayın + Original Orijinal + Output Channel: Çıkış Kanalı: + Output Levels: Çıkış Seviyeleri: + Output: Çıkış: + Outside Dışarıda + Overlay Color Kaplama Rengi + Overlay Opacity Kaplama Opaklığı + Overlay: Rule of Thirds Kaplama: Üçte Bir Kuralı + Override Pressure Basıncı Geçersiz Kıl + Override Rotation Döndürmeyi Geçersiz Kıl + Override Tilt Eğimi Geçersiz Kıl + PRESET DETAILS ÖN AYAR DETAYLARI + PSD PSD + Paint Overlay Boya Kaplaması + Panel locations are saved in the workspace. Keyboard shortcuts, menus and toolbar are optional. Panel konumları çalışma alanına kaydedilir. Klavye kısayolları, menüler ve araç çubuğu isteğe bağlıdır. + Paper Kağıt + Path Yol + Pattern Desen + Pattern Size Desen Boyutu + Pause Duraklat + Percent Yüzde + Perceptual algısal + Perspective Warp is not active Perspektif Çarpıtma etkin değil + Perspective Warp: draw planes along the image's perspective, then switch to Warp Perspektif Çarpıtma: görüntünün perspektifi boyunca düzlemler çizin, ardından Çarpıtma'ya geçin + Photo Filter Fotoğraf Filtresi + PhotoCraft PhotoCraft + PhotoCraft Manages Colors PhotoCraft Renkleri Yönetir + PhotoCraft — an open-source, native image editor written in Rust. PhotoCraft — Rust'ta yazılmış açık kaynaklı, yerel bir resim düzenleyici. + Pin Depth: Pim Derinliği: + Pixel Length: Piksel Uzunluğu: + Pixels/Centimeter Piksel/Santimetre + Pixels/Inch Piksel/İnç + Pixels: Piksel: + Play Oyna + Play selection Seçimi oynat + Portrait Portre + Position Pozisyon + Position and Size Konum ve Boyut + Posterize Posterleştir + Preserve Details Ayrıntıları Koru + Preserve Luminosity Parlaklığı Koru + Preset Ön ayar + Preset Type Ön Ayar Türü + Preset: Ön ayar: + Presets: Ön ayarlar: + Press keys… Tuşlara basın… + Pressure Basınç + Pressure for Opacity Opaklık Basıncı + Pressure for Size Boyuta Göre Basınç + Prevent auto-nesting in and out of Artboards and Frames Çalışma Yüzeyleri ve Çerçevelerin içine ve dışına otomatik yerleştirmeyi önleyin + Preview Önizleme + Previous frame Önceki çerçeve + Previous note Önceki not + Print Yazdır + Printer Yazıcı + Printer Manages Colors Yazıcı Renkleri Yönetir + Printer Setup Yazıcı Kurulumu + Printing Marks Baskı İşaretleri + Progressive Aşamalı + Promote Tanıt + Protect Detail Detayı Koruyun + Protect Foreground Color Ön Plan Rengini Koruyun + Protect Tones Tonları Koruyun + Proximity Match Yakınlık Eşleşmesi + Pulled String Mode Çekilmiş Dize Modu + Puppet Warp is not active Kukla Çarpıtma etkin değil + Purity saflık + Quality Kalite + Quick Actions Hızlı Eylemler + Quick Export As PNG PNG Olarak Hızlı Dışa Aktarma + Radial Gradient Radyal Gradyan + Radius Yarıçap + Radius: Yarıçap: + Range: Aralık: + Rate Oran + Recently Used Son Kullanılanlar + Reconstruct Yeniden inşa et + Record ● a sequence of edits, then play ▶ it on any document. Bir dizi düzenlemeyi kaydedin ● ve ardından herhangi bir belgede oynatın. + Red Kırmızı + Redefine style by current selection Stili geçerli seçime göre yeniden tanımlayın + Refine Hassaslaştır + Reflected Gradient Yansıyan Degrade + Registration Marks Tescil İşaretleri + Regular Düzenli + Relative akraba + Relative Colorimetric Bağıl Kolorimetrik + Remove Kaldır + Remove All Pins Tüm Pinleri Kaldır + Remove Background Arka Planı Kaldır + Remove Planes Uçakları Kaldır + Remove stop Durağı kaldır + Remove variable Değişkeni kaldır + Rename Yeniden adlandır + Rename Group… Grubu Yeniden Adlandır… + Rename Layer… Katmanı Yeniden Adlandır… + Rename Tool Preset… Araç Ön Ayarını Yeniden Adlandır… + Rename… Yeniden adlandır… + Resample Yeniden örnekle + Reset All to Defaults Tümünü Varsayılanlara Sıfırla + Import Shortcuts… Kısayolları İçe Aktar… + Load a keyboard shortcut set saved as .kys .kys olarak kaydedilen bir klavye kısayolu kümesi yükleyin + Imported {n} shortcuts from {file}. Click OK to keep them. {n} kısayolları {file} adresinden içe aktarıldı. Bunları saklamak için Tamam'ı tıklayın. + {n} commands are not in PhotoCraft. {n} komutları PhotoCraft'ta değil. + Keyboard shortcuts imported İçe aktarılan klavye kısayolları + Your keyboard shortcut set {set} is in use here: {n} shortcuts differ from the defaults. Edit › Keyboard Shortcuts shows them; Reset All to Defaults undoes this. {set} klavye kısayol grubunuz burada kullanılıyor: {n} kısayolları varsayılanlardan farklı. Düzenle › Klavye Kısayolları bunları gösterir; Tümünü Varsayılanlara Sıfırla bu işlemi geri alır. + Import keyboard shortcuts? Klavye kısayolları içe aktarılsın mı? + PhotoCraft found your keyboard shortcut set {set} from another image editor on this computer: {n} of its shortcuts differ from PhotoCraft's. Import it? PhotoCraft, {set} klavye kısayol setinizi bu bilgisayardaki başka bir resim düzenleyicide buldu: {n} kısayolları PhotoCraft'ınkilerden farklı. İçe aktarılsın mı? + Edit › Keyboard Shortcuts › Reset All to Defaults undoes an import. Düzenle › Klavye Kısayolları › Tümünü Varsayılanlara Sıfırla, içe aktarma işlemini geri alır. + Don't Import İçe Aktarma + The keyboard shortcut set was not imported: {error} Klavye kısayol seti içe aktarılmadı: {error} + Reset Section Bölümü Sıfırla + Reset Transform Dönüşümü Sıfırla + Reset to defaults Varsayılanlara sıfırla + Resolution Çözünürlük + Resolution: Çözünürlük: + Restore All Tümünü Geri Yükle + Restore Defaults Varsayılanları Geri Yükle + Restrictive (Web) Kısıtlayıcı (Web) + Right align text Metni sağa hizala + Rigid Sert + Rotate: Döndür: + Rotation Döndürme + Roughness Pürüzlülük + Roundness Yuvarlaklık + Roundness Jitter Yuvarlaklık Değişimi + Rulers & Grids Cetveller ve Izgaralar + Sample All Layers Tüm Katmanları Örnekle + Sample: Örnek: + Sampling: Background Swatch Örnekleme: Arka Plan Renk Örneği + Sampling: Continuous Örnekleme: Sürekli + Sampling: Once Örnekleme: Bir kez + Saturate Doygunluk + Saturation Doygunluk + Saturation Jitter Doygunluk Değişimi + Save HTML and Images HTML ve Görselleri Kaydet + Save as PDF PDF olarak kaydet + Save selection as channel Seçimi kanal olarak kaydet + Save… Kaydet… + Scale to Fit Media Medyaya Sığacak Şekilde Ölçeklendirin + Scatter Dağılım + Scratch disks Kazıma diskleri + Search Ara + Search commands Arama komutları + Search commands, tools and panels… Komutları, araçları ve panelleri arayın… + Search fonts Yazı tiplerini arayın + Select All Tümünü Seç + Select Subject Konuyu Seçin + Select a type layer or click into text to insert glyphs Bir yazım katmanı seçin veya glif eklemek için metne tıklayın + Select text to apply a character style Karakter stili uygulamak için metni seçin + Select: Seçin: + Selections Seçimler + Selective seçici + Selective Color Seçici Renk + Send the selected pin backward Seçilen pini geriye gönder + Set additional smoothing options Ek yumuşatma seçeneklerini ayarlayın + Set background color Arka plan rengini ayarla + Set foreground color Ön plan rengini ayarla + Set painting symmetry options Boyama simetrisi seçeneklerini ayarlama + Symmetry Off Simetri Kapalı + Set shape fill type Şekil doldurma türünü ayarla + Set shape stroke type Şekil kontur türünü ayarlama + Set the text color Metin rengini ayarlama + Shadows Gölgeler + Shape: Şekil: + Sharpening Bileme + Shift Shift + Shortcut removed. Kısayol kaldırıldı. + Show All Menu Items Tüm Menü Öğelerini Göster + Show Backdrop Arka Planı Göster + Show Guides Kılavuzları Göster + Show Mask Maskeyi Göster + Show Mesh Mesh'i Göster + Show Overlay Kaplamayı Göster + Show Transform Controls Dönüştürme Kontrollerini Göster + Show or hide the Notes panel Notlar panelini gösterme veya gizleme + Show: Göster: + Sides Taraflar + Sides: Taraflar: + Size Boyut + Size Jitter Boyut Değişimi + Size: Boyut: + Slice Options… Dilim Seçenekleri… + Slices From Guides Kılavuzlardan Dilimler + Slices are locked (View › Lock Slices) Dilimler kilitlidir (Görünüm › Dilimleri Kilitle) + Small Caps Küçük Büyük Harfler + Smoothing Pürüzsüzleştirme + Space After Sonraki Boşluk + Space Before Önceki Boşluk + Spacing Aralık + Spell check complete. Yazım denetimi tamamlandı. + Split: Bölünmüş: + Star ratio Yıldız oranı + Stop playing/recording Oynatmayı/kaydetmeyi durdur + Straighten Düzelt + Straighten Layer Katmanı Düzleştir + Strength: Güç: + Strikethrough Üstü çizili + Stroke Kontur + Stroke Catch-up İnme Yakalama + Stroke: İnme: + Style Stil + Style Options Stil Seçenekleri + Style Options… Stil Seçenekleri… + Style: Normal Tarz: Normal + Subtract from Sample Örnekten Çıkart + Subtract from selection ({key}) Seçimden çıkar ({key}) + Suggestions: Öneriler: + Swap colours (X) Renkleri değiştir (X) + Swaps height and width Yüksekliği ve genişliği değiştirir + Switch between free transform and warp modes Serbest dönüştürme ve çarpıtma modları arasında geçiş yapın + Switch theme Temayı değiştir + Temperature Sıcaklık + Tetrahedral dörtyüzlü + Text Position: Metin Konumu: + Texture Doku + Texture Each Tip Her Ucu Doku + Threshold Eşik + Threshold Level Eşik Seviyesi + Thumbnail size (smallest: list) Küçük resim boyutu (en küçük: liste) + Tilt X X'i yatır + Tilt Y Y Eğimi + Tint Renk tonu + Toggle count group visibility Sayım grubu görünürlüğünü değiştir + Toggle text orientation Metin yönünü değiştir + Tolerance Tolerans + Tolerance: Tolerans: + Tone: Ton: + Toolbar Araç Çubuğu + Top Üst + Total: Toplam: + Tracking Takip + Tracking (1/1000 em) Takip (1/1000 em) + Transparency Şeffaflık + Transparent Şeffaf + Trilinear Üç çizgili + Type Styles Tip Stilleri + Type: Tür: + Underline Altı çizili + Untitled İsimsiz + Untitled-1 İsimsiz-1 + Update layer comp (visibility, position and appearance) Katman kompozisyonunu güncelleyin (görünürlük, konum ve görünüm) + Use Default Varsayılanı Kullan + Use Legacy Eskiyi Kullan + Use Measurement Scale Ölçüm Ölçeğini Kullan + Use the embedded profile (instead of the working space) Gömülü profili kullanın (çalışma alanı yerine) + Variables bind a layer's visibility, text or pixels to a named data slot. Değişkenler bir katmanın görünürlüğünü, metnini veya piksellerini adlandırılmış bir veri yuvasına bağlar. + Vertical scale Dikey ölçek + Vibrance Canlılık + View Options Seçenekleri Görüntüle + Vignetting Kenar ayrıntısı kaybı + Violet, Orange Menekşe, Turuncu + Visibility Görünürlük + Visible Görünür + Warp: Çözgü: + Web Snap Web Snap + Weight Ağırlık + Weight: Ağırlık: + White Beyaz + White Balance: As Shot Beyaz Dengesi: Çekildiği Gibi + Whites Beyazlar + Width Genişlik + Slant Eğimli + Width: Genişlik: + Work Path Çalışma Yolu + Yellow Sarı + Yellow · Blue Sarı · Mavi + Zoom Yakınlaştır + Zoom in Yakınlaştır + Zoom out Uzaklaştır + command or shortcut komut veya kısayol + current akım + image file path resim dosyası yolu + modified değiştirilmiş + name isim + new yeni + {name} options {name} seçenekler + ↑↓ navigate {key} run esc close ↑↓ gezin {key} çalıştır esc kapat + Version {version} Sürüm {version} + New Document Yeni Belge + New Document With Mask Maskeli Yeni Belge + New Layer With Mask Maskeli Yeni Katman + Save Preset… Ön Ayarı Kaydet… + Preset Name Ön Ayar Adı + No saved presets yet. Henüz kayıtlı ön ayar yok. + Error Hata + Command Komut + Adjustment layers have nothing to transform Ayarlama katmanlarının dönüştürülecek hiçbir şeyi yok + Altitude Rakım + Android 1080p Android1080p + Apple Watch 45mm Apple Watch 45mm + Aqua Su + Art & Illustration Sanat ve İllüstrasyon + ArtCraft ArtCraft + Background Eraser Tool Arka Plan Silgisi Aracı + Bevel & Emboss Eğim Ver ve Kabart + Blend Mode Karışım Modu + Blues Blues + Blur Tool Bulanıklık Aracı + Bold Kalın + Brush Fırça + Block Blok + Brush Pose Fırça Duruşu + Brush Tip Shape Fırça Ucu Şekli + Brush Tool Fırça Aracı + Build-up İnşaat + Burn Tool Koyulaştırma Aracı + Centimeters Santimetre + Choke Şok + Classic Klasik + Click to add text Metin eklemek için tıklayın + Click to fill similar colours Benzer renkleri doldurmak için tıklayın + Clone Stamp Tool Klonlama Damgası Aracı + Color Burn Renk Yanması + Color Dodge Renk Soldurma + Color Dynamics Renk Dinamiği + Color Overlay Renk Kaplaması + Comic Book Çizgi Roman + Conform Uygun + Content-Aware Fill needs a selection on a pixel layer İçeriğe Uygun Dolgu, piksel katmanında seçim yapılmasını gerektirir + Could not transform: the layer is empty Dönüştürülemedi: katman boş + Could not use Perspective Warp: the layer is empty Perspektif Çarpıtma kullanılamadı: katman boş + Could not use Puppet Warp: no opaque pixels Puppet Warp kullanılamadı: opak piksel yok + Could not use Puppet Warp: the layer is empty Puppet Warp kullanılamadı: katman boş + Crop Tool Kırpma Aracı + Crosswise Çapraz olarak + Current Tool Güncel Araç + Custom Shape Tool Özel Şekil Aracı + Cyans Camgöbeği + Default PhotoCraft Size Varsayılan PhotoCraft Boyutu + Delete Workspace Çalışma Alanını Sil + Diamond Elmas + Dimensions: Boyutlar: + Direction Yön + Distance Uzaklık + Document Dimensions Belge Boyutları + Document Profile Belge Profili + Document Sizes Belge Boyutları + Dodge Tool Açıklaştırma Aracı + Down Aşağı + Drag to draw a gradient Degrade çizmek için sürükleyin + Drag to move the active layer Etkin katmanı taşımak için sürükleyin + Drag to pan · hold Space with any tool Kaydırmak için sürükleyin · herhangi bir araçla Space tuşunu basılı tutun + Drop Shadow Alt Gölge + Dual Brush Çift Fırça + Edge Kenar + Efficiency Verimlilik + Efficiency: 100% Verimlilik: %100 + Ellipse Tool Elips Aracı + Elliptical Marquee Tool Eliptik İşaretleme Aracı + Single Row Marquee Tool Tek Satır İşaretleme Aracı + Single Column Marquee Tool Tek Sütun İşaretleme Aracı + Emboss Kabartma + Eraser Silgi + Eraser Tool Silgi Aracı + ExtraBold Ekstra Kalın + ExtraLight Ekstra Hafif + Eyedropper Tool Damlalık Aracı + Fade Solmaya + Fill Opacity Dolgu Opaklığı + Film & Video Film ve Video + From Gönderen + General Genel + GitHub GitHub + Gradient Overlay Degrade Yerleşimi + Gradient Tool Degrade Aracı + Greens Yeşiller + Hand Tool El Aracı + Hard Sert + Hard Mix Sert Karışım + Healing Brush Tool Düzeltme Fırçası Aracı + Highlights from: Öne çıkanlar: + History Brush Tool Geçmiş Fırçası Aracı + Horizontal Type Tool Yatay Metin Aracı + Horizontal Type Mask Tool Yatay Metin Maskesi Aracı + Vertical Type Mask Tool Dikey Metin Maskesi Aracı + Image Size: Resim Boyutu: + Inches İnç + Indexed Dizine eklendi + Initial Direction Başlangıç Yönü + Inner Bevel İç Eğim + Inner Glow İç Işıma + Inner Shadow İç Gölge + Lab Lab + Landscape, 10 x 8 Yatay, 10 x 8 + Landscape, 6 x 4 Yatay, 6 x 4 + Landscape, 7 x 5 Yatay, 7 x 5 + Lasso Kement + Lasso Tool Kement Aracı + Layer Count Katman Sayısı + Layer Knocks Out Drop Shadow Katman Alt Gölgeyi Ortadan Kaldırır + Legal Yasal + Letter Mektup + Light Işık + Line Tool Çizgi Aracı + Linear Doğrusal + Linear Burn Doğrusal Yanma + Linear Height Doğrusal Yükseklik + Link with Layer Katmanla Bağlantı + Lorem Ipsum Lorem İpsum + Magentas Macentalar + Magic Eraser Tool Sihirli Silgi Aracı + Magic Wand Tool Sihirli Değnek Aracı + Marquee Seçim Çerçevesi + Mean: Anlamı: + Measurement Scale Ölçüm Ölçeği + Measurement Scale Marker Ölçüm Ölçeği İşaretleyicisi + Millimeters Milimetre + Mobile Mobil + Move Tool Taşıma Aracı + Could not use the move tool because the layer is locked. Katman kilitli olduğundan taşıma aracı kullanılamadı. + Could not complete the Free Transform command because the layer is locked. Katman kilitli olduğundan Serbest Dönüştürme komutu tamamlanamadı. + Multiply Çoğalt + My Brushes Fırçalarım + Neutrals Nötrler + New Workspace Yeni Çalışma Alanı + Note Tool Not Aracı + Object Selection Tool Nesne Seçme Aracı + Off Kapalı + Open Aç + Orange Turuncu + Original Ratio Orijinal Oran + Out Of Gamut Gamut Dışı + Outer Bevel Dış Eğim + Outer Glow Dış Parıltı + Overlay Kaplama + Paint Bucket Tool Boya Kovası Aracı + Paints from the document's opening state Belgenin açılış durumundaki boyalar + Path Selection Tool Yol Seçimi Aracı + Direct Selection Tool Doğrudan Seçim Aracı + Add Anchor Point Tool Bağlantı Noktası Ekleme Aracı + Delete Anchor Point Tool Bağlantı Noktası Silme Aracı + Click a segment to add an anchor point · {alt}-click an anchor to delete it Bağlantı noktası eklemek için bir segmenti tıklayın · {alt}-silmek için bir bağlantıyı tıklayın + Click an anchor point to delete it · {alt}-click a segment to add one Silmek için bir bağlantı noktasını tıklayın · {alt}-bir parça eklemek için bir parçayı tıklayın + Pattern Overlay Desen Yerleşimi + Pen Pressure Kalem Basıncı + Pen Tilt Kalem Eğimi + Pen Tool Kalem Aracı + Convert Point Tool Nokta Dönüştürme Aracı + Photo Fotoğraf + PhotoCraft website PhotoCraft web sitesi + Picas Pikalar + Pillow Emboss Yastık Kabartma + Pixel Replacement Piksel Değiştirme + Pixels Piksel + Points Puanlar + Polygon Tool Çokgen Aracı + Polygonal Lasso Tool Çokgen Kement Aracı + Portrait, 4 x 6 Portre, 4 x 6 + Portrait, 5 x 7 Portre, 5 x 7 + PostScript (72 points/inch) PostScript (72 nokta/inç) + Postcard Kartpostal + Poster Poster + Pro (Dark) Pro (Koyu) + Pro (Light) Pro (Hafif) + Pro (Light Gray) Pro (Açık Gri) + Pro (Medium Gray) Pro (Orta Gri) + Protect Texture Dokuyu Koruyun + Purple Mor + Quick Mask Hızlı Maske + Quick Selection Tool Hızlı Seçim Aracı + Radial Radyal + Rasterize Layer Katmanı Rasterleştir + Rasterize Layers Katmanları Rasterleştir + Ratio Oran + Recent Son + Rectangle Tool Dikdörtgen Aracı + Rectangular Marquee Tool Dikdörtgen İşaretleme Aracı + Reds Kırmızılar + Reflected Yansıyan + Sample: foreground colour Örnek: ön plan rengi + Sampled Colors Örneklenen Renkler + Satin Saten + Save Pixel Aspect Ratio Piksel En Boy Oranını Kaydet + Scattering Saçılma + Scratch Sizes Çizik Boyutları + Select Data Points Veri Noktalarını Seçin + Selection Seçim + SemiBold Yarı Kalın + Shadows up to: Şuna kadar gölgeler: + Shape Dynamics Şekil Dinamiği + Sharpen Tool Keskinleştirme Aracı + Show Extras Options Ekstra Seçeneklerini Göster + Slice Select Tool Dilim Seçme Aracı + Slice Tool Dilim Aracı + Smart Filters Akıllı Filtreler + Smudge Tool Leke Aracı + Soft Yumuşak + Soften Yumuşat + Source Kaynak + Source: set Kaynak: ayarlandı + Sponge Tool Sünger Aracı + Spot Healing Brush Tool Nokta Düzeltme Fırçası Aracı + Spread Yayılma + Square, 12 x 12 Kare, 12x12 + Square, 5 x 5 Kare, 5x5 + Std Dev: Standart Geliştirme: + Studio (Dark) Stüdyo (Karanlık) + Studio (Light) Stüdyo (Işık) + Stylus Wheel Kalem Tekerleği + Subtract Çıkar + Tabloid Tabloid + Text Replacement Metin Değiştirme + Thin İnce + Traditional (72.27 points/inch) Geleneksel (72,27 nokta/inç) + Transfer Aktarım + Triangle Tool Üçgen Aracı + Unsaved changes Kaydedilmemiş değişiklikler + Uses the foreground and background colours. Ön plan ve arka plan renklerini kullanır. + Web ağ + Web Large Web Büyük + Web Minimum Web Minimumu + Web Most Common Web En Yaygın + WebP (lossless) WebP (kayıpsız) + Wet Edges Islak Kenarlar + Yellows Sarılar + Zoom Tool Yakınlaştırma Aracı + {name} Properties {name} Özellikler + Revert “{name}” to the last saved version? Your changes will be lost. “{name}” son kaydedilen sürüme döndürülsün mü? Değişiklikleriniz kaybolacak. + Do you want to save the changes you made to “{name}” before quitting? Çıkmadan önce “{name}” öğesinde yaptığınız değişiklikleri kaydetmek istiyor musunuz? + Do you want to save the changes you made to “{name}” before closing? Kapatmadan önce “{name}” üzerinde yaptığınız değişiklikleri kaydetmek istiyor musunuz? + Doc: {flat}/{layered} Doküman: {flat}/{layered} + Scratch: {size} Çizik: {size} + Untagged {mode} Etiketlenmemiş {mode} + Invalid {mode} profile Geçersiz {mode} profili + Unnamed {mode} profile Adsız {mode} profili + {w} px x {h} px ({ppi} ppi) {w} px x {h} px ({ppi} ppi) + {w} {unit} x {h} {unit} ({ppi} ppi) {w} {unit} x {h} {unit} ({ppi} ppi) + Resolution: {dpi} pixels/inch Çözünürlük: {dpi} piksel/inç + Doc: {w} × {h} px Doküman: {w} × {h} piksel + Frame {current} / {total} Çerçeve {current} / {total} + Count: {n} Sayım: {n} + BLANK DOCUMENT PRESETS ({n}) BOŞ BELGE ÖN AYARLARI ({n}) + Constraints ({n}) Kısıtlamalar ({n}) + Align {what} {what} hizala +@plural {n} Layer|{n} Layers {n} Katman +@plural {n} layer|{n} layers {n} katman +@plural Group · {n} layer|Group · {n} layers Grup · {n} katman + Additional plugins folder Ek eklentiler klasörü + Adobe Adobe + Adobe rgb Adobe rgb + Allow agent control Aracı kontrolüne izin ver + Allow scripts to connect Komut dosyalarının bağlanmasına izin ver + Always Her zaman + Always create smart objects when placing Yerleştirirken daima akıllı nesneler yaratın + Animated zoom Animasyonlu yakınlaştırma + Apply auto tone Otomatik tonu uygula + Ask Sor + Ask before saving layered tiff Katmanlı tiff'i kaydetmeden önce sor + Auto collapse icon panels Simge panellerini otomatik daralt + Auto show hidden panels Gizli panelleri otomatik göster + Auto show home screen Ana ekranı otomatik göster + Autosave Otomatik kaydetme + Autosave minutes Dakikaları otomatik kaydet + Beep when done Bittiğinde bip sesi + Bicubic automatic Bikübik otomatik + Bicubic sharper Bikübik daha keskin + Bicubic smoother Bikübik daha pürüzsüz + Bit depth Bit derinliği + Brush preview color Fırça önizleme rengi + Cache levels Önbellek düzeyleri + Cache tile size Önbellek kutucuğu boyutu + Camera Raw Defaults Camera Raw Varsayılanları + Canvas border Kanvas kenarlığı + Show canvas dots Kanvas noktalarını göster + Canvas color Kanvas rengi + Canvas custom color Kanvas özel rengi + Color picker Renk seçici + Color space Renk alanı + Column width Sütun genişliği + Concise Kısa + Control port Kontrol portu + Convert to srgb srgb'ye dönüştür + Cursors İmleçler + Custom dark Özel koyu + Custom light Özel ışık + Dark Karanlık + Dark gray Koyu gri + Dashed lines Kesikli çizgiler + Destination Hedef + Detailed Detaylı + Disks Diskler + Display p3 Ekran p3 + Double click layer mask launches select and mask Çift tıklama katman maskesi seçme ve maskelemeyi başlatır + Drop shadow Alt gölge + Dynamic color sliders Dinamik renk kaydırıcıları + East asian Doğu Asya + Effect cache mb Efekt önbelleği mb + Enable flick panning Hızlı kaydırmayı etkinleştir + Enable floating document window docking Kayan belge penceresi yerleştirmeyi etkinleştir + Enable narrow options bar Dar seçenekler çubuğunu etkinleştir + Enabled Etkin + Enhanced Controls Gelişmiş Kontroller + Export clipboard Panoyu dışa aktar + Extra large Ekstra büyük + File Handling Dosya İşleme + File path Dosya yolu + Fill new type layers with placeholder Yeni yazı katmanlarını yer tutucuyla doldurma + Font preview Yazı tipi önizlemesi + Full size tip Tam boyutlu uç + Gamut warning color Gamut uyarı rengi + Gamut warning opacity Gamut uyarı opaklığı + Generator enabled Jeneratör etkin + Gif Gif + Glossy parlak + Grid color Izgara rengi + Grid colors Izgara renkleri + Grid size Izgara boyutu + Grid style Izgara stili + Grid unit Izgara ünitesi + Gridline every Kılavuz çizgisi her + Guide color Kılavuz rengi + Guide style Kılavuz stili + Guides, Grid & Slices Kılavuzlar, Izgaralar ve Dilimler + Gutter Oluk + History Log Geçmiş Günlüğü + History states Tarih durumları + Ignore exif profile tag Exif profil etiketini yoksay + Image interpolation Görüntü enterpolasyonu + Image previews Resim önizlemeleri + Integrations Entegrasyonlar + Interface Arayüz + Jpeg quality JPEG kalitesi + Jpg Jpg + Language Dil + Large tabs Büyük sekmeler + Legacy compositing Eski birleştirme + Light gray Açık gri + Line Hat + Lines çizgiler + Lossless Kayıpsız + Lowercase extension Küçük harf uzantısı + Maximize psd compatibility PSD uyumluluğunu en üst düzeye çıkarın + Medium gray Orta gri + Memory usage mb Bellek kullanımı mb + Low resolution previews Düşük çözünürlüklü önizlemeler + Missing glyph protection Glif koruması eksik + Modern Çağdaş + Nearest neighbor En yakın komşu + Never Asla + Normal tip Normal uç + Open as smart object Akıllı nesne olarak aç + Open in camera raw Camera raw'da aç + Open documents as tabs Belgeleri sekmeler halinde aç + Overscroll Aşırı kaydırma + Performance Performans + Png png + Point size Nokta boyutu + Precise Hassas + Preserve details Ayrıntıları koru + Print resolution Yazdırma çözünürlüğü + Pro Profesyonel + Pro light Profesyonel ışık + Pro light gray Pro açık gri + Pro medium Profesyonel orta + Pro photo Profesyonel fotoğraf + Quick export format Hızlı dışa aktarma formatı + Quick export location Hızlı dışa aktarma konumu + Recent file count Son dosya sayısı + Recent files Son dosyalar + Recent fonts En yeni yazı tipleri + Recover on launch Başlatıldığında kurtar + Remember workspace changes Çalışma alanı değişikliklerini hatırla + Resize image during place Yerleştirme sırasında resmi yeniden boyutlandır + Rotate view with trackpad İzleme dörtgeniyle görünümü döndürme + Same folder Aynı klasör + Save in background Arka planda kaydet + Scratch Disks Kazı Diskleri + Screen Ekran + Screen resolution Ekran çözünürlüğü + Scrubby slider acceleration Temiz kaydırıcı hızlandırması + Sessions only Yalnızca oturumlar + Sharpen for Şunun için keskinleştir: + Show channels in color Kanalları renkli göster + Show crosshair in brush tip Fırça ucunda artı işaretini göster + Show extension panels Uzatma panellerini göster + Show font names in english İngilizce yazı tipi adlarını göster + Show menu colors Menü renklerini göster + Show only crosshair while painting Boyama sırasında yalnızca artı işaretini göster + Show slice numbers Dilim numaralarını göster + Show tooltips Araç ipuçlarını göster + Show highlight on rollover Rollover sırasında vurgulamayı göster + Show bounding box when dragging layer Katmanı sürüklerken sınırlayıcı kutuyu göster + System title bar Sistem başlık çubuğu + Show transformation values Dönüşüm değerlerini göster + Slice color Dilim rengi + Smart guide color Akıllı kılavuz rengi + Smart quotes Akıllı tırnaklar + Snap vector tools and transforms to pixel grid Vektör araçlarını tutturun ve piksel ızgarasına dönüştürün + Srgb Srgb + Standard Standart + Studio Stüdyo + Studio light Stüdyo ışığı + Subdivisions Alt bölümler + System Sistem + Text engine Metin motoru + Text file Metin dosyası + Tiny minik + Touch gestures Dokunma hareketleri + Transparency & Gamut Şeffaflık ve Gamut + Type units Tip birimleri + UI font size kullanıcı arayüzü yazı tipi boyutu + UI scale Kullanıcı arayüzü ölçeği + Units & Rulers Birimler ve Cetveller + Use additional plugins folder Ek eklentiler klasörünü kullan + Use esc to commit Taahhüt etmek için esc kullanın + Use gpu GPU'yu kullan + Use legacy free transform Eski ücretsiz dönüşümü kullanın + Use shift key for tool switch Araç anahtarı için Shift tuşunu kullanın + Vary round brush hardness on hud Hud üzerinde yuvarlak fırça sertliğini değiştirin + Webp Webp + World ready Dünya hazır + Zoom clicked point to center Tıklanan noktayı merkeze yakınlaştır + Zoom resizes windows Yakınlaştırma pencereleri yeniden boyutlandırır + Zoom with scroll wheel Kaydırma tekerleği ile yakınlaştırma + Zoom with trackpad pinch İzleme dörtgeni tutamıyla yakınlaştırma + Pass Through Geçirgen + Dissolve Eritme + Darker Color Daha Koyu Renk + Linear Dodge (Add) Doğrusal Soldurma (Ekle) + Lighter Color Daha Açık Renk + Soft Light Yumuşak Işık + Hard Light Sert Işık + Vivid Light Canlı Işık + Linear Light Doğrusal Işık + Pin Light Nokta Işığı + Exclusion Dışlama + Divide Böl + Luminosity Parlaklık +@plural {n} sample|{n} samples {n} örnek + {added}, {removed} subtracted {added}, {removed} çıkarıldı + Adjustment Preview Ayar Önizlemesi + Airbrush: keeps depositing paint while the pointer rests. Airbrush: İşaretçi dururken boyayı bırakmaya devam eder. + Angle: Açı: + Blend If Eğer karıştır + Close Tab Group Sekme Grubunu Kapat + Collapse Daralt + Collapse All Groups Tüm Grupları Daralt + Collapse Panel Group Panel Grubunu Daralt + Collapse group ({key}-click: all groups) Grubu daralt ({key}-tıklama: tüm gruplar) + Create new brush from the current settings Mevcut ayarlardan yeni fırça oluştur + Create new brush from these settings Bu ayarlardan yeni fırça oluşturun + Update the current brush with these settings Mevcut fırçayı bu ayarlarla güncelleyin + Delete brush Fırçayı sil + Drag the arrow to set the angle, the dots to set the roundness Açıyı ayarlamak için oku, yuvarlaklığı ayarlamak için noktaları sürükleyin + Expand Genişlet + Expand Panel Group Panel Grubunu Genişlet + Expand group ({key}-click: all groups) Grubu genişlet ({key}-tıklayın: tüm gruplar) + Fade steps Adımları soldur + Hide the layer's effects ({key}-click: all layers) Katmanın efektlerini gizle ({key}-tıklama: tüm katmanlar) + Import Brushes… (.abr) Fırçaları İçe Aktar… (.abr) + Move Group Down Grubu Aşağı Taşı + Move Group Up Grubu Yukarı Taşı + Reset the brush to the defaults Fırçayı varsayılanlara sıfırlayın + Restore original size Orijinal boyutu geri yükle + Roundness: Yuvarlaklık: + Search Brushes Fırçalarda Ara + Show the layer's effects ({key}-click: all layers) Katmanın efektlerini göster ({key}-tıklama: tüm katmanlar) + Brush picker Fırça seçici + Erase Sil + Right click with painting tools Boyama araçlarıyla sağ tıklayın + System Info… Sistem Bilgisi… + System Info Sistem Bilgisi + More panels Daha fazla panel + More documents Daha fazla belge + These settings aren't available in PhotoCraft yet. Bu ayarlar henüz PhotoCraft'ta mevcut değildir. + Graphics Grafik + Reset GPU Backend GPU Arka Uçunu Sıfırla + Applies at next launch. Bir sonraki açılışta geçerlidir. + Click to sample the foreground colour · {key}-click for background Ön plan rengini örneklemek için tıklayın · {key}-arka plan için tıklayın + {key}-click to set the source {key}-kaynağı ayarlamak için tıklayın + {key} to subtract {key} çıkarmak için + Clone source {n} ({key}-click with Clone Stamp to set) Kaynağı kopyala {n} ({key}-ayarlamak için Klonlama Damgası ile tıklayın) + Source: not set ({key}-click with Clone Stamp) Kaynak: ayarlanmadı ({key}-Klon Damgası ile tıklayın) + Pixel Layer Piksel Katmanı + Type Layer Tip Katmanı + Shape Layer Şekil Katmanı + Group Layer Grup Katmanı + Fill Layer Dolgu Katmanı + Smart Object Layer Akıllı Nesne Katmanı + Create Warped Text Çarpık Metin Oluştur + Rasterize Smart Object Akıllı Nesneyi Rasterleştir + Rasterize Fill Content Dolgu İçeriğini Rasterleştir + Rasterize Layer Style Katman Stilini Rasterleştir + Unlock: picking a preset replaces these settings Kilidi aç: bir ön ayarın seçilmesi bu ayarların yerini alır + Lock: keep these settings when picking another preset Kilitle: başka bir ön ayar seçerken bu ayarları koruyun + Diameter: Çap: + Hardness: Sertlik: + No brush presets Fırça ön ayarı yok + Toggle the Brush Settings panel (F5) Fırça Ayarları panelini açın/kapatın (F5) + Create new brush preset from the current settings Geçerli ayarlardan yeni fırça hazır ayarı oluşturun + Brush Settings… (F5): every option of this brush Fırça Ayarları… (F5): bu fırçanın tüm seçenekleri + Rename Brush… Fırçayı Yeniden Adlandır… + Delete Brush Fırçayı Sil + New Brush Preset… Yeni Fırça Ön Ayarı… + Brush Preset Options Fırça Ön Ayarı Seçenekleri + Group name Grup adı + Brush name Fırça adı + Brush Name Fırça Adı + Off: the speed of the pointer sets the spacing Kapalı: işaretçinin hızı aralığı belirler + Tilt Scale Eğim Ölçeği + Brush Projection Fırça Projeksiyonu + Apply the pen's tilt and rotation to the tip shape Kalemin eğimini ve dönüşünü uç şekline uygulayın + Mixer Brush Karıştırıcı Fırça + Mixer Brush Tool Karıştırıcı Fırça Aracı + Color Replacement Tool Renk Değiştirme Aracı + Wet Islaklık + Mix Karışım + Wetness Jitter Islaklık Titreme + Mix Jitter Karıştırma Titreşimi + Show the layer mask as an overlay Katman maskesini kaplama olarak göster + Toggle visibility Görünürlüğü aç/kapat + Unlink the mask from the layer Maskenin katmanla bağlantısını kaldırın + Link the mask to the layer Maskeyi katmana bağlama + Gradient Gradyan + Gradient Options Degrade Seçenekleri + Align with layer Katmanla hizala + Reset Alignment Hizalamayı Sıfırla + Centre the gradient (offset 0, 0) Degradeyi ortalayın (kaydırma 0, 0) + Gradient Editor Degrade Düzenleyici + Gradient picker Degrade seçici + Gradient stops Gradyan durakları + Save As Preset Ön Ayar Olarak Kaydet + The gradient the Gradient tool paints with Degrade aracının boyadığı degrade + Adds the current gradient to the Gradients panel Geçerli degradeyi Degradeler paneline ekler + The current gradient (pick one in Window › Gradients) Geçerli degrade (Pencere › Degradeler'den birini seçin) + Select a type layer to edit its character and paragraph settings. Karakter ve paragraf ayarlarını düzenlemek için bir yazı katmanı seçin. + Text color Metin rengi + Type Options Tip Seçenekleri + Anti-aliasing method Kenar yumuşatma yöntemi + Horizontal type Yatay tip + Vertical type Dikey tip + Fill path with foreground color Yolu ön plan rengiyle doldur + Stroke path with brush Fırçayla kontur yolu + Load path as a selection Yolu seçim olarak yükle + Make work path from selection Seçimden iş yolunu yap + Add vector mask Vektör maskesi ekle + Create new path Yeni yol oluştur + Delete path Yolu sil + Delete vector mask Vektör maskesini sil + CPU (no GPU acceleration) CPU (GPU hızlandırması yok) + DirectX 12 DirectX 12 + GPU backend GPU arka ucu + Linux display server Linux görüntü sunucusu + X11 X11 + Metal Metal + OpenGL OpenGL + Use tablet pressure Tablet basıncını kullan + Vulkan Vulkan + Alt-click to define a source point to clone from Kopyalanacak kaynak noktayı tanımlamak için Alt tuşuna basarak tıklayın + No path to make a selection from: draw one with the Pen tool or select one in the Paths panel. Seçim yapılabilecek yol yok: Kalem aracıyla bir yol çizin veya Yollar panelinden birini seçin. + Cancel opening Açılışı iptal et + Cancelled opening {name} {name} açılışı iptal edildi + Developing {name} {name} geliştiriliyor + Cancelled {label} {label} iptal edildi + Esc to cancel İptal etmek için Esc + Opened {name} {name} tarihinde açıldı + Opening {name} {name} açılıyor + Saved {name} {name} kaydedildi + Saving {name} {name} kaydediliyor + A save to {name} is still running; try again when it finishes {name} konumuna kaydetme işlemi hâlâ devam ediyor; bittiğinde tekrar dene + {label} is writing the file and can no longer be cancelled {label} dosyayı yazıyor ve artık iptal edilemez + Opening {name}… {name} açılıyor… + Opening… Açılıyor… + Reading… Okunuyor… + Working… Çalışıyor… + Color Range Renk Aralığı + Adaptive Wide Angle Uyarlanabilir Geniş Açı + Chalk & Charcoal Tebeşir ve Kömür + Charcoal Kömür + Chrome Krom + Conté Crayon Conte Crayon + Graphic Pen Grafik Kalemi + Halftone Pattern Noktalı Resim Deseni + Note Paper Not Kağıdı + Photocopy Fotokopi + Plaster Alçı + Reticulation Retikülasyon + Stamp Damga + Torn Edges Yırtık Kenarlar + Water Paper Su Kağıdı + Move Taşı + Pencil Kalem + Clone Stamp Klon Damgası + Dodge Dodge + Burn Yanık + Quick Selection Hızlı Seçim + History Brush Tarih Fırçası + Color Replacement Renk Değiştirme + New Group Yeni Grup + Layer Comp Katman Kompozisyonu + Alpha Alfa + Make Yap + Model Modeli + F F + Artist Sanatçı + Spot Color Nokta Rengi + Roman Roma + Bold Italic Kalın İtalik + Justification Gerekçe + Symbols Semboller + Punctuation Noktalama işaretleri + Make Work Path İş Yolu Yap + Make Selection Seçim Yap + Fill Path Yolu Doldur + Stroke Path Kontur Yolu + Delete Path Yolu Sil + W W + H H + Ruler Cetvel + New Layer Comp Yeni Katman Kompozisyonu + Duplicate Layer Comp Yinelenen Katman Kompozisyonu + Rename Layer Comp Katman Kompozisyonunu Yeniden Adlandırın + Apply Layer Comp Katman Kompozisyonunu Uygula + Update Layer Comp Katman Kompozisyonunu Güncelle + Method Yöntem + Author Yazar + Software Yazılım + Pencil Tool Kurşun Kalem Aracı + Pixel Piksel + Adjustment Ayarlama + Drag (lasso) or click points (polygonal) · {add} add · {sub} subtract Noktaları sürükleyin (kement) veya tıklayın (çokgen) · {add} ekle · {sub} çıkar + Drag a crop box · drag inside to move · edges resize ({ratio} ratio, {centre} centre) · Space moves while drawing · arrows nudge · X swaps orientation · {commit} commits · Esc cancels Kırpma kutusunu sürükleyin · taşımak için içeriye sürükleyin · kenarları yeniden boyutlandırın ({ratio} oranı, {centre} merkez) · Çizim sırasında boşluk hareket eder · oklar iter · X yönünü değiştirir · {commit} gerçekleştirir · Esc iptal eder + {mode} Color · {bits} bit {mode} Renkli · {bits} bit + Scrubby Zoom Süpürge Yakınlaştırma + Auto Erase Otomatik Silme + Color Adaptation Renk Uyarlaması + Preserve Transparency Şeffaflığı Koruyun + New Style… Yeni Stil… + shortcut kısayol + Saved Kaydedildi + Arc Yay + Arch Kemer + Bulge çıkıntı + Shell Lower Kabuk Alt Kısmı + Shell Upper Kabuk Üstü + Flag Bayrak + Fish Balık + Wave Dalga + Rise Yüksel + Inflate Şişir + Twist Büküm + Squeeze Sıkıştır + Mask Maske + Channel Kanal + Rectangle Dikdörtgen + New Channel Yeni Kanal + Save Selection Seçimi Kaydet + Load Selection Yük Seçimi +@id edit.purge.undo Geri Al + Rendering Mode İşleme Modu + Automatic (recommended) Otomatik (önerilen) + CPU / Compatibility CPU / Uyumluluk + Automatic uses GPU acceleration when available and falls back to CPU rendering on errors. Otomatik, mümkün olduğunda GPU hızlandırmayı kullanır ve hatalarda CPU oluşturmaya geri döner. + Switched to CPU rendering CPU oluşturmaya geçildi + GPU acceleration could not continue. Your documents are unchanged. GPU hızlandırması devam edemedi. Belgeleriniz değişmedi. + PhotoCraft is using the CPU image compositor. The window may still use your graphics adapter. PhotoCraft, CPU görüntü düzenleyicisini kullanıyor. Pencere hala grafik bağdaştırıcınızı kullanıyor olabilir. + Retry GPU requires a restart. Save your work first. GPU'yu yeniden dene, yeniden başlatma gerektirir. Öncelikle çalışmanızı kaydedin. + Keep Using CPU CPU'yu Kullanmaya Devam Edin + Retry GPU GPU'yu yeniden dene + Advanced Gelişmiş + GPU Backend GPU Arka Ucu + Details Ayrıntılar + Rendering mode Oluşturma modu + Freeze Lasso: drag to freeze an area, Alt-drag to thaw it (L) Kementi Dondur: Bir alanı dondurmak için sürükleyin, buzunu çözmek için Alt tuşuna basarak sürükleyin (L) + 3 x 3 3 x 3 + 4 x 4 4 x 4 + 5 x 5 5 x 5 + Camera Raw Filter ({layer}) Camera Raw Filtresi ({layer}) + Camera Raw ({name}) Camera Raw ({name}) + Edit Type Türü Düzenle + Grid: Izgara: + Highlight Clipping Warning (O) Kırpılma Uyarısını Vurgula (O) + Lasso around an area, then drag the selection Bir alanı kementle çevreleyin, ardından seçimi sürükleyin + Patch: Yama: + Shadow Clipping Warning (U) Gölge Kırpılması Uyarısı (U) + Show Lab Color Readouts Laboratuvar Renk Okumalarını Göster + Show Red at 3 o'clock Kırmızıyı saat 3 yönünde göster + Show Selected Region Seçilen Bölgeyi Göster + Show Skin Tone Indicator Cilt Tonu Göstergesini Göster + Show Vectorscope Vectorscope'u göster + Tone Histogram Ton Histogramı + 75% 75% + 80% 80% + 85% 85% + 90% 90% + 95% 95% + 125% 125% + 150% 150% + 175% 175% + 250% 250% + 300% 300% + No patterns Desen yok + Enable {name} {name}'yi etkinleştir + Hold Alt while drawing for straight segments Düz parçalar çizerken Alt tuşunu basılı tutun + Drag or click polygon points · hold Alt during lasso for straight segments · {add} add · {sub} before drawing subtracts Çokgen noktalarını sürükleyin veya tıklayın · düz parçalar için kement sırasında Alt tuşunu basılı tutun · {add} ekleyin · çizim çıkarmadan önce {sub} + Extend Uzat + Structure: Yapı: + Content-Aware Move Tool İçeriğe Uygun Taşıma Aracı + TIFF Options TIFF Seçenekleri + Targa Options Targa Seçenekleri + 24 bits/pixel 24 bit/piksel + 32 bits/pixel 32 bit/piksel + Including layers will increase file size. Katmanların eklenmesi dosya boyutunu artıracaktır. + Discard Layers and Save a Copy Katmanları Atın ve Bir Kopyasını Kaydedin + Don't show again Bir daha gösterme + Save failed: {error} Kaydetme başarısız oldu: {error} + Save cancelled Kaydetme iptal edildi + Style {name} saved {name} stili kaydedildi + Make Default Varsayılan Yap + Reset to Default Varsayılana Sıfırla + Couldn't place {name}: {error} {name} yerleştirilemedi: {error} + Full-resolution preview unavailable Tam çözünürlüklü önizleme kullanılamıyor + Magnetic Lasso Tool Manyetik Kement Aracı + Frequency Frekans + Use tablet pressure to change pen width Kalem genişliğini değiştirmek için tablet basıncını kullanın + About Hakkında + Contributors Katkıda Bulunanlar + Models Modeller + Sort Sırala + Username Kullanıcı adı + Display name Görünen ad + Real name Gerçek isim + Reverse the order Sırayı tersine çevir + Grab bag Çantayı al + Table Tablo + Name (A–Z) Ad (A–Z) + Merged PRs Birleştirilmiş PR'ler + Commits Taahhütler + Lines added Satırlar eklendi + Lines deleted Satırlar silindi + Line delta Çizgi deltası + Binary assets added İkili varlıklar eklendi + Binary assets removed İkili varlıklar kaldırıldı + First commit İlk taahhüt + First İlk + Last commit Son taahhüt + Last Son + Contributors: {contributors} · Commits: {commits} Katkıda Bulunanlar: {contributors} · Taahhütler: {commits} + No contributor data was built into this copy. Bu kopyaya hiçbir katkıda bulunan verisi eklenmedi. + No model credits were built into this copy. Bu kopyaya hiçbir model kredisi eklenmemiştir. + Company Şirket + Version Sürüm + % of all commits Tüm taahhütlerin yüzdesi + Lines +/− Çizgiler +/− + @{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{binAdded} / −{binDeleted} binary assets, {first} – {last} @{login}: {prs} PR'ler, {commits} taahhütler, +{added} / −{deleted} satırlar (Δ {delta}), +{binAdded} / −{binDeleted} ikili varlıklar, {first} – {last} + Create new swatch Yeni renk örneği oluştur + New Swatch… Yeni Swatch… + New Swatch Group… Yeni Swatch Grubu… + Import Swatches… Renk Örneklerini İçe Aktar… + Replace Swatches… Renk Örneklerini Değiştirin… + Export Swatches… Renk Örneklerini Dışa Aktar… + Export Swatches for Exchange… Değişim için Renk Örneklerini Dışa Aktar… + Reset Swatches Renk Örneklerini Sıfırla + Add to Swatches Renk Örneklerine Ekle + Blend If: Eğer Karışım: + Channels: Kanallar: + Knockout Nakavt + Apply At Canvas Bounds Kanvas Sınırlarında Uygula + Color Picker (Text Color) Renk Seçici (Metin Rengi) + Color Picker ({name}) Renk Seçici ({name}) + Color Picker (Fill Color) Renk Seçici (Dolgu Rengi) + Fill color Rengi doldur + Color Picker (Stroke Color) Renk Seçici (Kontur Rengi) + Stroke color Kontur rengi + Pick screen color Ekran rengini seç + Sample a pixel anywhere on the screen Ekranın herhangi bir yerinde bir pikseli örnekleyin + Click to pick · Esc to cancel Seçmek için tıklayın · İptal etmek için Esc + Pick a screen pixel or press Esc to cancel Bir ekran pikseli seçin veya iptal etmek için Esc tuşuna basın + Scroll to zoom Yakınlaştırmak için kaydırın + Show/Hide All Panels Tüm Panelleri Göster/Gizle + Show/Hide Panels Panelleri Göster/Gizle + Could not open Açılamadı + {path}: the path is not valid Unicode; rename the file and open it again. {path}: yol geçerli bir Unicode değil; dosyayı yeniden adlandırın ve tekrar açın. + Contents: İçerik: + Custom Pattern: Özel Desen: + Foreground Color Ön Plan Rengi + Color… Renk… + 50% Gray %50 Gri + {size} (was {old}) {size} ({old} idi) + Cone Koni + Cone (Inverted) Koni (Ters Çevrilmiş) + Domed Kubbeli + Domed (Inverted) Kubbeli (Ters) + Diagonal (Descending) Çapraz (Azalan) + Contour Editor Kontur Düzenleyici + Anti-aliased Kenar yumuşatma + Corner Köşe + Gloss Contour Parlak Kontur + Contour Kontur + Cone - Inverted Koni - Ters + Cove - Deep Koy - Derin + Cove - Shallow Koy - Sığ + Half Round Yarım Yuvarlak + Ring - Double Yüzük - Çift Kişilik + Rolling Slope - Descending Yuvarlanan Eğim - Azalan + Rounded Steps Yuvarlak Adımlar + Sawtooth 1 Testere dişi 1 + Red Eye Tool Kırmızı Göz Aracı + Red Eye Kırmızı Göz + Pupil Size Öğrenci Boyutu + Darken Amount Koyulaştırma Miktarı + Click a red pupil to neutralize it Nötrleştirmek için kırmızı bir gözbebeğine tıklayın + open source açık kaynak + …and {n} more …ve {n} daha + Eyedroppers: Damlalıklar: + Set Black Point Siyah Noktayı Ayarla + Set Neutral Gray Point Nötr Gri Noktayı Ayarla + Set White Point Beyaz Noktayı Ayarla + Unavailable in this color mode Bu renk modunda kullanılamaz + Selection Preview: Seçim Önizlemesi: + Black Matte Siyah Mat + White Matte Beyaz Mat +layerLabel No Color Renk Yok + Seafoam Deniz köpüğü + Indigo Çivit mavisi + Fuchsia Fuşya + Violet Menekşe + Large document: redrawing on the CPU Büyük belge: CPU'da yeniden çizim + This redraw took {seconds} s on the CPU. Bu yeniden çizim CPU'da {seconds} saniye sürdü. + Edits that change the whole document, such as a layer's blend mode, opacity or visibility, redraw all of it. Bir katmanın karışım modu, opaklığı veya görünürlüğü gibi belgenin tamamını değiştiren düzenlemeler, belgenin tamamını yeniden çizer. + Its layers don't fit the GPU memory budget. Raising Memory usage in Preferences › Performance raises the budget, up to a quarter of this computer's memory. Katmanları GPU bellek bütçesine uymuyor. Tercihler'de Bellek kullanımını artırma › Performans, bütçeyi bu bilgisayarın belleğinin dörtte birine kadar artırır. + The GPU compositor wasn't used: {reason} GPU dizgicisi kullanılmadı: {reason} +cameraRaw Light Açık Tonlar +fontWeight Thin İnce +fontWeight ExtraLight Ekstra İnce +fontWeight Light Hafif +fontWeight Regular Normal +fontWeight Medium Orta +fontWeight SemiBold Yarı Kalın +fontWeight Bold Kalın +fontWeight ExtraBold Ekstra Kalın +fontWeight Black En Kalın +fontWeight Italic İtalik + Pattern Stamp Tool Desen Damgası Aracı + Pattern Stamp Desen Damgası + Impressionist Empresyonist + Rotate View Görünümü Döndür + Rotate View Tool Görünümü Döndürme Aracı + Reset View Görünümü Sıfırla + Drag around the centre to rotate the view · Shift constrains to 15° Görünümü döndürmek için merkezin etrafında sürükleyin · Kaydırma 15° ile sınırlandırılır +@id select.all Tümünü Seç +@id edit.stroke Kontur… +@id edit.transform.scale Ölçekle +cameraRaw Red Kırmızı +cameraRaw Orange Turuncu +cameraRaw Yellow Sarı +cameraRaw Green Yeşil +cameraRaw Aqua Camgöbeği +cameraRaw Blue Mavi +cameraRaw Purple Mor +cameraRaw Magenta Macenta +cameraRaw Blending Karışım +cameraRaw Luminance Parlaklık +cameraRaw Temperature Sıcaklık +cameraRaw Color Renk + Patch Tool Yama Aracı + Preferences… Tercihler… + Settings Ayarlar + Duplicate Çoğalt + Actual Pixels Gerçek Pikseller + Hide Gizle + New Layer… Yeni Katman… + Clipping Mask Kırpma Maskesi + Tool Options Araç Seçenekleri + Color Picker Renk Seçici + Color Swatches Renk Örnekleri + Linear Dodge Doğrusal Soldurma + Preview Image Resmin Önizlemesi + Automatic Otomatik + Save As Farklı Kaydet + Import… İçe aktar… + Remove All Tümünü Kaldır + Unlock Kilidi aç + Enable Etkinleştir + Disable Devre dışı bırak + On Açık + Selected Seçilen + Clear Selection Seçimi Temizle + Invert Selection Seçimi Ters Çevir + Select Inverse Tersini Seç + Contract Sözleşme + Sample Size Örnek Boyutu + Strength Güç + Gamma Gama + Input Giriş + Output Çıkış + Input Levels Giriş Seviyeleri + Output Levels Çıkış Seviyeleri + Layer Styles Katman Stilleri + Blending Mode Karıştırma Modu + Fill Color Dolgu Rengi + Stroke Color Kontur Rengi + Stroke Width Kontur Genişliği + Shadow Gölge + Adjustment Layer Ayarlama Katmanı + Adjustment Layers Ayarlama Katmanları + Text Layer Metin Katmanı + Documents Belgeler + File Name Dosya Adı + File Format Dosya Formatı + Compression Sıkıştırma + Artboards Çalışma yüzeyleri + Snap to Grid Izgaraya Yasla + Full Screen Tam Ekran + Fullscreen Tam ekran + Workspaces Çalışma alanları + Alignment Hizalama + Step Backward Geri Adım + Step Forward İleri Adım + Show All Tümünü Göster + Hidden Gizli + New Layer Yeni Katman + Duplicate Layer Katmanı Çoğalt + Ungroup Grubu çöz + Lock Transparent Pixels Şeffaf Pikselleri Kilitle + Lock Image Pixels Görüntü Piksellerini Kilitle + Lock Position Kilit Konumu + Lock All Tümünü Kilitle + Show Rulers Cetvelleri Göster + Show Grid Izgarayı Göster + Guide Layout… Kılavuz Düzeni… + Page Setup… Sayfa Yapısı… + Reset Preferences Tercihleri Sıfırla + Documentation Dokümantasyon + Check for Updates Güncellemeleri Kontrol Et + Loading… Yükleniyor… + Processing… İşleniyor… + Saving… Kaydediliyor… + Exporting… Dışa aktarılıyor… + Please wait… Lütfen bekleyin… + No document open Hiçbir belge açık değil + No selection Seçim yok + No layers Katman yok + No recent files Yeni dosya yok + Unsupported file format Desteklenmeyen dosya biçimi + Failed to open file Dosya açılamadı + Failed to save file Dosya kaydedilemedi + Operation canceled İşlem iptal edildi + Changes have not been saved. Değişiklikler kaydedilmedi. + Are you sure? Emin misin? + Discard Changes Değişiklikleri İptal Et + Recent Files Son Dosyalar + Open File Dosyayı Aç + Save File Dosyayı Kaydet + Save Changes Değişiklikleri Kaydet + Rendering… Oluşturuluyor… + Importing… İçe aktarılıyor… + Ready Hazır + Failed Başarısız + Warning Uyarı + Information Bilgi + Errors Hatalar + Retry Yeniden dene + Continue Devam et + Skip Atla + Stop Durdur + Resume Devam et + Reset All Tümünü Sıfırla + Defaults Varsayılanlar + Apply to All Tümüne Uygula + Confirm Onayla + Finish Bitiş + Back Geri + Next Sonraki + Previous Önceki + More Daha Fazla + Less Daha az + Manual Manuel + Disabled Devre dışı + Locked Kilitli + Unlocked Kilitli değil + Delete… Sil… + Create… Oluştur… + Edit… Düzenle… + Change… Değiştir… + Transformation Dönüşüm + Scaling Ölçeklendirme + Canvas Size Kanvas Boyutu + Percentage Yüzde + Degrees Dereceler + Middle Orta + Location Konum + Location: Konum: + Diameter Çap + Intensity Yoğunluk + Sensitivity Hassasiyet + Softness Yumuşaklık + Feather Radius Tüy Yarıçapı + Color Profile Renk Profili + Library Kütüphane + Libraries Kütüphaneler + Layer Properties Katman Özellikleri + Groups Gruplar + Masks Maskeler + Add Mask Maske Ekle + Delete Mask Maskeyi Sil + Invert Mask Maskeyi Ters Çevir + Enable Mask Maskeyi Etkinleştir + Disable Mask Maskeyi Devre Dışı Bırak + Apply Mask Maske Uygula + Import Settings Ayarları İçe Aktarma + Export Settings Ayarları Dışa Aktarma + Shortcut Kısayol + Shortcuts Kısayollar + Keyboard Klavye + Mouse Fare + Tablet tablet + Display Ekran + Panel Paneli + Hide Grid Izgarayı Gizle + Fit to Window Pencereye Sığdır + Dark Theme Koyu Tema + Light Theme Işık Teması + Live Preview Canlı Önizleme + Before önce + After Sonra + Compare Karşılaştır + File Size Dosya Boyutu + Filename Dosya adı + Folder Klasör + Open Folder Klasörü Aç + Choose Folder Klasör Seçin + Browse Göz at + Find Bul + Replace Değiştir + Category Kategori + Date Tarih + Time Zaman + Learn More Daha Fazla Bilgi Edinin + Report a Bug Hata Bildir + Updates Güncellemeler + Update Güncelleme + Restart Required Yeniden Başlatma Gerekli + Restart Yeniden başlat + Quit Çıkış + Quit PhotoCraft PhotoCraft'tan Çık + Close Window Pencereyi Kapat + New Window Yeni Pencere + Open Image Resmi Aç + Save Image Resmi Kaydet + Export Image Görüntüyü Dışa Aktar + Import Image Görüntüyü İçe Aktar + Export As Farklı Dışa Aktar + Export to Şuraya aktar: + Export Options Dışa Aktarma Seçenekleri + Import Options İçe Aktarma Seçenekleri + No Selection Seçim Yok + No Document Belge Yok + No Image Resim Yok + No Layers Katman Yok + No Results Sonuç Yok + No Results Found Sonuç Bulunamadı + Nothing to Undo Geri Alınacak Bir Şey Yok + Nothing to Redo Tekrarlanacak bir şey yok + Changes Saved Değişiklikler Kaydedildi + Unsaved Changes Kaydedilmemiş Değişiklikler + Save before closing? Kapatmadan önce kaydet? + Are you sure you want to quit? Vazgeçmek istediğinden emin misin? + The file could not be opened. Dosya açılamadı. + The file could not be saved. Dosya kaydedilemedi. + Unsupported format Desteklenmeyen biçim + Out of memory Bellek yetersiz + Permission denied İzin reddedildi + File not found Dosya bulunamadı + Operation failed İşlem başarısız oldu + Operation completed İşlem tamamlandı + Operation cancelled İşlem iptal edildi + Camera Calibration Kamera Kalibrasyonu + Snapshots Anlık görüntüler + Recovery Kurtarma + Fill Light Işık Doldur + Convert to Grayscale Gri Tonlamaya Dönüştür + Sharpness Keskinlik + Color Noise Reduction Renk Gürültü Azaltma + Luminance Smoothness Parlaklık Pürüzsüzlüğü + Focal Length35mm Odak Uzunluğu35mm + Aspect Ratio En Boy Oranı + Enter description… Açıklamayı girin… + Industry Standard Endüstri Standardı + Uncoated CMYK Kaplamasız CMYK + Working Spaces Çalışma Alanları + Color Management Policies Renk Yönetimi Politikaları + Detect Faces Yüzleri Algıla + Localize Color Clusters Renk Kümelerini Yerelleştirin + Duplicated selection name Yinelenen seçim adı + New channel only Yalnızca yeni kanal + Masked Areas Maskelenmiş Alanlar + Selected Areas Seçilen Alanlar + Color indicates Renk şunu gösterir: + Create Snapshot Anlık Görüntü Oluştur + Delete Snapshot Anlık Görüntüyü Sil + New Snapshot Yeni Anlık Görüntü + Snapshot 1 Anlık Görüntü 1 + Nonlinear History Doğrusal Olmayan Geçmiş + Set New Snapshot as Default Yeni Anlık Görüntüyü Varsayılan Olarak Ayarla + Automatically Create First Snapshot İlk Anlık Görüntüyü Otomatik Olarak Oluştur + Automatically Create New Snapshot When Saving Kaydederken Otomatik Olarak Yeni Anlık Görüntü Oluştur + Show New Snapshot Dialog by Default Yeni Anlık Görüntü İletişim Kutusunu Varsayılan Olarak Göster + Clear History Geçmişi Temizle + Panel Options… Panel Seçenekleri… + View menu Menüyü görüntüle + Keep view in sync Görünümü senkronize tutun + Mouse Controls Fare Kontrolleri + Initial Direction of Stroke Başlangıç Strok Yönü + Direction of Stroke İnme Yönü + Humidity Nem + Auto Clean Brush Otomatik Temizleme Fırçası + Brush Tip Fırça Ucu + New Layer from Brush Brush'tan Yeni Katman + New Brush Yeni Fırça + New Tool Preset Yeni Araç Ön Ayarı + Auto-Leading Otomatik Satır Aralığı + Scale Horizontally Yatay Olarak Ölçeklendir + Scale Vertically Dikey Ölçeklendir + Baseline Shift Taban Çizgisi Kayması + Superscript Üst simge + Subscript Abonelik + Ligature Ligatür + Alternative Alternatif + Extra Light Ekstra Işık + Extra Bold Ekstra Kalın + Sharpen Amount Keskinleştirme Tutarı + Sharpen Radius Yarıçapı Keskinleştir + Sharpen Detail Detayı Keskinleştir + Sharpen Masking Maskelemeyi Keskinleştir + Noise Luminance Gürültü Parlaklığı + Noise Luminance Detail Gürültü Parlaklığı Ayrıntısı + Noise Color Gürültü Rengi + Noise Color Detail Gürültü Rengi Ayrıntısı + Grain Amount Tane Miktarı + Grain Size Tane Boyutu + Grain Roughness Tahıl Pürüzlülüğü + Vignette Roundness Vinyet Yuvarlaklığı + Vignette Feather Vinyet Tüyü + Vignette Highlights Vinyet Öne Çıkanlar + Vignette Style Vinyet Stili + Planes Uçaklar + Corners Köşeler + Plane Uçak + Shadow Amount Gölge Miktarı + Shadow Tone Gölge Tonu + Shadow Radius Gölge Yarıçapı + Highlight Amount Tutarı Vurgula + Highlight Tone Vurgu Tonu + Highlight Radius Yarıçapı Vurgula + Midtone Orta ton + Black Clip Siyah Klip + White Clip Beyaz Klip + Fuzziness bulanıklık + Source Layer Kaynak Katmanı + Neutralize Nötrleştir + Use Selection In Source Kaynaktaki Seçimi Kullan + Use Selection In Target Hedefteki Seçimi Kullan + Flame Type Alev Tipi + Randomize Length Uzunluğu Rastgeleleştir + Interval Aralık + Adjust Interval For Loops Döngüler İçin Aralığı Ayarla + Use Custom Color Özel Renk Kullan + Flame Lines Alev Hatları + Flame Bottom Alignment Alev Alt Hizalaması + Flame Style Alev Stili + Flame Shape Alev Şekli + Randomize Shapes Şekilleri Rastgeleleştir + Frame Çerçeve + Margin Marj + Arrangement Düzenleme + Thickness Kalınlık + Vine Color Asma Rengi + Flower Color Çiçek Rengi + Leaf Color Yaprak Rengi + Base Tree Type Temel Ağaç Türü + Light Direction Işık Yönü + Leaves Amount Yaprak Tutarı + Leaves Size Yaprak Boyutu + Branches Height Dal Yüksekliği + Branches Thickness Dal Kalınlığı + Default Leaves Varsayılan İzinler + Leaves Color Yaprak Rengi + Custom Branch Color Özel Şube Rengi + Branches Color Dal Rengi + Flat Shading Düz Gölgeleme + Enable Timeline Quick Config Zaman Çizelgesi Hızlı Yapılandırmasını Etkinleştir + Set Start Timecode… Başlangıç Zaman Kodunu Ayarla… + Timecode Zaman kodu + Current Time Güncel Saat + Duration Süre + Repeat Tekrarla + Play Once Bir Kez Oyna + Info Options… Bilgi Seçenekleri… + First Color Readout İlk Renk Okuması + Second Color Readout İkinci Renk Okuması + Actual Color Gerçek Renk + Grayscale Slider Gri Tonlama Kaydırıcısı + Web Color Web Rengi + Total Ink Toplam Mürekkep + Opacity Mask Opaklık Maskesi + Document Size Belge Boyutu + Timing Zamanlama + Status Information Durum Bilgileri + Mouse Coordinates Fare Koordinatları + Ruler Units Cetvel Birimleri + Restore last viewed comp Son görüntülenen kompozisyonu geri yükle + Select All Layers Tüm Katmanları Seç + Keep proportions Oranları koruyun + Interpolation Enterpolasyon + Caption Başlık + Caption Credits Altyazı Kredisi + Keywords Anahtar Kelimeler + Copyright Info URL Telif Hakkı Bilgisi URL'si + Copyright Status Telif Hakkı Durumu + Copyrighted Telif hakkıyla korunuyor + Public Domain Kamu Alanı + Unknown Bilinmiyor + Credit Kredi + Transmission Reference İletim Referansı + Urgency Aciliyet + High Yüksek + Low Düşük + Supplemental Categories Tamamlayıcı Kategoriler + Object Name / Title Nesne Adı / Başlığı + Date Created Oluşturulma Tarihi + City Şehir + Province / State İl / Eyalet + Country Ülke + Byline Yazar yazısı + Byline Title Yazar Başlığı + Phone Telefon + Email E-posta + Last Modified Son Değiştirilme + Camera Data Kamera Verileri + Camera Model Kamera Modeli + Camera Make Kamera Markası + EXIF Version EXIF Sürümü + Exposure Program Maruziyet Programı + Aperture Diyafram + Shutter Speed Enstantane Hızı + Metering Mode Ölçüm Modu + Light Source Işık Kaynağı + Flash Flaş + Create Multiple Picture Packages Çoklu Resim Paketleri Oluşturun + Choose… Seç… + Select Folder… Klasör Seç… + Override Action "Save" Commands Eylem "Kaydet" Komutlarını Geçersiz Kıl + File Naming Dosya Adlandırma + Compatibility Uyumluluk + Include ICC Profile ICC Profilini Ekle + Error File Hata Dosyası + Stop For Errors Hatalar İçin Durdur + Log Errors To File Hataları Dosyaya Günlüğe Kaydet + Settings: Ayarlar: + Working Space Çalışma Alanı + Advanced Controls Gelişmiş Kontroller + Desaturate Monitor Colors By Monitör Renklerinin Doygunluğunu Azaltma + Blend RGB Colors Using Gamma 1.0 Gama 1.0 Kullanarak RGB Renklerini Karıştırın + Profile Mismatches: Ask When Opening Profil Uyuşmazlıkları: Açarken Sor + Ask When Pasting Yapıştırırken Sor + Missing Profiles: Ask When Opening Eksik Profiller: Açarken Sor + Embed profiles Profilleri yerleştir + Coerce to sRGB sRGB'ye baskı yapın + Graphic and web Grafik ve web + Minimalistic Minimalist + Expand All Groups Tüm Grupları Genişlet + Recent Items Son Öğeler + Delete Preset… Ön Ayarı Sil… + Preset Name: Ön Ayar Adı: + Width and Height Genişlik ve Yükseklik + Units Birimler + Columns Sütunlar + Create new count group Yeni sayım grubu oluştur + Drag to move the layer Katmanı taşımak için sürükleyin + Go to Layer Katmana Git + Current Mevcut + Reference point location Referans noktası konumu + Toggle reference point Referans noktasını değiştir + Heal Off İyileşme + Heal On İyileşme + Heal Auto Otomatik İyileştirme + Brush Size Fırça Boyutu + Heal Color Rengi İyileştir + Result Sonuç + Fast Hızlı + Accurate Doğru + Add to Ekle + Subtract from Şundan çıkar: + Intersect with İle kesiştir + Capture Comp Comp'ı Yakala + No Layer Comps Katman Kompozisyonu Yok + Add to selection (⇧) Seçime ekle (⇧) + Click to zoom in · ⌥-click to zoom out Yakınlaştırmak için tıklayın · Uzaklaştırmak için ⌥-tıklayın + Commit Perspective Warp (↩) Perspektif Çarpıtma İşlemi (↩) + Commit Puppet Warp (↩) Kukla Çarpıtma İşlemi (↩) + Commit any current edits (⌘↩) Mevcut düzenlemeleri taahhüt et (⌘↩) + Commit current crop operation (↵) Mevcut kırpma işlemini gerçekleştir (↵) + Commit transform (↩) Dönüşümü kaydet (↩) + Commit warp (↩) Çözgü gerçekleştir (↩) + Create a new layer (⇧⌘N) Yeni bir katman oluştur (⇧⌘N) + Custom pattern Özel desen + General Brushes Genel Fırçalar + New document… ⌘N Yeni belge… ⌘N + Open… ⌘O Aç… ⌘O + Search commands (⌘K) Arama komutları (⌘K) + Uses the foreground and background colors. Ön plan ve arka plan renklerini kullanır. + Collapse group (⌥-click: all groups) Grubu daralt (⌥ tuşuna basarak tıklayın: tüm gruplar) + Expand group (⌥-click: all groups) Grubu genişlet (⌥ tuşuna basarak tıklayın: tüm gruplar) + Date and Time Tarih ve Saat + Scale Units Ölçek Birimleri + Scale Factor Ölçek Faktörü + Area Alan + Perimeter Çevre + Circularity Dairesellik + Gray Value (Minimum) Gri Değeri (Minimum) + Gray Value (Maximum) Gri Değeri (Maksimum) + Gray Value (Mean) Gri Değeri (Ortalama) + Gray Value (Median) Gri Değeri (Medyan) + Integrated Density Entegre Yoğunluk + Length Uzunluk + In Black Siyah + In White Beyaz + Out Black Siyah + Out White Beyaz Dışı + Tint Color Ton Rengi + Stops Duraklar + Center X Merkez X + Center Y Merkez Y + Distribution Dağıtım + Monochromatic Tek renkli + Cell Size Hücre Boyutu + Generators Jeneratörler + Wavelength Min Dalga Boyu Min + Wavelength Max Maksimum Dalga Boyu + Amplitude Min Genlik Min + Amplitude Max Genlik Maksimum + Undefined Areas Tanımsız Alanlar + Preserve Koru + Max Radius Maksimum Yarıçap + Depth Mode Derinlik Modu + Solid Front Faces Katı Ön Yüzler + Mask Incomplete Blocks Tamamlanmamış Blokları Maskele + Stylization Stilizasyon + Cleanliness Temizlik + Bristle Detail Kıl Detayı + Lighting Aydınlatma + Shine Parıltı + Max Offset Maksimum Ofset + Map Document Harita Belgesi + Map Path Harita Yolu + Map Layer Harita Katmanı + Ridges Sırtlar + Light Type Işık Tipi + Light X Işık X + Light Y Işık Y + Light Z Açık Z + Target X Hedef X + Target Y Hedef Y + Hotspot Sıcak nokta + Elevation Yükseklik + Ambient Ortam + Warmth sıcaklık + Gloss parlaklık + Metallic metalik + Ambience ortam + White Is High Beyaz Yüksek + Reduce Color Noise Renk Gürültüsünü Azaltın + Sharpen Details Ayrıntıları Keskinleştir + Remove Jpeg Artifact Jpeg Yapısını Kaldır + Remove Tool Aracı Kaldır + Blade Curvature Bıçak Eğrisi + Depth Map Derinlik Haritası + Focal Distance Odak Mesafesi + Focus Odaklanma + Transition Geçiş + Radius X Yarıçap X + Radius Y Y Yarıçapı + Pins Pimler + Blur Angle Bulanıklık Açısı + Speed Hız + Taper Konik + Start X X'i başlat + Start Y Y'yi başlat + End X X'in sonu + End Y Y Sonu + Kernel çekirdek + Input Mode Giriş Modu + Row Order Satır Sırası + Eliminate Ortadan kaldır + Create By Oluşturan + List Liste + Pencil Width Kalem Genişliği + Stroke Pressure Strok Basıncı + Paper Brightness Kağıt Parlaklığı + Number Of Levels Seviye Sayısı + Edge Simplicity Kenar Sadeliği + Edge Fidelity Kenar Doğruluğu + Brush Detail Fırça Detayı + Highlight Area Alanı Vurgula + Glow Size Parıltı Boyutu + Glow Brightness Parıltı Parlaklığı + Brush Type Fırça Tipi + Stroke Size Kontur Boyutu + Stroke Detail Kontur Detayı + Highlight Strength Gücü Vurgula + Smoothness Pürüzsüzlük + Edge Thickness Kenar Kalınlığı + Edge Intensity Kenar Yoğunluğu + Posterization Posterleştirme + Stroke Length Strok Uzunluğu + Relief Rahatlama + Definition Tanım + Texture Coverage Doku Kapsamı + Shadow Intensity Gölge Yoğunluğu + Edge Width Kenar Genişliği + Edge Brightness Kenar Parlaklığı + Direction Balance Yön Dengesi + Black Intensity Siyah Yoğunluğu + White Intensity Beyaz Yoğunluğu + Dark Intensity Karanlık Yoğunluk + Custom Pixel Aspect Ratio Özel Piksel En Boy Oranı + 32-bit Preview Options 32 bit Önizleme Seçenekleri + New Guide Yeni Kılavuz + Join the ArtCraft Discord ArtCraft Discord'una katılın + Report an Issue Sorun Bildir + Load Files into Stack Dosyaları Yığına Yükle + Statistics İstatistikler + Duplicate Layers Katmanları Çoğalt + Edit Toolbar Araç Çubuğunu Düzenle + Import Brushes Fırçaları İçe Aktar + Load 3D LUT 3D LUT'u yükleyin + New document Yeni belge + Press keys Tuşlara basın + Rename Group Grubu Yeniden Adlandır + Rename Tool Preset Araç Ön Ayarını Yeniden Adlandır + Search commands, tools and panels Komutları, araçları ve panelleri arayın + Slice Options Dilim Seçenekleri + Rename Brush Fırçayı Yeniden Adlandır + Opening Açılış + Reading Okuma + Working Çalışma + Accented Edges Vurgulu Kenarlar + Angled Strokes Açılı Vuruşlar + Anisotropic Anizotropik + Around Center Merkez Çevresi + Artistic Sanatsal + Bamboo Bambu + Bas Relief Bas Rölyef + Berries Meyveler + Blast Patlama + Bleach Bypass Ağartma Baypası + Blocks Bloklar + Brick Tuğla + Brush Strokes Fırça Darbeleri + Burlap Çuval bezi + Candle Light Mum Işığı + Circle daire + Clumped Topaklanmış + Coarse Dots Kaba Noktalar + Colored Pencil Renkli Kalem + Contrasty Kontrastlı + Cool Harika + Craquelure Küçük çatlak + Cross Çapraz + Cross Process Çapraz Süreç + Crosshatch Çapraz tarama + Cutout Kesim + Daisies Papatyalar + Dark Rough Karanlık Sert + Dark Strokes Karanlık Vuruşlar + Darken Only Yalnızca Koyulaştır + Day For Night Gündüz Gece + Deep Blue Derin Mavi + Deep Emerald Derin Zümrüt + Deep Red Koyu Kırmızı + Deep Yellow Koyu Sarı + Dot Nokta + Double Line Çift Hat + Draft Taslak + Dry Brush Kuru Fırça + Duplication Çoğaltma + Edge Extension Kenar Uzantısı + Edge Only Yalnızca Kenar + Enlarged Büyütülmüş + Even Fields Çift Alanlar + Faded Film Solmuş Film + Film Grain Film Tahıl + Fine iyi + Fine Dots İnce Noktalar + Flat Düz + Fresco Fresk + From Left Soldan + From Right Sağdan + Frosted Buzlu + Generic jenerik + Glass Cam + Glowing Edges Parlayan Kenarlar + Grainy Dots Grenli Noktalar + Hearts Kalpler + Heptagon Yedigen + Hexagon Altıgen + Horizontal Only Yalnızca Yatay + Infinite Sonsuz + Ink Outlines Mürekkep Ana Hatları + Ivy sarmaşık + Left Diagonal Sol Çapraz + Level Based Seviyeye Dayalı + Light Rough Hafif Kaba + Lighten Only Yalnızca Açıklaştır + Long Lines Uzun Çizgiler + Long Strokes Uzun Vuruşlar + Lower Daha düşük + Medium Dots Orta Noktalar + Medium Lines Orta Çizgiler + Medium Strokes Orta Vuruşlar + Mono Contrast Mono Kontrast + Mosaic Tiles Mozaik Fayans + Multiple Flames Along Path Yol Boyunca Çoklu Alevler + Multiple Flames One Direction Çoklu Alevler Tek Yön + Multiple Flames Path Directions Çoklu Alev Yolu Yönleri + Multiple Flames Various Length Çoklu Alevler Çeşitli Uzunluklar + Octagon sekizgen + Odd Fields Tek Alanlar + One Flame Along Path Yol Boyunca Bir Alev + Out From Center Merkezden Dışarı + Oval oval + Overlay Edge Kaplama Kenarı + Palette Knife Palet Bıçağı + Parallel paralel + Patchwork yama işi + Pentagon Pentagon + Point Nokta + Pointed Sivri + Pond Ripples Gölet Dalgaları + Pyramids Piramitler + Random Rastgele + Right Diagonal Sağ Diyagonal + Ring Yüzük + Rope Halat + Roses Güller + Sandstone Kumtaşı + Scallops tarak + Sepia Sepya + Short Lines Kısa Çizgiler + Short Strokes Kısa Vuruşlar + Simple Basit + Light Intensity Işık Yoğunluğu + Spray Radius Püskürtme Yarıçapı + Stroke Direction Strok Yönü + Graininess Taneciklilik + Glow Amount Işıma Miktarı + Clear Amount Tutarı Temizle + Distortion Bozulma + Ripple Size Dalgalanma Boyutu + Ripple Magnitude Dalgalanma Büyüklüğü + Charcoal Area Kömür Alanı + Chalk Area Tebeşir Alanı + Charcoal Thickness Kömür Kalınlığı + Light Dark Balance Açık Karanlık Dengesi + Foreground Level Ön Plan Seviyesi + Background Level Arka Plan Düzeyi + Pattern Type Desen Türü + Image Balance Görüntü Dengesi + Darkness Karanlık + Fiber Length Elyaf Uzunluğu + Crack Spacing Çatlak Aralığı + Crack Depth Çatlak Derinliği + Crack Brightness Çatlak Parlaklığı + Grain Type Tahıl Türü + Tile Size Döşeme Boyutu + Grout Width Derz Genişliği + Lighten Grout Harcı hafifletmek + Square Size Kare Boyutu + Border Thickness Kenar Kalınlığı + Correct Distortion Bozulmanın Düzeltilmesi + Correct Vignette Doğru Vinyet + Correct C A Doğru CA + Auto Scale Otomatik Ölçeklendirme + Red Cyan Kırmızı Camgöbeği + Blue Yellow Mavi Sarı + Vignette Amount Vinyet Tutarı + Vignette Midpoint Vinyet Orta Noktası + Constraints Kısıtlamalar + Curve Highlights Eğrinin Öne Çıkan Noktaları + Curve Lights Eğri Işıkları + Curve Darks Eğri Koyuları + Curve Shadows Eğri Gölgeleri + Curve Splits Eğri Bölmeleri + Point Curve Nokta Eğrisi + Point Curve Red Nokta Eğrisi Kırmızı + Point Curve Green Nokta Eğrisi Yeşil + Point Curve Blue Nokta Eğrisi Mavi + Hsl Hue Hsl Ton + Hsl Sat HSL Cumartesi + Hsl Lum Hsl Lum + Grade Shadows Sınıf Gölgeleri + Grade Midtones Derece Orta Tonları + Grade Highlights Notun Öne Çıkan Noktaları + Grade Global Küresel Sınıf + Grade Blending Sınıf Harmanlama + Grade Balance Not Dengesi + Sine sinüs + Sketch Eskiz + Snowflakes Kar taneleri + Sparkle ışıltı + Spatter Sıçrama + Speckle Benek + Spin Döndürme + Sprinkles serpintiler + Squareness Karelik + Stagger Sendeleme + Stained Glass Vitray + Star Yıldız + Stars Yıldızlar + Stippled noktalanmış + Stretch Streç + Teal Orange turkuaz turuncu + Tiny Lens Minik Mercek + To Center Merkeze + Triangle Üçgen + Unaltered değiştirilmemiş + Underpainting Alt boyama + Underwater Sualtı + Uniform Üniforma + Upper Üst + Vertical Only Yalnızca Dikey + Vine With Flowers Çiçekli Asma + Vine With Leaves Yapraklı Asma + Violent Şiddet içeren + Warm Sıcak + Watercolor Suluboya + Waves Dalgalar + Wide Blurry Geniş Bulanık + Wide Sharp Geniş Keskin + Wrap Sarma + Zigzag Zikzak + Wetness ıslaklık + Delete Smart Filters Akıllı Filtreleri Sil + Enable Smart Filters Akıllı Filtreleri Etkinleştir + Delete Layer… Katmanı Sil… + Select Similar Colors Benzer Renkleri Seçin + New Selection Yeni Seçim + Click the first point or press ↵ to close · Esc cancels Kapatmak için ilk noktayı tıklayın veya ↵ tuşuna basın · Esc iptal eder + Click to add a point · drag off or ⌘/Ctrl-click or Delete to remove Nokta eklemek için tıklayın · sürükleyin veya kaldırmak için ⌘/Ctrl tuşuna basarak tıklayın veya Sil + Click to apply, ⌥-click to clear overrides, double-click for Style Options Uygulamak için tıklayın, geçersiz kılmaları temizlemek için ⌥-tıklayın, Stil Seçenekleri için çift tıklayın + Click: corner · Drag: smooth · Click first point: close · ↩ finish · Esc cancel Tıklayın: köşe · Sürükleyin: pürüzsüz · İlk noktaya tıklayın: kapat · ↩ bitir · Esc iptal + Rulers (⌘R) Cetveller (⌘R) + Show Guides (⌘;) Kılavuzları Göster (⌘;) + Grid (⌘') Izgara (⌘') + PDF Presentation… PDF Sunumu… + Picture Package… Resim Paketi… + Web Photo Gallery… Web Fotoğraf Galerisi… + Gray: Gri: + Spot: Nokta: + Technology Previews… Teknoloji Önizlemeleri… + 3D… 3 boyutlu… + AI Integrations Yapay Zeka Entegrasyonları + Add Noise Gürültü Ekle + Add Pins Pin Ekle + Add a mask (from the selection; ⌥ inverts) Bir maske ekleyin (seçimden; ⌥ tersine çevirir) + Adds grain to the soft edges of the brush tip. Fırça ucunun yumuşak kenarlarına gren ekler. + Adobe PDF Presets… Adobe PDF Hazır Ayarları… + Advanced Blending Gelişmiş Harmanlama + After (X) (X)'ten sonra + Airbrush: keeps painting while the pointer rests. Airbrush: İşaretçi dururken boyamaya devam eder. + Alternates for Current Selection Mevcut Seçimin Alternatifleri + Apply Data Set Veri Kümesini Uygula + Apply Image Resmi Uygula + Arbitrary keyfi + Artboard from Group Gruptan çalışma yüzeyi + Artboard from Layers Katmanlardan Çalışma Yüzeyi + Artboards to Files Çalışma Yüzeylerinden Dosyalara + Artboards to PDF Çalışma yüzeylerini PDF'ye dönüştürme + Ask Before Saving Saved Embedded Kaydedilen Gömülü Kaydetmeden Önce Sor + Assign Profile Profil Ata + At Şu tarihte: + Audio Ses + Auto-Align Layers Katmanları Otomatik Hizala + Auto-Blend Layers Katmanları Otomatik Karıştır + Auto-Hide Otomatik Gizle + Auto-leading % Otomatik satır aralığı % + Avoid Widows/Orphans Dul/Yetimlerden Kaçının + Background from Layer Katmandan Arka Plan + Batch Toplu + Blend Karışım + Border Sınır + Box Blur Kutu Bulanıklığı + Calculations Hesaplamalar + Camera Raw Camera Raw + Camera Raw Filter Camera Raw Filtresi + Canvas rotation Kanvas döndürme + Channel1 Kanal1 + Channel2 Kanal2 + Channel3 Kanal3 + Channel4 Kanal4 + Clipping Path Kırpma Yolu + Clone Klon + Color Decontaminate Renkli Dekontaminasyon + Color Halftone Renk Noktalı Resim + Color Lookup Tables Renk Arama Tabloları + Color Settings Renk Ayarları + Color Table Renk Tablosu + Compose Oluştur + Condensed Yoğunlaştırılmış + Conditional Mode Change Koşullu Mod Değişikliği + Content-Aware Fill İçeriğe Uygun Dolgu + Convert Frames > Video Layers Çerçeveleri Dönüştür > Video Katmanları + Convert to Linked Bağlantılıya Dönüştür + Convert to Profile Profile Dönüştür + Create Date Tarih Oluştur + Create Plane Düzlem Oluştur + Create new layer Yeni katman oluştur + Create new set Yeni grup oluştur + Crystallize Kristalleş + Data Veri + Data Sets as Files Dosya Olarak Veri Kümeleri + DateTime Original TarihSaat Orijinal + De-Interlace Taramasızlaştırma + Defaults restored. Varsayılanlar geri yüklendi. + Define Brush Preset Fırça Ön Ayarını Tanımla + Define Custom Shape Özel Şekli Tanımla + Define Pattern Deseni Tanımla + Defringe Bordürleri kaldır + Delete Pins Pinleri Sil + Diffuse Yaygın + Diffuse Glow Yaygın Parıltı + Digits Rakamlar + Displace Yer değiştir + Do you want to save you made to “{name}” before quitting? Çıkmadan önce yaptığınız işi “{name}” konumuna kaydetmek istiyor musunuz? + Dodge/Burn Soldurma/Yakma + Duplicate Path Yinelenen Yol + Dust & Scratches Toz ve Çizikler + Dynamics Dinamik + Edit Plane Düzlemi Düzenle + Export Contents İçeriği Dışa Aktar + Export Preferences Dışa Aktarma Tercihleri + Export/Import Presets Ön Ayarları Dışa Aktarma/İçe Aktarma + Extensions Uzantılar + Extrude Ekstrüzyon + Fibers Lifler + Field Blur Alan Bulanıklığı + File Info Dosya Bilgileri + Filter Gallery Filtre Galerisi + Find and Replace Text Metni Bul ve Değiştir + First Line Indent İlk Satır Girintisi + Fit Image Resmi Sığdır + Flame Alev + Flatten Frames Into Clips Çerçeveleri Klipsler halinde Düzleştirin + Flatten Frames Into Layers Çerçeveleri Katmanlara Düzleştirin + Focus Area Odak Alanı + Follows only edges this close to the pointer ([ and ] change it) Yalnızca işaretçiye bu kadar yakın olan kenarları takip eder ([ ve ] bunu değiştirir) + Frame Duration Kare Süresi + Frame Sync Çerçeve Senkronizasyonu + Gaussian Gaussian + Gaussian Blur Gauss Bulanıklığı + General Blend Genel Karışım + Global Light Küresel Işık + Glyph Glif + Glyph Scaling Glif Ölçekleme + Group from Layers Katmanlardan Gruplandır + Group · {n} layer Grup · {n} katman + HDR Toning HDR Tonlama + HSB Color HSB Rengi + HSL/Grayscale HSL/Gri tonlamalı + Hanging Punctuation Asılı Noktalama İşaretleri + Heal İyileşmek + Healing Şifa + Hide the layer's effects (⌥-click: all layers) Katmanın efektlerini gizleyin (⌥ tuşuna basarak tıklayın: tüm katmanlar) + High Pass Yüksek Geçiş + Higher values follow only edges that contrast sharply with their surroundings Daha yüksek değerler yalnızca çevreleriyle keskin bir kontrast oluşturan kenarları takip eder + Highlight Vurgula + How often fastening points are placed by themselves Sabitleme noktalarının kendi başlarına ne sıklıkla yerleştirildiği + ISO Speed ISO Hızı + Image Processor Görüntü İşlemcisi + In içinde + Install Plug-in Eklentiyi Yükle + Interpret Footage Görüntüyü Yorumlama + Intersect with selection (⇧⌥) Seçimle kesiştir (⇧⌥) + Iris Blur İris Bulanıklığı + Jag Jag + Justify Gerekçelendir + Keeps the current texture when switching presets. Ön ayarları değiştirirken mevcut dokuyu korur. + Label Etiket + Layer Comps to Files Dosyalara Katman Kompozisyonları + Layer Content Options Katman İçeriği Seçenekleri + Layer From Background Arka Plandan Katman + Layer from Background Arka Plandan Katman + Layers to Files Dosyalara Katmanlar + Legacy Eski + Lens Objektif + Lens Blur Mercek Bulanıklığı + Lens Correction Mercek Düzeltme + Lens Corrections Mercek Düzeltmeleri + Lens Flare Mercek Parlaması + Lens Info Objektif Bilgisi + Letter Spacing Harf Aralığı + Lighting Effects Aydınlatma Efektleri + Limit Playback Oynatmayı Sınırla + Liquify Sıvılaştır + Lock Layers Katmanları Kilitle + Loop Döngü + Lum Lum + Match Color Rengi Eşleştir + Measure Ölçü + Merge to HDR Pro HDR Pro'ya Birleştir + Mezzotint Mezotint + Modify Date Tarihi Değiştir + Mosaic Mozaik + Motion Blur Hareket Bulanıklığı + Native file drag-and-drop is not supported on Wayland yet. Use File › Open, or run PhotoCraft under XWayland with `WAYLAND_DISPLAY= photocraft`. Yerel dosya sürükle ve bırak özelliği henüz Wayland'de desteklenmiyor. Dosya › Aç'ı kullanın veya PhotoCraft'ı XWayland altında `WAYLAND_DISPLAY= photocraft` ile çalıştırın. + Neon Glow Neon Parıltı + New Guide Layout Yeni Kılavuz Düzeni + New Path Yeni Yol + New Video Group Yeni Video Grubu + New Video Layer Yeni Video Katmanı + New Video Layer from File Dosyadan Yeni Video Katmanı + Newspaper Gazete + Ocean Ripple Okyanus Dalgalanması + Oil Paint Yağlı Boya + Open As Farklı Aç + Operation Operasyon + Out Dışarı + Package Paket + Paint Daubs Boya Lekeleri + Path Blur Yol Bulanıklığı + Path to Illustrator… İllüstratöre Giden Yol… + Path: Yol: + Paths to Illustrator Illustrator'a Giden Yollar + Photomerge Fotoğraf Birleştir + Picture Frame Resim Çerçevesi + Pinch Tutam + Place Embedded Gömülü Yer + Place Linked Bağlantılı Yer + Place Scale Marker Ölçek İşaretçisini Yerleştirin + Plastic Wrap Plastik Sarma + Pointillize Noktalaştır + Polar Coordinates Kutupsal Koordinatlar + Polar To Rectangular Polar'dan Dikdörtgen'e + Poster Edges Poster Kenarları + Preset Manager Ön Ayar Yöneticisi + Profile Profil + Quick Sync Hızlı Senkronizasyon + Radial Blur Radyal Bulanıklık + Raw Data Ham Veri + Raw Defaults Ham Varsayılanlar + Rectangular To Polar Dikdörtgenden Polar'a + Reduce Noise Gürültüyü Azaltın + Relink to File Dosyaya Yeniden Bağlan + Render Video Videoyu Oluştur + Replace Color Rengi Değiştir + Replace Contents İçeriği Değiştir + Replace Footage Görüntüyü Değiştir + Resolve Missing Fonts Eksik Yazı Tiplerini Çözün + Ripple Dalgalanma + Roman Hanging Punctuation Roma Asılı Noktalama İşaretleri + Rotate Auto Otomatik Döndür + Rotate Fixed Sabit Döndür + Rough Pastels Kaba Pastel + Sat Cumartesi + Save a Copy Bir Kopyasını Kaydet + Save for Web (Legacy) Web için Kaydet (Eski) + Saved Multichannel Çok Kanallı Kaydedildi + Scale Effects Ölçek Efektleri + Script Events Manager Komut Dosyası Olay Yöneticisi + Search menus Arama menüleri + Seed tohum + Select Plane Düzlem Seç + Select and Mask Seç ve Maskele + Semi Bold Yarı Kalın + Set Measurement Scale Ölçüm Ölçeğini Ayarla + Shadows/Highlights Gölgeler/Vurgular + Shape Blur Şekil Bulanıklığı + Shear Kesme + Show the layer's effects (⌥-click: all layers) Katmanın efektlerini göster (⌥ tuşuna basarak tıklayın: tüm katmanlar) + Single Word Justification Tek Kelime Gerekçesi + Smart Blur Akıllı Bulanıklaştırma + Smart Sharpen Akıllı Keskinleştirme + Smudge Stick Leke Çubuğu + Solid Color Düz Renk + Spacing: Aralık: + Spherize Küreselleştir + Spin Blur Döndürme Bulanıklığı + Split Toning Bölünmüş Tonlama + Split at Playhead Oynatma Kafasında Böl + Spot nokta + Spot Channel Spot Kanal + Sprayed Strokes Püskürtülmüş Vuruşlar + Strokes Vuruşlar + Subject Distance Konu Mesafesi + Subtract from selection (⌥) Seçimden çıkar (⌥) + Sumi-e Sumi-e + Surface Blur Yüzey Bulanıklığı + Technology Previews Teknoloji Önizlemeleri + Texturizer Dokulaştırıcı + Tiles Fayans + Tilt Eğim + Tilt-Shift Tilt-Shift + Tone Curve Ton Eğrisi + Tool Araç + Toolbars Araç Çubukları + Trace Contour Konturu İzle + Trap Tuzak + Tree Ağaç + Trim Kırpma + Turbulent Çalkantılı + Twirl Burgu + Ultra Bold Ultra Kalın + Ultra Light Ultra Hafif + Unsharp Mask Keskinliği Azaltma Maskesi + Use File › Open to open an image. Bir resmi açmak için Dosya › Aç'ı kullanın. + Vanishing Point Ufuk Noktası + Variable Data Sets Değişken Veri Setleri + Video Frames to Layers Video Karelerinden Katmanlara + WIA Support WIA Desteği + Warp Text Metni Çözgü + Watercolour look: lighter interior, darker rims. Suluboya görünümü: daha açık iç kısım, daha koyu jantlar. + Wind Rüzgâr + Word Spacing Kelime Aralığı + Working Gray Plate Gri Çalışma Plakası + ZigZag ZigZag + ↑↓ navigate ↵ run esc close ↑↓ gezin ↵ çalıştır esc kapat +cameraRaw Amount Miktar +cameraRaw Blacks Siyahlar +cameraRaw Color Detail Renk Detayı +cameraRaw Color Grading Renk Derecelendirme +cameraRaw Darks Koyular +cameraRaw Global Genel +cameraRaw Hue Ton +cameraRaw Lights Açıklar +cameraRaw Luminance Detail Parlaklık Detayı +cameraRaw Masking Maskeleme +cameraRaw Roughness Pürüzlülük +cameraRaw Tint Renk Tonu +cameraRaw Vibrance Titreşim +cameraRaw Whites Beyazlar + Wand Değnek + Note tool Not aracı + Magnetic Lasso Manyetik Kement + Art History Brush Sanat Tarihi Fırçası + Spot Healing Nokta Şifası + Content-Aware Move İçeriğe Uygun Taşıma + Vertical Type Tool Dikey Metin Aracı + Click the first point or press {key} to close · {del} removes a point · Esc cancels İlk noktayı tıklayın veya kapatmak için {key} tuşuna basın · {del} bir noktayı kaldırır · Esc iptal eder + Click, then move along an edge · click to fasten a point · {alt}-click for a straight segment · double-click to close Tıklayın, ardından bir kenar boyunca hareket edin · bir noktayı sabitlemek için tıklayın · düz bir parça için {alt}-tıklayın · kapatmak için çift tıklayın + About {app} {app} Hakkında + Hide {app} {app}'ı gizle + Quit {app} {app}'dan çık + Services Hizmetler + Hide Others Diğerlerini Gizle + 3D 3D + Pen Kalem + Hand El + Sampler Örnekleyici + Patch Yama + Perspective Crop Perspektif Kırpma + RGB RGB + ISO ISO + ColorSync Renk Senkronizasyonu + ProPhoto ProFotoğraf + sRGB sRGB + ACES ACES + {zoom}% %{zoom} + Mac LCD Mac LCD'si + Mac Sharp Mac Keskin + Mac Crisp Mac Çıtır + Mac Strong Mac Güçlü + Mac Smooth Mac Pürüzsüz + Adobe Single-line Composer Adobe Tek Satır Oluşturucu + Adobe Every-line Composer Adobe Her Satır Oluşturucusu + X X + Y Y + 30 fps 30 fps + 25 fps 25 fps + 24 fps 24 fps + 15 fps 15 fps + 10 fps 10 fps + URLs URLs + EXIF EXIF + GPS GPS + Mac OS Mac OS + Unix Unix + RGB: RGB: + CMYK: CMYK: + sRGB IEC61966-2.1 sRGB IEC61966-2.1 + Adobe RGB (1998) Adobe RGB (1998) + ProPhoto RGB ProPhoto RGB + ColorMatch RGB ColorMatch RGB + Wide Gamut RGB Wide Gamut RGB + Apple RGB Apple RGB + NTSC (1953) NTSC (1953) + PAL/SECAM PAL/SECAM + SMPTE C SMPTE-C + HDTV (Rec. 709) HDTV (Kayıt 709) + CIE RGB CIE RGB + Photo (2 × 3 in) Fotoğraf (2 × 3 inç) + Photo (4 × 6 in) Fotoğraf (4 × 6 inç) + Photo (5 × 7 in) Fotoğraf (5 × 7 inç) + Photo (8 × 10 in) Fotoğraf (8 × 10 inç) + Lut Lut + Cooling L B B Soğutma L B B + Cooling80 Soğutma80 + Cooling82 Soğutma82 + Hsb HSB + Hsl HSL + Movie Prime Film Başbakanı + Prime105 Prime105 + Prime35 Prime35 + Rgb RGB + Sponge Sünger + Warming L B A Isınma L B A + Warming81 Isınma81 + Warming85 Isınma85 +@id filter.sharpen.sharpen Keskinleştir + Good iyi + Best En iyi + Out of gamut for printing: click for the nearest printable colour Yazdırma için gamın dışında: yazdırılabilir en yakın renk için tıklayın + Not a web colour: click for the nearest web colour Web rengi değil: en yakın web rengi için tıklayın + Adjustment Properties Ayarlama Özellikleri + Brush Stroke Fırça Darbesi + Default Foreground and Background Colors Varsayılan Ön Plan ve Arka Plan Renkleri + Move Layer Katmanı Taşı + Rectangular Selection Dikdörtgen Seçimi + Reorder Layer Katmanı Yeniden Sırala + Select Layer Katman Seç + Set Colors Renkleri Ayarla + Switch Foreground and Background Colors Ön Plan ve Arka Plan Renklerini Değiştir + Target Hedef + 3 by 3 Average 3'e 3 Ortalama + 5 by 5 Average 5'e 5 Ortalama + 11 by 11 Average 11'e 11 Ortalama + 31 by 31 Average 31'e 31 Ortalama + 51 by 51 Average 51'e 51 Ortalama + 101 by 101 Average 101'e 101 Ortalama + All Layers No Adjustments Tüm Katmanlar Ayarlama Yok + Color to Alpha… Alfa'ya Renk… + Current & Below No Adjustments Mevcut ve Altında Ayarlama Yok + Now drag the selection onto another area Şimdi seçimi başka bir alana sürükleyin + Point Sample Nokta Örneği + Sample Size: Örnek Boyutu: + Show Sampling Ring Örnekleme Halkasını Göster + Dual Axis Çift Eksen + Diagonal diyagonal + Transform Symmetry Simetriyi Dönüştür + Rasterize svg groups deeper than Svg gruplarını şundan daha derin bir şekilde rasterleştirin: + 0 turns this threshold off; SVG groups nested deeper than 100 levels are always rasterized. 0 bu eşiği kapatır; 100 düzeyden daha derine yerleştirilmiş SVG grupları her zaman rasterleştirilir. + Rule of Thirds Üçte Bir Kuralı + Golden Ratio Altın Oran + Golden Spiral Altın Spiral + Auto Show Overlay Otomatik Göster Yer Paylaşımı + Always Show Overlay Kaplamayı Her Zaman Göster + Never Show Overlay Kaplamayı Hiçbir Zaman Gösterme + Cycle Overlay Döngü Yerleşimi + Cycle Orientation Döngü Yönü + Set the overlay options for the Crop tool Kırpma aracının kaplama seçeneklerini ayarlama + Alt-click went to the desktop, which moves windows with Alt-drag. Set its window-move key to Super, or latch Alt in Window › Modifier Keys. Alt tuşuna basıp masaüstüne giderek pencereleri Alt tuşuyla sürükleyerek hareket ettirin. Pencere taşıma tuşunu Süper olarak ayarlayın veya Pencere › Değiştirici Tuşlar'da Alt'ı mandallayın. + Color Picker (Layer Style Color) Renk Seçici (Katman Stili Rengi) + Auto Hide Notifications Bildirimleri Otomatik Gizle + Notification Duration (seconds) Bildirim Süresi (saniye) + Appearance Mode Görünüm Modu + Next Appearance Mode Sonraki Görünüm Modu + Sync with system Sistemle senkronizasyon + Active Aktif + Color Picker (Solid Color) Renk Seçici (Düz Renk) + Straighten the image by drawing a line on it Üzerine bir çizgi çizerek görüntüyü düzeltin + Set additional Crop options Ek Kırpma seçeneklerini ayarlayın + Show Cropped Area Kırpılmış Alanı Göster + Enable Crop Shield Kırpma Kalkanını Etkinleştir + Match Canvas Maç Kanvası + Auto Adjust Opacity Opaklığı Otomatik Ayarla + Crop Shield color Kırpma Kalkanı rengi + Color Picker (Crop Shield Color) Renk Seçici (Kırpma Kalkanı Rengi) + From Center Merkezden + Link radii Bağlantı yarıçapları + Star Ratio: Yıldız Oranı: + Create Rectangle Dikdörtgen Oluştur + Create Ellipse Elips Oluştur + Create Triangle Üçgen Oluştur + Create Polygon Çokgen Oluştur + Pressure curve Basınç eğrisi + Click to add a point, right-click to remove Nokta eklemek için tıklayın, kaldırmak için sağ tıklayın + Some brush presets could not be loaded Bazı fırça ön ayarları yüklenemedi + Retry saving presets Ön ayarları kaydetmeyi yeniden deneyin + Brush preset changes are not saved: {error} Fırça hazır ayarı değişiklikleri kaydedilmiyor: {error} + Keep this tab open to retain your brushes. Fırçalarınızı korumak için bu sekmeyi açık tutun. + Browser storage is unavailable; brushes are session-only. Keep this tab open to retain them. Tarayıcı depolama alanı kullanılamıyor; fırçalar yalnızca oturum içindir. Bunları korumak için bu sekmeyi açık tutun. + Saving brush presets… Keep this tab open until saving finishes. Fırça ön ayarları kaydediliyor… Kaydetme bitene kadar bu sekmeyi açık tutun. + Reflect Yansıt + Glow Parıltı + Negation Olumsuzluk + XOR XOR + Color Burn (Paint.NET) Renk Yanması (Paint.NET) + Color Dodge (Paint.NET) Renk Soldurma (Paint.NET) + Pro Medium Profesyonel Orta + Studio Light Stüdyo Işığı + Stroke Options Kontur Seçenekleri + Solid Katı + Dashed Kesikli + Dotted Noktalı + Caps Kapaklar + Butt / Flat Popo / Düz + Miter Gönye + Round Yuvarlak + Bevel Eğim + Miter limit Gönye sınırı + Dashed line Kesikli çizgi + Dash Çizgi + Gap Boşluk + Dash / gap lengths × stroke width Çizgi / boşluk uzunlukları × kontur genişliği + Add pair Çift ekle + Remove pair Çifti kaldır + Dash offset Çizgi ofseti + Open paths use centered strokes Açık yollar ortalanmış konturlar kullanır + Use finite lengths and a positive pattern total Sonlu uzunluklar ve pozitif bir model toplamı kullanın + No subject found — try Object Selection or the Lasso Konu bulunamadı — Nesne Seçimi'ni veya Kement'i deneyin + Quick Selection found nothing there Hızlı Seçim orada hiçbir şey bulamadı + Object Selection found nothing there — try a tighter rectangle Nesne Seçimi burada hiçbir şey bulamadı; daha dar bir dikdörtgen deneyin + No subject found — try a rectangle around the object Konu bulunamadı — nesnenin etrafında bir dikdörtgen oluşturmayı deneyin + Appearance Settings… Görünüm Ayarları… + Add to favorites Favorilere ekle + Remove from favorites Favorilerden kaldır +cameraData Make Üretici +cameraData Model Model +cameraData Date Taken Çekim Tarihi +cameraData Exposure Pozlama +cameraData F-Stop Diyafram +cameraData ISO Speed ISO Hızı +cameraData Focal Length Odak Uzaklığı +cameraData Focal Length (35 mm) Odak Uzaklığı (35 mm) +cameraData Lens Lens + Activate Panel Paneli Etkinleştir + Change Panel Group Panel Grubunu Değiştir + Change Panel Layout Panel Düzenini Değiştir + Close Panel Paneli Kapat + Dock Panel Bağlantı İstasyonu Paneli + Float Panel Şamandıra Paneli + Move Panel Paneli Taşı + Group with Şununla grupla: + Panel menu Panel menüsü + Resize panel window Panel penceresini yeniden boyutlandır + Resize panels Panelleri yeniden boyutlandır + Use Classic Mode Klasik Modu Kullan + Auto Center Preview Otomatik Merkezleme Önizlemesi + Next Document Sonraki Belge + Previous Document Önceki Belge + W x H x Resolution G x Y x Çözünürlük + Front Image Ön Resim + Perspective Crop Tool Perspektif Kırpma Aracı + Drag a box or click four corners · drag the corners onto the edges of a skewed shape · {commit} commits · Esc cancels Bir kutuyu sürükleyin veya dört köşeyi tıklayın · köşeleri çarpık bir şeklin kenarlarına sürükleyin · {commit} taahhütleri · Esc iptalleri + Artboard Tool Çalışma Yüzeyi Aracı + Make Portrait Portre Yap + Make Landscape Manzara Yap + Add New Artboard Yeni Çalışma Yüzeyi Ekle + Freeform Pen Tool Serbest Kalem Aracı + Curvature Pen Tool Eğrilik Kalemi Aracı + Curve Fit: Eğri Fitili: + Drag: draw freehand · Release on the start point: close Sürükleyin: serbest çizim yapın · Başlangıç noktasında bırakın: kapat + Click: smooth point · Double-click: corner · Drag a point: move · Click first point: close · {key} finish Tıklama: düzgün nokta · Çift tıklama: köşe · Bir noktayı sürükleyin: taşıma · İlk noktayı tıklayın: kapat · {key} bitiş + New Crop Preset… Yeni Kırpma Ön Ayarı… + Delete Crop Preset… Kırpma Ön Ayarını Sil… + Select the crop presets to delete: Silinecek kırpma ön ayarlarını seçin: + Select the crop presets to delete Silinecek kırpma ön ayarlarını seçin + Enter a name for the crop preset Kırpma ön ayarı için bir ad girin + There is no crop size or ratio to save Kaydedilecek kırpma boyutu veya oranı yok + Search settings… Arama ayarları… + No matching settings Eşleşen ayar yok + PhotoCraft — Screen Color Picker PhotoCraft — Ekran Rengi Seçici + Loading fonts… Yazı tipleri yükleniyor… + Onion Skin Soğan Kabuğu + Marching Ants Yürüyen Karıncalar + On Black Siyah + On White Beyaz + On Layers Katmanlarda + Show Edge Kenarı Göster + Show Original Orijinali Göster + F cycles the views; hold X to see the image F görünümleri döndürür; resmi görmek için X'i basılı tutun + Refine Edge Brush (R) Kenar Fırçasını İncelt (R) + Expand Detection Area Algılama Alanını Genişlet + Restore Original Edge Orijinal Kenarı Geri Yükle + Paint over hair or fur on the image; Alt paints the other mode Görüntünün üzerine saç veya kürkün üzerini boyayın; Alt diğer modu boyar + Clear Brush Strokes Fırça Darbelerini Temizle + Show rulers Cetvelleri göster + Frame Tool Çerçeve Aracı + Create a new rectangular frame Yeni bir dikdörtgen çerçeve oluşturun + Create a new elliptical frame Yeni bir eliptik çerçeve oluşturun + Include in playback Oynatmaya dahil et + Scale: Ölçek: + Snap to Origin Orijine Yapış + Click to place · Alt-click or drag off-canvas to remove Yerleştirmek için tıklayın · Kaldırmak için Alt tuşuna basarak tıklayın veya tuvalin dışına sürükleyin + {n} of {max} sample points {n} / {max} örnek nokta + Emulsion Down Emülsiyon Aşağı + Functions Fonksiyonlar + Print Resolution: Baskı Çözünürlüğü: + Transparency Threshold Saydamlık Eşiği + Opacity Threshold Opaklık Eşiği + (No neutral color exists for {mode} mode.) ({mode} modu için nötr renk bulunmuyor.) + Drag: draw freehand · {alt}-click: straight segment · Release on the start point: close Sürükle: serbest çiz · {alt}-tıkla: düz segment · Başlangıç noktasında bırak: kapat + Fill with {mode}-neutral color (50% gray) {mode} nötr rengiyle doldur (%50 gri) + Fill with {mode}-neutral color (black) {mode} nötr rengiyle doldur (siyah) + Fill with {mode}-neutral color (white) {mode} nötr rengiyle doldur (beyaz) + Use Previous Layer to Create Clipping Mask Kırpma Maskesi Oluşturmak İçin Önceki Katmanı Kullan + Amount: Miktar: + Apply Vanishing Point ({key}) Ufuk Noktasını Uygula ({key}) + Apply the removal ({key}) Kaldırmayı uygula ({key}) + Drag to draw the curve · {key}-click draws a straight line Eğriyi çizmek için sürükle · {key}-tıklama düz çizgi çizer + Draw to modify the curve Eğriyi değiştirmek için çiz + Edit points to modify the curve Eğriyi değiştirmek için noktaları düzenle + Fix the red plane first: its corners must form a convex quad Önce kırmızı düzlemi düzeltin: köşeleri dışbükey bir dörtgen oluşturmalı + Grid Size: Izgara Boyutu: + Light Blue Açık Mavi + Light Gray Açık Gri + Light Red Açık Kırmızı + Medium Blue Orta Mavi + Merge Group Grubu Birleştir + Protect skin tones Ten tonlarını koru + Protect: Koru: + Remove after each stroke Her vuruştan sonra kaldır + Saving {percent} Kaydediliyor {percent} + Scale or rotate the moved area, then press {key} Taşınan alanı ölçeklendirin veya döndürün, ardından {key} tuşuna basın + Smooth the curve values Eğri değerlerini yumuşat + Strokes to remove: {n} (Enter applies, Esc cancels) Kaldırılacak vuruşlar: {n} (Enter uygular, Esc iptal eder) + The layer or its mask changed. Drag the mask onto the Trash again. Katman veya maskesi değişti. Maskeyi yeniden Çöp Kutusu'na sürükleyin. + Transform On Drop Bırakınca Dönüştür + Vanishing Point is not active Ufuk Noktası etkin değil + Vanishing Point: click four corners to create a plane Ufuk Noktası: düzlem oluşturmak için dört köşeye tıklayın +@plural Exported {n} swatch to {file}|Exported {n} swatches to {file} {n} renk örneği {file} dosyasına dışa aktarıldı +@plural Imported {n} brush from {group}|Imported {n} brushes from {group} {group} grubundan {n} fırça içe aktarıldı +@plural Imported {n} swatch from {file}|Imported {n} swatches from {file} {file} dosyasından {n} renk örneği içe aktarıldı +@plural Played {n} step|Played {n} steps {n} adım oynatıldı +@plural Saved for Web: {n} file|Saved for Web: {n} files Web İçin Kaydedildi: {n} dosya +@plural Updated {n} linked smart object changed on disk|Updated {n} linked smart objects changed on disk Diskte değişen {n} bağlantılı akıllı nesne güncellendi +@plural {n} layer recorded by this comp was deleted. Update the comp, or clear the warning.|{n} layers recorded by this comp were deleted. Update the comp, or clear the warning. Bu kompozisyonun kaydettiği {n} katman silindi. Kompozisyonu güncelleyin veya uyarıyı temizleyin. +@plural {n} plane|{n} planes {n} düzlem +@plural {n} preset|{n} presets {n} ön ayar +@plural {n} sample point removed|{n} sample points removed {n} örnek nokta kaldırıldı +@plural {n} slice|{n} slices {n} dilim +@plural {n} step|{n} steps {n} adım +@plural {warning} (+{n} more brush preset warning)|{warning} (+{n} more brush preset warnings) {warning} (+{n} fırça ön ayarı uyarısı daha) +@plural {what} with {n} warning|{what} with {n} warnings {what}, {n} uyarı ile diff --git a/docs/localization-parity.md b/docs/localization-parity.md index 8b0ebf40..cba241e1 100644 --- a/docs/localization-parity.md +++ b/docs/localization-parity.md @@ -48,7 +48,8 @@ catalog). 8 more, each at 1,608 / 1,608 measured keys, status `partial` for the same reason: Traditional Chinese `zh-hant` (2,329 rows), Russian `ru` (2,544), Ukrainian `uk` (3,375), Czech `cs` (3,522), Polish `pl` (3,366), Greek `el` (3,481), Dutch `nl` (3,568), Italian `it` (3,928; also every dynamic label the -other catalogs translate, [notes](localization-it.md)). +other catalogs translate, [notes](localization-it.md)). Turkish `tr` (3,731 rows) also covers every +measured key. Czech UI follow-up (2026-10-11): status and notice wrappers, hardware labels, brush and transform accessibility names, rasterization prompts, profile mismatch messages and preset @@ -79,3 +80,4 @@ engine localization or native review is complete. | 2026-10-11 | minor | Czech dynamic status/notice and hardware text, render labels and Navigator zoom context; engine messages remain English | | 2026-10-11 | minor | Czech review follow-ups: English System Info diagnostics, id-aware shortcut labels, display-only auto translation, warning punctuation and wording; catalog row count refreshed | | 2026-10-11 | minor | Italian: 1,287 dynamic labels added (filter parameters, Camera Raw, lighting, panels, dialogs) and terminology made consistent | +| 2026-10-12 | minor | Added Turkish (`tr`) catalog with 100% measured UI coverage | diff --git a/xtask/src/i18n_coverage.rs b/xtask/src/i18n_coverage.rs index 105f9274..2be43cb5 100644 --- a/xtask/src/i18n_coverage.rs +++ b/xtask/src/i18n_coverage.rs @@ -579,6 +579,7 @@ mod tests { ("el", "el.tsv"), ("uk", "uk.tsv"), ("nl", "nl.tsv"), + ("tr", "tr.tsv"), ("vi", "vi.tsv"), ] { let catalog_path = root.join("crates/ui-egui/src/i18n").join(path);