X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FBitmapOutputDev.cc;h=4b2a33432f8d667cc03de63c91f866ac9188a142;hb=7ff0a634c656a09f58162ddc57795e30400cdde9;hp=e915bed4913c3883ba68ed89ee64f2259a7ce70e;hpb=18507d7cb3535fdfd333c0e33cf5db8bd5d6e40a;p=swftools.git

diff --git a/lib/pdf/BitmapOutputDev.cc b/lib/pdf/BitmapOutputDev.cc
index e915bed..4b2a334 100644
--- a/lib/pdf/BitmapOutputDev.cc
+++ b/lib/pdf/BitmapOutputDev.cc
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <memory.h>
+#include <assert.h>
 #include "config.h"
 #include "BitmapOutputDev.h"
 #include "GFXOutputDev.h"
@@ -29,6 +30,8 @@
 #include "../png.h"
 #include "../devices/record.h"
 
+#define UNKNOWN_BOUNDING_BOX 0,0,0,0
+
 static SplashColor splash_white = {255,255,255};
 static SplashColor splash_black = {0,0,0};
     
@@ -74,7 +77,6 @@ BitmapOutputDev::BitmapOutputDev(InfoOutputDev*info, PDFDoc*doc)
 
     this->gfxdev->setDevice(this->gfxoutput);
     
-    this->config_bitmapfonts = 0;
     this->config_extrafontdata = 0;
     this->bboxpath = 0;
     //this->clipdev = 0;
@@ -93,9 +95,15 @@ BitmapOutputDev::~BitmapOutputDev()
     if(this->rgbdev) {
 	delete this->rgbdev;this->rgbdev = 0;
     }
+    if(this->gfxdev) {
+	delete this->gfxdev;this->gfxdev= 0;
+    }
     if(this->boolpolydev) {
 	delete this->boolpolydev;this->boolpolydev = 0;
     }
+    if(this->booltextdev) {
+	delete this->booltextdev;this->booltextdev = 0;
+    }
     if(this->clip0dev) {
 	delete this->clip0dev;this->clip0dev = 0;
     }
@@ -141,8 +149,6 @@ void BitmapOutputDev::setParameter(const char*key, const char*value)
 {
     if(!strcmp(key, "extrafontdata")) {
 	this->config_extrafontdata = atoi(value);
-    } else if(!strcmp(key, "bitmapfonts")) {
-	this->config_bitmapfonts = atoi(value);
     }
     this->gfxdev->setParameter(key, value);
 }
@@ -150,7 +156,7 @@ void BitmapOutputDev::preparePage(int pdfpage, int outputpage)
 {
 }
 
-void getBitmapBBox(Guchar*alpha, int width, int height, int*xmin, int*ymin, int*xmax, int*ymax)
+static void getBitmapBBox(Guchar*alpha, int width, int height, int*xmin, int*ymin, int*xmax, int*ymax)
 {
     *ymin = -1;
     *xmin = width;
@@ -188,8 +194,9 @@ void BitmapOutputDev::flushBitmap()
     int width = rgbdev->getBitmapWidth();
     int height = rgbdev->getBitmapHeight();
     
-    SplashColorPtr rgb = rgbdev->getBitmap()->getDataPtr();
-    Guchar*alpha = rgbdev->getBitmap()->getAlphaPtr();
+    SplashColorPtr rgb = rgbbitmap->getDataPtr();
+    Guchar*alpha = rgbbitmap->getAlphaPtr();
+    Guchar*alpha2 = boolpolybitmap->getAlphaPtr();
 
     int xmin,ymin,xmax,ymax;
     getBitmapBBox(alpha, width, height, &xmin,&ymin,&xmax,&ymax);
@@ -212,7 +219,7 @@ void BitmapOutputDev::flushBitmap()
     //xmin = ymin = 0;
     //xmax = width;
     //ymax = height;
-
+    
     int rangex = xmax-xmin;
     int rangey = ymax-ymin;
     gfximage_t*img = (gfximage_t*)malloc(sizeof(gfximage_t)); 
@@ -224,14 +231,31 @@ void BitmapOutputDev::flushBitmap()
 	SplashColorPtr in=&rgb[((y+ymin)*width+xmin)*sizeof(SplashColor)];
 	gfxcolor_t*out = &img->data[y*rangex];
 	Guchar*ain = &alpha[(y+ymin)*width+xmin];
-	for(x=0;x<rangex;x++) {
-	    /* according to endPage()/compositeBackground() in xpdf/SplashOutputDev.cc, we
-	       have to premultiply alpha (mix background and pixel according to the alpha channel).
-	    */
-	    out[x].r = (in[x*3+0]*ain[x])/255;
-	    out[x].g = (in[x*3+1]*ain[x])/255;
-	    out[x].b = (in[x*3+2]*ain[x])/255;
-	    out[x].a = ain[x];
+	Guchar*ain2 = &alpha2[(y+ymin)*width+xmin];
+	if(this->emptypage) {
+	    for(x=0;x<rangex;x++) {
+		/* the first bitmap on the page doesn't need to have an alpha channel-
+		   blend against a white background*/
+		out[x].r = (in[x*3+0]*ain[x])/255 + 255-ain[x];
+		out[x].g = (in[x*3+1]*ain[x])/255 + 255-ain[x];
+		out[x].b = (in[x*3+2]*ain[x])/255 + 255-ain[x];
+		out[x].a = 255;
+	    }
+	} else {
+	    for(x=0;x<rangex;x++) {
+                /*
+                if(!ain2[x]) {
+		    out[x].r = 0;out[x].g = 0;out[x].b = 0;out[x].a = 0;
+                } else {*/
+
+		/* according to endPage()/compositeBackground() in xpdf/SplashOutputDev.cc, we
+		   have to premultiply alpha (mix background and pixel according to the alpha channel).
+		*/
+                out[x].r = (in[x*3+0]*ain[x])/255;
+                out[x].g = (in[x*3+1]*ain[x])/255;
+                out[x].b = (in[x*3+2]*ain[x])/255;
+                out[x].a = ain[x];
+	    }
 	}
     }
     /* transform bitmap rectangle to "device space" */
@@ -245,26 +269,56 @@ void BitmapOutputDev::flushBitmap()
     m.ty = ymin;
     m.m00 = m.m11 = 1;
     m.m10 = m.m01 = 0;
+    m.tx -= 0.5;
+    m.ty -= 0.5;
 
     gfxline_t* line = gfxline_makerectangle(xmin, ymin, xmax, ymax);
     dev->fillbitmap(dev, line, img, &m, 0);
     gfxline_free(line);
 
-    memset(rgbdev->getBitmap()->getAlphaPtr(), 0, rgbdev->getBitmap()->getWidth()*rgbdev->getBitmap()->getHeight());
-    memset(rgbdev->getBitmap()->getDataPtr(), 0, rgbdev->getBitmap()->getRowSize()*rgbdev->getBitmap()->getHeight());
+    memset(rgbbitmap->getAlphaPtr(), 0, rgbbitmap->getWidth()*rgbbitmap->getHeight());
+    memset(rgbbitmap->getDataPtr(), 0, rgbbitmap->getRowSize()*rgbbitmap->getHeight());
 
     free(img->data);img->data=0;free(img);img=0;
+
+    this->emptypage = 0;
 }
 
 void BitmapOutputDev::flushText()
 {
     msg("<verbose> Flushing text/polygons");
     gfxdevice_record_flush(this->gfxoutput, this->dev);
+    
+    this->emptypage = 0;
+}
+
+void writeBitmap(SplashBitmap*bitmap, char*filename)
+{
+    int y,x;
+    
+    int width = bitmap->getWidth();
+    int height = bitmap->getHeight();
+
+    gfxcolor_t*data = (gfxcolor_t*)malloc(sizeof(gfxcolor_t)*width*height);
+
+    for(y=0;y<height;y++) {
+	gfxcolor_t*line = &data[y*width];
+	for(x=0;x<width;x++) {
+            Guchar c[4];
+	    bitmap->getPixel(x,y,c);
+	    int a = bitmap->getAlpha(x,y);
+	    line[x].r = c[0];
+	    line[x].g = c[1];
+	    line[x].b = c[2];
+	    line[x].a = a;
+	}
+    }
+    writePNG(filename, (unsigned char*)data, width, height);
+    free(data);
 }
 
 void writeAlpha(SplashBitmap*bitmap, char*filename)
 {
-    return;
     int y,x;
     
     int width = bitmap->getWidth();
@@ -287,41 +341,87 @@ void writeAlpha(SplashBitmap*bitmap, char*filename)
 }
 static int dbg_btm_counter=1;
 
