X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2FBitmapOutputDev.h;h=ac1329867e9732aa027105b506193e0a4f7fa9e0;hp=3e821c774831a98fcbda57c8fc684ce3678aeb61;hb=f29d8006b1d8253c50808d6eb4941bdeb808c601;hpb=cbcb36e38ef35e0a1b950fa8cfa3d90e5aeaa19b

diff --git a/lib/pdf/BitmapOutputDev.h b/lib/pdf/BitmapOutputDev.h
index 3e821c7..ac13298 100644
--- a/lib/pdf/BitmapOutputDev.h
+++ b/lib/pdf/BitmapOutputDev.h
@@ -30,17 +30,31 @@
 #include "PDFDoc.h"
 #include "CommonOutputDev.h"
 
+struct ClipState
+{
+    ClipState*next;
+    SplashBitmap*clipbitmap;
+    char written;
+    ClipState();
+};
+
+#define STATE_PARALLEL 0
+#define STATE_TEXT_IS_ABOVE 1
+#define STATE_BITMAP_IS_ABOVE 2
+
 class BitmapOutputDev: public CommonOutputDev {
 public:
     BitmapOutputDev(InfoOutputDev*info, PDFDoc*doc);
     virtual ~BitmapOutputDev();
+
+    virtual void dbg_newdata(char*newdata);
    
     // CommonOutputDev:
     virtual void setDevice(gfxdevice_t*dev);
     virtual void setMove(int x,int y);
     virtual void setClip(int x1,int y1,int x2,int y2);
     virtual void setParameter(const char*key, const char*value);
-    virtual void preparePage(int pdfpage, int outputpage);
+    virtual void setPageMap(int*page2page, int pagemap_size);
 
     // OutputDev:
     virtual GBool upsideDown();
@@ -60,6 +74,7 @@ public:
 
     virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2);
     virtual void endPage();
+    virtual void finishPage();
 
     virtual void saveState(GfxState *state);
     virtual void restoreState(GfxState *state);
@@ -96,11 +111,20 @@ public:
     virtual void stroke(GfxState *state);
     virtual void fill(GfxState *state);
     virtual void eoFill(GfxState *state);
+#if (xpdfMajorVersion < 3) || (xpdfMinorVersion < 2) || (xpdfUpdateVersion < 7)
     virtual void tilingPatternFill(GfxState *state, Object *str,
-				   int paintType, Dict *resDict,
-				   double *mat, double *bbox,
-				   int x0, int y0, int x1, int y1,
-				   double xStep, double yStep);
+			       int paintType, Dict *resDict,
+			       double *mat, double *bbox,
+			       int x0, int y0, int x1, int y1,
+			       double xStep, double yStep);
+#else
+    virtual void tilingPatternFill(GfxState *state, Gfx *gfx, Object *str,
+			       int paintType, Dict *resDict,
+			       double *mat, double *bbox,
+			       int x0, int y0, int x1, int y1,
+			       double xStep, double yStep);
+#endif
+
     virtual GBool functionShadedFill(GfxState *state,
 				     GfxFunctionShading *shading);
     virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading);
@@ -157,19 +181,62 @@ public:
     virtual void setSoftMask(GfxState *state, double *bbox, GBool alpha, Function *transferFunc, GfxColor *backdropColor);
     virtual void clearSoftMask(GfxState *state);
 
-private:
-    void flush();
+    virtual void processLink(Link *link, Catalog *catalog);
+  
+    virtual void setVectorAntialias(GBool vaa);
+    virtual GBool getVectorAntialias();
 
-    char config_bitmapfonts;
+    
+private:
+    void clearClips();
+    void clearBoolPolyDev();
+    void clearBoolTextDev();
+    void flushText();
+    void flushBitmap();
+    GBool checkNewText(int x1, int y1, int x2, int y2);
+    GBool checkNewBitmap(int x1, int y1, int x2, int y2);
+    GBool clip0and1differ(int x1,int y1,int x2,int y2);
+    GBool intersection(SplashBitmap*boolpoly, SplashBitmap*booltext, int x1, int y1, int x2, int y2);
+    
+    virtual gfxbbox_t getImageBBox(GfxState*state);
+    virtual gfxbbox_t getBBox(GfxState*state);
+
+    char config_extrafontdata;
+
+    int layerstate;
+    GBool emptypage;
+
+    SplashPath*bboxpath;
 
-    int width, height;
     PDFDoc*doc;
     XRef*xref;
     SplashOutputDev*rgbdev;
-    SplashOutputDev*alphadev;
+    SplashOutputDev*clip0dev;
+    SplashOutputDev*clip1dev;
+    SplashOutputDev*boolpolydev;
+    SplashOutputDev*booltextdev;
+
+    SplashBitmap*rgbbitmap;
+    SplashBitmap*clip0bitmap;
+    SplashBitmap*clip1bitmap;
+    SplashBitmap*boolpolybitmap;
+    SplashBitmap*stalepolybitmap;
+    SplashBitmap*booltextbitmap;
+    SplashBitmap*staletextbitmap;
+
+    gfxdevice_t* gfxoutput;
     GFXOutputDev*gfxdev;
     InfoOutputDev*info;
     gfxdevice_t*dev;
+
+    int movex, movey;
+    int width, height;
+
+    int user_movex, user_movey;
+    int user_clipx1, user_clipy1;
+    int user_clipx2, user_clipy2;
+
+    //ClipState*clipstates;
 };
 
 #endif