[EGIT] [core/efl] master 01/02: ecore-evas-wayland: remove float comparison warning from wayland backend

[Christopher Michael]

devilhorns pushed a commit to branch master.

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

commit fa05393d025bab7a99b23ca28d7d1f032387ed45
Author: Chris Michael <cp.mich...@samsung.com>
Date:   Tue Dec 20 08:53:16 2016 -0500

    ecore-evas-wayland: remove float comparison warning from wayland backend
    
    Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
 .../engines/wayland/ecore_evas_wayland_common.c           | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 81d16a4..85a103f 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -926,7 +926,9 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
              if (bw < 1) bw = 1;
              if (bh < 1) bh = 1;
              a = ((double)bw / (double)bh);
-             if ((ee->prop.aspect != 0.0) && (a < ee->prop.aspect))
+
+             if ((!EINA_FLT_CMP(ee->prop.aspect, 0.0) &&
+                  (a < ee->prop.aspect)))
                {
                   if ((h < ee->h) > 0)
                     bw = bh * ee->prop.aspect;
@@ -936,7 +938,8 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
                   w = bw + ee->prop.base.w;
                   h = bh + ee->prop.base.h;
                }
-             else if ((ee->prop.aspect != 0.0) && (a > ee->prop.aspect))
+             else if ((!EINA_FLT_CMP(ee->prop.aspect, 0.0)) &&
+                      (a > ee->prop.aspect))
                {
                   bw = bh * ee->prop.aspect;
                   w = bw + ee->prop.base.w;
@@ -945,14 +948,16 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
         else
           {
              a = ((double)w / (double)h);
-             if ((ee->prop.aspect != 0.0) && (a < ee->prop.aspect))
+             if ((!EINA_FLT_CMP(ee->prop.aspect, 0.0)) &&
+                 (a < ee->prop.aspect))
                {
                   if ((h < ee->h) > 0)
                     w = h * ee->prop.aspect;
                   else
                     h = w / ee->prop.aspect;
                }
-             else if ((ee->prop.aspect != 0.0) && (a > ee->prop.aspect))
+             else if ((!EINA_FLT_CMP(ee->prop.aspect, 0.0)) &&
+                      (a > ee->prop.aspect))
                w = h * ee->prop.aspect;
           }
 
@@ -1242,7 +1247,7 @@ _ecore_evas_wl_common_aspect_set(Ecore_Evas *ee, double 
aspect)
    LOGFN(__FILE__, __LINE__, __FUNCTION__);
 
    if (!ee) return;
-   if (ee->prop.aspect == aspect) return;
+   if (EINA_FLT_CMP(ee->prop.aspect, aspect)) return;
    ee->prop.aspect = aspect;
 }
 

--