summaryrefslogtreecommitdiff
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
parent50986087676afb8ca2daaff2aa6db3ecb6019786 (diff)
downloadeeshow-9b05360c849b56f54f194ab355c81964efa9ccfe.tar.gz
eeshow-9b05360c849b56f54f194ab355c81964efa9ccfe.tar.bz2
eeshow-9b05360c849b56f54f194ab355c81964efa9ccfe.zip
eeshow/gfx/diff.c (merge_coord): typo caused offset troubles
-rw-r--r--TODO6
-rw-r--r--gfx/diff.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/TODO b/TODO
index 65cae88..18969fe 100644
--- a/TODO
+++ b/TODO
@@ -37,6 +37,8 @@ Rendering:
- return indication of whether diff found any differences
- in diff, pass only options understood by cairo_png
- find out why in Cairo PDF non-dashed lines disappear if CAIRO_LINE_CAP_ROUND
+- non-interactive diff mode currently requires both sheets to have identical
+ size
GUI:
- fonts grow beyond their bounding boxes when zooming in
@@ -67,7 +69,3 @@ GUI/glabels:
- maybe indicate how it is used
- there can be "hanging" pop-ups, see comment in gui/glabel.c:hover_glabel
- should there be a way to remove glabel highlighting ?
-- comparing Neo900 fbc3a95 and 6a9f71a, sheet 2 has large offset differences,
- causing hover to have displaced AoIs in diff_old, and both AoIs and overlays
- are wrong in diff_new. Offset differences also defeat rapid switching between
- old and new as a means to spot differences.
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;