refactor(color): Move color_to8 and color_to16 to utils

Author: alixinne

src/color.rs

@@ -4,6 +4,9 @@ use slotmap::{DefaultKey, SlotMap};
 
 use crate::models::{Color, Color16};
 
+mod utils;
+pub use utils::{color_to16, color_to8};
+
 #[derive(Default, Debug, Clone, Copy)]
 struct RgbChannelAdjustment {
     adjust: Color,
@@ -356,12 +359,4 @@ impl ChannelAdjustments {
     }
 }
 
-pub fn color_to8(color: Color16) -> Color {
-    let (r, g, b) = color.into_components();
-    Color::from_components(((r >> 8) as u8, (g >> 8) as u8, (b >> 8) as u8))
-}
 
-pub fn color_to16(color: Color) -> Color16 {
-    let (r, g, b) = color.into_components();
-    Color16::from_components(((r as u16) << 8, (g as u16) << 8, (b as u16) << 8))
-}

src/color/utils.rs

@@ -0,0 +1,21 @@
+//! Color utilities
+
+use palette::LinSrgb;
+
+use crate::models::{Color, Color16};
+
+const FACTOR: u16 = 65535 / 255;
+
+pub fn color_to8(color: Color16) -> Color {
+    let (r, g, b) = color.into_components();
+    Color::new((r / FACTOR) as u8, (g / FACTOR) as u8, (b / FACTOR) as u8)
+}
+
+pub fn color_to16(color: Color) -> Color16 {
+    let (r, g, b) = color.into_components();
+    Color16::new(
+        (r as u16) * FACTOR,
+        (g as u16) * FACTOR,
+        (b as u16) * FACTOR,
+    )
+}