Add Rgb(a)32F DynamicImage Variant

Cargo.toml

@@ -21,7 +21,7 @@ name = "image"
 path = "./src/lib.rs"
 
 [dependencies]
-bytemuck = "1"
+bytemuck = { version = "1.7.0", features = ["extern_crate_alloc"] } # includes cast_vec
 byteorder = "1.3.2"
 num-iter = "0.1.32"
 num-rational = { version = "0.4", default-features = false }

Cargo.toml.public-private-dependencies

@@ -24,7 +24,7 @@ path = "./src/lib.rs"
 
 [dependencies]
 # Not yet public.
-bytemuck = "1"
+bytemuck = { version = "1.7.0", features = ["extern_crate_alloc"] } # includes cast_vec
 byteorder = "1.3.2"
 num-iter = "0.1.32"
 num-rational = "0.3"

src/buffer.rs

@@ -12,7 +12,7 @@ use crate::dynimage::{save_buffer, save_buffer_with_format, write_buffer_with_fo
 use crate::error::ImageResult;
 use crate::image::{GenericImage, GenericImageView, ImageFormat, ImageOutputFormat};
 use crate::math::Rect;
-use crate::traits::{EncodableLayout, Pixel};
+use crate::traits::{EncodableLayout, Pixel, PixelWithColorType};
 use crate::utils::expand_packed;
 
 /// Iterate over pixel refs.
@@ -585,7 +585,7 @@ where
 /// ```no_run
 /// use image::{GenericImage, GenericImageView, ImageBuffer, open};
 ///
-/// let on_top = open("path/to/some.png").unwrap().into_rgb();
+/// let on_top = open("path/to/some.png").unwrap().into_rgb8();
 /// let mut img = ImageBuffer::from_fn(512, 512, |x, y| {
 ///     if (x + y) % 2 == 0 {
 ///         image::Rgb([0, 0, 0])
@@ -602,8 +602,8 @@ where
 /// ```no_run
 /// use image::{open, DynamicImage};
 ///
-/// let rgba = open("path/to/some.png").unwrap().into_rgba();
-/// let gray = DynamicImage::ImageRgba8(rgba).into_luma();
+/// let rgba = open("path/to/some.png").unwrap().into_rgba8();
+/// let gray = DynamicImage::ImageRgba8(rgba).into_luma8();
 /// ```
 #[derive(Debug, Hash, PartialEq, Eq)]
 pub struct ImageBuffer<P: Pixel, Container> {
@@ -795,7 +795,7 @@ where
         FlatSamples {
             samples: self.data,
             layout,
-            color_hint: Some(P::COLOR_TYPE),
+            color_hint: None, // TODO: the pixel type might contain P::COLOR_TYPE if it satisfies PixelWithColorType
         }
     }
 
@@ -809,7 +809,7 @@ where
         FlatSamples {
             samples: self.data.as_ref(),
             layout,
-            color_hint: Some(P::COLOR_TYPE),
+            color_hint: None, // TODO: the pixel type might contain P::COLOR_TYPE if it satisfies PixelWithColorType
         }
     }
 
@@ -823,7 +823,7 @@ where
         FlatSamples {
             samples: self.data.as_mut(),
             layout,
-            color_hint: Some(P::COLOR_TYPE),
+            color_hint: None, // TODO: the pixel type might contain P::COLOR_TYPE if it satisfies PixelWithColorType
         }
     }
 }
@@ -934,14 +934,15 @@ where
     pub fn save<Q>(&self, path: Q) -> ImageResult<()>
     where
         Q: AsRef<Path>,
+        P: PixelWithColorType,
     {
         // This is valid as the subpixel is u8.
         save_buffer(
             path,
             self.as_bytes(),
             self.width(),
             self.height(),
-            <P as Pixel>::COLOR_TYPE,
+            <P as PixelWithColorType>::COLOR_TYPE,
         )
     }
 }
@@ -960,14 +961,15 @@ where
     pub fn save_with_format<Q>(&self, path: Q, format: ImageFormat) -> ImageResult<()>
     where
         Q: AsRef<Path>,
+        P: PixelWithColorType,
     {
         // This is valid as the subpixel is u8.
         save_buffer_with_format(
             path,
             self.as_bytes(),
             self.width(),
             self.height(),
-            <P as Pixel>::COLOR_TYPE,
+            <P as PixelWithColorType>::COLOR_TYPE,
             format,
         )
     }
@@ -990,14 +992,15 @@ where
     where
         W: std::io::Write + std::io::Seek,
         F: Into<ImageOutputFormat>,
+        P: PixelWithColorType,
     {
         // This is valid as the subpixel is u8.
         write_buffer_with_format(
             writer,
             self.as_bytes(),
             self.width(),
             self.height(),
-            <P as Pixel>::COLOR_TYPE,
+            <P as PixelWithColorType>::COLOR_TYPE,
             format,
         )
     }
@@ -1320,7 +1323,7 @@ where
     /// let image_path = "examples/fractal.png";
     /// let image = image::open(&image_path)
     ///     .expect("Open file failed")
-    ///     .to_rgba();
+    ///     .to_rgba8();
     /// 
     /// let gray_image: GrayImage = image.convert();
     /// ```

src/codecs/jpeg/encoder.rs

@@ -12,6 +12,7 @@ use crate::utils::clamp;
 
 use super::entropy::build_huff_lut;
 use super::transform;
+use crate::traits::PixelWithColorType;
 
 // Markers
 // Baseline DCT
@@ -472,8 +473,9 @@ impl<'a, W: Write> JpegEncoder<'a, W> {
     pub fn encode_image<I: GenericImageView>(
         &mut self,
         image: &I,
-    ) -> ImageResult<()> {
+    ) -> ImageResult<()> where I::Pixel: PixelWithColorType {
         let n = I::Pixel::CHANNEL_COUNT;
+        let color_type = I::Pixel::COLOR_TYPE;
         let num_components = if n == 1 || n == 2 { 1 } else { 3 };
 
         self.writer.write_marker(SOI)?;
@@ -551,8 +553,7 @@ impl<'a, W: Write> JpegEncoder<'a, W> {
         build_scan_header(&mut buf, &self.components[..num_components]);
         self.writer.write_segment(SOS, &buf)?;
 
-
-        if I::Pixel::COLOR_TYPE.has_color() {
+        if color_type.has_color() {
             self.encode_rgb(image)
         } else {
             self.encode_gray(image)
@@ -774,9 +775,11 @@ fn encode_coefficient(coefficient: i32) -> (u8, u16) {
 
 #[inline]
 fn rgb_to_ycbcr<P: Pixel>(pixel: P) -> (u8, u8, u8) {
-    use num_traits::{cast::ToPrimitive, bounds::Bounded};
+    use num_traits::{cast::ToPrimitive};
+    use crate::traits::Primitive;
+
     let [r, g, b] = pixel.to_rgb().0;
-    let max: f32 = P::Subpixel::max_value().to_f32().unwrap();
+    let max: f32 = P::Subpixel::DEFAULT_MAX_VALUE.to_f32().unwrap();
     let r: f32 = r.to_f32().unwrap();
     let g: f32 = g.to_f32().unwrap();
     let b: f32 = b.to_f32().unwrap();