diff --git a/legacy/edje/src/lib/edje_lua2.c b/legacy/edje/src/lib/edje_lua2.c index 1d167e9eb4..1b94d65a22 100644 --- a/legacy/edje/src/lib/edje_lua2.c +++ b/legacy/edje/src/lib/edje_lua2.c @@ -2935,16 +2935,16 @@ static int _elua_line_xy(lua_State *L) // Stack usage [ { Edje_Lua_Obj *obj = (Edje_Lua_Obj *)lua_touserdata(L, 1); // Stack usage [-0, +0, -] Edje_Lua_Evas_Object *elo = (Edje_Lua_Evas_Object *)obj; - Evas_Coord x1, y1, x2, y2; + Evas_Coord xx1, yy1, xx2, yy2; if (!_elua_isa(obj, _elua_evas_line_meta)) return 0; - if (_elua_scan_params(L, 2, "%x1 %y1 %x2 %y2", &x1, &y1, &x2, &y2) > 0) + if (_elua_scan_params(L, 2, "%xx1 %yy1 %xx2 %yy2", &xx1, &yy1, &xx2, &yy2) > 0) { // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e] - evas_object_line_xy_set(elo->evas_obj, x1, y1, x2, y2); + evas_object_line_xy_set(elo->evas_obj, xx1, yy1, xx2, yy2); } - evas_object_line_xy_get(elo->evas_obj, &x1, &y1, &x2, &y2); - _elua_ret(L, "%x1 %y1 %x2 %y2", x1, y1, x2, y2); + evas_object_line_xy_get(elo->evas_obj, &xx1, &yy1, &xx2, &yy2); + _elua_ret(L, "%xx1 %yy1 %xx2 %yy2", xx1, yy1, xx2, yy2); // Stack usage [-8, +9, em] return 1; } diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c index 2205ba3a5d..ec0e34a110 100644 --- a/legacy/edje/src/lib/edje_util.c +++ b/legacy/edje/src/lib/edje_util.c @@ -2353,8 +2353,8 @@ EAPI Eina_Bool edje_object_parts_extends_calc(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { Edje *ed; - Evas_Coord x1 = INT_MAX, y1 = INT_MAX; - Evas_Coord x2 = 0, y2 = 0; + Evas_Coord xx1 = INT_MAX, yy1 = INT_MAX; + Evas_Coord xx2 = 0, yy2 = 0; unsigned int i; ed = _edje_fetch(obj); @@ -2386,18 +2386,18 @@ edje_object_parts_extends_calc(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, E rpx2 = rpx1 + rp->w; rpy2 = rpy1 + rp->h; - if (x1 > rpx1) x1 = rpx1; - if (y1 > rpy1) y1 = rpy1; - if (x2 < rpx2) x2 = rpx2; - if (y2 < rpy2) y2 = rpy2; + if (xx1 > rpx1) xx1 = rpx1; + if (yy1 > rpy1) yy1 = rpy1; + if (xx2 < rpx2) xx2 = rpx2; + if (yy2 < rpy2) yy2 = rpy2; } ed->calc_only = 0; - if (x) *x = x1; - if (y) *y = y1; - if (w) *w = x2 - x1; - if (h) *h = y2 - y1; + if (x) *x = xx1; + if (y) *y = yy1; + if (w) *w = xx2 - xx1; + if (h) *h = yy2 - yy1; return EINA_TRUE; }