summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorRobin Watts <robin.watts@artifex.com>2018-03-12 15:13:36 +0000
committerRobin Watts <robin.watts@artifex.com>2018-03-12 15:16:01 +0000
commitc6acebf711335e09e3c8285a3de7471de2754af4 (patch)
treeace2ed1ef8be562895ec659f8dd99e19cd692713 /source
parentcc83451bdfde6930c26e741ac55d2f9cd986a9c8 (diff)
downloadmupdf-c6acebf711335e09e3c8285a3de7471de2754af4.tar.xz
Bug 699106: Correct progress figures when using display_list.
The progress figures did not correctly add up to progress_max. Now they do. In addition, if we abort, the progress figure will accurately indicate how far we got.
Diffstat (limited to 'source')
-rw-r--r--source/fitz/list-device.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/fitz/list-device.c b/source/fitz/list-device.c
index 39314b54..ca3425ab 100644
--- a/source/fitz/list-device.c
+++ b/source/fitz/list-device.c
@@ -1553,7 +1553,8 @@ fz_run_display_list(fz_context *ctx, fz_display_list *list, fz_device *dev, cons
{
if (cookie->abort)
break;
- cookie->progress = progress++;
+ cookie->progress = progress;
+ progress += n.size;
}
node++;
@@ -1843,4 +1844,6 @@ visible:
fz_drop_colorspace(ctx, colorspace);
fz_drop_stroke_state(ctx, stroke);
fz_drop_path(ctx, path);
+ if (cookie)
+ cookie->progress = progress;
}