Update image to 0.24

Cargo.toml

@@ -18,7 +18,7 @@ display-window = ["sdl2"]
 [dependencies]
 approx = "0.5"
 conv = "0.3.3"
-image = { version = "0.23.6", default-features = false }
+image = { version = "0.24.1", default-features = false }
 itertools = "0.10"
 nalgebra = { version = "0.30", default-features = false, features = ["std"] }
 num = "0.4"
@@ -31,7 +31,7 @@ sdl2 = { version = "0.35", optional = true, default-features = false, features =
 
 [dev-dependencies]
 assert_approx_eq = "1.1.0"
-image = "0.23.6"
+image = "0.24.1"
 quickcheck = "0.9.2"
 wasm-bindgen-test = "0.3.14"
 

src/definitions.rs

@@ -1,6 +1,6 @@
 //! Trait definitions and type aliases.
 
-use image::{Bgr, Bgra, ImageBuffer, Luma, LumaA, Pixel, Rgb, Rgba};
+use image::{ImageBuffer, Luma, LumaA, Pixel, Rgb, Rgba};
 use std::{i16, u16, u8};
 
 /// An `ImageBuffer` containing Pixels of type P with storage `Vec<P::Subpixel>`.
@@ -64,18 +64,6 @@ impl_black_white!(
     Rgba([u16::MIN, u16::MIN, u16::MIN, u16::MAX]),
     Rgba([u16::MAX, u16::MAX, u16::MAX, u16::MAX])
 );
-impl_black_white!(Bgr<u8>, Bgr([u8::MIN; 3]), Bgr([u8::MAX; 3]));
-impl_black_white!(Bgr<u16>, Bgr([u16::MIN; 3]), Bgr([u16::MAX; 3]));
-impl_black_white!(
-    Bgra<u8>,
-    Bgra([u8::MIN, u8::MIN, u8::MIN, u8::MAX]),
-    Bgra([u8::MAX, u8::MAX, u8::MAX, u8::MAX])
-);
-impl_black_white!(
-    Bgra<u16>,
-    Bgra([u16::MIN, u16::MIN, u16::MIN, u16::MAX]),
-    Bgra([u16::MAX, u16::MAX, u16::MAX, u16::MAX])
-);
 
 /// Something with a 2d position.
 pub trait Position {

src/drawing/bezier.rs

@@ -19,7 +19,6 @@ pub fn draw_cubic_bezier_curve<I>(
 ) -> Image<I::Pixel>
 where
     I: GenericImage,
-    I::Pixel: 'static,
 {
     let mut out = ImageBuffer::new(image.width(), image.height());
     out.copy_from(image, 0, 0).unwrap();
@@ -39,7 +38,6 @@ pub fn draw_cubic_bezier_curve_mut<C>(
     color: C::Pixel,
 ) where
     C: Canvas,
-    C::Pixel: 'static,
 {
     // Bezier Curve function from: https://pomax.github.io/bezierinfo/#control
     let cubic_bezier_curve = |t: f32| {

src/drawing/canvas.rs

@@ -110,6 +110,8 @@ impl<I: GenericImage> Canvas for Blend<I> {
     }
 
     fn draw_pixel(&mut self, x: u32, y: u32, color: Self::Pixel) {
-        self.0.get_pixel_mut(x, y).blend(&color)
+        let mut pix = self.0.get_pixel(x, y);
+        pix.blend(&color);
+        self.0.put_pixel(x, y, pix);
     }
 }

src/drawing/conics.rs

@@ -26,7 +26,6 @@ pub fn draw_hollow_ellipse<I>(
 ) -> Image<I::Pixel>
 where
     I: GenericImage,
-    I::Pixel: 'static,
 {
     let mut out = ImageBuffer::new(image.width(), image.height());
     out.copy_from(image, 0, 0).unwrap();
@@ -52,7 +51,6 @@ pub fn draw_hollow_ellipse_mut<C>(
     color: C::Pixel,
 ) where
     C: Canvas,
-    C::Pixel: 'static,
 {
     // Circle drawing algorithm is faster, so use it if the given ellipse is actually a circle.
     if width_radius == height_radius {
@@ -90,7 +88,6 @@ pub fn draw_filled_ellipse<I>(
 ) -> Image<I::Pixel>
 where
     I: GenericImage,
-    I::Pixel: 'static,
 {
     let mut out = ImageBuffer::new(image.width(), image.height());
     out.copy_from(image, 0, 0).unwrap();
@@ -116,7 +113,6 @@ pub fn draw_filled_ellipse_mut<C>(
     color: C::Pixel,
 ) where
     C: Canvas,
-    C::Pixel: 'static,
 {
     // Circle drawing algorithm is faster, so use it if the given ellipse is actually a circle.
     if width_radius == height_radius {
@@ -204,7 +200,6 @@ pub fn draw_hollow_circle<I>(
 ) -> Image<I::Pixel>
 where
     I: GenericImage,
-    I::Pixel: 'static,
 {
     let mut out = ImageBuffer::new(image.width(), image.height());
     out.copy_from(image, 0, 0).unwrap();
@@ -218,7 +213,6 @@ where
 pub fn draw_hollow_circle_mut<C>(canvas: &mut C, center: (i32, i32), radius: i32, color: C::Pixel)
 where
     C: Canvas,
-    C::Pixel: 'static,
 {
     let mut x = 0i32;
     let mut y = radius;
@@ -252,7 +246,6 @@ where
 pub fn draw_filled_circle_mut<C>(canvas: &mut C, center: (i32, i32), radius: i32, color: C::Pixel)
 where
     C: Canvas,
-    C::Pixel: 'static,
 {
     let mut x = 0i32;
     let mut y = radius;
@@ -308,7 +301,6 @@ pub fn draw_filled_circle<I>(
 ) -> Image<I::Pixel>
 where
     I: GenericImage,
-    I::Pixel: 'static,
 {
     let mut out = ImageBuffer::new(image.width(), image.height());
     out.copy_from(image, 0, 0).unwrap();

src/drawing/cross.rs

@@ -43,7 +43,6 @@ where
 pub fn draw_cross<I>(image: &I, color: I::Pixel, x: i32, y: i32) -> Image<I::Pixel>
 where
     I: GenericImage,
-    I::Pixel: 'static,
 {
     let mut out = ImageBuffer::new(image.width(), image.height());
     out.copy_from(image, 0, 0).unwrap();

src/drawing/line.rs

@@ -92,12 +92,12 @@ fn clamp_point<I: GenericImage>(p: (f32, f32), image: &I) -> (f32, f32) {
 
 /// Iterates over the image pixels in a line segment using
 /// [Bresenham's line drawing algorithm](https://en.wikipedia.org/wiki/Bresenham%27s_line_algorithm).
-pub struct BresenhamLinePixelIter<'a, P: Pixel + 'static> {
+pub struct BresenhamLinePixelIter<'a, P: Pixel> {
     iter: BresenhamLineIter,
     image: &'a Image<P>,
 }
 
-impl<'a, P: Pixel + 'static> BresenhamLinePixelIter<'a, P> {
+impl<'a, P: Pixel> BresenhamLinePixelIter<'a, P> {
     /// Creates a [`BresenhamLinePixelIter`](struct.BresenhamLinePixelIter.html) which will iterate over
     /// the image pixels with coordinates between `start` and `end`.
     pub fn new(
@@ -114,7 +114,7 @@ impl<'a, P: Pixel + 'static> BresenhamLinePixelIter<'a, P> {
     }
 }
 
-impl<'a, P: Pixel + 'static> Iterator for BresenhamLinePixelIter<'a, P> {
+impl<'a, P: Pixel> Iterator for BresenhamLinePixelIter<'a, P> {
     type Item = &'a P;
 
     fn next(&mut self) -> Option<Self::Item> {
@@ -126,12 +126,12 @@ impl<'a, P: Pixel + 'static> Iterator for BresenhamLinePixelIter<'a, P> {
 
 /// Iterates over the image pixels in a line segment using
 /// [Bresenham's line drawing algorithm](https://en.wikipedia.org/wiki/Bresenham%27s_line_algorithm).
-pub struct BresenhamLinePixelIterMut<'a, P: Pixel + 'static> {
+pub struct BresenhamLinePixelIterMut<'a, P: Pixel> {
     iter: BresenhamLineIter,
     image: &'a mut Image<P>,
 }
 
-impl<'a, P: Pixel + 'static> BresenhamLinePixelIterMut<'a, P> {
+impl<'a, P: Pixel> BresenhamLinePixelIterMut<'a, P> {
     /// Creates a [`BresenhamLinePixelIterMut`](struct.BresenhamLinePixelIterMut.html) which will iterate over
     /// the image pixels with coordinates between `start` and `end`.
     pub fn new(
@@ -154,7 +154,7 @@ impl<'a, P: Pixel + 'static> BresenhamLinePixelIterMut<'a, P> {
     }
 }
 
-impl<'a, P: Pixel + 'static> Iterator for BresenhamLinePixelIterMut<'a, P> {
+impl<'a, P: Pixel> Iterator for BresenhamLinePixelIterMut<'a, P> {
     type Item = &'a mut P;
 
     fn next(&mut self) -> Option<Self::Item> {
@@ -179,7 +179,6 @@ pub fn draw_line_segment<I>(
 ) -> Image<I::Pixel>
 where
     I: GenericImage,
-    I::Pixel: 'static,
 {
     let mut out = ImageBuffer::new(image.width(), image.height());
     out.copy_from(image, 0, 0).unwrap();
@@ -195,7 +194,6 @@ where
 pub fn draw_line_segment_mut<C>(canvas: &mut C, start: (f32, f32), end: (f32, f32), color: C::Pixel)
 where
     C: Canvas,
-    C::Pixel: 'static,
 {
     let (width, height) = canvas.dimensions();
     let in_bounds = |x, y| x >= 0 && x < width as i32 && y >= 0 && y < height as i32;
@@ -230,7 +228,7 @@ pub fn draw_antialiased_line_segment<I, B>(
 ) -> Image<I::Pixel>
 where
     I: GenericImage,
-    I::Pixel: 'static,
+
     B: Fn(I::Pixel, I::Pixel, f32) -> I::Pixel,
 {
     let mut out = ImageBuffer::new(image.width(), image.height());
@@ -255,7 +253,7 @@ pub fn draw_antialiased_line_segment_mut<I, B>(
     blend: B,
 ) where
     I: GenericImage,
-    I::Pixel: 'static,
+
     B: Fn(I::Pixel, I::Pixel, f32) -> I::Pixel,
 {
     let (mut x0, mut y0) = (start.0, start.1);
@@ -295,7 +293,7 @@ fn plot_wu_line<I, T, B>(
     color: I::Pixel,
 ) where
     I: GenericImage,
-    I::Pixel: 'static,
+
     T: Fn(i32, i32) -> (i32, i32),
     B: Fn(I::Pixel, I::Pixel, f32) -> I::Pixel,
 {
@@ -314,7 +312,7 @@ fn plot_wu_line<I, T, B>(
 struct Plotter<'a, I, T, B>
 where
     I: GenericImage,
-    I::Pixel: 'static,
+
     T: Fn(i32, i32) -> (i32, i32),
     B: Fn(I::Pixel, I::Pixel, f32) -> I::Pixel,
 {
@@ -326,7 +324,7 @@ where
 impl<'a, I, T, B> Plotter<'a, I, T, B>
 where
     I: GenericImage,
-    I::Pixel: 'static,
+
     T: Fn(i32, i32) -> (i32, i32),
     B: Fn(I::Pixel, I::Pixel, f32) -> I::Pixel,
 {

src/drawing/mod.rs

@@ -40,7 +40,6 @@ pub use self::text::{draw_text, draw_text_mut, text_size};
 fn draw_if_in_bounds<C>(canvas: &mut C, x: i32, y: i32, color: C::Pixel)
 where
     C: Canvas,
-    C::Pixel: 'static,
 {
     if x >= 0 && x < canvas.width() as i32 && y >= 0 && y < canvas.height() as i32 {
         canvas.draw_pixel(x as u32, y as u32, color);

src/drawing/polygon.rs

@@ -16,7 +16,6 @@ use std::i32;
 pub fn draw_polygon<I>(image: &I, poly: &[Point<i32>], color: I::Pixel) -> Image<I::Pixel>
 where
     I: GenericImage,
-    I::Pixel: 'static,
 {
     let mut out = ImageBuffer::new(image.width(), image.height());
     out.copy_from(image, 0, 0).unwrap();
@@ -32,7 +31,6 @@ where
 pub fn draw_polygon_mut<C>(canvas: &mut C, poly: &[Point<i32>], color: C::Pixel)
 where
     C: Canvas,
-    C::Pixel: 'static,
 {
     if poly.is_empty() {
         return;

src/drawing/rect.rs

@@ -12,7 +12,6 @@ use std::f32;
 pub fn draw_hollow_rect<I>(image: &I, rect: Rect, color: I::Pixel) -> Image<I::Pixel>
 where
     I: GenericImage,
-    I::Pixel: 'static,
 {
     let mut out = ImageBuffer::new(image.width(), image.height());
     out.copy_from(image, 0, 0).unwrap();
@@ -26,7 +25,6 @@ where
 pub fn draw_hollow_rect_mut<C>(canvas: &mut C, rect: Rect, color: C::Pixel)
 where
     C: Canvas,
-    C::Pixel: 'static,
 {
     let left = rect.left() as f32;
     let right = rect.right() as f32;
@@ -46,7 +44,6 @@ where
 pub fn draw_filled_rect<I>(image: &I, rect: Rect, color: I::Pixel) -> Image<I::Pixel>
 where
     I: GenericImage,
-    I::Pixel: 'static,
 {
     let mut out = ImageBuffer::new(image.width(), image.height());
     out.copy_from(image, 0, 0).unwrap();
@@ -60,7 +57,6 @@ where
 pub fn draw_filled_rect_mut<C>(canvas: &mut C, rect: Rect, color: C::Pixel)
 where
     C: Canvas,
-    C::Pixel: 'static,
 {
     let canvas_bounds = Rect::at(0, 0).of_size(canvas.width(), canvas.height());
     if let Some(intersection) = canvas_bounds.intersect(rect) {

src/drawing/text.rs

@@ -92,7 +92,6 @@ pub fn draw_text<'a, I>(
 where
     I: GenericImage,
     <I::Pixel as Pixel>::Subpixel: ValueInto<f32> + Clamp<f32>,
-    I::Pixel: 'static,
 {
     let mut out = ImageBuffer::new(image.width(), image.height());
     out.copy_from(image, 0, 0).unwrap();

src/filter/median.rs

@@ -108,7 +108,7 @@ use std::cmp::{max, min};
 #[must_use = "the function does not modify the original image"]
 pub fn median_filter<P>(image: &Image<P>, x_radius: u32, y_radius: u32) -> Image<P>
 where
-    P: Pixel<Subpixel = u8> + 'static,
+    P: Pixel<Subpixel = u8>,
 {
     let (width, height) = image.dimensions();
 
@@ -141,7 +141,7 @@ fn initialise_histogram_for_top_left_pixel<P>(
     y_radius: u32,
 ) -> HistSet
 where
-    P: Pixel<Subpixel = u8> + 'static,
+    P: Pixel<Subpixel = u8>,
 {
     let (width, height) = image.dimensions();
     let kernel_size = (2 * x_radius + 1) * (2 * y_radius + 1);
@@ -166,7 +166,7 @@ where
 
 fn slide_right<P>(hist: &mut HistSet, image: &Image<P>, x: u32, y: u32, rx: i32, ry: i32)
 where
-    P: Pixel<Subpixel = u8> + 'static,
+    P: Pixel<Subpixel = u8>,
 {
     let (width, height) = image.dimensions();
 
@@ -189,7 +189,7 @@ fn slide_down_column<P>(
     rx: i32,
     ry: i32,
 ) where
-    P: Pixel<Subpixel = u8> + 'static,
+    P: Pixel<Subpixel = u8>,
 {
     let (width, height) = image.dimensions();
     hist.set_to_median(out, x, 0);
@@ -217,7 +217,7 @@ fn slide_up_column<P>(
     rx: i32,
     ry: i32,
 ) where
-    P: Pixel<Subpixel = u8> + 'static,
+    P: Pixel<Subpixel = u8>,
 {
     let (width, height) = image.dimensions();
     hist.set_to_median(out, x, height - 1);
@@ -265,7 +265,7 @@ impl HistSet {
 
     fn incr<P>(&mut self, image: &Image<P>, x: u32, y: u32)
     where
-        P: Pixel<Subpixel = u8> + 'static,
+        P: Pixel<Subpixel = u8>,
     {
         unsafe {
             let pixel = image.unsafe_get_pixel(x, y);
@@ -280,7 +280,7 @@ impl HistSet {
 
     fn decr<P>(&mut self, image: &Image<P>, x: u32, y: u32)
     where
-        P: Pixel<Subpixel = u8> + 'static,
+        P: Pixel<Subpixel = u8>,
     {
         unsafe {
             let pixel = image.unsafe_get_pixel(x, y);
@@ -295,7 +295,7 @@ impl HistSet {
 
     fn set_to_median<P>(&self, image: &mut Image<P>, x: u32, y: u32)
     where
-        P: Pixel<Subpixel = u8> + 'static,
+        P: Pixel<Subpixel = u8>,
     {
         unsafe {
             let target = image.get_pixel_mut(x, y);