cedric pushed a commit to branch master.
commit 7c6b3b1d4a2efb19fdf3c1d79cb97880b93f8d3a
Author: Cedric Bail <[email protected]>
Date: Wed Aug 7 18:40:23 2013 +0900
edje: fix off-by-one when x or y where negative.
---
src/lib/edje/edje_calc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index fac832f..b4ebcae 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -2357,19 +2357,19 @@ _edje_part_recalc_single(Edje *ed,
when doing min restricted calc */
if (!ed->calc_only)
{
- if (params->final.x + params->final.w < TO_INT(ADD(params->eval.x,
params->eval.w)))
+ if (ABS(params->final.x) + params->final.w <
TO_INT(ADD(ABS(params->eval.x), params->eval.w)))
{
params->final.w += 1;
}
- else if (params->final.x + params->final.w >
TO_INT(ADD(params->eval.x, params->eval.w)))
+ else if (ABS(params->final.x) + params->final.w >
TO_INT(ADD(ABS(params->eval.x), params->eval.w)))
{
params->final.w -= 1;
}
- if (params->final.y + params->final.h < TO_INT(ADD(params->eval.y,
params->eval.h)))
+ if (ABS(params->final.y) + params->final.h <
TO_INT(ADD(ABS(params->eval.y), params->eval.h)))
{
params->final.h += 1;
}
- else if (params->final.y + params->final.h >
TO_INT(ADD(params->eval.y, params->eval.h)))
+ else if (ABS(params->final.y) + params->final.h >
TO_INT(ADD(ABS(params->eval.y), params->eval.h)))
{
params->final.h -= 1;
}
--
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
