Update pixels::unmultiply_inplace to support RB swap and use it in canvas_state (#35313)

* update unmultiply_inplace to handle reversed RGB

Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>

* Reuse unmultiply_inplace instead of manual compute; remove unused

Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>

---------

Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>
This commit is contained in:
Euclid Ye 2025-02-06 13:02:49 +08:00 committed by GitHub
parent cb7688314b
commit 0de6d1bc3a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 13 additions and 4116 deletions

View file

@ -20,7 +20,7 @@ fn bench(c: &mut Criterion) {
c.bench_function("unmultiply_inplace", move |b| {
b.iter_batched(
|| data.clone(),
|mut data| pixels::unmultiply_inplace(&mut data),
|mut data| pixels::unmultiply_inplace::<false>(&mut data),
BatchSize::SmallInput,
)
});

View file

@ -197,7 +197,7 @@ pub fn detect_image_format(buffer: &[u8]) -> Result<ImageFormat, &str> {
}
}
pub fn unmultiply_inplace(pixels: &mut [u8]) {
pub fn unmultiply_inplace<const SWAP_RB: bool>(pixels: &mut [u8]) {
for rgba in pixels.chunks_mut(4) {
let a = rgba[3] as u32;
let mut b = rgba[2] as u32;
@ -209,9 +209,15 @@ pub fn unmultiply_inplace(pixels: &mut [u8]) {
g = g * 255 / a;
b = b * 255 / a;
rgba[2] = b as u8;
rgba[1] = g as u8;
rgba[0] = r as u8;
if SWAP_RB {
rgba[2] = r as u8;
rgba[1] = g as u8;
rgba[0] = b as u8;
} else {
rgba[2] = b as u8;
rgba[1] = g as u8;
rgba[0] = r as u8;
}
}
}
}