Some linearizing fixes

awxkee · Oct 18, 2024 · ad63ce3 · ad63ce3
1 parent c789fa4
commit ad63ce3
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 35 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@ workspace = { members = ["src/app"] }
 
 [package]
 name = "colorutils-rs"
-version = "0.7.1"
+version = "0.7.2"
 edition = "2021"
 description = "High performance utilities for color format handling and conversion."
 readme = "README.md"

diff --git a/src/image.rs b/src/image.rs
@@ -15,23 +15,23 @@ pub enum ImageConfiguration {
 
 impl ImageConfiguration {
     #[inline(always)]
-    pub fn get_channels_count(&self) -> usize {
+    pub const fn get_channels_count(&self) -> usize {
         match self {
             ImageConfiguration::Rgb | ImageConfiguration::Bgr => 3,
             ImageConfiguration::Rgba | ImageConfiguration::Bgra => 4,
         }
     }
 
     #[inline(always)]
-    pub fn has_alpha(&self) -> bool {
+    pub const fn has_alpha(&self) -> bool {
         match self {
             ImageConfiguration::Rgb | ImageConfiguration::Bgr => false,
             ImageConfiguration::Rgba | ImageConfiguration::Bgra => true,
         }
     }
 
     #[inline(always)]
-    pub fn get_r_channel_offset(&self) -> usize {
+    pub const fn get_r_channel_offset(&self) -> usize {
         match self {
             ImageConfiguration::Rgb => 0,
             ImageConfiguration::Rgba => 0,
@@ -40,23 +40,23 @@ impl ImageConfiguration {
     }
 
     #[inline(always)]
-    pub fn get_g_channel_offset(&self) -> usize {
+    pub const fn get_g_channel_offset(&self) -> usize {
         match self {
             ImageConfiguration::Rgb | ImageConfiguration::Bgr => 1,
             ImageConfiguration::Rgba | ImageConfiguration::Bgra => 1,
         }
     }
 
     #[inline(always)]
-    pub fn get_b_channel_offset(&self) -> usize {
+    pub const fn get_b_channel_offset(&self) -> usize {
         match self {
             ImageConfiguration::Rgb => 2,
             ImageConfiguration::Rgba => 2,
             ImageConfiguration::Bgra | ImageConfiguration::Bgr => 0,
         }
     }
     #[inline(always)]
-    pub fn get_a_channel_offset(&self) -> usize {
+    pub const fn get_a_channel_offset(&self) -> usize {
         match self {
             ImageConfiguration::Rgb | ImageConfiguration::Bgr => 0,
             ImageConfiguration::Rgba | ImageConfiguration::Bgra => 3,

diff --git a/src/image_to_linear_u8.rs b/src/image_to_linear_u8.rs
@@ -31,9 +31,8 @@ fn channels_to_linear<const CHANNELS_CONFIGURATION: u8, const USE_ALPHA: bool>(
 
     let mut lut_table = vec![0u8; 256];
     for i in 0..256 {
-        lut_table[i] = (transfer_function.linearize(i as f32 * (1. / 255.0)) * 255.)
-            .ceil()
-            .min(255.) as u8;
+        lut_table[i] =
+            (transfer_function.linearize(i as f32 * (1. / 255.0)) * 255.).min(255.) as u8;
     }
 
     let iter;

diff --git a/src/jzazbz_to_image.rs b/src/jzazbz_to_image.rs
@@ -47,9 +47,7 @@ fn jzazbz_to_image<const CHANNELS_CONFIGURATION: u8, const TARGET: u8>(
 
     let mut lut_table = vec![0u8; 2049];
     for i in 0..2049 {
-        lut_table[i] = (transfer_function.gamma(i as f32 * (1. / 2048.0)) * 255.)
-            .ceil()
-            .min(255.) as u8;
+        lut_table[i] = (transfer_function.gamma(i as f32 * (1. / 2048.0)) * 255.).min(255.) as u8;
     }
 
     let src_slice_safe_align = unsafe {

diff --git a/src/lalphabeta_to_image.rs b/src/lalphabeta_to_image.rs
@@ -27,9 +27,7 @@ fn lalphabeta_to_image<const CHANNELS_CONFIGURATION: u8>(
 
     let mut lut_table = vec![0u8; 2049];
     for i in 0..2049 {
-        lut_table[i] = (transfer_function.gamma(i as f32 * (1. / 2048.0)) * 255.)
-            .round()
-            .min(255.) as u8;
+        lut_table[i] = (transfer_function.gamma(i as f32 * (1. / 2048.0)) * 255.).min(255.) as u8;
     }
 
     let src_slice_safe_align = unsafe {

diff --git a/src/linear_to_image.rs b/src/linear_to_image.rs
@@ -32,9 +32,7 @@ fn linear_to_gamma_channels<const CHANNELS_CONFIGURATION: u8, const USE_ALPHA: b
 
     let mut lut_table = vec![0u8; 2049];
     for i in 0..2049 {
-        lut_table[i] = (transfer_function.gamma(i as f32 * (1. / 2048.0)) * 255.)
-            .round()
-            .min(255.) as u8;
+        lut_table[i] = (transfer_function.gamma(i as f32 * (1. / 2048.0)) * 255.).min(255.) as u8;
     }
 
     let src_slice_safe_align = unsafe {

diff --git a/src/linear_to_image_u8.rs b/src/linear_to_image_u8.rs
@@ -32,9 +32,7 @@ fn linear_to_gamma_channels<const CHANNELS_CONFIGURATION: u8, const USE_ALPHA: b
 
     let mut lut_table = vec![0u8; 256];
     for i in 0..256 {
-        lut_table[i] = (transfer_function.gamma(i as f32 * (1. / 255.0)) * 255.)
-            .ceil()
-            .min(255.) as u8;
+        lut_table[i] = (transfer_function.gamma(i as f32 * (1. / 255.0)) * 255.).min(255.) as u8;
     }
 
     #[cfg(feature = "rayon")]

diff --git a/src/linear_to_planar.rs b/src/linear_to_planar.rs
@@ -24,9 +24,7 @@ fn linear_to_gamma_channels(
 ) {
     let mut lut_table = vec![0u8; 2049];
     for i in 0..2049 {
-        lut_table[i] = (transfer_function.gamma(i as f32 * (1. / 2048.0)) * 255.)
-            .ceil()
-            .min(255.) as u8;
+        lut_table[i] = (transfer_function.gamma(i as f32 * (1. / 2048.0)) * 255.).min(255.) as u8;
     }
 
     let src_slice_safe_align = unsafe {

diff --git a/src/oklab_to_image.rs b/src/oklab_to_image.rs
@@ -54,9 +54,7 @@ fn oklab_to_image<const CHANNELS_CONFIGURATION: u8, const TARGET: u8>(
 
     let mut lut_table = vec![0u8; 2049];
     for i in 0..2049 {
-        lut_table[i] = (transfer_function.gamma(i as f32 * (1. / 2048.0)) * 255.)
-            .ceil()
-            .min(255.) as u8;
+        lut_table[i] = (transfer_function.gamma(i as f32 * (1. / 2048.0)) * 255.).min(255.) as u8;
     }
 
     let channels = image_configuration.get_channels_count();

diff --git a/src/xyz_lab_to_image.rs b/src/xyz_lab_to_image.rs
@@ -80,9 +80,7 @@ fn xyz_to_channels<const CHANNELS_CONFIGURATION: u8, const USE_ALPHA: bool, cons
 
     let mut lut_table = vec![0u8; 2049];
     for i in 0..2049 {
-        lut_table[i] = (transfer_function.gamma(i as f32 * (1. / 2048.0)) * 255.)
-            .ceil()
-            .min(255.) as u8;
+        lut_table[i] = (transfer_function.gamma(i as f32 * (1. / 2048.0)) * 255.).min(255.) as u8;
     }
 
     #[cfg(feature = "rayon")]

diff --git a/src/xyza_laba_to_image.rs b/src/xyza_laba_to_image.rs
@@ -59,9 +59,7 @@ fn xyz_with_alpha_to_channels<const CHANNELS_CONFIGURATION: u8, const TARGET: u8
 
     let mut lut_table = vec![0u8; 2049];
     for i in 0..2049 {
-        lut_table[i] = (transfer_function.gamma(i as f32 * (1. / 2048.0)) * 255.)
-            .ceil()
-            .min(255.) as u8;
+        lut_table[i] = (transfer_function.gamma(i as f32 * (1. / 2048.0)) * 255.).min(255.) as u8;
     }
 
     let src_slice_safe_align = unsafe {