mirror of
https://gitlab.gnome.org/GNOME/gimp.git
synced 2025-10-06 01:12:40 +02:00
core, libgimpcolor: CMKY & HSL to float
Continuing 32d64ab1
, this converts the
few instances of CMYK and HSL/A double
to float to match babl's precision.
This commit is contained in:
@@ -554,10 +554,15 @@ gimp_color_parse_css_numeric (const gchar *css)
|
||||
color = gegl_color_new (NULL);
|
||||
if (hsl)
|
||||
{
|
||||
gfloat values_f[4];
|
||||
|
||||
for (i = 0; i < (alpha ? 4 : 3); i++)
|
||||
values_f[i] = (gfloat) values[i];
|
||||
|
||||
if (alpha)
|
||||
gegl_color_set_pixel (color, babl_format ("HSLA double"), values);
|
||||
gegl_color_set_pixel (color, babl_format ("HSLA float"), values_f);
|
||||
else
|
||||
gegl_color_set_pixel (color, babl_format ("HSL double"), values);
|
||||
gegl_color_set_pixel (color, babl_format ("HSL float"), values_f);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@@ -235,9 +235,9 @@ gimp_color_is_out_of_self_gamut (GeglColor *color)
|
||||
model == babl_model ("cmyk") ||
|
||||
model == babl_model ("cmykA"))
|
||||
{
|
||||
gdouble cmyk[4];
|
||||
gfloat cmyk[4];
|
||||
|
||||
gegl_color_get_pixel (color, babl_format_with_space ("CMYK double", space), cmyk);
|
||||
gegl_color_get_pixel (color, babl_format_with_space ("CMYK float", space), cmyk);
|
||||
oog = ((cmyk[0] < 0.0 && -cmyk[0] > CHANNEL_EPSILON) ||
|
||||
(cmyk[0] > 1.0 && cmyk[0] - 1.0 > CHANNEL_EPSILON) ||
|
||||
(cmyk[1] < 0.0 && -cmyk[1] > CHANNEL_EPSILON) ||
|
||||
@@ -303,16 +303,16 @@ gimp_color_is_out_of_gamut (GeglColor *color,
|
||||
else if (babl_space_is_cmyk (space))
|
||||
{
|
||||
GeglColor *c = gegl_color_new (NULL);
|
||||
gdouble cmyk[4];
|
||||
gfloat cmyk[4];
|
||||
|
||||
/* CMYK conversion always produces colors in [0; 1] range. What we want
|
||||
* to check is whether the source and converted colors are the same in
|
||||
* Lab space.
|
||||
*/
|
||||
gegl_color_get_pixel (color,
|
||||
babl_format_with_space ("CMYK double", space),
|
||||
babl_format_with_space ("CMYK float", space),
|
||||
cmyk);
|
||||
gegl_color_set_pixel (c, babl_format_with_space ("CMYK double", space), cmyk);
|
||||
gegl_color_set_pixel (c, babl_format_with_space ("CMYK float", space), cmyk);
|
||||
is_out_of_gamut = (! gimp_color_is_perceptually_identical (color, c));
|
||||
g_object_unref (c);
|
||||
}
|
||||
|
Reference in New Issue
Block a user