AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-09 10:20:07 +00:00
Code Issues Projects Releases Wiki Activity

colorstate: Drop xyz for now

Browse Source 
Converting to and from xyz turns out to be more difficult than
expected, depending on what whitepoint you choose, And different
specs choose different whitepoints, so we can't directly map
css xyz to cicp xyz anyway.
This commit is contained in:
Matthias Clasen 2024-08-06 10:20:41 -04:00
parent fde8c6df79
commit 03ef6a7719
3 changed files with 1 additions and 17 deletions
Show Stats 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 * - 5: PAL
* - 6,7: BT.601 / NTSC * - 6,7: BT.601 / NTSC
* - 9: BT.2020 * - 9: BT.2020
* - 10: CIE XYZ
* - 12: Display P3 * - 12: Display P3
* *
* Since: 4.16 * 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; to_xyz = rec2020_to_xyz;
from_xyz = xyz_to_rec2020; from_xyz = xyz_to_rec2020;
break; break;
case 10:
to_xyz = identity;
from_xyz = identity;
break;
case 12: case 12:
to_xyz = p3_to_xyz; to_xyz = p3_to_xyz;
from_xyz = xyz_to_p3; from_xyz = xyz_to_p3;

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_matrix_coefficients (params, 0);
gdk_cicp_params_set_range (params, GDK_CICP_RANGE_FULL); 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); color_state = gdk_cicp_params_build_color_state (params, &error);
} }
else if (g_strcmp0 (name, "rec2020") == 0) else if (g_strcmp0 (name, "rec2020") == 0)
@ -190,7 +179,7 @@ char **
get_color_state_names (void) get_color_state_names (void)
{ {
static const char *names[] = { static const char *names[] = {
"srgb", "srgb-linear", "display-p3", "xyz", "rec2020", "srgb", "srgb-linear", "display-p3", "rec2020",
"rec2100-pq", "rec2100-linear", "rec2100-hlg", "rec2100-pq", "rec2100-linear", "rec2100-hlg",
"yuv", "bt601", "bt709", "yuv", "bt601", "bt709",
NULL, NULL,