From 563fff9c9c7da050f75e3203fd29fb4a05056ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 26 Jun 2024 22:27:29 +0200 Subject: [PATCH] colorspace: Rename 'unknown' to 'default' An unknown color space isn't very useful to have, as there is not very actionable what to do with it. Rename it to 'default'. Later it'll be used to an implicit color space, which in practice will be treated as sRGB. Part-of: --- clutter/clutter/clutter-color-state.c | 2 +- clutter/clutter/clutter-enums.h | 4 ++-- src/tests/clutter/conform/actor-color-state.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clutter/clutter/clutter-color-state.c b/clutter/clutter/clutter-color-state.c index e72749ea8..8312bad3a 100644 --- a/clutter/clutter/clutter-color-state.c +++ b/clutter/clutter/clutter-color-state.c @@ -84,7 +84,7 @@ clutter_color_state_get_colorspace (ClutterColorState *color_state) ClutterColorStatePrivate *priv; g_return_val_if_fail (CLUTTER_IS_COLOR_STATE (color_state), - CLUTTER_COLORSPACE_UNKNOWN); + CLUTTER_COLORSPACE_DEFAULT); priv = clutter_color_state_get_instance_private (color_state); diff --git a/clutter/clutter/clutter-enums.h b/clutter/clutter/clutter-enums.h index 45956bf57..e5e8eb3c4 100644 --- a/clutter/clutter/clutter-enums.h +++ b/clutter/clutter/clutter-enums.h @@ -1002,7 +1002,7 @@ typedef enum /** * ClutterColorspace: - * @CLUTTER_COLORSPACE_UNKNOWN: Unknown colorspace + * @CLUTTER_COLORSPACE_DEFAULT: Unknown colorspace * @CLUTTER_COLORSPACE_SRGB: Default sRGB colorspace * @CLUTTER_COLORSPACE_BT2020: BT2020 colorspace * @@ -1010,7 +1010,7 @@ typedef enum */ typedef enum { - CLUTTER_COLORSPACE_UNKNOWN, + CLUTTER_COLORSPACE_DEFAULT, CLUTTER_COLORSPACE_SRGB, CLUTTER_COLORSPACE_BT2020, } ClutterColorspace; diff --git a/src/tests/clutter/conform/actor-color-state.c b/src/tests/clutter/conform/actor-color-state.c index 037f38761..cec10b77d 100644 --- a/src/tests/clutter/conform/actor-color-state.c +++ b/src/tests/clutter/conform/actor-color-state.c @@ -36,7 +36,7 @@ actor_color_state_default (void) color_state = clutter_actor_get_color_state (actor); colorspace = clutter_color_state_get_colorspace (color_state); - g_assert_cmpuint (colorspace, ==, CLUTTER_COLORSPACE_SRGB); + g_assert_cmpuint (colorspace, ==, CLUTTER_COLORSPACE_DEFAULT); clutter_actor_destroy (actor); } @@ -114,7 +114,7 @@ actor_change_color_state_to_null (void) color_state = clutter_actor_get_color_state (actor); colorspace = clutter_color_state_get_colorspace (color_state); - g_assert_cmpuint (colorspace, ==, CLUTTER_COLORSPACE_SRGB); + g_assert_cmpuint (colorspace, ==, CLUTTER_COLORSPACE_DEFAULT); clutter_actor_destroy (actor); }