Fixup ints.

Author: tychedelia

crates/processing_pyo3/src/color.rs

@@ -8,12 +8,24 @@ use crate::math::{PyVec4, PyVecIter, hash_f32, PyVec3};
 
 pub use processing::prelude::color::{ColorMode, ColorSpace};
 
-pub(crate) fn parse_numeric(space: &ColorSpace, obj: &Bound<'_, PyAny>) -> PyResult<f32> {
+fn int_maxes(space: &ColorSpace) -> [f32; 4] {
+    match space {
+        ColorSpace::Srgb | ColorSpace::Linear => [255.0, 255.0, 255.0, 255.0],
+        ColorSpace::Hsl | ColorSpace::Hsv | ColorSpace::Hwb => [360.0, 100.0, 100.0, 255.0],
+        ColorSpace::Oklch => [100.0, 100.0, 360.0, 255.0],
+        ColorSpace::Oklab => [100.0, 100.0, 100.0, 255.0],
+        ColorSpace::Lab => [100.0, 100.0, 100.0, 255.0],
+        ColorSpace::Lch => [100.0, 100.0, 360.0, 255.0],
+        ColorSpace::Xyz => [100.0, 100.0, 100.0, 255.0],
+    }
+}
+
+/// Parse a Python int or float into an f32 for a given channel.
+pub(crate) fn parse_numeric(space: &ColorSpace, obj: &Bound<'_, PyAny>, ch: usize) -> PyResult<f32> {
     if let Ok(v) = obj.extract::<i64>() {
-        return Ok(match space {
-            ColorSpace::Srgb | ColorSpace::Linear => v as f32 / 255.0,
-            _ => v as f32,
-        });
+        let native = space.default_maxes();
+        let imax = int_maxes(space);
+        return Ok(v as f32 / imax[ch] * native[ch]);
     }
     if let Ok(v) = obj.extract::<f64>() {
         return Ok(v as f32);
@@ -22,7 +34,7 @@ pub(crate) fn parse_numeric(space: &ColorSpace, obj: &Bound<'_, PyAny>) -> PyRes
 }
 
 fn convert_channel(mode: &ColorMode, obj: &Bound<'_, PyAny>, ch: usize) -> PyResult<f32> {
-    let v = parse_numeric(&mode.space, obj)?;
+    let v = parse_numeric(&mode.space, obj, ch)?;
     Ok(mode.scale(v, ch))
 }
 

crates/processing_pyo3/src/graphics.rs

@@ -511,20 +511,20 @@ impl Graphics {
     ) -> PyResult<()> {
         let space = crate::color::ColorSpace::from_u8(mode)
             .ok_or_else(|| PyRuntimeError::new_err(format!("unknown color space: {mode}")))?;
-        let parse = |obj: &Bound<'py, PyAny>| crate::color::parse_numeric(&space, obj);
+        let parse = |obj: &Bound<'py, PyAny>, ch: usize| crate::color::parse_numeric(&space, obj, ch);
         let new_mode = match (max1, max2, max3, max_alpha) {
             // color_mode(MODE)
             (None, _, _, _) => ColorMode::with_defaults(space),
             // color_mode(MODE, max)
-            (Some(m), None, _, _) => ColorMode::with_uniform_max(space, parse(m)?),
+            (Some(m), None, _, _) => ColorMode::with_uniform_max(space, parse(m, 0)?),
             // color_mode(MODE, max1, max2, max3)
             (Some(m1), Some(m2), Some(m3), None) => {
                 let defaults = space.default_maxes();
-                ColorMode::new(space, parse(m1)?, parse(m2)?, parse(m3)?, defaults[3])
+                ColorMode::new(space, parse(m1, 0)?, parse(m2, 1)?, parse(m3, 2)?, defaults[3])
             }
             // color_mode(MODE, max1, max2, max3, maxA)
             (Some(m1), Some(m2), Some(m3), Some(ma)) => {
-                ColorMode::new(space, parse(m1)?, parse(m2)?, parse(m3)?, parse(ma)?)
+                ColorMode::new(space, parse(m1, 0)?, parse(m2, 1)?, parse(m3, 2)?, parse(ma, 3)?)
             }
             _ => return Err(PyRuntimeError::new_err("expected 1, 2, 4, or 5 arguments")),
         };