1 files changed, 16 insertions, 4 deletions

diff --git a/noncore/unsupported/qpdf/xpdf/Gfx.h b/noncore/unsupported/qpdf/xpdf/Gfx.h
index be5f2c2..2ecfb24 100644
--- a/noncore/unsupported/qpdf/xpdf/Gfx.h
+++ b/noncore/unsupported/qpdf/xpdf/Gfx.h
@@ -3,5 +3,5 @@
 // Gfx.h
 //
-// Copyright 1996 Derek B. Noonburg
+// Copyright 1996-2002 Glyph & Cog, LLC
 //
 //========================================================================
@@ -28,4 +28,5 @@ class GfxPattern;
 class GfxShading;
 class GfxAxialShading;
+class GfxRadialShading;
 class GfxState;
 class Gfx;
@@ -98,5 +99,8 @@ public:
       GBool printCommandsA);
 
-  // Destructor.
+  // Constructor for a sub-page object.
+  Gfx(XRef *xrefA, OutputDev *outA, Dict *resDict,
+      PDFRectangle *box, GBool crop, PDFRectangle *cropBox);
+
   ~Gfx();
 
@@ -104,6 +108,11 @@ public:
   void display(Object *obj, GBool topLevel = gTrue);
 
-  void doWidgetForm(Object *str, fouble xMin, fouble yMin,
-		    fouble xMax, fouble yMax);
+  // Display an annotation, given its appearance (a Form XObject) and
+  // bounding box (in default user space).
+  void doAnnot(Object *str, fouble xMin, fouble yMin,
+	       fouble xMax, fouble yMax);
+
+  void pushResources(Dict *resDict);
+  void popResources();
 
 private:
@@ -111,6 +120,8 @@ private:
   XRef *xref;			// the xref table for this PDF file
   OutputDev *out;		// output device
+  GBool subPage;		// is this a sub-page object?
   GBool printCommands;		// print the drawing commands (for debugging)
   GfxResources *res;		// resource stack
+  int updateLevel;
 
   GfxState *state;		// current graphics state
@@ -180,4 +191,5 @@ private:
   void opShFill(Object args[], int numArgs);
   void doAxialShFill(GfxAxialShading *shading);
+  void doRadialShFill(GfxRadialShading *shading);
   void doEndPath();