Synched with Xpdf 0.92

[evince.git] / pdf / xpdf / OutputDev.h

diff --git a/pdf/xpdf/OutputDev.h b/pdf/xpdf/OutputDev.h
index 98afaff64cabc1c4332d37e8a3e4382544d88f83..d7de97abdf02fb104a535ec5ff129b2901ad56a6 100644 (file)
--- a/pdf/xpdf/OutputDev.h
+++ b/pdf/xpdf/OutputDev.h
@@ -20,6 +20,8 @@ class GfxState;
 class GfxColorSpace;
 class GfxImageColorMap;
 class Stream;
+class Link;
+class Catalog;
 
 //------------------------------------------------------------------------
 // OutputDev
@@ -64,8 +66,7 @@ public:
   virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
 
   //----- link borders
-  virtual void drawLinkBorder(double x1, double y1, double x2, double y2,
-                             double w) {}
+  virtual void drawLink(Link *link, Catalog *catalog) {}
 
   //----- save/restore graphics state
   virtual void saveState(GfxState *state) {}
@@ -83,6 +84,8 @@ public:
   virtual void updateLineWidth(GfxState *state) {}
   virtual void updateFillColor(GfxState *state) {}
   virtual void updateStrokeColor(GfxState *state) {}
+  virtual void updateFillOpacity(GfxState *state) {}
+  virtual void updateStrokeOpacity(GfxState *state) {}
 
   //----- update text state
   virtual void updateFont(GfxState *state) {}
@@ -115,13 +118,19 @@ public:
   virtual void drawString16(GfxState *state, GString *s) {}
 
   //----- image drawing
-  virtual void drawImageMask(GfxState *state, Stream *str,
+  virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
                             int width, int height, GBool invert,
                             GBool inlineImg);
-  virtual void drawImage(GfxState *state, Stream *str, int width,
-                        int height, GfxImageColorMap *colorMap,
+  virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+                        int width, int height, GfxImageColorMap *colorMap,
                         GBool inlineImg);
 
+#if OPI_SUPPORT
+  //----- OPI functions
+  virtual void opiBegin(GfxState *state, Dict *opiDict);
+  virtual void opiEnd(GfxState *state, Dict *opiDict);
+#endif
+
 private:
 
   double ctm[6];               // coordinate transform matrix