1 files changed, 21 insertions, 21 deletions

diff --git a/pdf/pdf_pattern.c b/pdf/pdf_pattern.c
index 33d84c99..194d9650 100644
--- a/pdf/pdf_pattern.c
+++ b/pdf/pdf_pattern.c
@@ -1,37 +1,36 @@
 #include "fitz.h"
 #include "mupdf.h"
 
-fz_error
-pdf_load_pattern(pdf_pattern **patp, pdf_xref *xref, fz_obj *dict)
+pdf_pattern *
+pdf_load_pattern(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 ((pat = pdf_find_item(ctx, xref->store, (pdf_store_drop_fn *)pdf_drop_pattern, dict)))
 	{
-		pdf_keep_pattern(*patp);
-		return fz_okay;
+		return pdf_keep_pattern(pat);
 	}
 
-	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"));
 
 	obj = fz_dict_gets(dict, "BBox");
-	pat->bbox = pdf_to_rect(obj);
+	pat->bbox = pdf_to_rect(ctx, obj);
 
 	obj = fz_dict_gets(dict, "Matrix");
 	if (obj)
-		pat->matrix = pdf_to_matrix(obj);
+		pat->matrix = pdf_to_matrix(ctx, obj);
 	else
 		pat->matrix = fz_identity;
 
@@ -39,16 +38,17 @@ pdf_load_pattern(pdf_pattern **patp, pdf_xref *xref, fz_obj *dict)
 	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)
+	fz_try(ctx)
 	{
-		pdf_remove_item(xref->store, pdf_drop_pattern, dict);
-		pdf_drop_pattern(pat);
-		return fz_rethrow(error, "cannot load pattern stream (%d %d R)", fz_to_num(dict), fz_to_gen(dict));
+		pat->contents = pdf_load_stream(xref, fz_to_num(dict), fz_to_gen(dict));
 	}
-
-	*patp = pat;
-	return fz_okay;
+	fz_catch(ctx)
+	{
+		pdf_remove_item(ctx, xref->store, (pdf_store_drop_fn *)pdf_drop_pattern, dict);
+		pdf_drop_pattern(ctx, pat);
+		fz_throw(ctx, "cannot load pattern stream (%d %d R)", fz_to_num(dict), fz_to_gen(dict));
+	}
+	return pat;
 }
 
 pdf_pattern *
@@ -59,14 +59,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);
 		if (pat->contents)
-			fz_drop_buffer(pat->contents);
-		fz_free(pat);
+			fz_drop_buffer(ctx, pat->contents);
+		fz_free(ctx, pat);
 	}
 }