diff options
author | Robin Watts <robin.watts@artifex.com> | 2011-09-14 17:36:57 +0100 |
---|---|---|
committer | Robin Watts <Robin.Watts@artifex.com> | 2011-09-15 14:50:17 +0100 |
commit | b51ef0eea028c73b6379e832eaa34fff3fbbb927 (patch) | |
tree | 1ab685ccd356e7fdc832b2e3322c0486b2670cfb /pdf/pdf_pattern.c | |
parent | 89ae81f651bfa112b8e07317eb6983beaf7cb212 (diff) | |
download | mupdf-b51ef0eea028c73b6379e832eaa34fff3fbbb927.tar.xz |
Add context to mupdf.
Huge pervasive change to lots of files, adding a context for exception
handling and allocation.
In time we'll move more statics into there.
Also fix some for(i = 0; i < function(...); i++) calls.
Diffstat (limited to 'pdf/pdf_pattern.c')
-rw-r--r-- | pdf/pdf_pattern.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/pdf/pdf_pattern.c b/pdf/pdf_pattern.c index 418062d6..d058b2b5 100644 --- a/pdf/pdf_pattern.c +++ b/pdf/pdf_pattern.c @@ -7,43 +7,44 @@ pdf_load_pattern(pdf_pattern **patp, pdf_xref *xref, fz_obj *dict) fz_error error; pdf_pattern *pat; fz_obj *obj; + fz_context *ctx = xref->ctx; - if ((*patp = pdf_find_item(xref->store, pdf_drop_pattern, dict))) + if ((*patp = pdf_find_item(ctx, xref->store, (pdf_store_drop_fn *)pdf_drop_pattern, dict))) { pdf_keep_pattern(*patp); return fz_okay; } - pat = fz_malloc(sizeof(pdf_pattern)); + pat = fz_malloc(ctx, sizeof(pdf_pattern)); pat->refs = 1; pat->resources = NULL; pat->contents = NULL; /* Store pattern now, to avoid possible recursion if objects refer back to this one */ - pdf_store_item(xref->store, pdf_keep_pattern, pdf_drop_pattern, dict, pat); + pdf_store_item(ctx, xref->store, (pdf_store_keep_fn *)pdf_keep_pattern, (pdf_store_drop_fn *)pdf_drop_pattern, dict, pat); - pat->ismask = fz_to_int(fz_dict_gets(dict, "PaintType")) == 2; - pat->xstep = fz_to_real(fz_dict_gets(dict, "XStep")); - pat->ystep = fz_to_real(fz_dict_gets(dict, "YStep")); + pat->ismask = fz_to_int(ctx, fz_dict_gets(ctx, dict, "PaintType")) == 2; + pat->xstep = fz_to_real(ctx, fz_dict_gets(ctx, dict, "XStep")); + pat->ystep = fz_to_real(ctx, fz_dict_gets(ctx, dict, "YStep")); - obj = fz_dict_gets(dict, "BBox"); - pat->bbox = pdf_to_rect(obj); + obj = fz_dict_gets(ctx, dict, "BBox"); + pat->bbox = pdf_to_rect(ctx, obj); - obj = fz_dict_gets(dict, "Matrix"); + obj = fz_dict_gets(ctx, dict, "Matrix"); if (obj) - pat->matrix = pdf_to_matrix(obj); + pat->matrix = pdf_to_matrix(ctx, obj); else pat->matrix = fz_identity; - pat->resources = fz_dict_gets(dict, "Resources"); + pat->resources = fz_dict_gets(ctx, dict, "Resources"); if (pat->resources) fz_keep_obj(pat->resources); error = pdf_load_stream(&pat->contents, xref, fz_to_num(dict), fz_to_gen(dict)); if (error) { - pdf_remove_item(xref->store, pdf_drop_pattern, dict); - pdf_drop_pattern(pat); + pdf_remove_item(ctx, xref->store, (pdf_store_drop_fn *)pdf_drop_pattern, dict); + pdf_drop_pattern(ctx, pat); return fz_error_note(error, "cannot load pattern stream (%d %d R)", fz_to_num(dict), fz_to_gen(dict)); } @@ -59,14 +60,14 @@ pdf_keep_pattern(pdf_pattern *pat) } void -pdf_drop_pattern(pdf_pattern *pat) +pdf_drop_pattern(fz_context *ctx, pdf_pattern *pat) { if (pat && --pat->refs == 0) { if (pat->resources) - fz_drop_obj(pat->resources); + fz_drop_obj(ctx, pat->resources); if (pat->contents) - fz_drop_buffer(pat->contents); - fz_free(pat); + fz_drop_buffer(ctx, pat->contents); + fz_free(ctx, pat); } } |