Skip to content

Fix bounds on mask composite #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
giantpand2000 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix bounds on mask composite #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c44c593
Fix bounds on mask composite
giantpand2000 Apr 3, 2022
bbb94a1
Add test for mask composite position
giantpand2000 Apr 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/draw_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ impl<Backing : AsRef<[u32]> + AsMut<[u32]>> DrawTarget<Backing> {

/// Draws `src` through an untransformed `mask` positioned at `x`, `y` in device space
pub fn mask(&mut self, src: &Source, x: i32, y: i32, mask: &Mask) {
self.composite(src, Some(&mask.data), intrect(x, y, mask.width, mask.height), intrect(x, y, mask.width, mask.height), BlendMode::SrcOver, 1.);
self.composite(src, Some(&mask.data), intrect(x, y, x + mask.width, y + mask.height), intrect(x, y, x + mask.width, y + mask.height), BlendMode::SrcOver, 1.);
}

/// Strokes `path` with `style` and fills the result with `src`
Expand Down
56 changes: 56 additions & 0 deletions src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,4 +956,60 @@ mod tests {
&checkerboard[..]
);
}

#[test]
fn mask_composite_position() {
let mask = Mask {
width: 2,
height: 2,
data: vec![0xff, 0xff, 0xff, 0xff],
};
let source = Source::Solid(SolidSource {
r: 0xff,
g: 0,
b: 0,
a: 0xff,
});
let zeros = SolidSource {
r: 0,
g: 0,
b: 0,
a: 0,
};
let red = 0xffff0000;
let width: i32 = 4;
let height: i32 = 4;

let mut dt = DrawTarget::new(width, height);
let pos = |offset: (usize, usize), (x, y): (usize, usize)| {
offset.0 + x + (offset.1 + y) * width as usize
};

dt.mask(&source, 0, 0, &mask);
assert_eq!(dt.get_data()[pos((0, 0), (0, 0))], red);
assert_eq!(dt.get_data()[pos((0, 0), (0, 1))], red);
assert_eq!(dt.get_data()[pos((0, 0), (1, 0))], red);
assert_eq!(dt.get_data()[pos((0, 0), (1, 1))], red);

dt.clear(zeros);
dt.mask(&source, 1, 0, &mask);
assert_eq!(dt.get_data()[pos((1, 0), (0, 0))], red);
assert_eq!(dt.get_data()[pos((1, 0), (0, 1))], red);
assert_eq!(dt.get_data()[pos((1, 0), (1, 0))], red);
assert_eq!(dt.get_data()[pos((1, 0), (1, 1))], red);

dt.clear(zeros);
dt.mask(&source, 0, 1, &mask);
assert_eq!(dt.get_data()[pos((0, 1), (0, 0))], red);
assert_eq!(dt.get_data()[pos((0, 1), (0, 1))], red);
assert_eq!(dt.get_data()[pos((0, 1), (1, 0))], red);
assert_eq!(dt.get_data()[pos((0, 1), (1, 1))], red);

dt.clear(zeros);
dt.mask(&source, 1, 1, &mask);
assert_eq!(dt.get_data()[pos((1, 1), (0, 0))], red);
assert_eq!(dt.get_data()[pos((1, 1), (0, 1))], red);
assert_eq!(dt.get_data()[pos((1, 1), (1, 0))], red);
assert_eq!(dt.get_data()[pos((1, 1), (1, 1))], red);
}
}