glib/poppler-page.cc | 4 ++-- poppler/Page.cc | 9 +++------ poppler/Page.h | 5 ++--- 3 files changed, 7 insertions(+), 11 deletions(-)
New commits: commit 40cb3f27f4dcad4fe8c48f0b638eac7913fc3722 Author: Albert Astals Cid <[email protected]> Date: Thu Apr 12 20:50:38 2012 +0200 Do not pass those params to createGfx since they aren't used diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc index c5252aa..156e2d7 100644 --- a/glib/poppler-page.cc +++ b/glib/poppler-page.cc @@ -270,7 +270,7 @@ poppler_page_get_text_page (PopplerPage *page) gTrue, /* Crop */ -1, -1, -1, -1, gFalse, /* printing */ - NULL, NULL, NULL, NULL); + NULL, NULL); page->page->display(gfx); text_dev->endPage(); @@ -924,7 +924,7 @@ poppler_page_get_image_output_dev (PopplerPage *page, gTrue, /* Crop */ -1, -1, -1, -1, gFalse, /* printing */ - NULL, NULL, NULL, NULL); + NULL, NULL); page->page->display(gfx); delete gfx; diff --git a/poppler/Page.cc b/poppler/Page.cc index afd7bc1..eccc198 100644 --- a/poppler/Page.cc +++ b/poppler/Page.cc @@ -15,7 +15,7 @@ // // Copyright (C) 2005 Kristian Høgsberg <[email protected]> // Copyright (C) 2005 Jeff Muizelaar <[email protected]> -// Copyright (C) 2005-2011 Albert Astals Cid <[email protected]> +// Copyright (C) 2005-2012 Albert Astals Cid <[email protected]> // Copyright (C) 2006-2008 Pino Toscano <[email protected]> // Copyright (C) 2006 Nickolay V. Shmyrev <[email protected]> // Copyright (C) 2006 Scott Turner <[email protected]> @@ -455,9 +455,7 @@ Gfx *Page::createGfx(OutputDev *out, double hDPI, double vDPI, int sliceX, int sliceY, int sliceW, int sliceH, GBool printing, GBool (*abortCheckCbk)(void *data), - void *abortCheckCbkData, - GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data), - void *annotDisplayDecideCbkData) { + void *abortCheckCbkData) { PDFRectangle *mediaBox, *cropBox; PDFRectangle box; Gfx *gfx; @@ -513,8 +511,7 @@ void Page::displaySlice(OutputDev *out, double hDPI, double vDPI, gfx = createGfx(out, hDPI, vDPI, rotate, useMediaBox, crop, sliceX, sliceY, sliceW, sliceH, printing, - abortCheckCbk, abortCheckCbkData, - annotDisplayDecideCbk, annotDisplayDecideCbkData); + abortCheckCbk, abortCheckCbkData); contents.fetch(xref, &obj); if (!obj.isNull()) { diff --git a/poppler/Page.h b/poppler/Page.h index 9dea41c..e2e666c 100644 --- a/poppler/Page.h +++ b/poppler/Page.h @@ -20,6 +20,7 @@ // Copyright (C) 2007 Julien Rebetez <[email protected]> // Copyright (C) 2008 Iñigo MartÃnez <[email protected]> // Copyright (C) 2012 Fabio D'Urso <[email protected]> +// Copyright (C) 2012 Albert Astals Cid <[email protected]> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -207,9 +208,7 @@ public: int sliceX, int sliceY, int sliceW, int sliceH, GBool printing, GBool (*abortCheckCbk)(void *data), - void *abortCheckCbkData, - GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data), - void *annotDisplayDecideCbkData); + void *abortCheckCbkData); // Display a page. void display(OutputDev *out, double hDPI, double vDPI,
_______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
