summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>2020-01-07 13:59:50 -0300
committerGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>2020-01-07 14:20:21 -0300
commit84ea4ad9902bae6542fb657ce9e12c1038b697fc (patch)
tree17dd444969ada1c99fbe1757aa7b077aaa5028d9
parent64685f4b20162b78964a5ab6fd57a93fb3860671 (diff)
downloadmutter-84ea4ad9902bae6542fb657ce9e12c1038b697fc.tar.gz
clutter/brightness-contrast-effect: Compare float with G_APPROX_VALUE
Nobody should ever compare float for equality. Use G_APPROX_VALUE to check that. https://gitlab.gnome.org/GNOME/mutter/merge_requests/992
-rw-r--r--clutter/clutter/clutter-brightness-contrast-effect.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/clutter/clutter/clutter-brightness-contrast-effect.c b/clutter/clutter/clutter-brightness-contrast-effect.c
index b984e2d82..be1df01cc 100644
--- a/clutter/clutter/clutter-brightness-contrast-effect.c
+++ b/clutter/clutter/clutter-brightness-contrast-effect.c
@@ -121,12 +121,12 @@ G_DEFINE_TYPE (ClutterBrightnessContrastEffect,
static gboolean
will_have_no_effect (ClutterBrightnessContrastEffect *self)
{
- return (self->brightness_red == no_change &&
- self->brightness_green == no_change &&
- self->brightness_blue == no_change &&
- self->contrast_red == no_change &&
- self->contrast_green == no_change &&
- self->contrast_blue == no_change);
+ return (G_APPROX_VALUE (self->brightness_red, no_change, FLT_EPSILON) &&
+ G_APPROX_VALUE (self->brightness_green, no_change, FLT_EPSILON) &&
+ G_APPROX_VALUE (self->brightness_blue, no_change, FLT_EPSILON) &&
+ G_APPROX_VALUE (self->contrast_red, no_change, FLT_EPSILON) &&
+ G_APPROX_VALUE (self->contrast_green, no_change, FLT_EPSILON) &&
+ G_APPROX_VALUE (self->contrast_blue, no_change, FLT_EPSILON));
}
static gboolean
@@ -497,9 +497,9 @@ clutter_brightness_contrast_effect_set_brightness_full (ClutterBrightnessContras
{
g_return_if_fail (CLUTTER_IS_BRIGHTNESS_CONTRAST_EFFECT (effect));
- if (red == effect->brightness_red &&
- green == effect->brightness_green &&
- blue == effect->brightness_blue)
+ if (G_APPROX_VALUE (red, effect->brightness_red, FLT_EPSILON) &&
+ G_APPROX_VALUE (green, effect->brightness_green, FLT_EPSILON) &&
+ G_APPROX_VALUE (blue, effect->brightness_blue, FLT_EPSILON))
return;
effect->brightness_red = red;
@@ -587,9 +587,9 @@ clutter_brightness_contrast_effect_set_contrast_full (ClutterBrightnessContrastE
{
g_return_if_fail (CLUTTER_IS_BRIGHTNESS_CONTRAST_EFFECT (effect));
- if (red == effect->contrast_red &&
- green == effect->contrast_green &&
- blue == effect->contrast_blue)
+ if (G_APPROX_VALUE (red, effect->contrast_red, FLT_EPSILON) &&
+ G_APPROX_VALUE (green, effect->contrast_green, FLT_EPSILON) &&
+ G_APPROX_VALUE (blue, effect->contrast_blue, FLT_EPSILON))
return;
effect->contrast_red = red;