Update pdf_obj's to have a pdf_document field.

Remove the fz_context field to avoid the structure growing.

1 files changed, 19 insertions, 19 deletions

diff --git a/source/pdf/pdf-xobject.c b/source/pdf/pdf-xobject.c
index 61fc876a..e85b2f75 100644
--- a/source/pdf/pdf-xobject.c
+++ b/source/pdf/pdf-xobject.c
@@ -110,7 +110,7 @@ pdf_load_xobject(pdf_document *xref, pdf_obj *dict)
 }
 
 pdf_obj *
-pdf_new_xobject(pdf_document *xref, const fz_rect *bbox, const fz_matrix *mat)
+pdf_new_xobject(pdf_document *doc, const fz_rect *bbox, const fz_matrix *mat)
 {
 	int idict_num;
 	pdf_obj *idict = NULL;
@@ -119,7 +119,7 @@ pdf_new_xobject(pdf_document *xref, const fz_rect *bbox, const fz_matrix *mat)
 	pdf_obj *obj = NULL;
 	pdf_obj *res = NULL;
 	pdf_obj *procset = NULL;
-	fz_context *ctx = xref->ctx;
+	fz_context *ctx = doc->ctx;
 
 	fz_var(idict);
 	fz_var(dict);
@@ -129,35 +129,35 @@ pdf_new_xobject(pdf_document *xref, const fz_rect *bbox, const fz_matrix *mat)
 	fz_var(procset);
 	fz_try(ctx)
 	{
-		dict = pdf_new_dict(ctx, 0);
+		dict = pdf_new_dict(doc, 0);
 
-		obj = pdf_new_rect(ctx, bbox);
+		obj = pdf_new_rect(doc, bbox);
 		pdf_dict_puts(dict, "BBox", obj);
 		pdf_drop_obj(obj);
 		obj = NULL;
 
-		obj = pdf_new_int(ctx, 1);
+		obj = pdf_new_int(doc, 1);
 		pdf_dict_puts(dict, "FormType", obj);
 		pdf_drop_obj(obj);
 		obj = NULL;
 
-		obj = pdf_new_int(ctx, 0);
+		obj = pdf_new_int(doc, 0);
 		pdf_dict_puts(dict, "Length", obj);
 		pdf_drop_obj(obj);
 		obj = NULL;
 
-		obj = pdf_new_matrix(ctx, mat);
+		obj = pdf_new_matrix(doc, mat);
 		pdf_dict_puts(dict, "Matrix", obj);
 		pdf_drop_obj(obj);
 		obj = NULL;
 
-		res = pdf_new_dict(ctx, 0);
-		procset = pdf_new_array(ctx, 2);
-		obj = pdf_new_name(ctx, "PDF");
+		res = pdf_new_dict(doc, 0);
+		procset = pdf_new_array(doc, 2);
+		obj = pdf_new_name(doc, "PDF");
 		pdf_array_push(procset, obj);
 		pdf_drop_obj(obj);
 		obj = NULL;
-		obj = pdf_new_name(ctx, "Text");
+		obj = pdf_new_name(doc, "Text");
 		pdf_array_push(procset, obj);
 		pdf_drop_obj(obj);
 		obj = NULL;
@@ -166,12 +166,12 @@ pdf_new_xobject(pdf_document *xref, const fz_rect *bbox, const fz_matrix *mat)
 		procset = NULL;
 		pdf_dict_puts(dict, "Resources", res);
 
-		obj = pdf_new_name(ctx, "Form");
+		obj = pdf_new_name(doc, "Form");
 		pdf_dict_puts(dict, "Subtype", obj);
 		pdf_drop_obj(obj);
 		obj = NULL;
 
-		obj = pdf_new_name(ctx, "XObject");
+		obj = pdf_new_name(doc, "XObject");
 		pdf_dict_puts(dict, "Type", obj);
 		pdf_drop_obj(obj);
 		obj = NULL;
@@ -195,9 +195,9 @@ pdf_new_xobject(pdf_document *xref, const fz_rect *bbox, const fz_matrix *mat)
 		form->resources = res;
 		res = NULL;
 
-		idict_num = pdf_create_object(xref);
-		pdf_update_object(xref, idict_num, dict);
-		idict = pdf_new_indirect(ctx, idict_num, 0, xref);
+		idict_num = pdf_create_object(doc);
+		pdf_update_object(doc, idict_num, dict);
+		idict = pdf_new_indirect(doc, idict_num, 0);
 		pdf_drop_obj(dict);
 		dict = NULL;
 
@@ -223,10 +223,10 @@ pdf_new_xobject(pdf_document *xref, const fz_rect *bbox, const fz_matrix *mat)
 	return idict;
 }
 
-void pdf_update_xobject_contents(pdf_document *xref, pdf_xobject *form, fz_buffer *buffer)
+void pdf_update_xobject_contents(pdf_document *doc, pdf_xobject *form, fz_buffer *buffer)
 {
 	pdf_dict_dels(form->contents, "Filter");
-	pdf_dict_puts_drop(form->contents, "Length", pdf_new_int(xref->ctx, buffer->len));
-	pdf_update_stream(xref, pdf_to_num(form->contents), buffer);
+	pdf_dict_puts_drop(form->contents, "Length", pdf_new_int(doc, buffer->len));
+	pdf_update_stream(doc, pdf_to_num(form->contents), buffer);
 	form->iteration ++;
 }