Rename pdf_xref type to pdf_document.

2 files changed, 5 insertions, 12 deletions

diff --git a/ios/document.c b/ios/document.c
index 5531a980..9c209046 100644
--- a/ios/document.c
+++ b/ios/document.c
@@ -18,18 +18,11 @@ open_document(fz_context *ctx, char *filename)
 	fz_try(ctx)
 	{
 		if (strstr(filename, ".pdf") || strstr(filename, ".PDF"))
-		{
-			doc->pdf = pdf_open_xref(ctx, filename);
-			pdf_load_page_tree(doc->pdf);
-		}
+			doc->pdf = pdf_open_document(ctx, filename);
 		else if (strstr(filename, ".xps") || strstr(filename, ".XPS"))
-		{
-			doc->xps = xps_open_file(ctx, filename);
-		}
+			doc->xps = xps_open_document(ctx, filename);
 		else
-		{
 			fz_throw(ctx, "unknown document format");
-		}
 	}
 	fz_catch(ctx)
 	{
@@ -264,12 +257,12 @@ close_document(struct document *doc)
 	if (doc->pdf) {
 		if (doc->pdf_page)
 			pdf_free_page(doc->ctx, doc->pdf_page);
-		pdf_free_xref(doc->pdf);
+		pdf_close_document(doc->pdf);
 	}
 	if (doc->xps) {
 		if (doc->xps_page)
 			xps_free_page(doc->xps, doc->xps_page);
-		xps_free_context(doc->xps);
+		xps_close_document(doc->xps);
 	}
 	fz_flush_warnings(doc->ctx);
 	fz_free(doc->ctx, doc);
diff --git a/ios/document.h b/ios/document.h
index ad0a8a62..5e3c740e 100644
--- a/ios/document.h
+++ b/ios/document.h
@@ -16,7 +16,7 @@
 struct document
 {
 	fz_context *ctx;
-	pdf_xref *pdf;
+	pdf_document *pdf;
 	xps_document *xps;
 	int number;
 	pdf_page *pdf_page;