2004-01-13 Remi Cohen-Scali <rcoscali@cvs.gnome.org>
* xpdf/Page.cc (Page::displaySlice):
Changed the size of the statements
enclosed in ifdef USE_ANNOTS_VIEW in order
to disable annotations display when annots
view is unused.
//~ need to reset CTM ???
annotList = new Annots(xref, annots.fetch(xref, &obj));
obj.free();
//~ need to reset CTM ???
annotList = new Annots(xref, annots.fetch(xref, &obj));
obj.free();
if (annotList->getNumAnnots() > 0) {
if (globalParams->getPrintCommands()) {
printf("***** Annotations\n");
}
for (i = 0; i < annotList->getNumAnnots(); ++i) {
Annot *annot = annotList->getAnnot(i);
if (annotList->getNumAnnots() > 0) {
if (globalParams->getPrintCommands()) {
printf("***** Annotations\n");
}
for (i = 0; i < annotList->getNumAnnots(); ++i) {
Annot *annot = annotList->getAnnot(i);
- if ((annotDisplayDecideCbk && (*annotDisplayDecideCbk)(annot, annotDisplayDecideCbkData))
-#ifdef USE_ANNOTS_VIEW
- || !annotDisplayDecideCbk
-#endif
- )
+ if ((annotDisplayDecideCbk &&
+ (*annotDisplayDecideCbk)(annot, annotDisplayDecideCbkData)) ||
+ !annotDisplayDecideCbk)
delete annotList;
delete gfx;
delete annotList;
delete gfx;