Adjust bounds on from_raw_rgb

197g · 197g · commit 6ea7369963df · 2026-03-08T22:23:35.000+01:00
These new bounds ensure that only our own pixel types can be used. That prepares changing our approach of algorithms such that we can optimize for individual cases without falling prey to needs for specialization. More context can be found here: <#2596 (comment)>
diff --git a/src/images/buffer.rs b/src/images/buffer.rs
@@ -1464,9 +1464,8 @@ impl<P: Pixel> ImageBuffer<P, Vec<P::Subpixel>> {
 
 impl<S, Container> ImageBuffer<Rgb<S>, Container>
 where
-    S: crate::Primitive + crate::traits::Enlargeable,
-    Rgb<S>: Pixel,
-    Container: DerefMut<Target = [<Rgb<S> as Pixel>::Subpixel]>,
+    Rgb<S>: PixelWithColorType<Subpixel = S>,
+    Container: DerefMut<Target = [S]>,
 {
     /// Construct an image by swapping `Bgr` channels into an `Rgb` order.
     pub fn from_raw_bgr(width: u32, height: u32, container: Container) -> Option<Self> {
@@ -1491,9 +1490,8 @@ where
 
 impl<S, Container> ImageBuffer<Rgba<S>, Container>
 where
-    S: crate::Primitive + crate::traits::Enlargeable,
-    Rgb<S>: Pixel,
-    Container: DerefMut<Target = [<Rgba<S> as Pixel>::Subpixel]>,
+    Rgba<S>: PixelWithColorType<Subpixel = S>,
+    Container: DerefMut<Target = [S]>,
 {
     /// Construct an image by swapping `BgrA` channels into an `RgbA` order.
     pub fn from_raw_bgra(width: u32, height: u32, container: Container) -> Option<Self> {
