Merge branch 'master' into context

Mostly redoing the xps_context to xps_document change and adding
contexts to newly written code.

Conflicts:
	apps/pdfapp.c
	apps/pdfapp.h
	apps/x11_main.c
	apps/xpsdraw.c
	draw/draw_device.c
	draw/draw_scale.c
	fitz/base_object.c
	fitz/fitz.h
	pdf/mupdf.h
	pdf/pdf_interpret.c
	pdf/pdf_outline.c
	pdf/pdf_page.c
	xps/muxps.h
	xps/xps_doc.c
	xps/xps_xml.c

1 files changed, 6 insertions, 3 deletions

diff --git a/fitz/filt_jpxd.c b/fitz/filt_jpxd.c
index 5700a664..64197a08 100644
--- a/fitz/filt_jpxd.c
+++ b/fitz/filt_jpxd.c
@@ -5,17 +5,19 @@
 
 static void fz_opj_error_callback(const char *msg, void *client_data)
 {
-	fprintf(stderr, "openjpeg error: %s", msg);
+	fz_context *ctx = (fz_context *)client_data;
+	fz_warn(ctx, "openjpeg error: %s", msg);
 }
 
 static void fz_opj_warning_callback(const char *msg, void *client_data)
 {
-	fprintf(stderr, "openjpeg warning: %s", msg);
+	fz_context *ctx = (fz_context *)client_data;
+	fz_warn(ctx, "openjpeg warning: %s", msg);
 }
 
 static void fz_opj_info_callback(const char *msg, void *client_data)
 {
-	/* fprintf(stderr, "openjpeg info: %s", msg); */
+	/* fz_warn("openjpeg info: %s", msg); */
 }
 
 fz_pixmap *
@@ -50,6 +52,7 @@ fz_load_jpx_image(fz_context *ctx, unsigned char *data, int size, fz_colorspace
 	opj_set_default_decoder_parameters(&params);
 
 	info = opj_create_decompress(format);
+	info->client_data = (void *)ctx;
 	opj_set_event_mgr((opj_common_ptr)info, &evtmgr, stderr);
 	opj_setup_decoder(info, &params);