summaryrefslogtreecommitdiff
path: root/xps/xps_doc.c
diff options
context:
space:
mode:
authorRobin Watts <robin.watts@artifex.com>2013-01-25 19:24:49 +0000
committerRobin Watts <robin.watts@artifex.com>2013-02-06 19:24:12 +0000
commitd3aa37962470253083714b5092a1ba759f674d47 (patch)
treeec60a0857cd3d44d3db5bc0c95aa69335b6b2d47 /xps/xps_doc.c
parentc42dac496e0994c4253eb50ce67ceaec864ed379 (diff)
downloadmupdf-d3aa37962470253083714b5092a1ba759f674d47.tar.xz
Change to pass structures by reference rather than value.
This is faster on ARM in particular. The primary changes involve fz_matrix, fz_rect and fz_bbox. Rather than passing 'fz_rect r' into a function, we now consistently pass 'const fz_rect *r'. Where a rect is passed in and modified, we miss the 'const' off. Where possible, we return the pointer to the modified structure to allow 'chaining' of expressions. The basic upshot of this work is that we do far fewer copies of rectangle/matrix structures, and all the copies we do are explicit. This has opened the way to other optimisations, also performed in this commit. Rather than using expressions like: fz_concat(fz_scale(sx, sy), fz_translate(tx, ty)) we now have fz_pre_{scale,translate,rotate} functions. These can be implemented much more efficiently than doing the fully fledged matrix multiplication that fz_concat requires. We add fz_rect_{min,max} functions to return pointers to the min/max points of a rect. These can be used to in transformations to directly manipulate values. With a little casting in the path transformation code we can avoid more needless copying. We rename fz_widget_bbox to the more consistent fz_bound_widget.
Diffstat (limited to 'xps/xps_doc.c')
-rw-r--r--xps/xps_doc.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/xps/xps_doc.c b/xps/xps_doc.c
index 4fefceb3..84d7bbd1 100644
--- a/xps/xps_doc.c
+++ b/xps/xps_doc.c
@@ -78,7 +78,7 @@ xps_add_fixed_document(xps_document *doc, char *name)
}
void
-xps_add_link(xps_document *doc, fz_rect area, char *base_uri, char *target_uri)
+xps_add_link(xps_document *doc, const fz_rect *area, char *base_uri, char *target_uri)
{
int len;
char *buffer = NULL;
@@ -506,13 +506,12 @@ xps_load_page(xps_document *doc, int number)
return NULL;
}
-fz_rect
-xps_bound_page(xps_document *doc, xps_page *page)
+fz_rect *
+xps_bound_page(xps_document *doc, xps_page *page, fz_rect *bounds)
{
- fz_rect bounds;
- bounds.x0 = bounds.y0 = 0;
- bounds.x1 = page->width * 72.0f / 96.0f;
- bounds.y1 = page->height * 72.0f / 96.0f;
+ bounds->x0 = bounds->y0 = 0;
+ bounds->x1 = page->width * 72.0f / 96.0f;
+ bounds->y1 = page->height * 72.0f / 96.0f;
return bounds;
}