Add ctx parameter and remove embedded contexts for API regularity.

Purge several embedded contexts:

Remove embedded context in fz_output.
Remove embedded context in fz_stream.
Remove embedded context in fz_device.
Remove fz_rebind_stream (since it is no longer necessary).
Remove embedded context in svg_device.
Remove embedded context in XML parser.

Add ctx argument to fz_document functions.

Remove embedded context in fz_document.
Remove embedded context in pdf_document.
Remove embedded context in pdf_obj.

Make fz_page independent of fz_document in the interface.

We shouldn't need to pass the document to all functions handling a page.
If a page is tied to the source document, it's redundant; otherwise it's
just pointless.

Fix reference counting oddity in fz_new_image_from_pixmap.

1 files changed, 157 insertions, 166 deletions

diff --git a/source/pdf/pdf-stream.c b/source/pdf/pdf-stream.c
index 9efd1887..2335e67a 100644
--- a/source/pdf/pdf-stream.c
+++ b/source/pdf/pdf-stream.c
@@ -4,14 +4,14 @@
  * Check if an object is a stream or not.
  */
 int
-pdf_is_stream(pdf_document *doc, int num, int gen)
+pdf_is_stream(fz_context *ctx, pdf_document *doc, int num, int gen)
 {
 	pdf_xref_entry *entry;
 
-	if (num <= 0 || num >= pdf_xref_len(doc))
+	if (num <= 0 || num >= pdf_xref_len(ctx, doc))
 		return 0;
 
-	entry = pdf_cache_object(doc, num, gen);
+	entry = pdf_cache_object(ctx, doc, num, gen);
 
 	return entry->stm_ofs != 0 || entry->stm_buf;
 }
@@ -26,18 +26,18 @@ pdf_stream_has_crypt(fz_context *ctx, pdf_obj *stm)
 	pdf_obj *obj;
 	int i;
 
-	filters = pdf_dict_getsa(stm, "Filter", "F");
+	filters = pdf_dict_getsa(ctx, stm, "Filter", "F");
 	if (filters)
 	{
-		if (!strcmp(pdf_to_name(filters), "Crypt"))
+		if (!strcmp(pdf_to_name(ctx, filters), "Crypt"))
 			return 1;
-		if (pdf_is_array(filters))
+		if (pdf_is_array(ctx, filters))
 		{
-			int n = pdf_array_len(filters);
+			int n = pdf_array_len(ctx, filters);
 			for (i = 0; i < n; i++)
 			{
-				obj = pdf_array_get(filters, i);
-				if (!strcmp(pdf_to_name(obj), "Crypt"))
+				obj = pdf_array_get(ctx, filters, i);
+				if (!strcmp(pdf_to_name(ctx, obj), "Crypt"))
 					return 1;
 			}
 		}
@@ -46,10 +46,9 @@ pdf_stream_has_crypt(fz_context *ctx, pdf_obj *stm)
 }
 
 static fz_jbig2_globals *
