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

clutter/color-state-params: Add new_from_primitives

Browse Source 
When creating a new color state from the primitives Colorimetry, EOTF
and Luminance; it is needed to previously check their tags to properly get
their values and avoid UB.

This check is duplicated and is a bit unreadable.

Using this new function helps keeping readability.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4144>
This commit is contained in:
Joan Torres
2024-10-25 14:41:55 +02:00
committed by Marge Bot
parent 2e2a91a14b
commit 7f8df9d9a1
4 changed files with 98 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/wayland/meta-wayland-color-management.c
View File

@ -911,10 +911,6 @@ creator_params_create (struct wl_client *client,
struct wl_resource *image_desc_resource;
g_autoptr (ClutterColorState) color_state = NULL;
MetaWaylandImageDescription *image_desc;
ClutterColorspace colorspace;
ClutterPrimaries *primaries;
ClutterTransferFunction tf_name;
float gamma_exp;
if (!creator_params->is_colorimetry_set || !creator_params->is_eotf_set)
{
@ -930,38 +926,11 @@ creator_params_create (struct wl_client *client,
wl_resource_get_version (resource),
id);
switch (creator_params->colorimetry.type)
{
case CLUTTER_COLORIMETRY_TYPE_COLORSPACE:
colorspace = creator_params->colorimetry.colorspace;
primaries = NULL;
break;
case CLUTTER_COLORIMETRY_TYPE_PRIMARIES:
colorspace = CLUTTER_COLORSPACE_SRGB;
primaries = creator_params->colorimetry.primaries;
break;
}
switch (creator_params->eotf.type)
{
case CLUTTER_EOTF_TYPE_NAMED:
tf_name = creator_params->eotf.tf_name;
gamma_exp = -1.0f;
break;
case CLUTTER_EOTF_TYPE_GAMMA:
tf_name = CLUTTER_TRANSFER_FUNCTION_SRGB;
gamma_exp = creator_params->eotf.gamma_exp;
break;
}
color_state = clutter_color_state_params_new_full (clutter_context,
colorspace,
tf_name,
primaries,
gamma_exp,
creator_params->lum.min,
creator_params->lum.max,
creator_params->lum.ref);
color_state =
clutter_color_state_params_new_from_primitives (clutter_context,
creator_params->colorimetry,
creator_params->eotf,
creator_params->lum);
image_desc =
meta_wayland_image_description_new_color_state (color_manager,