brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter/color-state-params: Make get white chromaticity func generic

Browse Source 
Change the name of the func to xyY_to_XYZ which explains more and allows
reusing it in the following commits.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4144>
This commit is contained in:
Joan Torres 2024-10-25 16:55:58 +02:00 committed by Marge Bot
parent 7e847b555b
commit 2e2a91a14b
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
clutter/clutter/clutter-color-state-params.c
View File

@ -757,21 +757,22 @@ get_luminance_mapping (ClutterColorStateParams *color_state_params,
} }
static void static void
get_white_chromaticity_in_XYZ (float x, xyY_to_XYZ (float x,
float y, float y,
graphene_vec3_t *XYZ) float Y,
graphene_vec3_t *XYZ)
{ {
if (y == 0.0f) if (y == 0.0f)
{ {
/* Avoid a division by 0 */ /* Avoid a division by 0 */
y = FLT_EPSILON; y = FLT_EPSILON;
g_warning ("White point y coordinate is 0, something is probably wrong"); g_warning ("y coordinate is 0, something is probably wrong");
} }
graphene_vec3_init (XYZ, graphene_vec3_init (XYZ,
x / y, (x * Y) / y,
1, Y,
(1 - x - y) / y); ((1 - x - y) * Y) / y);
} }
/* /*
@ -836,7 +837,7 @@ get_color_space_trans_matrices (ClutterColorStateParams *color_state_params,
if (!graphene_matrix_inverse (&primaries_mat, &inv_primaries_mat)) if (!graphene_matrix_inverse (&primaries_mat, &inv_primaries_mat))
return FALSE; return FALSE;
get_white_chromaticity_in_XYZ (primaries->w_x, primaries->w_y, &white_point_XYZ); xyY_to_XYZ (primaries->w_x, primaries->w_y, 1.0f, &white_point_XYZ);
graphene_matrix_transform_vec3 (&inv_primaries_mat, &white_point_XYZ, &coefficients); graphene_matrix_transform_vec3 (&inv_primaries_mat, &white_point_XYZ, &coefficients);
@ -927,10 +928,10 @@ get_chromatic_adaptation (ClutterColorStateParams *color_state_params,
0, 0, 0, 1, 0, 0, 0, 1,
}); });
get_white_chromaticity_in_XYZ (source_primaries->w_x, source_primaries->w_y, xyY_to_XYZ (source_primaries->w_x, source_primaries->w_y, 1.0f,
&src_white_point_XYZ); &src_white_point_XYZ);
get_white_chromaticity_in_XYZ (target_primaries->w_x, target_primaries->w_y, xyY_to_XYZ (target_primaries->w_x, target_primaries->w_y, 1.0f,
&dst_white_point_XYZ); &dst_white_point_XYZ);
graphene_matrix_transform_vec3 (&bradford_mat, &src_white_point_XYZ, graphene_matrix_transform_vec3 (&bradford_mat, &src_white_point_XYZ,
&src_white_point_LMS); &src_white_point_LMS);