Skip to content

Fixes & improvements #4

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

Merged
awxkee merged 2 commits into from
Apr 11, 2026
Merged

Fixes & improvements #4

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
dcd9783
fixes
awxkee Apr 11, 2026
f3ac6f0
Buffer api improvements
awxkee Apr 11, 2026
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
1 change: 0 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,3 @@ rust-version = "1.89.0"
erydanos = "0.2"
half = "2.6"
num-traits = "0.2"
rayon = { version = "1.10", optional = true }

[features]
default = ["rayon"]
rayon = ["dep:rayon"]
24 changes: 6 additions & 18 deletions src/app/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,9 @@ fn main() {
let src_stride = width * components as u32;
let start_time = Instant::now();
rgba_to_oklab(
&ImageBuffer::new(src_bytes, width, height, src_stride, 4).unwrap(),
&mut ImageBufferMut::new(
BufferStore::Borrowed(&mut lab_store),
width,
height,
src_stride,
4,
)
.unwrap(),
&ImageBuffer::new(src_bytes, width, height, 4).unwrap(),
&mut ImageBufferMut::new(BufferStore::Borrowed(&mut lab_store), width, height, 4)
.unwrap(),
TransferFunction::Srgb,
)
.unwrap();
Expand Down Expand Up @@ -106,15 +100,9 @@ fn main() {

let start_time = Instant::now();
oklab_to_rgba(
&ImageBuffer::new(&lab_store, width, height, src_stride, 4).unwrap(),
&mut ImageBufferMut::new(
BufferStore::Borrowed(&mut dst_slice),
width,
height,
src_stride,
4,
)
.unwrap(),
&ImageBuffer::new(&lab_store, width, height, 4).unwrap(),
&mut ImageBufferMut::new(BufferStore::Borrowed(&mut dst_slice), width, height, 4)
.unwrap(),
TransferFunction::Srgb,
)
.unwrap();
Expand Down
33 changes: 6 additions & 27 deletions src/buffer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,9 @@ impl<'a, F: Sized> ImageBuffer<'a, F>
where
[F]: ToOwned<Owned = Vec<F>>,
{
pub fn new(
data: &'a [F],
width: u32,
height: u32,
stride: u32,
channels: u32,
) -> Result<Self, ColorError> {
pub fn new(data: &'a [F], width: u32, height: u32, channels: u32) -> Result<Self, ColorError> {
let min_stride = width * channels;
if stride < min_stride {
return Err(ColorError::StrideTooNarrow {
min: min_stride,
given: stride,
});
}
let required = stride as usize * height as usize;
let required = min_stride as usize * height as usize;
if data.len() < required {
return Err(ColorError::BufferTooSmall {
expected: required,
Expand All @@ -49,7 +37,7 @@ where
data: Cow::Borrowed(data),
width,
height,
stride,
stride: min_stride,
channels,
})
}
Expand All @@ -58,17 +46,9 @@ where
data: Vec<F>,
width: u32,
height: u32,
stride: u32,
channels: u32,
) -> Result<Self, ColorError> {
let min_stride = width * channels;
if stride < min_stride {
return Err(ColorError::StrideTooNarrow {
min: min_stride,
given: stride,
});
}
let required = stride as usize * height as usize;
let required = width as usize * channels as usize * height as usize;
if data.len() < required {
return Err(ColorError::BufferTooSmall {
expected: required,
Expand All @@ -79,7 +59,7 @@ where
data: Cow::Owned(data),
width,
height,
stride,
stride: width * channels,
channels,
})
}
Expand Down Expand Up @@ -205,14 +185,13 @@ impl<'a, F: Copy + Debug + Sized> ImageBufferMut<'a, F> {
data: BufferStore<'a, F>,
width: u32,
height: u32,
stride: u32,
channels: u32,
) -> Result<Self, ColorError> {
let buf = Self {
data,
width,
height,
stride,
stride: width * channels,
channels,
};
buf.validate()?;
Expand Down
16 changes: 8 additions & 8 deletions src/concat_alpha.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,19 @@ mod tests {
let data = (0..stride * height)
.map(|i| (i as f32) / (stride * height) as f32)
.collect::<Vec<_>>();
ImageBuffer::from_vec(data, width, height, stride, 3).unwrap()
ImageBuffer::from_vec(data, width, height, 3).unwrap()
}

fn make_alpha(width: u32, height: u32, fill: f32) -> ImageBuffer<'static, f32> {
let stride = width;
let data = vec![fill; (stride * height) as usize];
ImageBuffer::from_vec(data, width, height, stride, 1).unwrap()
ImageBuffer::from_vec(data, width, height, 1).unwrap()
}

fn make_dst(width: u32, height: u32) -> ImageBufferMut<'static, f32> {
let stride = width * 4;
let data = BufferStore::Owned(vec![0f32; (stride * height) as usize]);
ImageBufferMut::new(data, width, height, stride, 4).unwrap()
ImageBufferMut::new(data, width, height, 4).unwrap()
}

#[test]
Expand Down Expand Up @@ -124,8 +124,8 @@ mod tests {

#[test]
fn works_with_single_pixel() {
let src = ImageBuffer::new(&[0.1f32, 0.2, 0.3], 1, 1, 3, 3).unwrap();
let alpha = ImageBuffer::new(&[0.9f32], 1, 1, 1, 1).unwrap();
let src = ImageBuffer::new(&[0.1f32, 0.2, 0.3], 1, 1, 3).unwrap();
let alpha = ImageBuffer::new(&[0.9f32], 1, 1, 1).unwrap();
let mut dst = make_dst(1, 1);

append_alpha(&src, &mut dst, &alpha).unwrap();
Expand All @@ -143,7 +143,7 @@ mod tests {
fn rejects_src_with_wrong_channel_count() {
let stride = 4;
let data = vec![0f32; (stride * 1) as usize];
let src = ImageBuffer::new(data.leak(), 1, 1, stride, 4).unwrap();
let src = ImageBuffer::new(data.leak(), 1, 1, 4).unwrap();
let alpha = make_alpha(1, 1, 1.0);
let mut dst = make_dst(1, 1);

Expand All @@ -157,7 +157,7 @@ mod tests {
let alpha = make_alpha(1, 1, 1.0);
let stride = 3;
let data = BufferStore::Owned(vec![0f32; (stride * 1) as usize]);
let mut dst = ImageBufferMut::new(data, 1, 1, stride, 3).unwrap();
let mut dst = ImageBufferMut::new(data, 1, 1, 3).unwrap();

let err = append_alpha(&src, &mut dst, &alpha).unwrap_err();
assert!(matches!(err, ColorError::Generic(_)));
Expand All @@ -168,7 +168,7 @@ mod tests {
let src = make_src(1, 1);
let stride = 2;
let data = vec![0f32; (stride * 1) as usize];
let alpha = ImageBuffer::new(data.leak(), 1, 1, stride, 2).unwrap();
let alpha = ImageBuffer::new(data.leak(), 1, 1, 2).unwrap();
let mut dst = make_dst(1, 1);

let err = append_alpha(&src, &mut dst, &alpha).unwrap_err();
Expand Down
11 changes: 5 additions & 6 deletions src/hsv_to_image.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,15 +202,14 @@ mod tests_hsv_u16_to_channels {
height: u32,
channels: u32,
) -> ImageBuffer<'static, u16> {
ImageBuffer::from_vec(data, width, height, width * channels, channels).unwrap()
ImageBuffer::from_vec(data, width, height, channels).unwrap()
}

fn make_dst(width: u32, height: u32, channels: u32) -> ImageBufferMut<'static, u8> {
ImageBufferMut::new(
BufferStore::Owned(vec![0u8; (width * height * channels) as usize]),
width,
height,
width * channels,
channels,
)
.unwrap()
Expand Down Expand Up @@ -553,28 +552,28 @@ mod tests_hsv_u16_to_channels {

#[test]
fn hsv_rgb_rejects_wrong_channel_count() {
let src = ImageBuffer::from_vec(vec![0u16; 2], 1, 1, 2, 2).unwrap();
let src = ImageBuffer::from_vec(vec![0u16; 2], 1, 1, 2).unwrap();
let mut dst = make_dst(1, 1, 3);
assert!(hsv_to_rgb(&src, &mut dst, SCALE).is_err());
}

#[test]
fn hsv_rgba_rejects_wrong_channel_count() {
let src = ImageBuffer::from_vec(vec![0u16; 2], 1, 1, 2, 2).unwrap();
let src = ImageBuffer::from_vec(vec![0u16; 2], 1, 1, 2).unwrap();
let mut dst = make_dst(1, 1, 4);
assert!(hsv_to_rgba(&src, &mut dst, SCALE).is_err());
}

#[test]
fn hsl_rgb_rejects_wrong_channel_count() {
let src = ImageBuffer::from_vec(vec![0u16; 2], 1, 1, 2, 2).unwrap();
let src = ImageBuffer::from_vec(vec![0u16; 2], 1, 1, 2).unwrap();
let mut dst = make_dst(1, 1, 3);
assert!(hsl_to_rgb(&src, &mut dst, SCALE).is_err());
}

#[test]
fn hsl_rgba_rejects_wrong_channel_count() {
let src = ImageBuffer::from_vec(vec![0u16; 2], 1, 1, 2, 2).unwrap();
let src = ImageBuffer::from_vec(vec![0u16; 2], 1, 1, 2).unwrap();
let mut dst = make_dst(1, 1, 4);
assert!(hsl_to_rgba(&src, &mut dst, SCALE).is_err());
}
Expand Down
35 changes: 14 additions & 21 deletions src/image_to_xyz_lab.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ pub fn rgb_to_xyz(
channels_to_xyz::<{ ImageConfiguration::Rgb as u8 }, false, { XyzTarget::Xyz as u8 }>(
src,
dst,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1, 1)?,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1)?,
matrix,
transfer_function,
)
Expand All @@ -268,7 +268,7 @@ pub fn bgr_to_xyz(
channels_to_xyz::<{ ImageConfiguration::Bgr as u8 }, false, { XyzTarget::Xyz as u8 }>(
src,
dst,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1, 1)?,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1)?,
matrix,
transfer_function,
)
Expand All @@ -292,7 +292,7 @@ pub fn srgb_to_xyz(
channels_to_xyz::<{ ImageConfiguration::Rgb as u8 }, false, { XyzTarget::Xyz as u8 }>(
src,
dst,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1, 1)?,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1)?,
&SRGB_TO_XYZ_D65,
TransferFunction::Srgb,
)
Expand All @@ -318,7 +318,7 @@ pub fn rgb_to_lab(
channels_to_xyz::<{ ImageConfiguration::Rgb as u8 }, false, { XyzTarget::Lab as u8 }>(
src,
dst,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1, 1)?,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1)?,
matrix,
transfer_function,
)
Expand All @@ -344,7 +344,7 @@ pub fn rgba_to_xyz(
channels_to_xyz::<{ ImageConfiguration::Rgba as u8 }, false, { XyzTarget::Xyz as u8 }>(
src,
dst,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1, 1)?,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1)?,
matrix,
transfer_function,
)
Expand All @@ -368,7 +368,7 @@ pub fn srgba_to_xyz(
channels_to_xyz::<{ ImageConfiguration::Rgba as u8 }, false, { XyzTarget::Xyz as u8 }>(
src,
dst,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1, 1)?,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1)?,
&SRGB_TO_XYZ_D65,
TransferFunction::Srgb,
)
Expand Down Expand Up @@ -533,7 +533,7 @@ pub fn bgr_to_lab(
channels_to_xyz::<{ ImageConfiguration::Bgr as u8 }, false, { XyzTarget::Lab as u8 }>(
src,
dst,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1, 1)?,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1)?,
matrix,
transfer_function,
)
Expand All @@ -559,7 +559,7 @@ pub fn rgb_to_luv(
channels_to_xyz::<{ ImageConfiguration::Rgb as u8 }, false, { XyzTarget::Luv as u8 }>(
src,
dst,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1, 1)?,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1)?,
matrix,
transfer_function,
)
Expand All @@ -585,7 +585,7 @@ pub fn bgr_to_luv(
channels_to_xyz::<{ ImageConfiguration::Bgr as u8 }, false, { XyzTarget::Luv as u8 }>(
src,
dst,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1, 1)?,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1)?,
matrix,
transfer_function,
)
Expand All @@ -611,7 +611,7 @@ pub fn rgb_to_lch(
channels_to_xyz::<{ ImageConfiguration::Rgb as u8 }, false, { XyzTarget::Lch as u8 }>(
src,
dst,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1, 1)?,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1)?,
matrix,
transfer_function,
)
Expand All @@ -637,7 +637,7 @@ pub fn bgr_to_lch(
channels_to_xyz::<{ ImageConfiguration::Bgr as u8 }, false, { XyzTarget::Lch as u8 }>(
src,
dst,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1, 1)?,
&mut ImageBufferMut::new(BufferStore::Owned(vec![0.; 1]), 1, 1, 1)?,
matrix,
transfer_function,
)
Expand All @@ -648,24 +648,17 @@ mod tests {
use super::*;

fn make_src(data: Vec<u8>, width: u32, height: u32, channels: u32) -> ImageBuffer<'static, u8> {
ImageBuffer::from_vec(data, width, height, width * channels, channels).unwrap()
ImageBuffer::from_vec(data, width, height, channels).unwrap()
}

