procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 17:33:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

modules: Swap ColorWheel to HSV float

Browse source 
Should resolve #11370

Per Pippin, HSV double is not a valid
color model for babl. We need to change
to HSV float to resolve the warning when
selecting colors on the Color Wheel.
This commit is contained in:
Alx Sa 2024-04-20 21:31:58 +00:00
parent 0c32125f1c
commit 7abcc97c6a
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/color-selector-wheel.c
View file

@ -147,9 +147,9 @@ colorsel_wheel_set_color (GimpColorSelector *selector,
GeglColor *color) GeglColor *color)
{ {
ColorselWheel *wheel = COLORSEL_WHEEL (selector); ColorselWheel *wheel = COLORSEL_WHEEL (selector);
gdouble hsv[3]; gfloat hsv[3];
gegl_color_get_pixel (color, babl_format_with_space ("HSV double", wheel->format), hsv); gegl_color_get_pixel (color, babl_format_with_space ("HSV float", wheel->format), hsv);
g_signal_handlers_block_by_func (wheel->hsv, g_signal_handlers_block_by_func (wheel->hsv,
G_CALLBACK (colorsel_wheel_changed), G_CALLBACK (colorsel_wheel_changed),
wheel); wheel);
@ -221,10 +221,10 @@ colorsel_wheel_changed (GimpColorWheel *wheel,
GimpColorSelector *selector) GimpColorSelector *selector)
{ {
GeglColor *color = gegl_color_new (NULL); GeglColor *color = gegl_color_new (NULL);
gdouble hsv[3]; gfloat hsv[3];
gimp_color_wheel_get_color (wheel, &hsv[0], &hsv[1], &hsv[2]); gimp_color_wheel_get_color (wheel, &hsv[0], &hsv[1], &hsv[2]);
gegl_color_set_pixel (color, babl_format_with_space ("HSV double", gegl_color_set_pixel (color, babl_format_with_space ("HSV float",
COLORSEL_WHEEL (selector)->format), COLORSEL_WHEEL (selector)->format),
hsv); hsv);
gimp_color_selector_set_color (selector, color); gimp_color_selector_set_color (selector, color);

12
modules/gimpcolorwheel.c
View file

@ -1341,17 +1341,17 @@ gimp_color_wheel_set_color (GimpColorWheel *wheel,
*/ */
void void
gimp_color_wheel_get_color (GimpColorWheel *wheel, gimp_color_wheel_get_color (GimpColorWheel *wheel,
gdouble *h, gfloat *h,
gdouble *s, gfloat *s,
gdouble *v) gfloat *v)
{ {
GimpColorWheelPrivate *priv = gimp_color_wheel_get_instance_private (wheel); GimpColorWheelPrivate *priv = gimp_color_wheel_get_instance_private (wheel);
g_return_if_fail (GIMP_IS_COLOR_WHEEL (wheel)); g_return_if_fail (GIMP_IS_COLOR_WHEEL (wheel));
if (h) *h = priv->h; if (h) *h = (gfloat) priv->h;
if (s) *s = priv->s; if (s) *s = (gfloat) priv->s;
if (v) *v = priv->v; if (v) *v = (gfloat) priv->v;
} }
/** /**

6
modules/gimpcolorwheel.h
View file

@ -77,9 +77,9 @@ void gimp_color_wheel_set_color (GimpColorWheel *wheel,
double s, double s,
double v); double v);
void gimp_color_wheel_get_color (GimpColorWheel *wheel, void gimp_color_wheel_get_color (GimpColorWheel *wheel,
gdouble *h, gfloat *h,
gdouble *s, gfloat *s,
gdouble *v); gfloat *v);
void gimp_color_wheel_set_ring_fraction (GimpColorWheel *wheel, void gimp_color_wheel_set_ring_fraction (GimpColorWheel *wheel,
gdouble fraction); gdouble fraction);