reshuffled libraries

[swftools.git] / lib / xpdf / GFXOutputDev.h

diff --git a/lib/xpdf/GFXOutputDev.h b/lib/xpdf/GFXOutputDev.h
index 0439b95..d828242 100644 (file)
--- a/lib/xpdf/GFXOutputDev.h
+++ b/lib/xpdf/GFXOutputDev.h
@@ -9,7 +9,6 @@
 
 typedef struct _fontlist
 {
-    char*id;
     char*filename;
     gfxfont_t*font;
     _fontlist*next;
@@ -38,7 +37,7 @@ public:
   gfxdevice_t* device;
 
   // Constructor.
-  GFXOutputDev::GFXOutputDev(parameter_t*p);
+  GFXOutputDev(parameter_t*p);
   void setDevice(gfxdevice_t*dev);
 
   // Destructor.
@@ -190,6 +189,11 @@ public:
   char* substitutesource[256];
   int substitutepos;
 
+  /* upper left corner of clipping rectangle (cropbox)- needs to be
+     added to all drawing coordinates to give the impression that all
+     pages start at (0,0)*/
+  int clipmovex,clipmovey;
+
   int user_movex,user_movey;
   int user_clipx1,user_clipx2,user_clipy1,user_clipy2;
 
@@ -208,6 +212,8 @@ public:
   /* config */
   int forceType0Fonts;
   int config_use_fontconfig;
+    
+  parameter_t*parameters;
 };
 
 #endif //__gfxoutputdev_h__