fast image operations
Diffstat (limited to 'src/drawing/box.rs')
| -rw-r--r-- | src/drawing/box.rs | 54 |
1 files changed, 20 insertions, 34 deletions
diff --git a/src/drawing/box.rs b/src/drawing/box.rs index 15f183f..dd46efc 100644 --- a/src/drawing/box.rs +++ b/src/drawing/box.rs @@ -1,65 +1,51 @@ //! `Box<cat>` +use std::ops::Range; + use crate::Image; impl<const CHANNELS: usize> Image<&mut [u8], CHANNELS> { /// Draw a bordered box - /// - /// # Safety - /// - /// UB if the box is out of bounds /// ``` /// # use fimg::Image; /// let mut b = Image::alloc(10, 9); - /// unsafe { b.as_mut().r#box((1, 1), 7, 6, [255]) }; + /// b.as_mut().r#box((1, 1), 7, 6, [255]); /// # assert_eq!(b.buffer(), b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\x00\x00\x00\x00\x00\x00\xff\x00\x00\xff\x00\x00\x00\x00\x00\x00\xff\x00\x00\xff\x00\x00\x00\x00\x00\x00\xff\x00\x00\xff\x00\x00\x00\x00\x00\x00\xff\x00\x00\xff\x00\x00\x00\x00\x00\x00\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00") /// ``` - pub unsafe fn r#box( - &mut self, - (x1, y1): (u32, u32), - width: u32, - height: u32, - c: [u8; CHANNELS], - ) { + pub fn r#box(&mut self, (x1, y1): (u32, u32), width: u32, height: u32, c: [u8; CHANNELS]) { // skip sides, leave that to second loop - for x in x1 + 1..width + x1 { + for x in clamp(x1 + 1..width + x1, 0..self.width()) { // top line - // SAFETY: responsibility is on caller + // SAFETY: clamped to bounds unsafe { self.set_pixel(x, x1, c) }; - // bottom line - // SAFETY: shift responsibility + // SAFETY: clamped to bounds unsafe { self.set_pixel(x, x1 + height, c) }; } - for y in y1..=height + y1 { - // SAFETY: >> responsibility + for y in clamp(y1..height + y1 + 1, 0..self.height()) { + // SAFETY: clamped to bounds unsafe { self.set_pixel(y1, y, c) }; - // SAFETY: << responsibility + // SAFETY: clamped to bounds unsafe { self.set_pixel(y1 + width, y, c) }; } } /// Draw a *filled* box. - /// - /// # Safety - /// - /// UB if box is out of bounds /// ``` /// # use fimg::Image; /// let mut b = Image::alloc(10, 9); - /// unsafe { b.as_mut().filled_box((1, 1), 7, 6, [255]) }; + /// b.as_mut().filled_box((1, 1), 7, 6, [255]); /// # assert_eq!(b.buffer(), b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00") /// ``` - pub unsafe fn filled_box( - &mut self, - (x1, y1): (u32, u32), - width: u32, - height: u32, - c: [u8; CHANNELS], - ) { - for x in x1..=width + x1 { - for y in y1..=height + y1 { - // SAFETY: fill it + pub fn filled_box(&mut self, (x1, y1): (u32, u32), width: u32, height: u32, c: [u8; CHANNELS]) { + for x in clamp(x1..1 + width + x1, 0..self.width()) { + for y in clamp(y1..1 + height + y1, 0..self.height()) { + // SAFETY: clamped to bounds unsafe { self.set_pixel(x, y, c) }; } } } } + +/// clamp a range with another range +fn clamp(r: Range<u32>, within: Range<u32>) -> Range<u32> { + r.start.clamp(within.start, within.end)..r.end.clamp(within.start, within.end) +} |