babl: move matrix code to new file babl-matrix.h

1 files changed, 3 insertions, 57 deletions

diff --git a/babl/babl-space.h b/babl/babl-space.h
index 902a685..a6065dd 100644
--- a/babl/babl-space.h
+++ b/babl/babl-space.h
@@ -22,6 +22,7 @@
 #include <math.h>
 #include <string.h>
 #include "base/util.h"
+#include "babl-matrix.h"
 
 BABL_CLASS_DECLARE (space);
 
@@ -53,67 +54,10 @@ typedef struct
      rigged is merging matrices */
 
 } BablSpace;
-#include <stdio.h>
 
-#define m(matr, j, i)  matr[j*3+i]
 
-static inline void babl_matrix_mul_matrix (const double *matA_,
-                                           const double *matB_,
-                                           double *out)
-{
-  int i, j;
-  double matA[9];
-  double matB[9];
-  double t1, t2, t3;
-  memcpy (matA, matA_, sizeof (matA));
-  memcpy (matB, matB_, sizeof (matB));
-
-  for (i = 0; i < 3; i++)
-  {
-    t1 = m(matA, i, 0);
-    t2 = m(matA, i, 1);
-    t3 = m(matA, i, 2);
-
-    for (j = 0; j < 3; j ++)
-    {
-      m(out,i,j) = t1 * m(matB, 0, j);
-      m(out,i,j) += t2 * m(matB, 1, j);
-      m(out,i,j) += t3 * m(matB, 2, j);
-    }
-  }
-}
-
-static inline void babl_matrix_invert (const double *in, double *out)
-{
-  double mat[9];
-  double det, invdet;
-  memcpy (mat, in, sizeof (mat));
-  det = m(mat, 0, 0) * (m(mat, 1, 1) *m(mat, 2, 2) - m(mat, 2, 1)*m(mat, 1, 2)) -
-        m(mat, 0, 1) * (m(mat, 1, 0) *m(mat, 2, 2) - m(mat, 1, 2)*m(mat, 2, 0)) +
-        m(mat, 0, 2) * (m(mat, 1, 0) *m(mat, 2, 1) - m(mat, 1, 1)*m(mat, 2, 0));
-  invdet = 1.0 / det;
-  m(out, 0, 0) = (m(mat, 1, 1) * m(mat, 2, 2) - m(mat, 2, 1) * m(mat, 1, 2)) * invdet;
-  m(out, 0, 1) = (m(mat, 0, 2) * m(mat, 2, 1) - m(mat, 0, 1) * m(mat, 2, 2)) * invdet;
-  m(out, 0, 2) = (m(mat, 0, 1) * m(mat, 1, 2) - m(mat, 0, 2) * m(mat, 1, 1)) * invdet;
-  m(out, 1, 0) = (m(mat, 1, 2) * m(mat, 2, 0) - m(mat, 1, 0) * m(mat, 2, 2)) * invdet;
-  m(out, 1, 1) = (m(mat, 0, 0) * m(mat, 2, 2) - m(mat, 0, 2) * m(mat, 2, 0)) * invdet;
-  m(out, 1, 2) = (m(mat, 1, 0) * m(mat, 0, 2) - m(mat, 0, 0) * m(mat, 1, 2)) * invdet;
-  m(out, 2, 0) = (m(mat, 1, 0) * m(mat, 2, 1) - m(mat, 2, 0) * m(mat, 1, 1)) * invdet;
-  m(out, 2, 1) = (m(mat, 2, 0) * m(mat, 0, 1) - m(mat, 0, 0) * m(mat, 2, 1)) * invdet;
-  m(out, 2, 2) = (m(mat, 0, 0) * m(mat, 1, 1) - m(mat, 1, 0) * m(mat, 0, 1)) * invdet;
-}
 
 
-static inline void babl_matrix_mul_vector (const double *mat, const double *v_in, double *v_out)
-{
-  double val[3]={v_in[0], v_in[1], v_in[2]};
-
-  v_out[0] = m(mat, 0, 0) * val[0] + m(mat, 0, 1) * val[1] + m(mat, 0, 2) * val[2];
-  v_out[1] = m(mat, 1, 0) * val[0] + m(mat, 1, 1) * val[1] + m(mat, 1, 2) * val[2];
-  v_out[2] = m(mat, 2, 0) * val[0] + m(mat, 2, 1) * val[1] + m(mat, 2, 2) * val[2];
-#undef m
-}
-
 static inline void babl_space_to_xyzf (const Babl *space, const float *rgb, float *xyz)
 {
   BablSpace *space_ = (void*)space;
@@ -151,4 +95,6 @@ static inline void _babl_space_from_xyz (const Babl *space, const double *xyz, d
 void
 babl_space_class_init (void);
 
+
+
 #endif