diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2012-02-03 16:04:03 +0100 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2012-02-03 16:04:03 +0100 |
| commit | f262a8c0bfae0cd90c2cd29acd409baf2157c241 (patch) | |
| tree | 1a9f3a8c483e16c5d3d435d7c7143a6aa73b58e1 /xps | |
| parent | 139d80bd65a164accf9d36d244d3d6a4c555aa47 (diff) | |
| download | mupdf-f262a8c0bfae0cd90c2cd29acd409baf2157c241.tar.xz | |
Be consistent about passing a fz_context in path/text/shade functions.
Diffstat (limited to 'xps')
| -rw-r--r-- | xps/xps_glyphs.c | 4 | ||||
| -rw-r--r-- | xps/xps_path.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xps/xps_glyphs.c b/xps/xps_glyphs.c index c394dd18..dc85f0ae 100644 --- a/xps/xps_glyphs.c +++ b/xps/xps_glyphs.c @@ -74,7 +74,7 @@ xps_lookup_font(xps_document *doc, char *name) xps_font_cache *cache; for (cache = doc->font_table; cache; cache = cache->next) if (!xps_strcasecmp(cache->name, name)) - return fz_keep_font(cache->font); + return fz_keep_font(doc->ctx, cache->font); return NULL; } @@ -83,7 +83,7 @@ xps_insert_font(xps_document *doc, char *name, fz_font *font) { xps_font_cache *cache = fz_malloc_struct(doc->ctx, xps_font_cache); cache->name = fz_strdup(doc->ctx, name); - cache->font = fz_keep_font(font); + cache->font = fz_keep_font(doc->ctx, font); cache->next = doc->font_table; doc->font_table = cache; } diff --git a/xps/xps_path.c b/xps/xps_path.c index 77bb6a36..76b9bb21 100644 --- a/xps/xps_path.c +++ b/xps/xps_path.c @@ -763,7 +763,7 @@ xps_parse_path_geometry(xps_document *doc, xps_resource *dict, xml_element *root } if (transform_att || transform_tag) - fz_transform_path(path, transform); + fz_transform_path(doc->ctx, path, transform); return path; } @@ -974,9 +974,9 @@ xps_parse_path(xps_document *doc, fz_matrix ctm, char *base_uri, xps_resource *d path = xps_parse_path_geometry(doc, dict, data_tag, 0, &fill_rule); if (stroke_att || stroke_tag) - area = fz_bound_path(path, &stroke, ctm); + area = fz_bound_path(doc->ctx, path, &stroke, ctm); else - area = fz_bound_path(path, NULL, ctm); + area = fz_bound_path(doc->ctx, path, NULL, ctm); if (navigate_uri_att) xps_add_link(doc, area, base_uri, navigate_uri_att); @@ -996,7 +996,7 @@ xps_parse_path(xps_document *doc, fz_matrix ctm, char *base_uri, xps_resource *d if (fill_tag) { - area = fz_bound_path(path, NULL, ctm); + area = fz_bound_path(doc->ctx, path, NULL, ctm); fz_clip_path(doc->dev, path, NULL, fill_rule == 0, ctm); xps_parse_brush(doc, ctm, area, fill_uri, dict, fill_tag); |