-pdf_load_jbig2_globals(pdf_document *doc, pdf_obj *dict)
+pdf_load_jbig2_globals(fz_context *ctx, pdf_document *doc, pdf_obj *dict)
 {
 	fz_jbig2_globals *globals;
-	fz_context *ctx = doc->ctx;
 	fz_buffer *buf = NULL;
 
 	fz_var(buf);
@@ -61,7 +60,7 @@ pdf_load_jbig2_globals(pdf_document *doc, pdf_obj *dict)
 
 	fz_try(ctx)
 	{
-		buf = pdf_load_stream(doc, pdf_to_num(dict), pdf_to_gen(dict));
+		buf = pdf_load_stream(ctx, doc, pdf_to_num(ctx, dict), pdf_to_gen(ctx, dict));
 		globals = fz_load_jbig2_globals(ctx, buf->data, buf->len);
 		pdf_store_item(ctx, dict, globals, buf->len);
 	}
@@ -81,68 +80,67 @@ pdf_load_jbig2_globals(pdf_document *doc, pdf_obj *dict)
  * Create a filter given a name and param dictionary.
  */
 static fz_stream *
-build_filter(fz_stream *chain, pdf_document *doc, pdf_obj *f, pdf_obj *p, int num, int gen, fz_compression_params *params)
+build_filter(fz_context *ctx, fz_stream *chain, pdf_document *doc, pdf_obj *f, pdf_obj *p, int num, int gen, fz_compression_params *params)
 {
-	fz_context *ctx = chain->ctx;
-	char *s = pdf_to_name(f);
+	char *s = pdf_to_name(ctx, f);
 
-	int predictor = pdf_to_int(pdf_dict_gets(p, "Predictor"));
-	pdf_obj *columns_obj = pdf_dict_gets(p, "Columns");
-	int columns = pdf_to_int(columns_obj);
-	int colors = pdf_to_int(pdf_dict_gets(p, "Colors"));
-	int bpc = pdf_to_int(pdf_dict_gets(p, "BitsPerComponent"));
+	int predictor = pdf_to_int(ctx, pdf_dict_gets(ctx, p, "Predictor"));
+	pdf_obj *columns_obj = pdf_dict_gets(ctx, p, "Columns");
+	int columns = pdf_to_int(ctx, columns_obj);
+	int colors = pdf_to_int(ctx, pdf_dict_gets(ctx, p, "Colors"));
+	int bpc = pdf_to_int(ctx, pdf_dict_gets(ctx, p, "BitsPerComponent"));
 
 	if (params)
 		params->type = FZ_IMAGE_RAW;
 
 	if (!strcmp(s, "ASCIIHexDecode") || !strcmp(s, "AHx"))
-		return fz_open_ahxd(chain);
+		return fz_open_ahxd(ctx, chain);
 
 	else if (!strcmp(s, "ASCII85Decode") || !strcmp(s, "A85"))
-		return fz_open_a85d(chain);
+		return fz_open_a85d(ctx, chain);
 
 	else if (!strcmp(s, "CCITTFaxDecode") || !strcmp(s, "CCF"))
 	{
-		pdf_obj *k = pdf_dict_gets(p, "K");
-		pdf_obj *eol = pdf_dict_gets(p, "EndOfLine");
-		pdf_obj *eba = pdf_dict_gets(p, "EncodedByteAlign");
-		pdf_obj *rows = pdf_dict_gets(p, "Rows");
-		pdf_obj *eob = pdf_dict_gets(p, "EndOfBlock");
-		pdf_obj *bi1 = pdf_dict_gets(p, "BlackIs1");
+		pdf_obj *k = pdf_dict_gets(ctx, p, "K");
+		pdf_obj *eol = pdf_dict_gets(ctx, p, "EndOfLine");
+		pdf_obj *eba = pdf_dict_gets(ctx, p, "EncodedByteAlign");
+		pdf_obj *rows = pdf_dict_gets(ctx, p, "Rows");
+		pdf_obj *eob = pdf_dict_gets(ctx, p, "EndOfBlock");
+		pdf_obj *bi1 = pdf_dict_gets(ctx, p, "BlackIs1");
 		if (params)
 		{
 			/* We will shortstop here */
 			params->type = FZ_IMAGE_FAX;
-			params->u.fax.k = (k ? pdf_to_int(k) : 0);
-			params->u.fax.end_of_line = (eol ? pdf_to_bool(eol) : 0);
-			params->u.fax.encoded_byte_align = (eba ? pdf_to_bool(eba) : 0);
+			params->u.fax.k = (k ? pdf_to_int(ctx, k) : 0);
+			params->u.fax.end_of_line = (eol ? pdf_to_bool(ctx, eol) : 0);
+			params->u.fax.encoded_byte_align = (eba ? pdf_to_bool(ctx, eba) : 0);
 			params->u.fax.columns = (columns_obj ? columns : 1728);
-			params->u.fax.rows = (rows ? pdf_to_int(rows) : 0);
-			params->u.fax.end_of_block = (eob ? pdf_to_bool(eob) : 1);
-			params->u.fax.black_is_1 = (bi1 ? pdf_to_bool(bi1) : 0);
+			params->u.fax.rows = (rows ? pdf_to_int(ctx, rows) : 0);
+			params->u.fax.end_of_block = (eob ? pdf_to_bool(ctx, eob) : 1);
+			params->u.fax.black_is_1 = (bi1 ? pdf_to_bool(ctx, bi1) : 0);
 			return chain;
 		}
-		return fz_open_faxd(chain,
-				k ? pdf_to_int(k) : 0,
-				eol ? pdf_to_bool(eol) : 0,
-				eba ? pdf_to_bool(eba) : 0,
+		return fz_open_faxd(ctx, chain,
+				k ? pdf_to_int(ctx, k) : 0,
+				eol ? pdf_to_bool(ctx, eol) : 0,
+				eba ? pdf_to_bool(ctx, eba) : 0,
 				columns_obj ? columns : 1728,
-				rows ? pdf_to_int(rows) : 0,
-				eob ? pdf_to_bool(eob) : 1,
-				bi1 ? pdf_to_bool(bi1) : 0);
+				rows ? pdf_to_int(ctx, rows) : 0,
+				eob ? pdf_to_bool(ctx, eob) : 1,
+				bi1 ? pdf_to_bool(ctx, bi1) : 0);
 	}
 
 	else if (!strcmp(s, "DCTDecode") || !strcmp(s, "DCT"))
 	{
-		pdf_obj *ct = pdf_dict_gets(p, "ColorTransform");
+		pdf_obj *ct = pdf_dict_gets(ctx, p, "ColorTransform");
 		if (params)
 		{
 			/* We will shortstop here */
 			params->type = FZ_IMAGE_JPEG;
-			params->u.jpeg.color_transform = (ct ? pdf_to_int(ct) : -1);
+			params->u.jpeg.color_transform = (ct ? pdf_to_int(ctx, ct) : -1);
 			return chain;
 		}
-		return fz_open_dctd(chain, ct ? pdf_to_int(ct) : -1, 0, NULL);
+		return fz_open_dctd(ctx, chain, ct ? pdf_to_int(ctx, ct) : -1, 0, NULL);
 	}
 
 	else if (!strcmp(s, "RunLengthDecode") || !strcmp(s, "RL"))
@@ -153,7 +151,7 @@ build_filter(fz_stream *chain, pdf_document *doc, pdf_obj *f, pdf_obj *p, int nu
 			params->type = FZ_IMAGE_RLD;
 			return chain;
 		}
-		return fz_open_rld(chain);
+		return fz_open_rld(ctx, chain);
 	}
 	else if (!strcmp(s, "FlateDecode") || !strcmp(s, "Fl"))
 	{
@@ -167,15 +165,15 @@ build_filter(fz_stream *chain, pdf_document *doc, pdf_obj *f, pdf_obj *p, int nu
 			params->u.flate.bpc = bpc;
 			return chain;
 		}
-		chain = fz_open_flated(chain, 15);
+		chain = fz_open_flated(ctx, chain, 15);
 		if (predictor > 1)
-			chain = fz_open_predict(chain, predictor, columns, colors, bpc);
+			chain = fz_open_predict(ctx, chain, predictor, columns, colors, bpc);
 		return chain;
 	}
 
 	else if (!strcmp(s, "LZWDecode") || !strcmp(s, "LZW"))
 	{
-		pdf_obj *ec = pdf_dict_gets(p, "EarlyChange");
+		pdf_obj *ec = pdf_dict_gets(ctx, p, "EarlyChange");
 		if (params)
 		{
 			/* We will shortstop here */
@@ -184,23 +182,23 @@ build_filter(fz_stream *chain, pdf_document *doc, pdf_obj *f, pdf_obj *p, int nu
 			params->u.lzw.columns = columns;
 			params->u.lzw.colors = colors;
 			params->u.lzw.bpc = bpc;
-			params->u.lzw.early_change = (ec ? pdf_to_int(ec) : 1);
+			params->u.lzw.early_change = (ec ? pdf_to_int(ctx, ec) : 1);
 			return chain;
 		}
-		chain = fz_open_lzwd(chain, ec ? pdf_to_int(ec) : 1);
+		chain = fz_open_lzwd(ctx, chain, ec ? pdf_to_int(ctx, ec) : 1);
 		if (predictor > 1)
-			chain = fz_open_predict(chain, predictor, columns, colors, bpc);
+			chain = fz_open_predict(ctx, chain, predictor, columns, colors, bpc);
 		return chain;
 	}
 
 	else if (!strcmp(s, "JBIG2Decode"))
 	{
 		fz_jbig2_globals *globals = NULL;
-		pdf_obj *obj = pdf_dict_gets(p, "JBIG2Globals");
-		if (pdf_is_indirect(obj))
-			globals = pdf_load_jbig2_globals(doc, obj);
+		pdf_obj *obj = pdf_dict_gets(ctx, p, "JBIG2Globals");
+		if (pdf_is_indirect(ctx, obj))
+			globals = pdf_load_jbig2_globals(ctx, doc, obj);
 		/* fz_open_jbig2d takes possession of globals */
-		return fz_open_jbig2d(chain, globals);
+		return fz_open_jbig2d(ctx, chain, globals);
 	}
 
 	else if (!strcmp(s, "JPXDecode"))
@@ -216,9 +214,9 @@ build_filter(fz_stream *chain, pdf_document *doc, pdf_obj *f, pdf_obj *p, int nu
 			return chain;
 		}
 
-		name = pdf_dict_gets(p, "Name");
-		if (pdf_is_name(name))
-			return pdf_open_crypt_with_filter(chain, doc->crypt, pdf_to_name(name), num, gen);
+		name = pdf_dict_gets(ctx, p, "Name");
+		if (pdf_is_name(ctx, name))
+			return pdf_open_crypt_with_filter(ctx, chain, doc->crypt, pdf_to_name(ctx, name), num, gen);
 
 		return chain;
 	}
@@ -233,30 +231,29 @@ build_filter(fz_stream *chain, pdf_document *doc, pdf_obj *f, pdf_obj *p, int nu
  * Assume ownership of head.
  */
 static fz_stream *
-build_filter_chain(fz_stream *chain, pdf_document *doc, pdf_obj *fs, pdf_obj *ps, int num, int gen, fz_compression_params *params)
+build_filter_chain(fz_context *ctx, fz_stream *chain, pdf_document *doc, pdf_obj *fs, pdf_obj *ps, int num, int gen, fz_compression_params *params)
 {
 	pdf_obj *f;
 	pdf_obj *p;
 	int i, n;
-	fz_context *ctx = chain->ctx;
 
 	fz_try(ctx)
 	{
-		n = pdf_array_len(fs);
+		n = pdf_array_len(ctx, fs);
 		for (i = 0; i < n; i++)
 		{
 			fz_stream *chain2;
 
-			f = pdf_array_get(fs, i);
-			p = pdf_array_get(ps, i);
+			f = pdf_array_get(ctx, fs, i);
+			p = pdf_array_get(ctx, ps, i);
 			chain2 = chain;
 			chain = NULL;
-			chain = build_filter(chain2, doc, f, p, num, gen, (i == n-1 ? params : NULL));
+			chain = build_filter(ctx, chain2, doc, f, p, num, gen, (i == n-1 ? params : NULL));
 		}
 	}
 	fz_catch(ctx)
 	{
-		fz_drop_stream(chain);
+		fz_drop_stream(ctx, chain);
 		fz_rethrow(ctx);
 	}
 
@@ -272,28 +269,27 @@ build_filter_chain(fz_stream *chain, pdf_document *doc, pdf_obj *fs, pdf_obj *ps
  * orig_num and orig_gen are used purely to seed the encryption.
  */
 static fz_stream *
-pdf_open_raw_filter(fz_stream *chain, pdf_document *doc, pdf_obj *stmobj, int num, int orig_num, int orig_gen, int offset)
+pdf_open_raw_filter(fz_context *ctx, fz_stream *chain, pdf_document *doc, pdf_obj *stmobj, int num, int orig_num, int orig_gen, int offset)
 {
-	fz_context *ctx = chain->ctx;
 	int hascrypt;
 	int len;
 
-	if (num > 0 && num < pdf_xref_len(doc))
+	if (num > 0 && num < pdf_xref_len(ctx, doc))
 	{
-		pdf_xref_entry *entry = pdf_get_xref_entry(doc, num);
+		pdf_xref_entry *entry = pdf_get_xref_entry(ctx, doc, num);
 		if (entry->stm_buf)
 			return fz_open_buffer(ctx, entry->stm_buf);
 	}
 
 	/* don't close chain when we close this filter */
-	fz_keep_stream(chain);
+	fz_keep_stream(ctx, chain);
 
-	len = pdf_to_int(pdf_dict_gets(stmobj, "Length"));
-	chain = fz_open_null(chain, len, offset);
+	len = pdf_to_int(ctx, pdf_dict_gets(ctx, stmobj, "Length"));
+	chain = fz_open_null(ctx, chain, len, offset);
 
 	hascrypt = pdf_stream_has_crypt(ctx, stmobj);
 	if (doc->crypt && !hascrypt)
-		chain = pdf_open_crypt(chain, doc->crypt, orig_num, orig_gen);
+		chain = pdf_open_crypt(ctx, chain, doc->crypt, orig_num, orig_gen);
 
 	return chain;
 }
@@ -303,37 +299,37 @@ pdf_open_raw_filter(fz_stream *chain, pdf_document *doc, pdf_obj *stmobj, int nu
  * to stream length and decrypting.
  */
 static fz_stream *
-pdf_open_filter(fz_stream *chain, pdf_document *doc, pdf_obj *stmobj, int num, int gen, int offset, fz_compression_params *imparams)
+pdf_open_filter(fz_context *ctx, pdf_document *doc, fz_stream *chain, pdf_obj *stmobj, int num, int gen, int offset, fz_compression_params *imparams)
 {
 	pdf_obj *filters;
 	pdf_obj *params;
 
-	filters = pdf_dict_getsa(stmobj, "Filter", "F");
-	params = pdf_dict_getsa(stmobj, "DecodeParms", "DP");
+	filters = pdf_dict_getsa(ctx, stmobj, "Filter", "F");
+	params = pdf_dict_getsa(ctx, stmobj, "DecodeParms", "DP");
 
-	chain = pdf_open_raw_filter(chain, doc, stmobj, num, num, gen, offset);
+	chain = pdf_open_raw_filter(ctx, chain, doc, stmobj, num, num, gen, offset);
 
 	fz_var(chain);
 
-	fz_try(doc->ctx)
+	fz_try(ctx)
 	{
-		if (pdf_is_name(filters))
+		if (pdf_is_name(ctx, filters))
 		{
 			fz_stream *chain2 = chain;
 			chain = NULL;
-			chain = build_filter(chain2, doc, filters, params, num, gen, imparams);
+			chain = build_filter(ctx, chain2, doc, filters, params, num, gen, imparams);
 		}
-		else if (pdf_array_len(filters) > 0)
+		else if (pdf_array_len(ctx, filters) > 0)
 		{
 			fz_stream *chain2 = chain;
 			chain = NULL;
-			chain = build_filter_chain(chain2, doc, filters, params, num, gen, imparams);
+			chain = build_filter_chain(ctx, chain2, doc, filters, params, num, gen, imparams);
 		}
 	}
-	fz_catch(doc->ctx)
+	fz_catch(ctx)
 	{
-		fz_drop_stream(chain);
-		fz_rethrow(doc->ctx);
+		fz_drop_stream(ctx, chain);
+		fz_rethrow(ctx);
 	}
 
 	return chain;
@@ -344,31 +340,30 @@ pdf_open_filter(fz_stream *chain, pdf_document *doc, pdf_obj *stmobj, int num, i
  * constraining to stream length, and without decryption.
  */
 fz_stream *
-pdf_open_inline_stream(pdf_document *doc, pdf_obj *stmobj, int length, fz_stream *chain, fz_compression_params *imparams)
+pdf_open_inline_stream(fz_context *ctx, pdf_document *doc, pdf_obj *stmobj, int length, fz_stream *chain, fz_compression_params *imparams)
 {
 	pdf_obj *filters;
 	pdf_obj *params;
 
-	filters = pdf_dict_getsa(stmobj, "Filter", "F");
-	params = pdf_dict_getsa(stmobj, "DecodeParms", "DP");
+	filters = pdf_dict_getsa(ctx, stmobj, "Filter", "F");
+	params = pdf_dict_getsa(ctx, stmobj, "DecodeParms", "DP");
 
 	/* don't close chain when we close this filter */
-	fz_keep_stream(chain);
+	fz_keep_stream(ctx, chain);
 
-	if (pdf_is_name(filters))
-		return build_filter(chain, doc, filters, params, 0, 0, imparams);
-	if (pdf_array_len(filters) > 0)
-		return build_filter_chain(chain, doc, filters, params, 0, 0, imparams);
+	if (pdf_is_name(ctx, filters))
+		return build_filter(ctx, chain, doc, filters, params, 0, 0, imparams);
+	if (pdf_array_len(ctx, filters) > 0)
+		return build_filter_chain(ctx, chain, doc, filters, params, 0, 0, imparams);
 
 	if (imparams)
 		imparams->type = FZ_IMAGE_RAW;
-	return fz_open_null(chain, length, fz_tell(chain));
+	return fz_open_null(ctx, chain, length, fz_tell(ctx, chain));
 }
 
 void
-pdf_load_compressed_inline_image(pdf_document *doc, pdf_obj *dict, int length, fz_stream *stm, int indexed, fz_image *image)
+pdf_load_compressed_inline_image(fz_context *ctx, pdf_document *doc, pdf_obj *dict, int length, fz_stream *stm, int indexed, fz_image *image)
 {
-	fz_context *ctx = doc->ctx;
 	fz_compressed_buffer *bc = fz_malloc_struct(ctx, fz_compressed_buffer);
 
 	fz_try(ctx)
@@ -376,8 +371,8 @@ pdf_load_compressed_inline_image(pdf_document *doc, pdf_obj *dict, int length, f
 		int dummy_l2factor = 0;
 		bc->buffer = fz_new_buffer(ctx, 1024);
 
-		stm = pdf_open_inline_stream(doc, dict, length, stm, &bc->params);
-		stm = fz_open_leecher(stm, bc->buffer);
+		stm = pdf_open_inline_stream(ctx, doc, dict, length, stm, &bc->params);
+		stm = fz_open_leecher(ctx, stm, bc->buffer);
 		stm = fz_open_image_decomp_stream(ctx, stm, &bc->params, &dummy_l2factor);
 
 		image->tile = fz_decomp_image_from_stream(ctx, stm, image, indexed, 0, 0);
@@ -394,39 +389,39 @@ pdf_load_compressed_inline_image(pdf_document *doc, pdf_obj *dict, int length, f
  * Open a stream for reading the raw (compressed but decrypted) data.
  */
 fz_stream *
-pdf_open_raw_stream(pdf_document *doc, int num, int gen)
+pdf_open_raw_stream(fz_context *ctx, pdf_document *doc, int num, int gen)
 {
-	return pdf_open_raw_renumbered_stream(doc, num, gen, num, gen);
+	return pdf_open_raw_renumbered_stream(ctx, doc, num, gen, num, gen);
 }
 
 fz_stream *
-pdf_open_raw_renumbered_stream(pdf_document *doc, int num, int gen, int orig_num, int orig_gen)
+pdf_open_raw_renumbered_stream(fz_context *ctx, pdf_document *doc, int num, int gen, int orig_num, int orig_gen)
 {
 	pdf_xref_entry *x;
 
-	if (num <= 0 || num >= pdf_xref_len(doc))
-		fz_throw(doc->ctx, FZ_ERROR_GENERIC, "object id out of range (%d %d R)", num, gen);
+	if (num <= 0 || num >= pdf_xref_len(ctx, doc))
+		fz_throw(ctx, FZ_ERROR_GENERIC, "object id out of range (%d %d R)", num, gen);
 
-	x = pdf_cache_object(doc, num, gen);
+	x = pdf_cache_object(ctx, doc, num, gen);
 	if (x->stm_ofs == 0)
-		fz_throw(doc->ctx, FZ_ERROR_GENERIC, "object is not a stream");
+		fz_throw(ctx, FZ_ERROR_GENERIC, "object is not a stream");
 
-	return pdf_open_raw_filter(doc->file, doc, x->obj, num, orig_num, orig_gen, x->stm_ofs);
+	return pdf_open_raw_filter(ctx, doc->file, doc, x->obj, num, orig_num, orig_gen, x->stm_ofs);
 }
 
 static fz_stream *
-pdf_open_image_stream(pdf_document *doc, int num, int gen, int orig_num, int orig_gen, fz_compression_params *params)
+pdf_open_image_stream(fz_context *ctx, pdf_document *doc, int num, int gen, int orig_num, int orig_gen, fz_compression_params *params)
 {
 	pdf_xref_entry *x;
 
-	if (num <= 0 || num >= pdf_xref_len(doc))
-		fz_throw(doc->ctx, FZ_ERROR_GENERIC, "object id out of range (%d %d R)", num, gen);
+	if (num <= 0 || num >= pdf_xref_len(ctx, doc))
+		fz_throw(ctx, FZ_ERROR_GENERIC, "object id out of range (%d %d R)", num, gen);
 
-	x = pdf_cache_object(doc, num, gen);
+	x = pdf_cache_object(ctx, doc, num, gen);
 	if (x->stm_ofs == 0 && x->stm_buf == NULL)
-		fz_throw(doc->ctx, FZ_ERROR_GENERIC, "object is not a stream");
+		fz_throw(ctx, FZ_ERROR_GENERIC, "object is not a stream");
 
-	return pdf_open_filter(doc->file, doc, x->obj, orig_num, orig_gen, x->stm_ofs, params);
+	return pdf_open_filter(ctx, doc, doc->file, x->obj, orig_num, orig_gen, x->stm_ofs, params);
 }
 
 /*
@@ -435,55 +430,55 @@ pdf_open_image_stream(pdf_document *doc, int num, int gen, int orig_num, int ori
  * Using doc->file while a stream is open is a Bad idea.
  */
 fz_stream *
-pdf_open_stream(pdf_document *doc, int num, int gen)
+pdf_open_stream(fz_context *ctx, pdf_document *doc, int num, int gen)
 {
-	return pdf_open_image_stream(doc, num, gen, num, gen, NULL);
+	return pdf_open_image_stream(ctx, doc, num, gen, num, gen, NULL);
 }
 
 fz_stream *
-pdf_open_stream_with_offset(pdf_document *doc, int num, int gen, pdf_obj *dict, int stm_ofs)
+pdf_open_stream_with_offset(fz_context *ctx, pdf_document *doc, int num, int gen, pdf_obj *dict, int stm_ofs)
 {
 	if (stm_ofs == 0)
-		fz_throw(doc->ctx, FZ_ERROR_GENERIC, "object is not a stream");
+		fz_throw(ctx, FZ_ERROR_GENERIC, "object is not a stream");
 
-	return pdf_open_filter(doc->file, doc, dict, num, gen, stm_ofs, NULL);
+	return pdf_open_filter(ctx, doc, doc->file, dict, num, gen, stm_ofs, NULL);
 }
 
 /*
  * Load raw (compressed but decrypted) contents of a stream into buf.
  */
 fz_buffer *
-pdf_load_raw_stream(pdf_document *doc, int num, int gen)
+pdf_load_raw_stream(fz_context *ctx, pdf_document *doc, int num, int gen)
 {
-	return pdf_load_raw_renumbered_stream(doc, num, gen, num, gen);
+	return pdf_load_raw_renumbered_stream(ctx, doc, num, gen, num, gen);
 }
 
 fz_buffer *
-pdf_load_raw_renumbered_stream(pdf_document *doc, int num, int gen, int orig_num, int orig_gen)
+pdf_load_raw_renumbered_stream(fz_context *ctx, pdf_document *doc, int num, int gen, int orig_num, int orig_gen)
 {
 	fz_stream *stm;
 	pdf_obj *dict;
 	int len;
 	fz_buffer *buf;
 
-	if (num > 0 && num < pdf_xref_len(doc))
+	if (num > 0 && num < pdf_xref_len(ctx, doc))
 	{
-		pdf_xref_entry *entry = pdf_get_xref_entry(doc, num);
+		pdf_xref_entry *entry = pdf_get_xref_entry(ctx, doc, num);
 		if (entry->stm_buf)
-			return fz_keep_buffer(doc->ctx, entry->stm_buf);
+			return fz_keep_buffer(ctx, entry->stm_buf);
 	}
 
-	dict = pdf_load_object(doc, num, gen);
+	dict = pdf_load_object(ctx, doc, num, gen);
 
-	len = pdf_to_int(pdf_dict_gets(dict, "Length"));
+	len = pdf_to_int(ctx, pdf_dict_gets(ctx, dict, "Length"));
 
-	pdf_drop_obj(dict);
+	pdf_drop_obj(ctx, dict);
 
-	stm = pdf_open_raw_renumbered_stream(doc, num, gen, orig_num, orig_gen);
+	stm = pdf_open_raw_renumbered_stream(ctx, doc, num, gen, orig_num, orig_gen);
 
-	buf = fz_read_all(stm, len);
+	buf = fz_read_all(ctx, stm, len);
 
-	fz_drop_stream(stm);
+	fz_drop_stream(ctx, stm);
 	return buf;
 }
 
@@ -504,9 +499,8 @@ pdf_guess_filter_length(int len, char *filter)
 }
 
 static fz_buffer *
-pdf_load_image_stream(pdf_document *doc, int num, int gen, int orig_num, int orig_gen, fz_compression_params *params, int *truncated)
+pdf_load_image_stream(fz_context *ctx, pdf_document *doc, int num, int gen, int orig_num, int orig_gen, fz_compression_params *params, int *truncated)
 {
-	fz_context *ctx = doc->ctx;
 	fz_stream *stm = NULL;
 	pdf_obj *dict, *obj;
 	int i, len, n;
@@ -514,36 +508,36 @@ pdf_load_image_stream(pdf_document *doc, int num, int gen, int orig_num, int ori
 
 	fz_var(buf);
 
-	if (num > 0 && num < pdf_xref_len(doc))
+	if (num > 0 && num < pdf_xref_len(ctx, doc))
 	{
-		pdf_xref_entry *entry = pdf_get_xref_entry(doc, num);
+		pdf_xref_entry *entry = pdf_get_xref_entry(ctx, doc, num);
 		if (entry->stm_buf)
-			return fz_keep_buffer(doc->ctx, entry->stm_buf);
+			return fz_keep_buffer(ctx, entry->stm_buf);
 	}
 
-	dict = pdf_load_object(doc, num, gen);
+	dict = pdf_load_object(ctx, doc, num, gen);
 
-	len = pdf_to_int(pdf_dict_gets(dict, "Length"));
-	obj = pdf_dict_gets(dict, "Filter");
-	len = pdf_guess_filter_length(len, pdf_to_name(obj));
-	n = pdf_array_len(obj);
+	len = pdf_to_int(ctx, pdf_dict_gets(ctx, dict, "Length"));
+	obj = pdf_dict_gets(ctx, dict, "Filter");
+	len = pdf_guess_filter_length(len, pdf_to_name(ctx, obj));
+	n = pdf_array_len(ctx, obj);
 	for (i = 0; i < n; i++)
-		len = pdf_guess_filter_length(len, pdf_to_name(pdf_array_get(obj, i)));
+		len = pdf_guess_filter_length(len, pdf_to_name(ctx, pdf_array_get(ctx, obj, i)));
 
-	pdf_drop_obj(dict);
+	pdf_drop_obj(ctx, dict);
 
-	stm = pdf_open_image_stream(doc, num, gen, orig_num, orig_gen, params);
+	stm = pdf_open_image_stream(ctx, doc, num, gen, orig_num, orig_gen, params);
 
 	fz_try(ctx)
 	{
 		if (truncated)
-			buf = fz_read_best(stm, len, truncated);
+			buf = fz_read_best(ctx, stm, len, truncated);
 		else
-			buf = fz_read_all(stm, len);
+			buf = fz_read_all(ctx, stm, len);
 	}
 	fz_always(ctx)
 	{
-		fz_drop_stream(stm);
+		fz_drop_stream(ctx, stm);
 	}
 	fz_catch(ctx)
 	{
@@ -557,26 +551,25 @@ pdf_load_image_stream(pdf_document *doc, int num, int gen, int orig_num, int ori
  * Load uncompressed contents of a stream into buf.
  */
 fz_buffer *
-pdf_load_stream(pdf_document *doc, int num, int gen)
+pdf_load_stream(fz_context *ctx, pdf_document *doc, int num, int gen)
 {
-	return pdf_load_image_stream(doc, num, gen, num, gen, NULL, NULL);
+	return pdf_load_image_stream(ctx, doc, num, gen, num, gen, NULL, NULL);
 }
 
 fz_buffer *
-pdf_load_renumbered_stream(pdf_document *doc, int num, int gen, int orig_num, int orig_gen, int *truncated)
+pdf_load_renumbered_stream(fz_context *ctx, pdf_document *doc, int num, int gen, int orig_num, int orig_gen, int *truncated)
 {
-	return pdf_load_image_stream(doc, num, gen, orig_num, orig_gen, NULL, truncated);
+	return pdf_load_image_stream(ctx, doc, num, gen, orig_num, orig_gen, NULL, truncated);
 }
 
 fz_compressed_buffer *
-pdf_load_compressed_stream(pdf_document *doc, int num, int gen)
+pdf_load_compressed_stream(fz_context *ctx, pdf_document *doc, int num, int gen)
 {
-	fz_context *ctx = doc->ctx;
 	fz_compressed_buffer *bc = fz_malloc_struct(ctx, fz_compressed_buffer);
 
 	fz_try(ctx)
 	{
-		bc->buffer = pdf_load_image_stream(doc, num, gen, num, gen, &bc->params, NULL);
+		bc->buffer = pdf_load_image_stream(ctx, doc, num, gen, num, gen, &bc->params, NULL);
 	}
 	fz_catch(ctx)
 	{
@@ -587,22 +580,21 @@ pdf_load_compressed_stream(pdf_document *doc, int num, int gen)
 }
 
 static fz_stream *
-pdf_open_object_array(pdf_document *doc, pdf_obj *list)
+pdf_open_object_array(fz_context *ctx, pdf_document *doc, pdf_obj *list)
 {
-	int i, n;
-	fz_context *ctx = doc->ctx;
 	fz_stream *stm;
+	int i, n;
 
-	n = pdf_array_len(list);
+	n = pdf_array_len(ctx, list);
 	stm = fz_open_concat(ctx, n, 1);
 
 	fz_var(i); /* Workaround Mac compiler bug */
 	for (i = 0; i < n; i++)
 	{
-		pdf_obj *obj = pdf_array_get(list, i);
+		pdf_obj *obj = pdf_array_get(ctx, list, i);
 		fz_try(ctx)
 		{
-			fz_concat_push(stm, pdf_open_stream(doc, pdf_to_num(obj), pdf_to_gen(obj)));
+			fz_concat_push(ctx, stm, pdf_open_stream(ctx, doc, pdf_to_num(ctx, obj), pdf_to_gen(ctx, obj)));
 		}
 		fz_catch(ctx)
 		{
@@ -616,18 +608,17 @@ pdf_open_object_array(pdf_document *doc, pdf_obj *list)
 }
 
 fz_stream *
-pdf_open_contents_stream(pdf_document *doc, pdf_obj *obj)
+pdf_open_contents_stream(fz_context *ctx, pdf_document *doc, pdf_obj *obj)
 {
-	fz_context *ctx = doc->ctx;
 	int num, gen;
 
-	if (pdf_is_array(obj))
-		return pdf_open_object_array(doc, obj);
+	if (pdf_is_array(ctx, obj))
+		return pdf_open_object_array(ctx, doc, obj);
 
-	num = pdf_to_num(obj);
-	gen = pdf_to_gen(obj);
-	if (pdf_is_stream(doc, num, gen))
-		return pdf_open_image_stream(doc, num, gen, num, gen, NULL);
+	num = pdf_to_num(ctx, obj);
+	gen = pdf_to_gen(ctx, obj);
+	if (pdf_is_stream(ctx, doc, num, gen))
+		return pdf_open_image_stream(ctx, doc, num, gen, num, gen, NULL);
 
 	fz_warn(ctx, "pdf object stream missing (%d %d R)", num, gen);
 	return NULL;