diff options
Diffstat (limited to 'pdf/xpdf/PDFDoc.cc')
-rw-r--r-- | pdf/xpdf/PDFDoc.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pdf/xpdf/PDFDoc.cc b/pdf/xpdf/PDFDoc.cc index 9108220..c92048b 100644 --- a/pdf/xpdf/PDFDoc.cc +++ b/pdf/xpdf/PDFDoc.cc @@ -114,6 +114,8 @@ PDFDoc::PDFDoc(BaseStream *strA, GString *ownerPassword, } GBool PDFDoc::setup(GString *ownerPassword, GString *userPassword) { + str->reset(); + // check header checkHeader(); @@ -203,7 +205,7 @@ void PDFDoc::checkHeader() { } } -void PDFDoc::displayPage(OutputDev *out, int page, double zoom, +void PDFDoc::displayPage(OutputDev *out, int page, double hDPI, double vDPI, int rotate, GBool doLinks, GBool (*abortCheckCbk)(void *data), void *abortCheckCbkData, @@ -221,18 +223,18 @@ void PDFDoc::displayPage(OutputDev *out, int page, double zoom, links = NULL; } getLinks(p); - p->display(out, zoom, rotate, links, catalog, + p->display(out, hDPI, vDPI, rotate, links, catalog, abortCheckCbk, abortCheckCbkData, annotDisplayDecideCbk, annotDisplayDecideCbkData); } else { - p->display(out, zoom, rotate, NULL, catalog, + p->display(out, hDPI, vDPI, rotate, NULL, catalog, abortCheckCbk, abortCheckCbkData, annotDisplayDecideCbk, annotDisplayDecideCbkData); } } void PDFDoc::displayPages(OutputDev *out, int firstPage, int lastPage, - int zoom, int rotate, GBool doLinks, + double hDPI, double vDPI, int rotate, GBool doLinks, GBool (*abortCheckCbk)(void *data), void *abortCheckCbkData, GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data), @@ -240,13 +242,14 @@ void PDFDoc::displayPages(OutputDev *out, int firstPage, int lastPage, int page; for (page = firstPage; page <= lastPage; ++page) { - displayPage(out, page, zoom, rotate, doLinks, + displayPage(out, page, hDPI, vDPI, rotate, doLinks, abortCheckCbk, abortCheckCbkData, annotDisplayDecideCbk, annotDisplayDecideCbkData); } } -void PDFDoc::displayPageSlice(OutputDev *out, int page, double zoom, +void PDFDoc::displayPageSlice(OutputDev *out, int page, + double hDPI, double vDPI, int rotate, int sliceX, int sliceY, int sliceW, int sliceH, GBool (*abortCheckCbk)(void *data), @@ -256,7 +259,7 @@ void PDFDoc::displayPageSlice(OutputDev *out, int page, double zoom, Page *p; p = catalog->getPage(page); - p->displaySlice(out, zoom, rotate, sliceX, sliceY, sliceW, sliceH, + p->displaySlice(out, hDPI, vDPI, rotate, sliceX, sliceY, sliceW, sliceH, NULL, catalog, abortCheckCbk, abortCheckCbkData, annotDisplayDecideCbk, annotDisplayDecideCbkData); |