[EGIT] [core/efl] master 33/37: edje: fix float comparison warning in edje programs.

[Cedric BAIL]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=4c465772f9be51da1cdb555d6eb7f60183ed35d9

commit 4c465772f9be51da1cdb555d6eb7f60183ed35d9
Author: Cedric BAIL <ced...@osg.samsung.com>
Date:   Tue Dec 20 16:02:02 2016 -0800

    edje: fix float comparison warning in edje programs.
---
 src/lib/edje/edje_program.c | 10 +++++-----
 src/lib/edje/edje_var.c     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index a2df439..695f57c 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -678,7 +678,7 @@ _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool 
force, const char *ssig,
      {
         ERR("Programs recursing up to recursion limit of %i in '%s' with 
sig='%s', src='%s' from '%s', '%s'. Disabled.",
             64, pr->name, ssig, ssrc, ed->path, ed->group);
-        if (pr->action == EDJE_ACTION_TYPE_STATE_SET && ((pr->tween.time == 
ZERO) || (ed->no_anim)))
+        if (pr->action == EDJE_ACTION_TYPE_STATE_SET && (EQ(pr->tween.time, 
ZERO) || (ed->no_anim)))
           ERR("Possible solution: try adding transition time to prevent 
Schrödinger's part state");
         recursion_limit = 1;
         return;
@@ -1947,7 +1947,7 @@ _edje_param_native_set(Edje *ed, Edje_Real_Part *rp, 
const char *name, const Edj
                   if (rp->part->dragable.confine_id != -1)
                     d = CLAMP(d, 0.0, 1.0);
                   if (rp->part->dragable.x < 0) d = 1.0 - d;
-                  if (rp->drag->val.x == FROM_DOUBLE(d)) return EINA_TRUE;
+                  if (EQ(rp->drag->val.x, FROM_DOUBLE(d))) return EINA_TRUE;
                   rp->drag->val.x = FROM_DOUBLE(d);
 #ifdef EDJE_CALC_CACHE
                   rp->invalidate = EINA_TRUE;
@@ -1966,7 +1966,7 @@ _edje_param_native_set(Edje *ed, Edje_Real_Part *rp, 
const char *name, const Edj
                   if (rp->part->dragable.confine_id != -1)
                     d = CLAMP(d, 0.0, 1.0);
                   if (rp->part->dragable.y < 0) d = 1.0 - d;
-                  if (rp->drag->val.y == FROM_DOUBLE(d)) return EINA_TRUE;
+                  if (EQ(rp->drag->val.y, FROM_DOUBLE(d))) return EINA_TRUE;
                   rp->drag->val.y = FROM_DOUBLE(d);
 #ifdef EDJE_CALC_CACHE
                   rp->invalidate = EINA_TRUE;
@@ -2286,11 +2286,11 @@ _edje_param_validate(const Edje_External_Param *param, 
const Edje_External_Param
         return EINA_TRUE;
 
       case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
-        if ((info->info.d.min != EDJE_EXTERNAL_DOUBLE_UNSET) &&
+        if (!EINA_DBL_CMP(info->info.d.min, EDJE_EXTERNAL_DOUBLE_UNSET) &&
             (info->info.d.min > param->d))
           return EINA_FALSE;
 
-        if ((info->info.d.max != EDJE_EXTERNAL_DOUBLE_UNSET) &&
+        if (!EINA_DBL_CMP(info->info.d.max, EDJE_EXTERNAL_DOUBLE_UNSET) &&
             (info->info.d.max < param->d))
           return EINA_FALSE;
 
diff --git a/src/lib/edje/edje_var.c b/src/lib/edje/edje_var.c
index 6c2ddf2..3bc3ebf 100644
--- a/src/lib/edje/edje_var.c
+++ b/src/lib/edje/edje_var.c
@@ -134,7 +134,7 @@ _edje_var_anim_cb(void *data EINA_UNUSED)
                           embryo_program_vm_pop(ed->collection->script);
                           _edje_recalc(ed);
                        }
-                       if (v == 1.0) ea->delete_me = 1;
+                       if (EQ(v, FROM_INT(1))) ea->delete_me = 1;
                     }
                }
              tl2 = eina_list_remove(tl2, ea);

--