cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=6e40fd890b5dc0218c8edb195003eb95c5bf5ac1

commit 6e40fd890b5dc0218c8edb195003eb95c5bf5ac1
Author: Cedric BAIL <ced...@osg.samsung.com>
Date:   Tue Dec 20 15:46:43 2016 -0800

    edje: fix float comparison warning in edje_pick.
---
 src/bin/edje/edje_pick.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/edje/edje_pick.c b/src/bin/edje/edje_pick.c
index a4a2b22..79a361c 100644
--- a/src/bin/edje/edje_pick.c
+++ b/src/bin/edje/edje_pick.c
@@ -558,7 +558,7 @@ _edje_pick_output_prepare(Edje_File *o, Edje_File *edf, 
char *name)
              if (o->feature_ver < edf->feature_ver)
                o->feature_ver = edf->feature_ver;
           }
-        if (o->base_scale != edf->base_scale)
+        if (NEQ(o->base_scale, edf->base_scale))
           {
              EINA_LOG_ERR("Error: Merging files of various base scale. Base 
scale of the files should be same.\n");
              free(o);

-- 


Reply via email to