devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=32745f91ae108074ffe91268c9a9f72fed9d7b16
commit 32745f91ae108074ffe91268c9a9f72fed9d7b16
Author: Chris Michael <cp.mich...@samsung.com>
Date: Tue Dec 20 09:29:49 2016 -0500
evas: remove float comparison warning for evas_object_main
Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
src/lib/evas/canvas/evas_object_main.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_main.c
b/src/lib/evas/canvas/evas_object_main.c
index 5da0192..80af8a8 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1539,7 +1539,9 @@ _efl_canvas_object_efl_gfx_size_hint_hint_align_set(Eo
*eo_obj, Evas_Object_Prot
return;
evas_object_async_block(obj);
_evas_object_size_hint_alloc(eo_obj, obj);
- if ((obj->size_hints->align.x == x) && (obj->size_hints->align.y == y))
return;
+ if ((EINA_DBL_CMP(obj->size_hints->align.x, x)) &&
+ (EINA_DBL_CMP(obj->size_hints->align.y, y)))
+ return;
obj->size_hints->align.x = x;
obj->size_hints->align.y = y;
@@ -1566,7 +1568,9 @@ _efl_canvas_object_efl_gfx_size_hint_hint_weight_set(Eo
*eo_obj, Evas_Object_Pro
return;
evas_object_async_block(obj);
_evas_object_size_hint_alloc(eo_obj, obj);
- if ((obj->size_hints->weight.x == x) && (obj->size_hints->weight.y == y))
return;
+ if ((EINA_DBL_CMP(obj->size_hints->weight.x, x)) &&
+ (EINA_DBL_CMP(obj->size_hints->weight.y, y)))
+ return;
obj->size_hints->weight.x = x;
obj->size_hints->weight.y = y;
@@ -1918,7 +1922,7 @@ EOLIAN static void
_efl_canvas_object_scale_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
double scale)
{
if (obj->delete_me) return;
- if (obj->cur->scale == scale) return;
+ if (EINA_DBL_CMP(obj->cur->scale, scale)) return;
evas_object_async_block(obj);
EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur)
--
