:displaySlice): Changed the size of the statements enclosed in ifdef

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.

diff --git a/pdf/xpdf/Page.cc b/pdf/xpdf/Page.cc
index fb7abc026779ad6aecb6987bb3b25e3b1eef08cf..c7a1e1350fc6aa07f9e4ac204820ffa8f74edf05 100644 (file)
--- a/pdf/xpdf/Page.cc
+++ b/pdf/xpdf/Page.cc
@@ -338,22 +338,21 @@ void Page::displaySlice(OutputDev *out, double dpi, int rotate,
   //~ need to reset CTM ???
   annotList = new Annots(xref, annots.fetch(xref, &obj));
   obj.free();
+#ifdef USE_ANNOTS_VIEW
   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)
           annot->draw(gfx); 
-            
     }
     out->dump();
   }
+#endif
   delete annotList;
 
   delete gfx;