-void BitmapOutputDev::checkNewText()
+static const char*STATE_NAME[] = {"parallel", "textabovebitmap", "bitmapabovetext"};
+
+int checkAlphaSanity(SplashBitmap*boolbtm, SplashBitmap*alphabtm)
+{
+    assert(boolbtm->getWidth() == alphabtm->getWidth());
+    assert(boolbtm->getHeight() == alphabtm->getHeight());
+    if(boolbtm->getMode()==splashModeMono1) {
+        return 1;
+    }
+
+    int width = boolbtm->getWidth();
+    int height = boolbtm->getHeight();
+
+    int bad=0;
+    int x,y;
+    for(y=0;y<height;y++) {
+	for(x=0;x<width;x++) {
+	    int a1 = alphabtm->getAlpha(x,y);
+	    int a2 = boolbtm->getAlpha(x,y);
+            if(a1!=a2) {
+                bad++;
+            }
+	}
+    }
+    double badness = bad/(double)(width*height);
+    if(badness>0.2) {
+        msg("<error> Bitmaps don't correspond: %d out of %d pixels wrong (%.2f%%)", bad, width*height, 
+                badness*100.0);
+        return 0;
+    }
+    msg("<notice> %f", badness);
+    return 1;
+}
+
+GBool BitmapOutputDev::checkNewText(int x1, int y1, int x2, int y2)
 {
     /* called once some new text was drawn on booltextdev, and
        before the same thing is drawn on gfxdev */
-    
-    msg("<debug> Testing new text data against current bitmap data, state=%d, counter=%d\n", layerstate, dbg_btm_counter);
+   
+    msg("<trace> Testing new text data against current bitmap data, state=%s, counter=%d\n", STATE_NAME[layerstate], dbg_btm_counter);
     
     char filename1[80];
     char filename2[80];
-    sprintf(filename1, "state%dbitmap_newtext.png", dbg_btm_counter);
-    sprintf(filename2, "state%dtext_newtext.png", dbg_btm_counter);
-    writeAlpha(boolpolydev->getBitmap(), filename1);
-    writeAlpha(booltextdev->getBitmap(), filename2);
+    char filename3[80];
+    sprintf(filename1, "state%dboolbitmap_afternewtext.png", dbg_btm_counter);
+    sprintf(filename2, "state%dbooltext_afternewtext.png", dbg_btm_counter);
+    sprintf(filename3, "state%dbitmap_afternewtext.png", dbg_btm_counter);
+    if(0) {
+        msg("<verbose> %s %s %s", filename1, filename2, filename3);
+	writeAlpha(boolpolybitmap, filename1);
+	writeAlpha(booltextbitmap, filename2);
+	writeBitmap(rgbdev->getBitmap(), filename3);
+    }
     dbg_btm_counter++;
 
-    if(intersection()) {
-	msg("<verbose> Text is above current bitmap/polygon data");
+    GBool ret = false;
+    if(intersection(x1,y1,x2,y2)) {
 	if(layerstate==STATE_PARALLEL) {
 	    /* the new text is above the bitmap. So record that fact,
 	       and also clear the bitmap buffer, so we can check for
 	       new intersections */
+	    msg("<verbose> Text is above current bitmap/polygon data");
 	    layerstate=STATE_TEXT_IS_ABOVE;
-	    clearBoolPolyDev();
+	    clearBoolPolyDev(x1,y1,x2,y2);
 	} else if(layerstate==STATE_BITMAP_IS_ABOVE) {
 	    /* there's a bitmap above the (old) text. So we need
 	       to flush out that text, and record that the *new*
 	       text is now *above* the bitmap
 	     */
+	    msg("<verbose> Text is above current bitmap/polygon data (which is above some other text)");
 	    flushText();
 	    layerstate=STATE_TEXT_IS_ABOVE;
 	    /* clear both bool devices- the text device because
 	       we just dumped out all the (old) text, and the
 	       poly dev so we can check for new intersections */
-	    clearBoolPolyDev();
-	    clearBoolTextDev();
+	    clearBoolPolyDev(x1,y1,x2,y2);
+            /* FIXME this destroys the text pixels we just
+               drew to test for the intersection- however we need
+               those to check for the *new* intersections */
+	    clearBoolTextDev(x1,y1,x2,y2);
+            ret = true;
 	} else {
 	    /* we already know that the current text section is
 	       above the current bitmap section- now just new
@@ -329,43 +429,60 @@ void BitmapOutputDev::checkNewText()
 	       *again* it's above the current bitmap- so clear
 	       the polygon bitmap again, so we can check for
 	       new intersections */
-	    clearBoolPolyDev();
+	    msg("<verbose> Text is still above current bitmap/polygon data");
+	    clearBoolPolyDev(x1,y1,x2,y2);
 	}
     } 
+    return ret;
 }
 
-void BitmapOutputDev::checkNewBitmap()
+GBool BitmapOutputDev::checkNewBitmap(int x1, int y1, int x2, int y2)
 {
     /* similar to checkNewText() above, only in reverse */
-    msg("<debug> Testing new graphics data against current text data, state=%d, counter=%d\n", layerstate, dbg_btm_counter);
+    msg("<trace> Testing new graphics data against current text data, state=%s, counter=%d\n", STATE_NAME[layerstate], dbg_btm_counter);
 
     char filename1[80];
     char filename2[80];
-    sprintf(filename1, "state%dbitmap_newbitmap.png", dbg_btm_counter);
-    sprintf(filename2, "state%dtext_newbitmap.png", dbg_btm_counter);
-    writeAlpha(boolpolydev->getBitmap(), filename1);
-    writeAlpha(booltextdev->getBitmap(), filename2);
+    char filename3[80];
+    sprintf(filename1, "state%dboolbitmap_afternewgfx.png", dbg_btm_counter);
+    sprintf(filename2, "state%dbooltext_afternewgfx.png", dbg_btm_counter);
+    sprintf(filename3, "state%dbitmap_afternewgfx.png", dbg_btm_counter);
+
+    if(0) {
+        msg("<verbose> %s %s %s", filename1, filename2, filename3);
+	writeAlpha(boolpolybitmap, filename1);
+	writeAlpha(booltextbitmap, filename2);
+	writeBitmap(rgbdev->getBitmap(), filename3);
+    }
     dbg_btm_counter++;
 
-    if(intersection()) {
-	msg("<verbose> Bitmap is above current text data");
+    GBool ret = false;
+    if(intersection(x1,y1,x2,y2)) {
 	if(layerstate==STATE_PARALLEL) {
+	    msg("<verbose> Bitmap is above current text data");
 	    layerstate=STATE_BITMAP_IS_ABOVE;
-	    clearBoolTextDev();
+	    clearBoolTextDev(x1,y1,x2,y2);
 	} else if(layerstate==STATE_TEXT_IS_ABOVE) {
+	    msg("<verbose> Bitmap is above current text data (which is above some bitmap)");
 	    flushBitmap();
 	    layerstate=STATE_BITMAP_IS_ABOVE;
-	    clearBoolTextDev();
-	    clearBoolPolyDev();
+	    clearBoolTextDev(x1,y1,x2,y2);
+            /* FIXME this destroys the polygon pixels we just
+               drew to test for the intersection- however we need
+               those to check for the *new* intersections */
+	    clearBoolPolyDev(x1,y1,x2,y2);
+            ret = true;
 	} else {
-	    clearBoolTextDev();
+	    msg("<verbose> Bitmap is still above current text data");
+	    clearBoolTextDev(x1,y1,x2,y2);
 	}
     } 
+    return ret;
 }
 
 //void checkNewText() {
-//    Guchar*alpha = rgbdev->getBitmap()->getAlphaPtr();
-//    Guchar*charpixels = clip1dev->getBitmap()->getDataPtr();
+//    Guchar*alpha = rgbbitmap->getAlphaPtr();
+//    Guchar*charpixels = clip1bitmap->getDataPtr();
 //    int xx,yy;
 //    for(yy=0;yy<height;yy++) {
 //        Guchar*aline = &alpha[yy*width];
@@ -381,26 +498,62 @@ void BitmapOutputDev::checkNewBitmap()
 //            break;
 //}
 
-GBool BitmapOutputDev::clip0and1differ()
+GBool BitmapOutputDev::clip0and1differ(int x1,int y1,int x2,int y2)
 {
-    if(clip0dev->getBitmap()->getMode()==splashModeMono1) {
-	SplashBitmap*clip0 = clip0dev->getBitmap();
-	SplashBitmap*clip1 = clip1dev->getBitmap();
-	int width8 = (clip0->getWidth()+7)/8;
-	int height = clip0->getHeight();
-	return memcmp(clip0->getDataPtr(), clip1->getDataPtr(), width8*height);
+    if(clip0bitmap->getMode()==splashModeMono1) {
+	if(x2<=x1)
+	    return gFalse;
+	if(x2<0)
+	    return gFalse;
+	if(x1<0)
+	    x1 = 0;
+	if(x1>=clip0bitmap->getWidth())
+	    return gFalse;
+	if(x2>clip0bitmap->getWidth())
+	    x2=clip0bitmap->getWidth();
+
+	if(y2<=y1)
+	    return gFalse;
+	if(y2<0)
+	    return gFalse;
+	if(y1<0)
+	    y1 = 0;
+	if(y1>=clip0bitmap->getHeight())
+	    return gFalse;
+	if(y2>clip0bitmap->getHeight())
+	    y2=clip0bitmap->getHeight();
+	
+	SplashBitmap*clip0 = clip0bitmap;
+	SplashBitmap*clip1 = clip1bitmap;
+	int width8 = (clip0bitmap->getWidth()+7)/8;
+	int height = clip0bitmap->getHeight();
+	int x18 = x1/8;
+	int x28 = (x2+7)/8;
+	int y;
+
+	for(y=y1;y<y2;y++) {
+	    unsigned char*row1 = &clip0bitmap->getDataPtr()[width8*y+x18];
+	    unsigned char*row2 = &clip1bitmap->getDataPtr()[width8*y+x28];
+	    if(memcmp(row1, row2, x28-x18))
+		return gTrue;
+	}
+	return gFalse;
     } else {
-	SplashBitmap*clip0 = clip0dev->getBitmap();
-	SplashBitmap*clip1 = clip1dev->getBitmap();
+	SplashBitmap*clip0 = clip0bitmap;
+	SplashBitmap*clip1 = clip1bitmap;
 	int width = clip0->getAlphaRowSize();
 	int height = clip0->getHeight();
 	return memcmp(clip0->getAlphaPtr(), clip1->getAlphaPtr(), width*height);
     }
 }
 
-static void clearBooleanDev(SplashOutputDev*dev)
+static void clearBooleanBitmap(SplashBitmap*btm, int x1, int y1, int x2, int y2)
 {
-    SplashBitmap*btm = dev->getBitmap();
+    if(!(x1|y1|x2|y2)) {
+        x1 = y1 = 0;
+        x2 = btm->getWidth();
+        y2 = btm->getHeight();
+    }
     if(btm->getMode()==splashModeMono1) {
 	int width8 = (btm->getWidth()+7)/8;
 	int width = btm->getWidth();
@@ -413,10 +566,20 @@ static void clearBooleanDev(SplashOutputDev*dev)
     }
 }
 
-GBool BitmapOutputDev::intersection()
+long long unsigned int compare64(long long unsigned int*data1, long long unsigned int*data2, int len)
+{
+    long long unsigned int c;
+    int t;
+    for(t=0;t<len;t++) {
+        c |= data1[t]&data2[t];
+    }
+    return c;
+}
+
+GBool BitmapOutputDev::intersection(int x1, int y1, int x2, int y2)
 {
-    SplashBitmap*boolpoly = boolpolydev->getBitmap();
-    SplashBitmap*booltext = booltextdev->getBitmap();
+    SplashBitmap*boolpoly = boolpolybitmap;
+    SplashBitmap*booltext = booltextbitmap;
 	
     if(boolpoly->getMode()==splashModeMono1) {
 	/* alternative implementation, using one bit per pixel-
@@ -424,23 +587,32 @@ GBool BitmapOutputDev::intersection()
 
 	Guchar*polypixels = boolpoly->getDataPtr();
 	Guchar*textpixels = booltext->getDataPtr();
-    
+
 	int width8 = (width+7)/8;
 	int height = boolpoly->getHeight();
 	
+	if(x1|y1|x2|y2) {
+	    if(y1>=0 && y1<=y2 && y2<=height) {
+		polypixels+=y1*width8;
+		textpixels+=y1*width8;
+		height=y2-y1;
+	    }
+	}
+	
 	int t;
 	int len = height*width8;
-	unsigned int c=0;
-	if(len & (sizeof(unsigned int)-1)) {
-	    Guchar c2=0;
-	    for(t=0;t<len;t++) {
-		c2 |= polypixels[t]&textpixels[t];
-	    }
-	    c = c2;
-	} else {
-	    len /= sizeof(unsigned int);
-	    for(t=0;t<len;t++) {
-		c |= (((unsigned int*)polypixels)[t]) & (((unsigned int*)textpixels)[t]);
+	unsigned long long int c=0;
+        assert(sizeof(unsigned long long int)==8);
+	{
+            if(((int)polypixels&7) || ((int)textpixels&7)) {
+                //msg("<warning> Non-optimal alignment");
+            }
+            int l2 = len;
+	    len /= sizeof(unsigned long long int);
+            c = compare64((unsigned long long int*)polypixels, (unsigned long long int*)textpixels, len);
+            int l1 = len*sizeof(unsigned long long int);
+	    for(t=l1;t<l2;t++) {
+		c |= (unsigned long long int)(polypixels[t]&textpixels[t]);
 	    }
 	}
 	if(c)
@@ -496,7 +668,7 @@ void BitmapOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, do
     this->width = (int)(x2-x1);
     this->height = (int)(y2-y1);
 
-    msg("<verbose> startPage");
+    msg("<debug> startPage");
     rgbdev->startPage(pageNum, state, crop_x1, crop_y1, crop_x2, crop_y2);
     boolpolydev->startPage(pageNum, state, crop_x1, crop_y1, crop_x2, crop_y2);
     booltextdev->startPage(pageNum, state, crop_x1, crop_y1, crop_x2, crop_y2);
@@ -504,19 +676,35 @@ void BitmapOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, do
     clip1dev->startPage(pageNum, state, crop_x1, crop_y1, crop_x2, crop_y2);
     gfxdev->startPage(pageNum, state, crop_x1, crop_y1, crop_x2, crop_y2);
 
+    boolpolybitmap = boolpolydev->getBitmap();
+    booltextbitmap = booltextdev->getBitmap();
+    clip0bitmap = clip0dev->getBitmap();
+    clip1bitmap = clip1dev->getBitmap();
+    rgbbitmap = rgbdev->getBitmap();
+    
     flushText(); // write out the initial clipping rectangle
 
     /* just in case any device did draw a white background rectangle 
        into the device */
-    clearBoolTextDev();
-    clearBoolPolyDev();
+    clearBoolTextDev(UNKNOWN_BOUNDING_BOX);
+    clearBoolPolyDev(UNKNOWN_BOUNDING_BOX);
 
     this->layerstate = STATE_PARALLEL;
+    this->emptypage = 1;
+    msg("<debug> startPage done");
 }
 
 void BitmapOutputDev::endPage()
 {
     msg("<verbose> endPage (BitmapOutputDev)");
+
+    /* notice: we're not fully done yet with this page- there might still be 
+       a few calls to drawLink() yet to come */
+}
+void BitmapOutputDev::finishPage()
+{
+    msg("<verbose> finishPage (BitmapOutputDev)");
+    gfxdev->endPage();
    
     if(layerstate == STATE_BITMAP_IS_ABOVE) {
 	this->flushText();
@@ -533,7 +721,6 @@ void BitmapOutputDev::endPage()
     rgbdev->endPage();
     clip0dev->endPage();
     clip1dev->endPage();
-    gfxdev->endPage();
 }
 
 GBool BitmapOutputDev::upsideDown()
@@ -583,15 +770,11 @@ GBool BitmapOutputDev::useDrawForm()
 
 GBool BitmapOutputDev::interpretType3Chars()
 {
-    if(!config_bitmapfonts) {
-	boolpolydev->interpretType3Chars();
-	booltextdev->interpretType3Chars();
-	clip0dev->interpretType3Chars();
-	clip1dev->interpretType3Chars();
-	return rgbdev->interpretType3Chars();
-    } else {
-	return gfxdev->interpretType3Chars();
-    }
+    boolpolydev->interpretType3Chars();
+    booltextdev->interpretType3Chars();
+    clip0dev->interpretType3Chars();
+    clip1dev->interpretType3Chars();
+    return rgbdev->interpretType3Chars();
 }
 
 GBool BitmapOutputDev::needNonText() 
@@ -618,7 +801,7 @@ void BitmapOutputDev::setDefaultCTM(double *ctm)
     rgbdev->setDefaultCTM(ctm);
     clip0dev->setDefaultCTM(ctm);
     clip1dev->setDefaultCTM(ctm);
-    //gfxdev->setDefaultCTM(ctm);//?
+    gfxdev->setDefaultCTM(ctm);
 }
 void BitmapOutputDev::saveState(GfxState *state) 
 {
@@ -658,8 +841,7 @@ void BitmapOutputDev::updateAll(GfxState *state)
     rgbdev->updateAll(state);
     clip0dev->updateAll(state);
     clip1dev->updateAll(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateAll(state);
+    gfxdev->updateAll(state);
 }
 void BitmapOutputDev::updateCTM(GfxState *state, double m11, double m12, double m21, double m22, double m31, double m32)
 {
@@ -668,8 +850,7 @@ void BitmapOutputDev::updateCTM(GfxState *state, double m11, double m12, double
     rgbdev->updateCTM(state,m11,m12,m21,m22,m31,m32);
     clip0dev->updateCTM(state,m11,m12,m21,m22,m31,m32);
     clip1dev->updateCTM(state,m11,m12,m21,m22,m31,m32);
-    if(!config_bitmapfonts)
-	gfxdev->updateCTM(state,m11,m12,m21,m22,m31,m32);
+    gfxdev->updateCTM(state,m11,m12,m21,m22,m31,m32);
 }
 void BitmapOutputDev::updateLineDash(GfxState *state)
 {
@@ -678,8 +859,7 @@ void BitmapOutputDev::updateLineDash(GfxState *state)
     rgbdev->updateLineDash(state);
     clip0dev->updateLineDash(state);
     clip1dev->updateLineDash(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateLineDash(state);
+    gfxdev->updateLineDash(state);
 }
 void BitmapOutputDev::updateFlatness(GfxState *state)
 {
@@ -688,8 +868,7 @@ void BitmapOutputDev::updateFlatness(GfxState *state)
     rgbdev->updateFlatness(state);
     clip0dev->updateFlatness(state);
     clip1dev->updateFlatness(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateFlatness(state);
+    gfxdev->updateFlatness(state);
 }
 void BitmapOutputDev::updateLineJoin(GfxState *state)
 {
@@ -698,8 +877,7 @@ void BitmapOutputDev::updateLineJoin(GfxState *state)
     rgbdev->updateLineJoin(state);
     clip0dev->updateLineJoin(state);
     clip1dev->updateLineJoin(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateLineJoin(state);
+    gfxdev->updateLineJoin(state);
 }
 void BitmapOutputDev::updateLineCap(GfxState *state)
 {
@@ -708,8 +886,7 @@ void BitmapOutputDev::updateLineCap(GfxState *state)
     rgbdev->updateLineCap(state);
     clip0dev->updateLineCap(state);
     clip1dev->updateLineCap(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateLineCap(state);
+    gfxdev->updateLineCap(state);
 }
 void BitmapOutputDev::updateMiterLimit(GfxState *state)
 {
@@ -718,8 +895,7 @@ void BitmapOutputDev::updateMiterLimit(GfxState *state)
     rgbdev->updateMiterLimit(state);
     clip0dev->updateMiterLimit(state);
     clip1dev->updateMiterLimit(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateMiterLimit(state);
+    gfxdev->updateMiterLimit(state);
 }
 void BitmapOutputDev::updateLineWidth(GfxState *state)
 {
@@ -728,8 +904,7 @@ void BitmapOutputDev::updateLineWidth(GfxState *state)
     rgbdev->updateLineWidth(state);
     clip0dev->updateLineWidth(state);
     clip1dev->updateLineWidth(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateLineWidth(state);
+    gfxdev->updateLineWidth(state);
 }
 void BitmapOutputDev::updateStrokeAdjust(GfxState *state)
 {
@@ -738,8 +913,7 @@ void BitmapOutputDev::updateStrokeAdjust(GfxState *state)
     rgbdev->updateStrokeAdjust(state);
     clip0dev->updateStrokeAdjust(state);
     clip1dev->updateStrokeAdjust(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateStrokeAdjust(state);
+    gfxdev->updateStrokeAdjust(state);
 }
 void BitmapOutputDev::updateFillColorSpace(GfxState *state)
 {
@@ -748,8 +922,7 @@ void BitmapOutputDev::updateFillColorSpace(GfxState *state)
     rgbdev->updateFillColorSpace(state);
     clip0dev->updateFillColorSpace(state);
     clip1dev->updateFillColorSpace(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateFillColorSpace(state);
+    gfxdev->updateFillColorSpace(state);
 }
 void BitmapOutputDev::updateStrokeColorSpace(GfxState *state)
 {
@@ -758,8 +931,7 @@ void BitmapOutputDev::updateStrokeColorSpace(GfxState *state)
     rgbdev->updateStrokeColorSpace(state);
     clip0dev->updateStrokeColorSpace(state);
     clip1dev->updateStrokeColorSpace(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateStrokeColorSpace(state);
+    gfxdev->updateStrokeColorSpace(state);
 }
 void BitmapOutputDev::updateFillColor(GfxState *state)
 {
@@ -768,8 +940,7 @@ void BitmapOutputDev::updateFillColor(GfxState *state)
     rgbdev->updateFillColor(state);
     clip0dev->updateFillColor(state);
     clip1dev->updateFillColor(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateFillColor(state);
+    gfxdev->updateFillColor(state);
 }
 void BitmapOutputDev::updateStrokeColor(GfxState *state)
 {
@@ -778,8 +949,7 @@ void BitmapOutputDev::updateStrokeColor(GfxState *state)
     rgbdev->updateStrokeColor(state);
     clip0dev->updateStrokeColor(state);
     clip1dev->updateStrokeColor(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateStrokeColor(state);
+    gfxdev->updateStrokeColor(state);
 }
 void BitmapOutputDev::updateBlendMode(GfxState *state)
 {
@@ -788,8 +958,7 @@ void BitmapOutputDev::updateBlendMode(GfxState *state)
     rgbdev->updateBlendMode(state);
     clip0dev->updateBlendMode(state);
     clip1dev->updateBlendMode(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateBlendMode(state);
+    gfxdev->updateBlendMode(state);
 }
 void BitmapOutputDev::updateFillOpacity(GfxState *state)
 {
@@ -798,8 +967,7 @@ void BitmapOutputDev::updateFillOpacity(GfxState *state)
     rgbdev->updateFillOpacity(state);
     clip0dev->updateFillOpacity(state);
     clip1dev->updateFillOpacity(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateFillOpacity(state);
+    gfxdev->updateFillOpacity(state);
 }
 void BitmapOutputDev::updateStrokeOpacity(GfxState *state)
 {
@@ -808,8 +976,7 @@ void BitmapOutputDev::updateStrokeOpacity(GfxState *state)
     rgbdev->updateStrokeOpacity(state);
     clip0dev->updateStrokeOpacity(state);
     clip1dev->updateStrokeOpacity(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateStrokeOpacity(state);
+    gfxdev->updateStrokeOpacity(state);
 }
 void BitmapOutputDev::updateFillOverprint(GfxState *state)
 {
@@ -818,8 +985,7 @@ void BitmapOutputDev::updateFillOverprint(GfxState *state)
     rgbdev->updateFillOverprint(state);
     clip0dev->updateFillOverprint(state);
     clip1dev->updateFillOverprint(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateFillOverprint(state);
+    gfxdev->updateFillOverprint(state);
 }
 void BitmapOutputDev::updateStrokeOverprint(GfxState *state)
 {
@@ -828,8 +994,7 @@ void BitmapOutputDev::updateStrokeOverprint(GfxState *state)
     rgbdev->updateStrokeOverprint(state);
     clip0dev->updateStrokeOverprint(state);
     clip1dev->updateStrokeOverprint(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateStrokeOverprint(state);
+    gfxdev->updateStrokeOverprint(state);
 }
 void BitmapOutputDev::updateTransfer(GfxState *state)
 {
@@ -838,9 +1003,9 @@ void BitmapOutputDev::updateTransfer(GfxState *state)
     rgbdev->updateTransfer(state);
     clip0dev->updateTransfer(state);
     clip1dev->updateTransfer(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateTransfer(state);
+    gfxdev->updateTransfer(state);
 }
+
 void BitmapOutputDev::updateFont(GfxState *state)
 {
     boolpolydev->updateFont(state);
@@ -848,8 +1013,7 @@ void BitmapOutputDev::updateFont(GfxState *state)
     rgbdev->updateFont(state);
     clip0dev->updateFont(state);
     clip1dev->updateFont(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateFont(state);
+    gfxdev->updateFont(state);
 }
 void BitmapOutputDev::updateTextMat(GfxState *state)
 {
@@ -858,8 +1022,7 @@ void BitmapOutputDev::updateTextMat(GfxState *state)
     rgbdev->updateTextMat(state);
     clip0dev->updateTextMat(state);
     clip1dev->updateTextMat(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateTextMat(state);
+    gfxdev->updateTextMat(state);
 }
 void BitmapOutputDev::updateCharSpace(GfxState *state)
 {
@@ -868,8 +1031,7 @@ void BitmapOutputDev::updateCharSpace(GfxState *state)
     rgbdev->updateCharSpace(state);
     clip0dev->updateCharSpace(state);
     clip1dev->updateCharSpace(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateCharSpace(state);
+    gfxdev->updateCharSpace(state);
 }
 void BitmapOutputDev::updateRender(GfxState *state)
 {
@@ -878,8 +1040,7 @@ void BitmapOutputDev::updateRender(GfxState *state)
     rgbdev->updateRender(state);
     clip0dev->updateRender(state);
     clip1dev->updateRender(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateRender(state);
+    gfxdev->updateRender(state);
 }
 void BitmapOutputDev::updateRise(GfxState *state)
 {
@@ -888,8 +1049,7 @@ void BitmapOutputDev::updateRise(GfxState *state)
     rgbdev->updateRise(state);
     clip0dev->updateRise(state);
     clip1dev->updateRise(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateRise(state);
+    gfxdev->updateRise(state);
 }
 void BitmapOutputDev::updateWordSpace(GfxState *state)
 {
@@ -898,8 +1058,7 @@ void BitmapOutputDev::updateWordSpace(GfxState *state)
     rgbdev->updateWordSpace(state);
     clip0dev->updateWordSpace(state);
     clip1dev->updateWordSpace(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateWordSpace(state);
+    gfxdev->updateWordSpace(state);
 }
 void BitmapOutputDev::updateHorizScaling(GfxState *state)
 {
@@ -908,8 +1067,7 @@ void BitmapOutputDev::updateHorizScaling(GfxState *state)
     rgbdev->updateHorizScaling(state);
     clip0dev->updateHorizScaling(state);
     clip1dev->updateHorizScaling(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateHorizScaling(state);
+    gfxdev->updateHorizScaling(state);
 }
 void BitmapOutputDev::updateTextPos(GfxState *state)
 {
@@ -918,8 +1076,7 @@ void BitmapOutputDev::updateTextPos(GfxState *state)
     rgbdev->updateTextPos(state);
     clip0dev->updateTextPos(state);
     clip1dev->updateTextPos(state);
-    if(!config_bitmapfonts)
-	gfxdev->updateTextPos(state);
+    gfxdev->updateTextPos(state);
 }
 void BitmapOutputDev::updateTextShift(GfxState *state, double shift)
 {
@@ -928,29 +1085,32 @@ void BitmapOutputDev::updateTextShift(GfxState *state, double shift)
     rgbdev->updateTextShift(state, shift);
     clip0dev->updateTextShift(state, shift);
     clip1dev->updateTextShift(state, shift);
-    if(!config_bitmapfonts)
-	gfxdev->updateTextShift(state, shift);
+    gfxdev->updateTextShift(state, shift);
 }
 
 void BitmapOutputDev::stroke(GfxState *state)
 {
-    msg("<verbose> stroke");
+    msg("<debug> stroke");
     boolpolydev->stroke(state);
-    checkNewBitmap();
+    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     rgbdev->stroke(state);
 }
 void BitmapOutputDev::fill(GfxState *state)
 {
-    msg("<verbose> fill");
+    msg("<debug> fill");
     boolpolydev->fill(state);
-    checkNewBitmap();
+    if(checkNewBitmap(UNKNOWN_BOUNDING_BOX)) {
+        boolpolydev->fill(state);
+    }
     rgbdev->fill(state);
 }
 void BitmapOutputDev::eoFill(GfxState *state)
 {
-    msg("<verbose> eoFill");
+    msg("<debug> eoFill");
     boolpolydev->eoFill(state);
-    checkNewBitmap();
+    if(checkNewBitmap(UNKNOWN_BOUNDING_BOX)) {
+        boolpolydev->eoFill(state);
+    }
     rgbdev->eoFill(state);
 }
 #if (xpdfMajorVersion*10000 + xpdfMinorVersion*100 + xpdfUpdateVersion) < 30207
@@ -960,9 +1120,9 @@ void BitmapOutputDev::tilingPatternFill(GfxState *state, Object *str,
 			       int x0, int y0, int x1, int y1,
 			       double xStep, double yStep)
 {
-    msg("<verbose> tilingPatternFill");
+    msg("<debug> tilingPatternFill");
     boolpolydev->tilingPatternFill(state, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep);
-    checkNewBitmap();
+    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     rgbdev->tilingPatternFill(state, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep);
 }
 #else
@@ -972,32 +1132,32 @@ void BitmapOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx, Object *str,
 			       int x0, int y0, int x1, int y1,
 			       double xStep, double yStep) 
 {
-    msg("<verbose> tilingPatternFill");
+    msg("<debug> tilingPatternFill");
     boolpolydev->tilingPatternFill(state, gfx, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep);
-    checkNewBitmap();
+    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     rgbdev->tilingPatternFill(state, gfx, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep);
 }
 #endif
 
 GBool BitmapOutputDev::functionShadedFill(GfxState *state, GfxFunctionShading *shading) 
 {
-    msg("<verbose> functionShadedFill");
+    msg("<debug> functionShadedFill");
     boolpolydev->functionShadedFill(state, shading);
-    checkNewBitmap();
+    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     return rgbdev->functionShadedFill(state, shading);
 }
 GBool BitmapOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading)
 {
-    msg("<verbose> axialShadedFill");
+    msg("<debug> axialShadedFill");
     boolpolydev->axialShadedFill(state, shading);
-    checkNewBitmap();
+    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     return rgbdev->axialShadedFill(state, shading);
 }
 GBool BitmapOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading)
 {
-    msg("<verbose> radialShadedFill");
+    msg("<debug> radialShadedFill");
     boolpolydev->radialShadedFill(state, shading);
-    checkNewBitmap();
+    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     return rgbdev->radialShadedFill(state, shading);
 }
 
@@ -1006,7 +1166,7 @@ SplashColor white = {255,255,255};
 
 void BitmapOutputDev::clip(GfxState *state)
 {
-    msg("<verbose> clip");
+    msg("<debug> clip");
     boolpolydev->clip(state);
     booltextdev->clip(state);
     rgbdev->clip(state);
@@ -1014,7 +1174,7 @@ void BitmapOutputDev::clip(GfxState *state)
 }
 void BitmapOutputDev::eoClip(GfxState *state)
 {
-    msg("<verbose> eoClip");
+    msg("<debug> eoClip");
     boolpolydev->eoClip(state);
     booltextdev->eoClip(state);
     rgbdev->eoClip(state);
@@ -1022,7 +1182,7 @@ void BitmapOutputDev::eoClip(GfxState *state)
 }
 void BitmapOutputDev::clipToStrokePath(GfxState *state)
 {
-    msg("<verbose> clipToStrokePath");
+    msg("<debug> clipToStrokePath");
     boolpolydev->clipToStrokePath(state);
     booltextdev->clipToStrokePath(state);
     rgbdev->clipToStrokePath(state);
@@ -1031,88 +1191,99 @@ void BitmapOutputDev::clipToStrokePath(GfxState *state)
 
 void BitmapOutputDev::beginStringOp(GfxState *state)
 {
-    msg("<verbose> beginStringOp");
-    if(this->config_bitmapfonts) {
-	rgbdev->beginStringOp(state);
-	clip0dev->beginStringOp(state);
-	clip1dev->beginStringOp(state);
-    } else {
-	booltextdev->beginStringOp(state);
-	gfxdev->beginStringOp(state);
-    }
+    msg("<debug> beginStringOp");
+    clip0dev->beginStringOp(state);
+    clip1dev->beginStringOp(state);
+    booltextdev->beginStringOp(state);
+    gfxdev->beginStringOp(state);
 }
 void BitmapOutputDev::endStringOp(GfxState *state)
 {
-    msg("<verbose> endStringOp");
-    if(this->config_bitmapfonts) {
-	rgbdev->endStringOp(state);
-	clip0dev->endStringOp(state);
-	clip1dev->endStringOp(state);
-    } else {
-	booltextdev->endStringOp(state);
-	checkNewText();
-	gfxdev->endStringOp(state);
-    }
+    msg("<debug> endStringOp");
+    clip0dev->endStringOp(state);
+    clip1dev->endStringOp(state);
+    booltextdev->endStringOp(state);
+    checkNewText(UNKNOWN_BOUNDING_BOX);
+    gfxdev->endStringOp(state);
 }
 void BitmapOutputDev::beginString(GfxState *state, GString *s)
 {
-    msg("<verbose> beginString");
-    if(this->config_bitmapfonts) {
-	rgbdev->beginString(state, s);
-	clip0dev->beginString(state, s);
-	clip1dev->beginString(state, s);
-    } else {
-	booltextdev->beginString(state, s);
-	gfxdev->beginString(state, s);
-    }
+    msg("<debug> beginString");
+    clip0dev->beginString(state, s);
+    clip1dev->beginString(state, s);
+    booltextdev->beginString(state, s);
+    gfxdev->beginString(state, s);
 }
 void BitmapOutputDev::endString(GfxState *state)
 {
-    msg("<verbose> endString");
-    if(this->config_bitmapfonts) {
-	rgbdev->endString(state);
-	clip0dev->endString(state);
-	clip1dev->endString(state);
-    } else {
-	booltextdev->endString(state);
-	checkNewText();
-	gfxdev->endString(state);
-    }
+    msg("<debug> endString");
+    clip0dev->endString(state);
+    clip1dev->endString(state);
+    booltextdev->endString(state);
+    checkNewText(UNKNOWN_BOUNDING_BOX);
+    gfxdev->endString(state);
 }
 
 void BitmapOutputDev::clearClips()
 {
-    clearBooleanDev(clip0dev);
-    clearBooleanDev(clip1dev);
+    clearBooleanBitmap(clip0bitmap, 0, 0, 0, 0);
+    clearBooleanBitmap(clip1bitmap, 0, 0, 0, 0);
 }
-void BitmapOutputDev::clearBoolPolyDev()
+void BitmapOutputDev::clearBoolPolyDev(int x1, int y1, int x2, int y2)
 {
-    clearBooleanDev(boolpolydev);
+    clearBooleanBitmap(boolpolybitmap, x1, y1, x2, y2);
 }
-void BitmapOutputDev::clearBoolTextDev()
+void BitmapOutputDev::clearBoolTextDev(int x1, int y1, int x2, int y2)
 {
-    clearBooleanDev(booltextdev);
+    clearBooleanBitmap(booltextbitmap, x1, y1, x2, y2);
 }
 void BitmapOutputDev::drawChar(GfxState *state, double x, double y,
 		      double dx, double dy,
 		      double originX, double originY,
 		      CharCode code, int nBytes, Unicode *u, int uLen)
 {
-    msg("<verbose> drawChar");
-    if(this->config_bitmapfonts || (state->getRender()&4) /*clip*/ ) {
+    msg("<debug> drawChar render=%d", state->getRender());
+
+    if(state->getRender()&RENDER_CLIP) {
+	//char is just a clipping boundary
+	rgbdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
+        boolpolydev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
+        booltextdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
+        clip1dev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
+    } else if(rgbbitmap != rgbdev->getBitmap()) {
+	// we're doing softmasking or transparency grouping
+	boolpolydev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
+	checkNewBitmap(UNKNOWN_BOUNDING_BOX);
 	rgbdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
     } else {
+	// we're drawing a regular char
 	clearClips();
 	clip0dev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
 	clip1dev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
+   
+	/* calculate the bbox of this character */
+	int x1 = (int)x, x2 = (int)x+1, y1 = (int)y, y2 = (int)y+1;
+	SplashPath*path = clip0dev->getCurrentFont()->getGlyphPath(code);
+	int t;
+	for(t=0;t<path->getLength();t++) {
+	    double xx,yy;
+	    Guchar f;
+	    path->getPoint(t,&xx,&yy,&f);
+	    xx+=x;
+	    yy+=y;
+	    if(xx<x1) x1=(int)xx;
+	    if(yy<y1) y1=(int)yy;
+	    if(xx>x2) x2=(int)xx+1;
+	    if(yy>y2) y2=(int)yy+1;
+	}
 
 	/* if this character is affected somehow by the various clippings (i.e., it looks
 	   different on a device without clipping), then draw it on the bitmap, not as
 	   text */
-	if(clip0and1differ()) {
+	if(clip0and1differ(x1,y1,x2,y2)) {
 	    msg("<verbose> Char %d is affected by clipping", code);
 	    boolpolydev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
-	    checkNewBitmap();
+	    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
 	    rgbdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
 	    if(config_extrafontdata) {
 		int oldrender = state->getRender();
@@ -1124,7 +1295,7 @@ void BitmapOutputDev::drawChar(GfxState *state, double x, double y,
 	    /* this char is not at all affected by clipping. 
 	       Now just dump out the bitmap we're currently working on, if necessary. */
 	    booltextdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
-	    checkNewText();
+	    checkNewText(x1,y1,x2,y2);
 	    /* use polygonal output device to do the actual text handling */
 	    gfxdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
 	}
@@ -1134,29 +1305,21 @@ void BitmapOutputDev::drawString(GfxState *state, GString *s)
 {
     msg("<error> internal error: drawString not implemented");
     return;
-    if(this->config_bitmapfonts) {
-	rgbdev->drawString(state, s);
-	clip0dev->drawString(state, s);
-	clip1dev->drawString(state, s);
-    } else {
-	booltextdev->drawString(state, s);
-	gfxdev->drawString(state, s);
-    }
+    clip0dev->drawString(state, s);
+    clip1dev->drawString(state, s);
+    booltextdev->drawString(state, s);
+    gfxdev->drawString(state, s);
 }
 void BitmapOutputDev::endTextObject(GfxState *state)
 {
-    /* FIXME: the below might render things (stroke outlines etc.) to gfxdev which
-              might end up unflushed- should be handled similarily as
-	      drawChar() above
-     */
-    msg("<verbose> endTextObject");
-    if(this->config_bitmapfonts) {
-	rgbdev->endTextObject(state);
-	clip0dev->endTextObject(state);
-	clip1dev->endTextObject(state);
-    } else {
-	gfxdev->endType3Char(state);
-    }
+    msg("<debug> endTextObject");
+    rgbdev->endTextObject(state);
+    clip0dev->endTextObject(state);
+    clip1dev->endTextObject(state);
+    booltextdev->endTextObject(state);
+    /* TODO: do this only if rendermode!=0 */
+    checkNewText(UNKNOWN_BOUNDING_BOX);
+    gfxdev->endTextObject(state);
 }
 
 /* TODO: these four operations below *should* do nothing, as type3
@@ -1165,59 +1328,87 @@ GBool BitmapOutputDev::beginType3Char(GfxState *state, double x, double y,
 			     double dx, double dy,
 			     CharCode code, Unicode *u, int uLen)
 {
-    msg("<verbose> beginType3Char");
-    if(this->config_bitmapfonts) {
-	return rgbdev->beginType3Char(state, x, y, dx, dy, code, u, uLen);
-    } else {
-	/* call gfxdev so that it can generate "invisible" characters
-	   on top of the actual graphic content, for text extraction */
-	return gfxdev->beginType3Char(state, x, y, dx, dy, code, u, uLen);
-    }
+    msg("<debug> beginType3Char");
+    /* call gfxdev so that it can generate "invisible" characters
+       on top of the actual graphic content, for text extraction */
+    return gfxdev->beginType3Char(state, x, y, dx, dy, code, u, uLen);
 }
 void BitmapOutputDev::type3D0(GfxState *state, double wx, double wy)
 {
-    msg("<verbose> type3D0");
-    if(this->config_bitmapfonts) {
-	rgbdev->type3D0(state, wx, wy);
-    } else {
-	return gfxdev->type3D0(state, wx, wy);
-    }
+    msg("<debug> type3D0");
+    return gfxdev->type3D0(state, wx, wy);
 }
 void BitmapOutputDev::type3D1(GfxState *state, double wx, double wy, double llx, double lly, double urx, double ury)
 {
-    msg("<verbose> type3D1");
-    if(this->config_bitmapfonts) {
-	rgbdev->type3D1(state, wx, wy, llx, lly, urx, ury);
-    } else {
-	return gfxdev->type3D1(state, wx, wy, llx, lly, urx, ury);
-    }
+    msg("<debug> type3D1");
+    return gfxdev->type3D1(state, wx, wy, llx, lly, urx, ury);
 }
 void BitmapOutputDev::endType3Char(GfxState *state)
 {
-    msg("<verbose> endType3Char");
-    if(this->config_bitmapfonts) {
-	rgbdev->endType3Char(state);
-    } else {
-	gfxdev->endType3Char(state);
+    msg("<debug> endType3Char");
+    gfxdev->endType3Char(state);
+}
+
+class CopyStream: public Object
+{
+    Dict*dict;
+    char*buf;
+    MemStream*memstream;
+    public:
+    CopyStream(Stream*str, int len)
+    {
+	buf = 0;
+	str->reset();
+	if(len) {
+	    buf = (char*)malloc(len);
+	    int t;
+	    for (t=0; t<len; t++)
+	      buf[t] = str->getChar();
+	}
+	str->close();
+	this->dict = str->getDict();
+	this->memstream = new MemStream(buf, 0, len, this);
     }
-}
+    ~CopyStream() 
+    {
+	::free(this->buf);this->buf = 0;
+	delete this->memstream;
+    }
+    Dict* getDict() {return dict;}
+    Stream* getStream() {return this->memstream;};
+};
+
 void BitmapOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
 			   int width, int height, GBool invert,
 			   GBool inlineImg)
 {
-    msg("<verbose> drawImageMask");
+    msg("<debug> drawImageMask streamkind=%d", str->getKind());
+    CopyStream*cpystr = 0;
+    if(inlineImg) {
+	cpystr = new CopyStream(str, height * ((width + 7) / 8));
+	str = cpystr->getStream();
+    }
     boolpolydev->drawImageMask(state, ref, str, width, height, invert, inlineImg);
-    checkNewBitmap();
+    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     rgbdev->drawImageMask(state, ref, str, width, height, invert, inlineImg);
+    if(cpystr)
+	delete cpystr;
 }
 void BitmapOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
 		       int width, int height, GfxImageColorMap *colorMap,
 		       int *maskColors, GBool inlineImg)
 {
-    msg("<verbose> drawImage");
+    msg("<debug> drawImage streamkind=%d", str->getKind());
+    CopyStream*cpystr = 0;
+    if(inlineImg) {
+	cpystr = new CopyStream(str, height * ((width * colorMap->getNumPixelComps() * colorMap->getBits() + 7) / 8));
+	str = cpystr->getStream();
+    }
     boolpolydev->drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
-    checkNewBitmap();
+    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     rgbdev->drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
+    if(cpystr)
+	delete cpystr;
 }
 void BitmapOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,
 			     int width, int height,
@@ -1225,9 +1416,9 @@ void BitmapOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,
 			     Stream *maskStr, int maskWidth, int maskHeight,
 			     GBool maskInvert)
 {
-    msg("<verbose> drawMaskedImage");
+    msg("<debug> drawMaskedImage streamkind=%d", str->getKind());
     boolpolydev->drawMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskInvert);
-    checkNewBitmap();
+    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     rgbdev->drawMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskInvert);
 }
 void BitmapOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
@@ -1237,22 +1428,22 @@ void BitmapOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *
 				 int maskWidth, int maskHeight,
 				 GfxImageColorMap *maskColorMap)
 {
-    msg("<verbose> drawSoftMaskedImage");
+    msg("<debug> drawSoftMaskedImage %dx%d (%dx%d) streamkind=%d", width, height, maskWidth, maskHeight, str->getKind());
     boolpolydev->drawSoftMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskColorMap);
-    checkNewBitmap();
+    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     rgbdev->drawSoftMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskColorMap);
 }
 void BitmapOutputDev::drawForm(Ref id)
 {
-    msg("<verbose> drawForm");
+    msg("<debug> drawForm");
     boolpolydev->drawForm(id);
-    checkNewBitmap();
+    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     rgbdev->drawForm(id);
 }
 
 void BitmapOutputDev::processLink(Link *link, Catalog *catalog)
 {
-    msg("<verbose> processLink");
+    msg("<debug> processLink");
     gfxdev->processLink(link, catalog);
 }
 
@@ -1261,38 +1452,66 @@ void BitmapOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
 				    GBool isolated, GBool knockout,
 				    GBool forSoftMask)
 {
-    msg("<verbose> beginTransparencyGroup");
-    rgbdev->beginTransparencyGroup(state, bbox, blendingColorSpace, isolated, knockout, forSoftMask);
+    msg("<debug> beginTransparencyGroup");
+#if (xpdfMajorVersion*10000 + xpdfMinorVersion*100 + xpdfUpdateVersion) < 30207
+    GfxState*state1 = state->copy();
+    GfxState*state2 = state->copy();
+    state1->setPath(0);
+    state1->setPath(state->getPath()->copy());
+    state2->setPath(0);
+    state2->setPath(state->getPath()->copy());
+#else
+    GfxState*state1 = state->copy(gTrue);
+    GfxState*state2 = state->copy(gTrue);
+#endif
+    boolpolydev->beginTransparencyGroup(state1, bbox, blendingColorSpace, isolated, knockout, forSoftMask);
+    rgbdev->beginTransparencyGroup(state2, bbox, blendingColorSpace, isolated, knockout, forSoftMask);
     clip1dev->beginTransparencyGroup(state, bbox, blendingColorSpace, isolated, knockout, forSoftMask);
+    delete state1;
+    delete state2;
 }
 void BitmapOutputDev::endTransparencyGroup(GfxState *state)
 {
-    msg("<verbose> endTransparencyGroup");
-    boolpolydev->endTransparencyGroup(state);
-    checkNewBitmap();
-    rgbdev->endTransparencyGroup(state);
+    msg("<debug> endTransparencyGroup");
+#if (xpdfMajorVersion*10000 + xpdfMinorVersion*100 + xpdfUpdateVersion) < 30207
+    GfxState*state1 = state->copy();
+    GfxState*state2 = state->copy();
+    state1->setPath(0);
+    state1->setPath(state->getPath()->copy());
+    state2->setPath(0);
+    state2->setPath(state->getPath()->copy());
+#else
+    GfxState*state1 = state->copy(gTrue);
+    GfxState*state2 = state->copy(gTrue);
+#endif
+    boolpolydev->endTransparencyGroup(state1);
+    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+    rgbdev->endTransparencyGroup(state2);
+    delete state1;
+    delete state2;
     clip1dev->endTransparencyGroup(state);
 }
 void BitmapOutputDev::paintTransparencyGroup(GfxState *state, double *bbox)
 {
-    msg("<verbose> paintTransparencyGroup");
+    msg("<debug> paintTransparencyGroup");
     boolpolydev->paintTransparencyGroup(state,bbox);
-    checkNewBitmap();
+    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     rgbdev->paintTransparencyGroup(state,bbox);
+    clip1dev->paintTransparencyGroup(state,bbox);
 }
 void BitmapOutputDev::setSoftMask(GfxState *state, double *bbox, GBool alpha, Function *transferFunc, GfxColor *backdropColor)
 {
-    msg("<verbose> setSoftMask");
+    msg("<debug> setSoftMask");
     boolpolydev->setSoftMask(state, bbox, alpha, transferFunc, backdropColor);
-    checkNewBitmap();
+    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     rgbdev->setSoftMask(state, bbox, alpha, transferFunc, backdropColor);
     clip1dev->setSoftMask(state, bbox, alpha, transferFunc, backdropColor);
 }
 void BitmapOutputDev::clearSoftMask(GfxState *state)
 {
-    msg("<verbose> clearSoftMask");
+    msg("<debug> clearSoftMask");
     boolpolydev->clearSoftMask(state);
-    checkNewBitmap();
+    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     rgbdev->clearSoftMask(state);
     clip1dev->clearSoftMask(state);
 }