fn make_dst(width: u32, height: u32, channels: u32) -> ImageBufferMut<'static, f32> {
let len = (width * height * channels) as usize;
ImageBufferMut::new(
BufferStore::Owned(vec![0f32; len]),
width,
height,
width * channels,
channels,
)
.unwrap()
ImageBufferMut::new(BufferStore::Owned(vec![0f32; len]), width, height, channels).unwrap()
}

fn make_alpha(width: u32, height: u32) -> ImageBufferMut<'static, f32> {
let len = (width * height) as usize;
ImageBufferMut::new(BufferStore::Owned(vec![0f32; len]), width, height, width, 1).unwrap()
ImageBufferMut::new(BufferStore::Owned(vec![0f32; len]), width, height, 1).unwrap()
}

// ── helpers ───────────────────────────────────────────────────────────────
Expand Down
3 changes: 1 addition & 2 deletions src/image_xyza_laba.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,15 +419,14 @@ mod tests_with_alpha {
// ── helpers ───────────────────────────────────────────────────────────────

fn make_src(data: Vec<u8>, width: u32, height: u32, channels: u32) -> ImageBuffer<'static, u8> {
ImageBuffer::from_vec(data, width, height, width * channels, channels).unwrap()
ImageBuffer::from_vec(data, width, height, channels).unwrap()
}

fn make_dst(width: u32, height: u32, channels: u32) -> ImageBufferMut<'static, f32> {
ImageBufferMut::new(
BufferStore::Owned(vec![0f32; (width * height * channels) as usize]),
width,
height,
width * channels,
channels,
)
.unwrap()
Expand Down
Loading