Update iOS app to context branch.

3 files changed, 123 insertions, 117 deletions

diff --git a/ios/document.c b/ios/document.c
index ffb92519..cb392c12 100644
--- a/ios/document.c
+++ b/ios/document.c
@@ -6,72 +6,75 @@
 #include <ctype.h> // for tolower()
 
 struct document *
-open_document(char *filename)
+open_document(fz_context *ctx, char *filename)
 {
-	fz_error error;
+	struct document *doc;
 
-	if (strstr(filename, ".pdf") || strstr(filename, ".PDF")) {
-		struct document *doc = fz_malloc(sizeof *doc);
-		memset(doc, 0, sizeof *doc);
-		doc->number = -1;
-		error = pdf_open_xref(&doc->pdf, filename, NULL);
-		if (error) {
-			fz_free(doc);
-			fz_rethrow(error, "cannot open pdf document");
-			return NULL;
+	doc = fz_malloc_struct(ctx, struct document);
+	memset(doc, 0, sizeof *doc);
+	doc->ctx = ctx;
+	doc->number = -1;
+
+	fz_try(ctx)
+	{
+		if (strstr(filename, ".pdf") || strstr(filename, ".PDF"))
+		{
+			doc->pdf = pdf_open_xref(ctx, filename, NULL);
+			pdf_load_page_tree(doc->pdf);
 		}
-		error = pdf_load_page_tree(doc->pdf);
-		if (error) {
-			pdf_free_xref(doc->pdf);
-			fz_free(doc);
-			fz_rethrow(error, "cannot open pdf document");
-			return NULL;
+		else if (strstr(filename, ".xps") || strstr(filename, ".XPS"))
+		{
+			doc->xps = xps_open_file(ctx, filename);
 		}
-		return doc;
-	} else if (strstr(filename, ".xps") || strstr(filename, ".XPS")) {
-		struct document *doc = fz_malloc(sizeof *doc);
-		memset(doc, 0, sizeof *doc);
-		doc->number = -1;
-		error = xps_open_file(&doc->xps, filename);
-		if (error) {
-			fz_free(doc);
-			fz_rethrow(error, "cannot open xps document");
-			return NULL;
+		else
+		{
+			fz_throw(ctx, "unknown document format");
 		}
-		return doc;
-	} else {
-		fz_throw("unknown document format");
+	}
+	fz_catch(ctx)
+	{
+		close_document(doc);
 		return NULL;
 	}
+
+	return doc;
 }
 
 int
 needs_password(struct document *doc)
 {
-	if (doc->pdf) {
+	if (doc->pdf)
 		return pdf_needs_password(doc->pdf);
-	}
 	return 0;
 }
 
 int
 authenticate_password(struct document *doc, char *password)
 {
-	if (doc->pdf) {
+	if (doc->pdf)
 		return pdf_authenticate_password(doc->pdf, password);
-	}
 	return 1;
 }
 
 fz_outline *
 load_outline(struct document *doc)
 {
-	if (doc->pdf)
-		return pdf_load_outline(doc->pdf);
-	else if (doc->xps)
-		return xps_load_outline(doc->xps);
-	else
-		return NULL;
+	fz_outline *outline;
+	fz_var(outline);
+	fz_try (doc->ctx)
+	{
+		if (doc->pdf)
+			outline = pdf_load_outline(doc->pdf);
+		else if (doc->xps)
+			outline = xps_load_outline(doc->xps);
+		else
+			outline = NULL;
+	}
+	fz_catch (doc->ctx)
+	{
+		outline = NULL;
+	}
+	return outline;
 }
 
 int
@@ -88,27 +91,27 @@ count_pages(struct document *doc)
 static void
 load_page(struct document *doc, int number)
 {
-	fz_error error;
 	if (doc->number == number)
 		return;
-	doc->number = number;
-	if (doc->pdf) {
-		if (doc->pdf_page) {
-			pdf_age_store(doc->pdf->store, 1);
-			pdf_free_page(doc->pdf_page);
+	fz_try (doc->ctx)
+	{
+		doc->number = number;
+		if (doc->pdf) {
+			if (doc->pdf_page)
+				pdf_free_page(doc->ctx, doc->pdf_page);
+			doc->pdf_page = NULL;
+			doc->pdf_page = pdf_load_page(doc->pdf, number);
+		}
+		if (doc->xps) {
+			if (doc->xps_page)
+				xps_free_page(doc->xps, doc->xps_page);
+			doc->xps_page = NULL;
+			doc->xps_page = xps_load_page(doc->xps, number);
 		}
-		doc->pdf_page = NULL;
-		error = pdf_load_page(&doc->pdf_page, doc->pdf, number);
-		if (error)
-			fz_catch(error, "cannot load page %d", number);
 	}
-	if (doc->xps) {
-		if (doc->xps_page)
-			xps_free_page(doc->xps, doc->xps_page);
-		doc->xps_page = NULL;
-		error = xps_load_page(&doc->xps_page, doc->xps, number);
-		if (error)
-			fz_catch(error, "cannot load page %d", number);
+	fz_catch (doc->ctx)
+	{
+		fprintf(stderr, "cannot load page %d", number);
 	}
 }
 
@@ -130,29 +133,36 @@ measure_page(struct document *doc, int number, float *w, float *h)
 	else {
 		*w = *h = 72;
 	}
-	fz_flush_warnings();
+	fz_flush_warnings(doc->ctx);
 }
 
 void
-draw_page(struct document *doc, int number, fz_device *dev, fz_matrix ctm)
+draw_page(struct document *doc, int number, fz_device *dev, fz_matrix ctm, fz_cookie *cookie)
 {
 	load_page(doc, number);
-	if (doc->pdf_page) {
-		pdf_page *page = doc->pdf_page;
-		fz_matrix page_ctm = fz_concat(fz_rotate(-page->rotate), fz_scale(1, -1));
-		fz_rect mediabox = fz_transform_rect(page_ctm, page->mediabox);
-		page_ctm = fz_concat(page_ctm, fz_translate(-mediabox.x0, -mediabox.y0));
-		ctm = fz_concat(page_ctm, ctm);
-		pdf_run_page(doc->pdf, page, dev, ctm);
-	} else if (doc->xps_page) {
-		xps_page *page = doc->xps_page;
-		fz_matrix page_ctm = fz_scale(72.0f / 96.0f, 72.0f / 96.0f);
-		ctm = fz_concat(page_ctm, ctm);
-		doc->xps->dev = dev;
-		xps_parse_fixed_page(doc->xps, ctm, page);
-		doc->xps->dev = NULL;
+	fz_try (doc->ctx)
+	{
+		if (doc->pdf_page) {
+			pdf_page *page = doc->pdf_page;
+			fz_matrix page_ctm = fz_concat(fz_rotate(-page->rotate), fz_scale(1, -1));
+			fz_rect mediabox = fz_transform_rect(page_ctm, page->mediabox);
+			page_ctm = fz_concat(page_ctm, fz_translate(-mediabox.x0, -mediabox.y0));
+			ctm = fz_concat(page_ctm, ctm);
+			pdf_run_page(doc->pdf, page, dev, ctm, cookie);
+		} else if (doc->xps_page) {
+			xps_page *page = doc->xps_page;
+			fz_matrix page_ctm = fz_scale(72.0f / 96.0f, 72.0f / 96.0f);
+			ctm = fz_concat(page_ctm, ctm);
+			doc->xps->dev = dev;
+			xps_parse_fixed_page(doc->xps, ctm, page);
+			doc->xps->dev = NULL;
+		}
+	}
+	fz_catch (doc->ctx)
+	{
+		fprintf(stderr, "cannot draw page %d", number);
 	}
-	fz_flush_warnings();
+	fz_flush_warnings(doc->ctx);
 }
 
 static int
@@ -223,16 +233,16 @@ match(fz_text_span *span, char *s, int n)
 }
 
 int
-search_page(struct document *doc, int number, char *needle)
+search_page(struct document *doc, int number, char *needle, fz_cookie *cookie)
 {
 	int pos, len, i, n;
 
 	if (strlen(needle) == 0)
 		return 0;
 
-	fz_text_span *text = fz_new_text_span();
-	fz_device *dev = fz_new_text_device(text);
-	draw_page(doc, number, dev, fz_identity);
+	fz_text_span *text = fz_new_text_span(doc->ctx);
+	fz_device *dev = fz_new_text_device(doc->ctx, text);
+	draw_page(doc, number, dev, fz_identity, cookie);
 	fz_free_device(dev);
 
 	doc->hit_count = 0;
@@ -249,7 +259,7 @@ search_page(struct document *doc, int number, char *needle)
 		}
 	}
 
-	fz_free_text_span(text);
+	fz_free_text_span(doc->ctx, text);
 	return doc->hit_count;
 }
 
@@ -264,10 +274,7 @@ close_document(struct document *doc)
 {
 	if (doc->pdf) {
 		if (doc->pdf_page)
-			pdf_free_page(doc->pdf_page);
-		if (doc->pdf->store)
-			pdf_free_store(doc->pdf->store);
-		doc->pdf->store = NULL;
+			pdf_free_page(doc->ctx, doc->pdf_page);
 		pdf_free_xref(doc->pdf);
 	}
 	if (doc->xps) {
@@ -275,5 +282,6 @@ close_document(struct document *doc)
 			xps_free_page(doc->xps, doc->xps_page);
 		xps_free_context(doc->xps);
 	}
-	fz_flush_warnings();
+	fz_flush_warnings(doc->ctx);
+	fz_free(doc->ctx, doc);
 }
diff --git a/ios/document.h b/ios/document.h
index 797b1e8f..ad0a8a62 100644
--- a/ios/document.h
+++ b/ios/document.h
@@ -15,8 +15,9 @@
 
 struct document
 {
+	fz_context *ctx;
 	pdf_xref *pdf;
-	xps_context *xps;
+	xps_document *xps;
 	int number;
 	pdf_page *pdf_page;
 	xps_page *xps_page;
@@ -24,14 +25,14 @@ struct document
 	int hit_count;
 };
 
-struct document *open_document(char *filename);
+struct document *open_document(fz_context *ctx, char *filename);
 int needs_password(struct document *doc);
 int authenticate_password(struct document *doc, char *password);
 fz_outline *load_outline(struct document *doc);
 int count_pages(struct document *doc);
 void measure_page(struct document *doc, int number, float *w, float *h);
-void draw_page(struct document *doc, int number, fz_device *dev, fz_matrix ctm);
-int search_page(struct document *doc, int number, char *needle);
+void draw_page(struct document *doc, int number, fz_device *dev, fz_matrix ctm, fz_cookie *cookie);
+int search_page(struct document *doc, int number, char *needle, fz_cookie *cookie);
 fz_bbox search_result_bbox(struct document *doc, int i);
 void close_document(struct document *doc);
 
diff --git a/ios/main.m b/ios/main.m
index 7b977928..3840fcad 100644
--- a/ios/main.m
+++ b/ios/main.m
@@ -18,6 +18,7 @@
 static dispatch_queue_t queue;
 static fz_glyph_cache *glyphcache = NULL;
 static float screenScale = 1;
+static fz_context *ctx = NULL;
 
 @interface MuLibraryController : UITableViewController
 {
@@ -119,23 +120,11 @@ static float screenScale = 1;
 
 #pragma mark -
 
-static void showAlert(NSString *msg)
+static void showAlert(NSString *msg, NSString *filename)
 {
-	char msgbuf[160 * 30];
-	int i;
-
-	fz_strlcpy(msgbuf, "", sizeof msgbuf);
-	for (i = 0; i < fz_get_error_count(); i++)
-	{
-		char *s = fz_get_error_line(i);
-		s = strstr(s, "(): ") + 4;
-		fz_strlcat(msgbuf, s, sizeof msgbuf);
-		fz_strlcat(msgbuf, "\n", sizeof msgbuf);
-	}
-
 	UIAlertView *alert = [[UIAlertView alloc]
 		initWithTitle: msg
-		message: [NSString stringWithUTF8String: msgbuf]
+		message: filename
 		delegate: nil
 		cancelButtonTitle: @"Okay"
 		otherButtonTitles: nil];
@@ -152,10 +141,15 @@ static void flattenOutline(NSMutableArray *titles, NSMutableArray *pages, fz_out
 	indent[level * 4] = 0;
 	while (outline)
 	{
-		if (outline->page >= 0 && outline->title) {
-			NSString *title = [NSString stringWithUTF8String: outline->title];
-			[titles addObject: [NSString stringWithFormat: @"%s%@", indent, title]];
-			[pages addObject: [NSNumber numberWithInt: outline->page]];
+		if (outline->dest.kind == FZ_LINK_GOTO)
+		{
+			int page = outline->dest.ld.gotor.page;
+			if (page >= 0 && outline->title)
+			{
+				NSString *title = [NSString stringWithUTF8String: outline->title];
+				[titles addObject: [NSString stringWithFormat: @"%s%@", indent, title]];
+				[pages addObject: [NSNumber numberWithInt: page]];
+			}
 		}
 		flattenOutline(titles, pages, outline->down, level + 1);
 		outline = outline->next;
@@ -168,7 +162,7 @@ static void loadOutline(NSMutableArray *titles, NSMutableArray *pages, struct do
 
 static void releasePixmap(void *info, const void *data, size_t size)
 {
-	fz_drop_pixmap(info);
+	fz_drop_pixmap(ctx, info);
 }
 
 static UIImage *newImageWithPixmap(fz_pixmap *pix)
@@ -222,11 +216,11 @@ static UIImage *renderPage(struct document *doc, int number, CGSize screenSize)
 	ctm = fz_scale(scale.width, scale.height);
 	bbox = (fz_bbox){0, 0, pageSize.width * scale.width, pageSize.height * scale.height};
 
-	pix = fz_new_pixmap_with_rect(fz_device_rgb, bbox);
+	pix = fz_new_pixmap_with_rect(ctx, fz_device_rgb, bbox);
 	fz_clear_pixmap_with_color(pix, 255);
 
-	dev = fz_new_draw_device(glyphcache, pix);
-	draw_page(doc, number, dev, ctm);
+	dev = fz_new_draw_device(ctx, glyphcache, pix);
+	draw_page(doc, number, dev, ctm, NULL);
 	fz_free_device(dev);
 
 	return newImageWithPixmap(pix);
@@ -259,11 +253,11 @@ static UIImage *renderTile(struct document *doc, int number, CGSize screenSize,
 	rect.y1 = tileRect.origin.y + tileRect.size.height;
 	bbox = fz_round_rect(rect);
 
-	pix = fz_new_pixmap_with_rect(fz_device_rgb, bbox);
+	pix = fz_new_pixmap_with_rect(ctx, fz_device_rgb, bbox);
 	fz_clear_pixmap_with_color(pix, 255);
 
-	dev = fz_new_draw_device(glyphcache, pix);
-	draw_page(doc, number, dev, ctm);
+	dev = fz_new_draw_device(ctx, glyphcache, pix);
+	draw_page(doc, number, dev, ctm, NULL);
 	fz_free_device(dev);
 
 	return newImageWithPixmap(pix);
@@ -370,9 +364,9 @@ static UIImage *renderTile(struct document *doc, int number, CGSize screenSize,
 	printf("open document '%s'\n", filename);
 
 	_filename = [nsfilename retain];
-	_doc = open_document(filename);
+	_doc = open_document(ctx, filename);
 	if (!_doc) {
-		showAlert(@"Cannot open document");
+		showAlert(@"Cannot open document", nsfilename);
 		return;
 	}
 
@@ -1141,7 +1135,7 @@ static UIImage *renderTile(struct document *doc, int number, CGSize screenSize,
 
 	dispatch_async(queue, ^{
 		for (int i = start; i >= 0 && i < count_pages(doc); i += dir) {
-			int n = search_page(doc, i, needle);
+			int n = search_page(doc, i, needle, NULL);
 			if (n) {
 				dispatch_async(dispatch_get_main_queue(), ^{
 					[prevButton setEnabled: YES];
@@ -1391,7 +1385,10 @@ static UIImage *renderTile(struct document *doc, int number, CGSize screenSize,
 {
 	queue = dispatch_queue_create("com.artifex.mupdf.queue", NULL);
 
-	glyphcache = fz_new_glyph_cache();
+	// use at most 128M for resource cache
+	ctx = fz_new_context(&fz_alloc_default, 128<<20);
+
+	glyphcache = fz_new_glyph_cache(ctx);
 
 	screenScale = [[UIScreen mainScreen] scale];