]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
[region] Break circular dependency using an extra variable
authorCharlie Brej <cbrej@cs.man.ac.uk>
Sun, 22 Nov 2009 22:47:40 +0000 (22:47 +0000)
committerCharlie Brej <cbrej@cs.man.ac.uk>
Sun, 22 Nov 2009 22:47:40 +0000 (22:47 +0000)
new_area->width depends on new_area->x and vice versa. Break the dependency by
adding a temp variable.

src/libply/ply-region.c

index 88194bdb55fd86e6c00d687b8334ccf950ca4f99..b5e48fa5b1c65de9cefb34ee6099d44421f0b709 100644 (file)
@@ -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;