Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'small-fixes' into 'main'

Browse Source 
colorstate: Drop xyz for now

See merge request GNOME/gtk!7565
This commit is contained in:
Matthias Clasen
2024-08-06 20:06:38 +00:00
parent fde8c6df79 876445f080
commit 341860eb4d
4 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/gdkcicpparams.c
View File

@@ -168,7 +168,6 @@ gdk_cicp_params_class_init (GdkCicpParamsClass *klass)
* - 5: PAL
* - 6,7: BT.601 / NTSC
* - 9: BT.2020
* - 10: CIE XYZ
* - 12: Display P3
*
* Since: 4.16

4
gdk/gdkcolorstate.c
View File

@@ -676,10 +676,6 @@ gdk_color_state_new_for_cicp (const GdkCicp *cicp,
to_xyz = rec2020_to_xyz;
from_xyz = xyz_to_rec2020;
break;
case 10:
to_xyz = identity;
from_xyz = identity;
break;
case 12:
to_xyz = p3_to_xyz;
from_xyz = xyz_to_p3;

2
gtk/inspector/recorder.c
View File

@@ -990,6 +990,8 @@ add_texture_rows (GListStore *store,
add_text_row (store, "Type", "%s", G_OBJECT_TYPE_NAME (texture));
add_text_row (store, "Size", "%u x %u", gdk_texture_get_width (texture), gdk_texture_get_height (texture));
add_text_row (store, "Format", "%s", enum_to_nick (GDK_TYPE_MEMORY_FORMAT, gdk_texture_get_format (texture)));
add_text_row (store, "Color State", "%s", gdk_color_state_get_name (gdk_texture_get_color_state (texture)));
if (GDK_IS_MEMORY_TEXTURE (texture))
{
GBytes *bytes;

13
tools/gtk-image-tool-utils.c
View File

@@ -115,17 +115,6 @@ find_color_state_by_name (const char *name)
gdk_cicp_params_set_matrix_coefficients (params, 0);
gdk_cicp_params_set_range (params, GDK_CICP_RANGE_FULL);
color_state = gdk_cicp_params_build_color_state (params, &error);
}
else if (g_strcmp0 (name, "xyz") == 0)
{
params = gdk_cicp_params_new ();
gdk_cicp_params_set_color_primaries (params, 10);
gdk_cicp_params_set_transfer_function (params, 8);
gdk_cicp_params_set_matrix_coefficients (params, 0);
gdk_cicp_params_set_range (params, GDK_CICP_RANGE_FULL);
color_state = gdk_cicp_params_build_color_state (params, &error);
}
else if (g_strcmp0 (name, "rec2020") == 0)
@@ -190,7 +179,7 @@ char **
get_color_state_names (void)
{
static const char *names[] = {
"srgb", "srgb-linear", "display-p3", "xyz", "rec2020",
"srgb", "srgb-linear", "display-p3", "rec2020",
"rec2100-pq", "rec2100-linear", "rec2100-hlg",
"yuv", "bt601", "bt709",
NULL,