summaryrefslogtreecommitdiff
path: root/gfx
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-08-19 19:14:49 -0300
committerWerner Almesberger <werner@almesberger.net>2016-08-19 19:15:39 -0300
commit9b05360c849b56f54f194ab355c81964efa9ccfe (patch)
treed05591fdda299a6493e0a8d74e3b7cca4e2cd7bd /gfx
parent50986087676afb8ca2daaff2aa6db3ecb6019786 (diff)
downloadeeshow-9b05360c849b56f54f194ab355c81964efa9ccfe.tar.gz
eeshow-9b05360c849b56f54f194ab355c81964efa9ccfe.tar.bz2
eeshow-9b05360c849b56f54f194ab355c81964efa9ccfe.zip
eeshow/gfx/diff.c (merge_coord): typo caused offset troubles
Diffstat (limited to 'gfx')
-rw-r--r--gfx/diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gfx/diff.c b/gfx/diff.c
index 8379d22..14247ac 100644
--- a/gfx/diff.c
+++ b/gfx/diff.c
@@ -309,7 +309,7 @@ static void merge_coord(int pos_a, int pos_b, int dim_a, int dim_b,
*pos_res = pos_a;
dim_b += pos_b - pos_a;
} else {
- *pos_res = pos_a;
+ *pos_res = pos_b;
dim_a += pos_a - pos_b;
}
*res_dim = dim_a > dim_b ? dim_a : dim_b;