summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie Brej <cbrej@cs.man.ac.uk>2009-11-22 22:47:40 +0000
committerCharlie Brej <cbrej@cs.man.ac.uk>2009-11-22 22:47:40 +0000
commitb7c34f1857be6a4bd3e1d2a680d35346414e24b7 (patch)
tree2487a09aeac834039b8230f98717add94436fa25
parentdc115710493d11c2fb8d3e2f4b39d4df4a01ce31 (diff)
[region] Break circular dependency using an extra variable
new_area->width depends on new_area->x and vice versa. Break the dependency by adding a temp variable.
-rw-r--r--src/libply/ply-region.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libply/ply-region.c b/src/libply/ply-region.c
index 88194bdb..b5e48fa5 100644
--- a/src/libply/ply-region.c
+++ b/src/libply/ply-region.c
@@ -322,8 +322,9 @@ merge_rectangle_with_sub_list (ply_region_t *region,
*/
case PLY_RECTANGLE_OVERLAP_RIGHT_EDGE:
{
- new_area->width = (new_area->x + new_area->width) - (old_area->x + old_area->width);
+ long temp = new_area->x;
new_area->x = old_area->x + old_area->width;
+ new_area->width = (temp + new_area->width) - (old_area->x + old_area->width);
}
break;