aboutsummaryrefslogtreecommitdiffstats
path: root/libglitter_get_colour_model_conversion_matrix_double.c
diff options
context:
space:
mode:
Diffstat (limited to 'libglitter_get_colour_model_conversion_matrix_double.c')
-rw-r--r--libglitter_get_colour_model_conversion_matrix_double.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/libglitter_get_colour_model_conversion_matrix_double.c b/libglitter_get_colour_model_conversion_matrix_double.c
index 13ae07b..127ae10 100644
--- a/libglitter_get_colour_model_conversion_matrix_double.c
+++ b/libglitter_get_colour_model_conversion_matrix_double.c
@@ -3,12 +3,6 @@
#ifndef TEST
-#if defined(__GNUC__) && !defined(__clang__)
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wunsuffixed-float-constants"
-#endif
-
-
/**
* CIE XYZ-to-sRGB conversion matrix,
* in column-major order
@@ -19,11 +13,6 @@ static const double srgb[3][3] = {
{-0.498530193022728773666329971093, 0.041556042214430065351304932619, 1.057226567722703292062647051353}};
-#if defined(__GNUC__) && !defined(__clang__)
-# pragma GCC diagnostic pop
-#endif
-
-
static void
eliminate(double m[3][4]) /* row-major order */
{
@@ -45,10 +34,9 @@ eliminate(double m[3][4]) /* row-major order */
void
-libglitter_get_colour_model_conversion_matrix_double(double matrix[3][3], double c1x, double c1y,
- double c2x, double c2y, double c3x, double c3y,
- double white_x, double white_y, double white_Y,
- int xyz, double *c1Yp, double *c2Yp, double *c3Yp)
+libglitter_get_colour_model_conversion_matrix_double(double matrix[3][3], double c1x, double c1y, double c2x, double c2y,
+ double c3x, double c3y, double white_x, double white_y, double white_Y,
+ int xyz, double *restrict c1Yp, double *restrict c2Yp, double *restrict c3Yp)
{
double mat[3][4];
double x1, x2, x3;
@@ -116,7 +104,6 @@ libglitter_get_colour_model_conversion_matrix_double(double matrix[3][3], double
#define TOLERANCE 0.0001
-#define TOL 4
#define RX 0.412457445582367576708548995157
#define GX 0.357575865245515878143578447634