2 files changed, 5 insertions, 5 deletions

diff --git a/apps/pdfapp.c b/apps/pdfapp.c
index 145f49db..c5930129 100644
--- a/apps/pdfapp.c
+++ b/apps/pdfapp.c
@@ -265,7 +265,7 @@ static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage)
 		/* Create display list */
 		app->page->list = fz_newdisplaylist();
 		mdev = fz_newlistdevice(app->page->list);
-		error = pdf_runcontentstream(mdev, fz_identity, app->xref, app->page->resources, app->page->contents);
+		error = pdf_runpage(app->xref, app->page, mdev, fz_identity);
 		if (error)
 		{
 			error = fz_rethrow(error, "cannot draw page %d in '%s'", app->pageno, app->doctitle);
diff --git a/apps/pdfdraw.c b/apps/pdfdraw.c
index 3fb5f3c4..3ec51631 100644
--- a/apps/pdfdraw.c
+++ b/apps/pdfdraw.c
@@ -212,7 +212,7 @@ static void drawpnm(int pagenum, struct benchmark *loadtimes, struct benchmark *
 		fprintf(stdout, "creating display list for banded rendering\n");
 		list = fz_newdisplaylist();
 		dev = fz_newlistdevice(list);
-		error = pdf_runcontentstream(dev, fz_identity, xref, drawpage->resources, drawpage->contents);
+		error = pdf_runpage(xref, drawpage, dev, fz_identity);
 		if (error)
 			die(fz_rethrow(error, "cannot draw page %d in PDF file '%s'", pagenum, basename));
 		fz_freedevice(dev);
@@ -231,7 +231,7 @@ static void drawpnm(int pagenum, struct benchmark *loadtimes, struct benchmark *
 		}
 		else
 		{
-			error = pdf_runcontentstream(dev, ctm, xref, drawpage->resources, drawpage->contents);
+			error = pdf_runpage(xref, drawpage, dev, ctm);
 			if (error)
 				die(fz_rethrow(error, "cannot draw page %d in PDF file '%s'", pagenum, basename));
 		}
@@ -342,7 +342,7 @@ static void drawtxt(int pagenum, struct benchmark *loadtimes)
 	text = fz_newtextspan();
 	dev = fz_newtextdevice(text);
 
-	error = pdf_runcontentstream(dev, ctm, xref, drawpage->resources, drawpage->contents);
+	error = pdf_runpage(xref, drawpage, dev, ctm);
 	if (error)
 		die(fz_rethrow(error, "cannot extract text from page %d in PDF file '%s'", pagenum, basename));
 
@@ -375,7 +375,7 @@ static void drawxml(int pagenum)
 	printf("<?xml version=\"1.0\"?>\n");
 	printf("<page number=\"%d\">\n", pagenum);
 
-	error = pdf_runcontentstream(dev, ctm, xref, drawpage->resources, drawpage->contents);
+	error = pdf_runpage(xref, drawpage, dev, ctm);
 	if (error)
 		die(fz_rethrow(error, "cannot display page %d in PDF file '%s' as XML", pagenum, basename));