Merge PR #5680: Layer masks: From Transparency and Mask All Objects convert the Background and match the document depth (#5679)

This commit is contained in:
aiongg committed 2026-10-21 01:06:16 +00:00
commit acdf17f858
3 files changed
+60 -4

No files matched your search

+1 -1
View File
@@ -403,7 +403,7 @@ pub(crate) fn selection_mask(doc: &Document) -> Result<Option<LayerMask>> {
/// New pixel masks use the document's depth, as PSD saves/imports do. Otherwise a later soft
/// brush stroke quantizes differently depending on whether the document reopened as PSD or
/// native. Converting a selection keeps its coverage and does not alter the selection itself.
fn mask_at_depth(mut mask: LayerMask, depth: SampleType) -> Result<LayerMask> {
pub(crate) fn mask_at_depth(mut mask: LayerMask, depth: SampleType) -> Result<LayerMask> {
let format = mask.surface.format().with_sample(depth);
if mask.surface.format() != format {
mask.surface = mask.surface.try_convert(format)?;
+6 -3
View File
@@ -168,11 +168,12 @@ fn apply_mask(s: &mut Session, p: &Value) -> Result<Value> {
fn mask_from_transparency(s: &mut Session, p: &Value) -> Result<Value> {
let id = layer_param(s, p)?;
s.edit("From Transparency", |doc, _| {
let depth = doc.depth;
let surf = crate::commands::paint_surface(doc, id, &Value::Null)?;
// Masks are attached to layer coordinates, including pixels temporarily off-canvas.
// Clipping to document bounds loses their alpha permanently when moved back (#3043).
let r = surf.content_bounds();
let mut mask = LayerMask::hide_all();
let mut mask = crate::commands::mask_at_depth(LayerMask::hide_all(), depth)?;
if !r.is_empty() {
let mut px = read_rgba(surf, r);
let alpha: Vec<f32> = px.iter().map(|q| q[3]).collect();
@@ -183,6 +184,7 @@ fn mask_from_transparency(s: &mut Session, p: &Value) -> Result<Value> {
}
write_rgba(surf, r, &px);
}
crate::extra_cmds::background_to_layer_for_mask(doc, id);
doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?.mask = Some(mask);
Ok(Value::Null)
})
@@ -198,7 +200,7 @@ fn hide_selection(s: &mut Session, p: &Value) -> Result<Value> {
for x in &mut v {
*x = 1.0 - *x;
}
let mut mask = LayerMask::reveal_all();
let mut mask = crate::commands::mask_at_depth(LayerMask::reveal_all(), doc.depth)?;
mask.surface.write_region(bounds, &v);
mask.surface.prune();
for id in ids {
@@ -235,10 +237,11 @@ fn mask_all_objects(s: &mut Session, p: &Value) -> Result<Value> {
let region = region.ok_or_else(|| other("no objects were found"))?;
let bbox = region.bbox;
s.edit("Mask All Objects", |doc, _| {
let mut mask = LayerMask::hide_all();
let mut mask = crate::commands::mask_at_depth(LayerMask::hide_all(), doc.depth)?;
let v: Vec<f32> = region.mask.iter().map(|m| f32::from(*m) / 255.0).collect();
mask.surface.write_region(bbox, &v);
mask.surface.prune();
crate::extra_cmds::background_to_layer_for_mask(doc, id);
doc.layer_mut(id).ok_or(EngineError::NoLayer(id))?.mask = Some(mask);
Ok(())
})?;
@@ -552,6 +552,59 @@ fn mask_all_objects_masks_the_subject() {
}
}
fn subject(x: i32, y: i32) -> [f32; 4] {
let inside = (((x - 20) * (x - 20) + (y - 15) * (y - 15)) as f32).sqrt() < 8.0;
if inside { [0.9, 0.2, 0.1, 1.0] } else { [0.95, 0.95, 0.95, 1.0] }
}
#[test]
fn from_transparency_and_mask_all_objects_turn_the_background_into_a_layer() {
for cmd in ["layer.layerMask.fromTransparency", "layer.maskAllObjects", "layer.layerMask.hideSelection"] {
let mut s = Session::new();
s.execute("file.new", json!({"width": 40, "height": 30, "background": "white"})).unwrap();
let id = s.active().unwrap().active_layer.unwrap();
assert!(doc(&s).is_background(id));
paint(&mut s, subject);
if cmd.ends_with("hideSelection") {
select_left_half(&mut s);
}
s.execute(cmd, json!({})).unwrap();
assert!(!doc(&s).is_background(id), "{cmd}: the Background became a layer");
assert_eq!(active(&s).name, "Layer 0", "{cmd}");
assert!(active(&s).mask.is_some(), "{cmd}");
}
}
#[test]
fn layer_masks_are_built_at_the_document_depth() {
use photocraft_color::SampleType;
for (depth, sample, tol) in [(8, SampleType::U8, 1.0 / 255.0), (16, SampleType::U16, 1.0 / 65535.0), (32, SampleType::F32, 1e-6)] {
let mut s = session(depth, "rgb");
paint(&mut s, |_, _| [0.2, 0.4, 0.6, 0.5003]);
s.execute("layer.layerMask.fromTransparency", json!({})).unwrap();
let m = active(&s).mask.as_ref().unwrap();
assert_eq!(m.surface.format().sample, sample, "From Transparency at {depth}");
assert!((m.value(5, 5) - 0.5003).abs() < tol, "From Transparency at {depth}: {}", m.value(5, 5));
assert_eq!(m.value(-50, -50), 0.0, "outside the layer stays hidden at {depth}");
let mut s = session(depth, "rgb");
paint(&mut s, |_, _| [0.2, 0.4, 0.6, 1.0]);
select_left_half(&mut s);
s.execute("layer.layerMask.hideSelection", json!({})).unwrap();
let m = active(&s).mask.as_ref().unwrap();
assert_eq!(m.surface.format().sample, sample, "Hide Selection at {depth}");
assert_eq!((m.value(5, 5), m.value(30, 5), m.value(500, 500)), (0.0, 1.0, 1.0), "Hide Selection at {depth}");
let mut s = session(depth, "rgb");
paint(&mut s, subject);
s.execute("layer.maskAllObjects", json!({})).unwrap();
let m = active(&s).mask.as_ref().unwrap();
assert_eq!(m.surface.format().sample, sample, "Mask All Objects at {depth}");
assert!(m.value(20, 15) > m.value(1, 1), "Mask All Objects at {depth}");
assert_eq!(m.value(500, 500), 0.0, "Mask All Objects at {depth}");
}
}
#[test]
fn layer_masks_in_gray_cmyk_lab() {
for mode in ["gray", "cmyk", "lab"] {