Added color blending

Author: awxkee

Cargo.lock

@@ -2,7 +2,7 @@ workspace = { members = ["src/app"] }
 
 [package]
 name = "colorutils-rs"
-version = "0.5.4"
+version = "0.5.5"
 edition = "2021"
 description = "High performance utilities for color format handling and conversion."
 readme = "README.md"

Cargo.toml

@@ -46,6 +46,7 @@ pub mod planar_to_linear;
 mod rgb;
 mod rgb_expand;
 mod rgba;
+mod routines;
 mod sigmoidal;
 mod sigmoidal_to_image;
 #[cfg(all(

src/lib.rs

@@ -5,12 +5,12 @@
  * // license that can be found in the LICENSE file.
  */
 use crate::image::ImageConfiguration;
+use crate::image_to_oklab::OklabTarget;
 use crate::neon::get_neon_linear_transfer;
 use crate::neon::math::vcolorq_matrix_f32;
 use crate::{load_u8_and_deinterleave, TransferFunction, SRGB_TO_XYZ_D65};
 use erydanos::{vatan2q_f32, vcbrtq_fast_f32, vhypotq_fast_f32};
 use std::arch::aarch64::*;
-use crate::image_to_oklab::OklabTarget;
 
 macro_rules! triple_to_oklab {
     ($r: expr, $g: expr, $b: expr, $transfer: expr, $target: expr,
@@ -36,7 +36,8 @@ macro_rules! triple_to_oklab {
         let m_ = vcbrtq_fast_f32(l_m);
         let s_ = vcbrtq_fast_f32(l_s);
 
-        let (l, mut a, mut b) = vcolorq_matrix_f32(l_, m_, s_, $m0, $m1, $m2, $m3, $m4, $m5, $m6, $m7, $m8);
+        let (l, mut a, mut b) =
+            vcolorq_matrix_f32(l_, m_, s_, $m0, $m1, $m2, $m3, $m4, $m5, $m6, $m7, $m8);
 
         if $target == OklabTarget::OKLCH {
             let c = vhypotq_fast_f32(a, b);
@@ -119,8 +120,8 @@ pub unsafe fn neon_image_to_oklab<const CHANNELS_CONFIGURATION: u8, const TARGET
         let b_low_low = vmovl_u16(vget_low_u16(b_low));
 
         let (x_low_low, y_low_low, z_low_low) = triple_to_oklab!(
-            r_low_low, g_low_low, b_low_low, &transfer, target, x0, x1, x2, x3, x4, x5, x6, x7, x8, c0, c1,
-            c2, c3, c4, c5, c6, c7, c8, m0, m1, m2, m3, m4, m5, m6, m7, m8
+            r_low_low, g_low_low, b_low_low, &transfer, target, x0, x1, x2, x3, x4, x5, x6, x7, x8,
+            c0, c1, c2, c3, c4, c5, c6, c7, c8, m0, m1, m2, m3, m4, m5, m6, m7, m8
         );
 
         let a_low = vmovl_u8(vget_low_u8(a_chan));
@@ -140,8 +141,8 @@ pub unsafe fn neon_image_to_oklab<const CHANNELS_CONFIGURATION: u8, const TARGET
         let b_low_high = vmovl_high_u16(b_low);
 
         let (x_low_high, y_low_high, z_low_high) = triple_to_oklab!(
-            r_low_high, g_low_high, b_low_high, &transfer, target, x0, x1, x2, x3, x4, x5, x6, x7, x8, c0,
-            c1, c2, c3, c4, c5, c6, c7, c8, m0, m1, m2, m3, m4, m5, m6, m7, m8
+            r_low_high, g_low_high, b_low_high, &transfer, target, x0, x1, x2, x3, x4, x5, x6, x7,
+            x8, c0, c1, c2, c3, c4, c5, c6, c7, c8, m0, m1, m2, m3, m4, m5, m6, m7, m8
         );
 
         if image_configuration.has_alpha() {
@@ -162,8 +163,8 @@ pub unsafe fn neon_image_to_oklab<const CHANNELS_CONFIGURATION: u8, const TARGET
         let b_high_low = vmovl_u16(vget_low_u16(b_high));
 
         let (x_high_low, y_high_low, z_high_low) = triple_to_oklab!(
-            r_high_low, g_high_low, b_high_low, &transfer, target, x0, x1, x2, x3, x4, x5, x6, x7, x8, c0,
-            c1, c2, c3, c4, c5, c6, c7, c8, m0, m1, m2, m3, m4, m5, m6, m7, m8
+            r_high_low, g_high_low, b_high_low, &transfer, target, x0, x1, x2, x3, x4, x5, x6, x7,
+            x8, c0, c1, c2, c3, c4, c5, c6, c7, c8, m0, m1, m2, m3, m4, m5, m6, m7, m8
         );
 
         let a_high = vmovl_high_u8(a_chan);

src/neon/image_to_oklab.rs

@@ -5,12 +5,12 @@
  * // license that can be found in the LICENSE file.
  */
 use crate::image::ImageConfiguration;
+use crate::image_to_oklab::OklabTarget;
 use crate::neon::get_neon_gamma_transfer;
 use crate::neon::math::vcolorq_matrix_f32;
 use crate::{load_f32_and_deinterleave, TransferFunction, XYZ_TO_SRGB_D65};
-use std::arch::aarch64::*;
 use erydanos::{vcosq_f32, vsinq_f32};
-use crate::image_to_oklab::OklabTarget;
+use std::arch::aarch64::*;
 
 #[inline(always)]
 unsafe fn neon_oklab_gamma_vld<const CHANNELS_CONFIGURATION: u8, const TARGET: u8>(

src/neon/oklab_to_image.rs

@@ -42,7 +42,6 @@ unsafe fn process_pixels(
     let r_high_high = vmovl_high_u16(r_high);
 
     let x_high_high = neon_to_linear(r_high_high, &transfer);
-
     let storing_row = float32x4x4_t(x_low_low, x_low_high, x_high_low, x_high_high);
     storing_row
 }

src/neon/planar_to_linear.rs

@@ -5,19 +5,19 @@
  * // license that can be found in the LICENSE file.
  */
 use crate::image::ImageConfiguration;
+use crate::image_to_oklab::OklabTarget;
 #[cfg(all(
     any(target_arch = "aarch64", target_arch = "arm"),
     target_feature = "neon"
 ))]
 use crate::neon::neon_oklab_to_image;
+use crate::oklch::Oklch;
 #[cfg(all(
     any(target_arch = "x86_64", target_arch = "x86"),
     target_feature = "sse4.1"
 ))]
 use crate::sse::sse_oklab_to_image;
 use crate::{Oklab, TransferFunction};
