2004-01-13 Remi Cohen-Scali <rcoscali@cvs.gnome.org>
* xpdf/PDFDoc.h:
* xpdf/PDFDoc.cc: Added annots display CB.
void PDFDoc::displayPage(OutputDev *out, int page, double zoom,
int rotate, GBool doLinks,
GBool (*abortCheckCbk)(void *data),
void PDFDoc::displayPage(OutputDev *out, int page, double zoom,
int rotate, GBool doLinks,
GBool (*abortCheckCbk)(void *data),
- void *abortCheckCbkData) {
+ void *abortCheckCbkData,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),
+ void *annotDisplayDecideCbkData) {
Page *p;
if (globalParams->getPrintCommands()) {
Page *p;
if (globalParams->getPrintCommands()) {
}
getLinks(p);
p->display(out, zoom, rotate, links, catalog,
}
getLinks(p);
p->display(out, zoom, rotate, links, catalog,
- abortCheckCbk, abortCheckCbkData);
+ abortCheckCbk, abortCheckCbkData,
+ annotDisplayDecideCbk, annotDisplayDecideCbkData);
} else {
p->display(out, zoom, rotate, NULL, catalog,
} else {
p->display(out, zoom, rotate, NULL, catalog,
- abortCheckCbk, abortCheckCbkData);
+ abortCheckCbk, abortCheckCbkData,
+ annotDisplayDecideCbk, annotDisplayDecideCbkData);
}
}
void PDFDoc::displayPages(OutputDev *out, int firstPage, int lastPage,
int zoom, int rotate, GBool doLinks,
GBool (*abortCheckCbk)(void *data),
}
}
void PDFDoc::displayPages(OutputDev *out, int firstPage, int lastPage,
int zoom, int rotate, GBool doLinks,
GBool (*abortCheckCbk)(void *data),
- void *abortCheckCbkData) {
+ void *abortCheckCbkData,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),
+ void *annotDisplayDecideCbkData) {
int page;
for (page = firstPage; page <= lastPage; ++page) {
displayPage(out, page, zoom, rotate, doLinks,
int page;
for (page = firstPage; page <= lastPage; ++page) {
displayPage(out, page, zoom, rotate, doLinks,
- abortCheckCbk, abortCheckCbkData);
+ abortCheckCbk, abortCheckCbkData,
+ annotDisplayDecideCbk, annotDisplayDecideCbkData);
int rotate, int sliceX, int sliceY,
int sliceW, int sliceH,
GBool (*abortCheckCbk)(void *data),
int rotate, int sliceX, int sliceY,
int sliceW, int sliceH,
GBool (*abortCheckCbk)(void *data),
- void *abortCheckCbkData) {
+ void *abortCheckCbkData,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),
+ void *annotDisplayDecideCbkData) {
Page *p;
p = catalog->getPage(page);
p->displaySlice(out, zoom, rotate, sliceX, sliceY, sliceW, sliceH,
Page *p;
p = catalog->getPage(page);
p->displaySlice(out, zoom, rotate, sliceX, sliceY, sliceW, sliceH,
- NULL, catalog, abortCheckCbk, abortCheckCbkData);
+ NULL, catalog,
+ abortCheckCbk, abortCheckCbkData,
+ annotDisplayDecideCbk, annotDisplayDecideCbkData);
}
GBool PDFDoc::isLinearized() {
}
GBool PDFDoc::isLinearized() {
#include "Link.h"
#include "Catalog.h"
#include "Page.h"
#include "Link.h"
#include "Catalog.h"
#include "Page.h"
class GString;
class BaseStream;
class GString;
class BaseStream;
void displayPage(OutputDev *out, int page, double zoom,
int rotate, GBool doLinks,
GBool (*abortCheckCbk)(void *data) = NULL,
void displayPage(OutputDev *out, int page, double zoom,
int rotate, GBool doLinks,
GBool (*abortCheckCbk)(void *data) = NULL,
- void *abortCheckCbkData = NULL);
+ void *abortCheckCbkData = NULL,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
+ void *annotDisplayDecideCbkData = NULL);
// Display a range of pages.
void displayPages(OutputDev *out, int firstPage, int lastPage,
int zoom, int rotate, GBool doLinks,
GBool (*abortCheckCbk)(void *data) = NULL,
// Display a range of pages.
void displayPages(OutputDev *out, int firstPage, int lastPage,
int zoom, int rotate, GBool doLinks,
GBool (*abortCheckCbk)(void *data) = NULL,
- void *abortCheckCbkData = NULL);
+ void *abortCheckCbkData = NULL,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
+ void *annotDisplayDecideCbkData = NULL);
// Display part of a page.
void displayPageSlice(OutputDev *out, int page, double zoom,
int rotate, int sliceX, int sliceY,
int sliceW, int sliceH,
GBool (*abortCheckCbk)(void *data) = NULL,
// Display part of a page.
void displayPageSlice(OutputDev *out, int page, double zoom,
int rotate, int sliceX, int sliceY,
int sliceW, int sliceH,
GBool (*abortCheckCbk)(void *data) = NULL,
- void *abortCheckCbkData = NULL);
+ void *abortCheckCbkData = NULL,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
+ void *annotDisplayDecideCbkData = NULL);
// Find a page, given its object ID. Returns page number, or 0 if
// not found.
// Find a page, given its object ID. Returns page number, or 0 if
// not found.
// Save this file with another name.
GBool saveAs(GString *name);
// Save this file with another name.
GBool saveAs(GString *name);
private:
GBool setup(GString *ownerPassword, GString *userPassword);
private:
GBool setup(GString *ownerPassword, GString *userPassword);
GBool ok;
int errCode;
};
GBool ok;
int errCode;
};