Skip to content
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

jxl-color: Fix linear_to_srgb panic #27

Merged
merged 1 commit into from
May 24, 2023
Merged

jxl-color: Fix linear_to_srgb panic #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions crates/jxl-color/src/tf.rs
View file
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ pub fn linear_to_srgb(samples: &mut [f32]) {
let pow = pow * v_adj + 0.018092343;

// `mul` won't be used when `v` is small.
let idx = (v >> 23).saturating_sub(118) as usize & 15;
let idx = (v >> 23).wrapping_sub(118) as usize & 0xf;
let mul = 0x4000_0000 | (u32::from(POWTABLE_UPPER[idx]) << 18) | (u32::from(POWTABLE_LOWER[idx]) << 10);

let v = f32::from_bits(v);
@@ -127,7 +127,7 @@ unsafe fn linear_to_srgb_avx2(samples: &mut [f32]) {
let pow = pow.mul_add(v_adj, 0.107963754);
let pow = pow.mul_add(v_adj, 0.018092343);

let idx = ((v >> 23) - 118) as usize;
let idx = (v >> 23).wrapping_sub(118) as usize & 0xf;
let mul = 0x4000_0000 | (u32::from(POWTABLE_UPPER.0[idx]) << 18) | (u32::from(POWTABLE_LOWER.0[idx]) << 10);

let v = f32::from_bits(v);