diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2012-01-11 23:50:12 +0100 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2012-01-11 23:50:12 +0100 |
| commit | ed625b85feb08e0aa60e27494e72f7487e9b05a5 (patch) | |
| tree | 160ea690429333c90c2796b929656dfbd2eac394 /apps | |
| parent | 8f94cb1c9a9d59177326348cfd8f79ae441b9803 (diff) | |
| download | mupdf-ed625b85feb08e0aa60e27494e72f7487e9b05a5.tar.xz | |
Add xps_run_page function.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/pdfapp.c | 4 | ||||
| -rw-r--r-- | apps/xpsdraw.c | 16 |
2 files changed, 5 insertions, 15 deletions
diff --git a/apps/pdfapp.c b/apps/pdfapp.c index 5f7e79dc..0f8dd7e3 100644 --- a/apps/pdfapp.c +++ b/apps/pdfapp.c @@ -353,9 +353,7 @@ static void pdfapp_loadpage_xps(pdfapp_t *app) /* Create display list */ app->page_list = fz_new_display_list(app->ctx); mdev = fz_new_list_device(app->ctx, app->page_list); - app->xps->dev = mdev; - xps_parse_fixed_page(app->xps, fz_identity, page); - app->xps->dev = NULL; + xps_run_page(app->xps, page, mdev, fz_identity, NULL); fz_free_device(mdev); xps_free_page(app->xps, page); diff --git a/apps/xpsdraw.c b/apps/xpsdraw.c index cbf7f802..1058c390 100644 --- a/apps/xpsdraw.c +++ b/apps/xpsdraw.c @@ -72,14 +72,6 @@ static int isrange(char *s) return 1; } -static void -xps_run_page(xps_document *doc, xps_page *page, fz_device *dev, fz_matrix ctm) -{ - doc->dev = dev; - xps_parse_fixed_page(doc, ctm, page); - doc->dev = NULL; -} - static void drawpage(xps_document *doc, int pagenum) { xps_page *page; @@ -100,7 +92,7 @@ static void drawpage(xps_document *doc, int pagenum) { list = fz_new_display_list(doc->ctx); dev = fz_new_list_device(doc->ctx, list); - xps_run_page(doc, page, dev, fz_identity); + xps_run_page(doc, page, dev, fz_identity, NULL); fz_free_device(dev); } @@ -111,7 +103,7 @@ static void drawpage(xps_document *doc, int pagenum) if (list) fz_execute_display_list(list, dev, fz_identity, fz_infinite_bbox, NULL); else - xps_run_page(doc, page, dev, fz_identity); + xps_run_page(doc, page, dev, fz_identity, NULL); printf("</page>\n"); fz_free_device(dev); } @@ -123,7 +115,7 @@ static void drawpage(xps_document *doc, int pagenum) if (list) fz_execute_display_list(list, dev, fz_identity, fz_infinite_bbox, NULL); else - xps_run_page(doc, page, dev, fz_identity); + xps_run_page(doc, page, dev, fz_identity, NULL); fz_free_device(dev); printf("[Page %d]\n", pagenum); if (showtext > 1) @@ -167,7 +159,7 @@ static void drawpage(xps_document *doc, int pagenum) if (list) fz_execute_display_list(list, dev, ctm, bbox, NULL); else - xps_run_page(doc, page, dev, ctm); + xps_run_page(doc, page, dev, ctm, NULL); fz_free_device(dev); if (output) |