-use crate::image_to_oklab::OklabTarget;
-use crate::oklch::Oklch;
 
 fn oklab_to_image<const CHANNELS_CONFIGURATION: u8, const TARGET: u8>(
     src: &[f32],
@@ -134,7 +134,7 @@ pub fn oklab_to_rgba(
     height: u32,
     transfer_function: TransferFunction,
 ) {
-    oklab_to_image::<{ ImageConfiguration::Rgba as u8 }, {OklabTarget::OKLAB as u8}>(
+    oklab_to_image::<{ ImageConfiguration::Rgba as u8 }, { OklabTarget::OKLAB as u8 }>(
         src,
         src_stride,
         dst,
@@ -164,7 +164,7 @@ pub fn oklab_to_rgb(
     height: u32,
     transfer_function: TransferFunction,
 ) {
-    oklab_to_image::<{ ImageConfiguration::Rgb as u8 }, {OklabTarget::OKLAB as u8}>(
+    oklab_to_image::<{ ImageConfiguration::Rgb as u8 }, { OklabTarget::OKLAB as u8 }>(
         src,
         src_stride,
         dst,
@@ -194,7 +194,7 @@ pub fn oklab_to_bgr(
     height: u32,
     transfer_function: TransferFunction,
 ) {
-    oklab_to_image::<{ ImageConfiguration::Bgr as u8 }, {OklabTarget::OKLAB as u8}>(
+    oklab_to_image::<{ ImageConfiguration::Bgr as u8 }, { OklabTarget::OKLAB as u8 }>(
         src,
         src_stride,
         dst,
@@ -224,7 +224,7 @@ pub fn oklab_to_bgra(
     height: u32,
     transfer_function: TransferFunction,
 ) {
-    oklab_to_image::<{ ImageConfiguration::Bgra as u8 }, {OklabTarget::OKLAB as u8}>(
+    oklab_to_image::<{ ImageConfiguration::Bgra as u8 }, { OklabTarget::OKLAB as u8 }>(
         src,
         src_stride,
         dst,
@@ -254,7 +254,7 @@ pub fn oklch_to_rgba(
     height: u32,
     transfer_function: TransferFunction,
 ) {
-    oklab_to_image::<{ ImageConfiguration::Rgba as u8 }, {OklabTarget::OKLCH as u8}>(
+    oklab_to_image::<{ ImageConfiguration::Rgba as u8 }, { OklabTarget::OKLCH as u8 }>(
         src,
         src_stride,
         dst,
@@ -284,7 +284,7 @@ pub fn oklch_to_rgb(
     height: u32,
     transfer_function: TransferFunction,
 ) {
-    oklab_to_image::<{ ImageConfiguration::Rgb as u8 }, {OklabTarget::OKLCH as u8}>(
+    oklab_to_image::<{ ImageConfiguration::Rgb as u8 }, { OklabTarget::OKLCH as u8 }>(
         src,
         src_stride,
         dst,
@@ -314,7 +314,7 @@ pub fn oklch_to_bgr(
     height: u32,
     transfer_function: TransferFunction,
 ) {
-    oklab_to_image::<{ ImageConfiguration::Bgr as u8 }, {OklabTarget::OKLCH as u8}>(
+    oklab_to_image::<{ ImageConfiguration::Bgr as u8 }, { OklabTarget::OKLCH as u8 }>(
         src,
         src_stride,
         dst,
@@ -344,7 +344,7 @@ pub fn oklch_to_bgra(
     height: u32,
     transfer_function: TransferFunction,
 ) {
-    oklab_to_image::<{ ImageConfiguration::Bgra as u8 }, {OklabTarget::OKLCH as u8}>(
+    oklab_to_image::<{ ImageConfiguration::Bgra as u8 }, { OklabTarget::OKLCH as u8 }>(
         src,
         src_stride,
         dst,