diff options
author | Chris Michael <cp.michael@samsung.com> | 2016-12-20 11:13:40 -0500 |
---|---|---|
committer | Chris Michael <cp.michael@samsung.com> | 2016-12-20 11:13:40 -0500 |
commit | 2faf3df444bbe10c1628beff475028d00769c0ea (patch) | |
tree | c94b7152fb62f90294615e32afd784468c27c19b /src/lib/emotion/emotion_smart.c | |
parent | be02e13ece0470e977b9dfbe5e7f6368cbe31eea (diff) |
emotion: remove float comparison warnings
Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to '')
-rw-r--r-- | src/lib/emotion/emotion_smart.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c index 5ea48bbcd8..8add1227e4 100644 --- a/src/lib/emotion/emotion_smart.c +++ b/src/lib/emotion/emotion_smart.c | |||
@@ -1540,8 +1540,8 @@ _emotion_video_pos_update(Evas_Object *obj, double pos, double len) | |||
1540 | int npos = 0, nlen = 0; | 1540 | int npos = 0, nlen = 0; |
1541 | 1541 | ||
1542 | E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); | 1542 | E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); |
1543 | if (pos != sd->pos) npos = 1; | 1543 | if (!EINA_DBL_CMP(pos, sd->pos)) npos = 1; |
1544 | if (len != sd->len) nlen = 1; | 1544 | if (!EINA_DBL_CMP(len, sd->len)) nlen = 1; |
1545 | sd->pos = pos; | 1545 | sd->pos = pos; |
1546 | sd->len = len; | 1546 | sd->len = len; |
1547 | if (npos) | 1547 | if (npos) |
@@ -1573,8 +1573,8 @@ _emotion_frame_resize(Evas_Object *obj, int w, int h, double ratio) | |||
1573 | } | 1573 | } |
1574 | if (h > 0) tmp = (double)w / (double)h; | 1574 | if (h > 0) tmp = (double)w / (double)h; |
1575 | else tmp = 1.0; | 1575 | else tmp = 1.0; |
1576 | if (ratio != tmp) tmp = ratio; | 1576 | if (!EINA_DBL_CMP(ratio, tmp)) tmp = ratio; |
1577 | if (tmp != sd->ratio) | 1577 | if (!EINA_DBL_CMP(tmp, sd->ratio)) |
1578 | { | 1578 | { |
1579 | sd->ratio = tmp; | 1579 | sd->ratio = tmp; |
1580 | changed = 1; | 1580 | changed = 1; |
@@ -1619,7 +1619,7 @@ _emotion_open_done(Evas_Object *obj) | |||
1619 | E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); | 1619 | E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); |
1620 | sd->open = 1; | 1620 | sd->open = 1; |
1621 | 1621 | ||
1622 | if (sd->remember_jump) | 1622 | if (!EINA_DBL_CMP(sd->remember_jump, 0.0)) |
1623 | emotion_object_position_set(obj, sd->remember_jump); | 1623 | emotion_object_position_set(obj, sd->remember_jump); |
1624 | if (sd->remember_play != sd->play) | 1624 | if (sd->remember_play != sd->play) |
1625 | emotion_object_play_set(obj, sd->remember_play); | 1625 | emotion_object_play_set(obj, sd->remember_play); |
@@ -1737,7 +1737,8 @@ _emotion_frame_refill(Evas_Object *obj, double w, double h) | |||
1737 | Efl_Canvas_Video_Data *sd; | 1737 | Efl_Canvas_Video_Data *sd; |
1738 | 1738 | ||
1739 | E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); | 1739 | E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); |
1740 | if ((sd->fill.w != w) || (sd->fill.h != h)) | 1740 | if ((!EINA_DBL_CMP(sd->fill.w, w)) || |
1741 | (!EINA_DBL_CMP(sd->fill.h, h))) | ||
1741 | { | 1742 | { |
1742 | Evas_Coord ow, oh; | 1743 | Evas_Coord ow, oh; |
1743 | 1744 | ||