X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FBitmapOutputDev.h;h=acf487b2817797358d23a8dfa8c71fe862c1b5f9;hb=27a1543b139be30ef7e9d2ba21cb067f8ae685c0;hp=67c1c59bed64aa06e699b94f458bb5f9274c07d1;hpb=3b61bcb887e984af72bfe324b0e2847d8138b49c;p=swftools.git

diff --git a/lib/pdf/BitmapOutputDev.h b/lib/pdf/BitmapOutputDev.h
index 67c1c59..acf487b 100644
--- a/lib/pdf/BitmapOutputDev.h
+++ b/lib/pdf/BitmapOutputDev.h
@@ -52,7 +52,7 @@ public:
     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();
@@ -72,6 +72,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);
@@ -190,10 +191,13 @@ private:
     void clearBoolTextDev();
     void flushText();
     void flushBitmap();
-    void checkNewText();
-    void checkNewBitmap();
-    GBool clip0and1differ();
-    GBool intersection();
+    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;
 
@@ -214,7 +218,9 @@ private:
     SplashBitmap*clip0bitmap;
     SplashBitmap*clip1bitmap;
     SplashBitmap*boolpolybitmap;
+    SplashBitmap*stalepolybitmap;
     SplashBitmap*booltextbitmap;
+    SplashBitmap*staletextbitmap;
 
     gfxdevice_t* gfxoutput;
     GFXOutputDev*gfxdev;