X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2FBitmapOutputDev.cc;h=9e8123b10f4cb04c13a86f697dfee7a2eb4309ea;hp=5292f1a726e12a6c33fe5ea491360a2f82178e43;hb=0e7d4e61b7bcef123fd8212884bda5dbd3440316;hpb=52b159e163d2489db8aceb43a823d1d6bfc9b94e

diff --git a/lib/pdf/BitmapOutputDev.cc b/lib/pdf/BitmapOutputDev.cc
index 5292f1a..9e8123b 100644
--- a/lib/pdf/BitmapOutputDev.cc
+++ b/lib/pdf/BitmapOutputDev.cc
@@ -29,6 +29,8 @@
 #include "../log.h"
 #include "../png.h"
 #include "../devices/record.h"
+#include "../types.h"
+#include "bbox.h"
 
 #define UNKNOWN_BOUNDING_BOX 0,0,0,0
 
@@ -52,7 +54,7 @@ BitmapOutputDev::BitmapOutputDev(InfoOutputDev*info, PDFDoc*doc)
     this->rgbdev = new SplashOutputDev(splashModeRGB8, 1, gFalse, splash_white, gTrue, gTrue);
   
     /* color mode for binary bitmaps */
-    SplashColorMode colorMode = splashModeMono8;
+    SplashColorMode colorMode = splashModeMono1;
 
     /* two devices for testing things against clipping: one clips, the other doesn't */
     this->clip0dev = new SplashOutputDev(colorMode, 1, gFalse, splash_black, gTrue, gFalse);
@@ -73,7 +75,7 @@ BitmapOutputDev::BitmapOutputDev(InfoOutputDev*info, PDFDoc*doc)
     this->clip1dev->startDoc(this->xref);
 
     this->gfxoutput = (gfxdevice_t*)malloc(sizeof(gfxdevice_t));
-    gfxdevice_record_init(this->gfxoutput);
+    gfxdevice_record_init(this->gfxoutput, 0);
 
     this->gfxdev->setDevice(this->gfxoutput);
     
@@ -101,6 +103,12 @@ BitmapOutputDev::~BitmapOutputDev()
     if(this->boolpolydev) {
 	delete this->boolpolydev;this->boolpolydev = 0;
     }
+    if(this->stalepolybitmap) {
+	delete this->stalepolybitmap;this->stalepolybitmap = 0;
+    }
+    if(this->staletextbitmap) {
+	delete this->staletextbitmap;this->staletextbitmap = 0;
+    }
     if(this->booltextdev) {
 	delete this->booltextdev;this->booltextdev = 0;
     }
@@ -152,146 +160,186 @@ void BitmapOutputDev::setParameter(const char*key, const char*value)
     }
     this->gfxdev->setParameter(key, value);
 }
-void BitmapOutputDev::preparePage(int pdfpage, int outputpage)
+void BitmapOutputDev::setPageMap(int*page2page, int num_pages)
 {
+    this->gfxdev->setPageMap(page2page, num_pages);
 }
 
-static void getBitmapBBox(Guchar*alpha, int width, int height, int*xmin, int*ymin, int*xmax, int*ymax)
-{
-    *ymin = -1;
-    *xmin = width;
-    *xmax = 0;
-    int x,y;
-    for(y=0;y<height;y++) {
-	Guchar*a = &alpha[y*width];
-	for(x=0;x<width;x++) {
-	    if(a[x]) break;
-	}
-	int left = x; //first occupied pixel from left
-	int right = x+1; //last non-occupied pixel from right
-	for(;x<width;x++) {
-	    if(a[x]) right=x+1;
-	}
+void writeBitmap(SplashBitmap*bitmap, char*filename);
+void writeAlpha(SplashBitmap*bitmap, char*filename);
 
-	if(left!=width) {
-	    if(*ymin<0) 
-		*ymin=y;
-	    *ymax=y+1;
-	    if(left<*xmin) *xmin = left;
-	    if(right>*xmax) *xmax = right;
-	}
-    }
-    if(*xmin>=*xmax || *ymin>=*ymax) {
-	*xmin = 0;
-	*ymin = 0;
-	*xmax = 0;
-	*ymax = 0;
-    }
-}
+static int dbg_btm_counter=1;
 
 void BitmapOutputDev::flushBitmap()
 {
     int width = rgbdev->getBitmapWidth();
     int height = rgbdev->getBitmapHeight();
-    
-    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);
-
-    /* clip against (-movex, -movey, -movex+width, -movey+height) */
-    if(xmin < -this->movex) xmin = -this->movex;
-    if(ymin < -this->movey) ymin = -this->movey;
-    if(xmax > -this->movex + width) xmax = -this->movex+this->width;
-    if(ymax > -this->movey + height) ymax = -this->movey+this->height;
-
-    msg("<verbose> Flushing bitmap (bbox: %d,%d,%d,%d)", xmin,ymin,xmax,ymax);
-    
-    if((xmax-xmin)<=0 || (ymax-ymin)<=0) // no bitmap, nothing to do
-	return;
 
     if(sizeof(SplashColor)!=3) {
 	msg("<error> sizeof(SplashColor)!=3");
 	return;
     }
-    //xmin = ymin = 0;
-    //xmax = width;
-    //ymax = height;
+
+    /*static int counter=0;
+    if(!counter) {
+	writeBitmap(rgbdev->getBitmap(), "test.png");
+    } counter++;*/
     
-    int rangex = xmax-xmin;
-    int rangey = ymax-ymin;
-    gfximage_t*img = (gfximage_t*)malloc(sizeof(gfximage_t)); 
-    img->data = (gfxcolor_t*)malloc(rangex * rangey * 4);
-    img->width = rangex;
-    img->height = rangey;
-    int x,y;
-    for(y=0;y<rangey;y++) {
-	SplashColorPtr in=&rgb[((y+ymin)*width+xmin)*sizeof(SplashColor)];
-	gfxcolor_t*out = &img->data[y*rangex];
-	Guchar*ain = &alpha[(y+ymin)*width+xmin];
-	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];
+    /*static int counter=0;
+    char filename[160];
+    sprintf(filename, "test%d.png", counter++);
+    writeBitmap(rgbbitmap, filename);*/
+    
+    SplashColorPtr rgb = rgbbitmap->getDataPtr();
+    Guchar*alpha = rgbbitmap->getAlphaPtr();
+    
+    Guchar*alpha2 = stalepolybitmap->getDataPtr();
+    int width8 = (stalepolybitmap->getWidth()+7)/8;
+
+    /*char filename[80];
+    sprintf(filename, "flush%d_mask.png", dbg_btm_counter);
+    writeAlpha(stalepolybitmap, filename);
+    sprintf(filename, "flush%d_alpha.png", dbg_btm_counter);
+    writeAlpha(rgbbitmap, filename);
+    sprintf(filename, "flush%d_bitmap.png", dbg_btm_counter);
+    writeBitmap(rgbbitmap, filename);*/
+
+    ibbox_t* boxes = get_bitmap_bboxes((unsigned char*)alpha, width, height);
+    ibbox_t*b;
+
+    for(b=boxes;b;b=b->next) {
+	int xmin = b->xmin;
+	int ymin = b->ymin;
+	int xmax = b->xmax;
+	int ymax = b->ymax;
+
+	/* clip against (-movex, -movey, -movex+width, -movey+height) */
+
+	msg("<verbose> Flushing bitmap (bbox: %d,%d,%d,%d %dx%d) (clipped against %d,%d,%d,%d)", xmin,ymin,xmax,ymax, xmax-xmin, ymax-ymin,
+		-this->movex, -this->movey, -this->movex+this->width, -this->movey+this->height);
+
+	if(xmin < -this->movex) {
+	    xmin = -this->movex;
+	    if(xmax < -this->movex) continue;
+	}
+	if(ymin < -this->movey) {
+	    ymin = -this->movey;
+	    if(ymax < -this->movey) continue;
+	}
+	if(xmax >= -this->movex + this->width) {
+	    xmax = -this->movex+this->width;
+	    if(xmin >= -this->movex + this->width) continue;
+	}
+	if(ymax >= -this->movey + this->height) {
+	    ymax = -this->movey+this->height;
+	    if(ymin >= -this->movey + this->height) continue;
+	}
+	
+	if((xmax-xmin)<=0 || (ymax-ymin)<=0) // no bitmap, nothing to do
+	    continue;
+
+	int rangex = xmax-xmin;
+	int rangey = ymax-ymin;
+	gfximage_t*img = (gfximage_t*)malloc(sizeof(gfximage_t)); 
+	img->data = (gfxcolor_t*)malloc(rangex * rangey * 4);
+	img->width = rangex;
+	img->height = rangey;
+	int x,y;
+	for(y=0;y<rangey;y++) {
+	    SplashColorPtr in=&rgb[((y+ymin)*width+xmin)*sizeof(SplashColor)];
+	    gfxcolor_t*out = &img->data[y*rangex];
+	    Guchar*ain = &alpha[(y+ymin)*width+xmin];
+	    Guchar*ain2 = &alpha2[(y+ymin)*width8];
+	    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+xmin)/8]&(0x80>>((x+xmin)&7)))) {
+			/* cut away pixels that we don't remember drawing (i.e., that are
+			   not in the monochrome bitmap). Prevents some "hairlines" showing
+			   up to the left and right of bitmaps. */
+			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, this
+			   data has non-premultiplied alpha, which is exactly what the output device 
+			   expects, so don't premultiply it here, either.
+			*/
+			out[x].r = in[x*3+0];
+			out[x].g = in[x*3+1];
+			out[x].b = in[x*3+2];
+			out[x].a = ain[x];
+		    }
+		}
 	    }
 	}
+
+	/* transform bitmap rectangle to "device space" */
+	xmin += movex;
+	ymin += movey;
+	xmax += movex;
+	ymax += movey;
+
+	gfxmatrix_t m;
+	m.tx = xmin;
+	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);
+    
+	free(img->data);img->data=0;free(img);img=0;
     }
-    /* transform bitmap rectangle to "device space" */
-    xmin += movex;
-    ymin += movey;
-    xmax += movex;
-    ymax += movey;
-
-    gfxmatrix_t m;
-    m.tx = xmin;
-    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);
+    ibbox_destroy(boxes);
 
     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");
+    msg("<verbose> Flushing text");
     gfxdevice_record_flush(this->gfxoutput, this->dev);
     
     this->emptypage = 0;
 }
 
+void writeMonoBitmap(SplashBitmap*btm, char*filename)
+{
+    int width8 = (btm->getWidth()+7)/8;
+    int width = btm->getWidth();
+    int height = btm->getHeight();
+    gfxcolor_t*b = (gfxcolor_t*)malloc(sizeof(gfxcolor_t)*width*height);
+    unsigned char*data = btm->getDataPtr();
+    int x,y;
+    for(y=0;y<height;y++) {
+        unsigned char*l = &data[width8*y];
+        gfxcolor_t*d = &b[width*y];
+        for(x=0;x<width;x++) {
+            if(l[x>>3]&(128>>(x&7))) {
+                d[x].r = d[x].b = d[x].a = 255;
+		d[x].g = 0;
+            } else {
+                d[x].r = d[x].g = d[x].b = d[x].a = 0;
+            }
+        }
+    }
+    writePNG(filename, (unsigned char*)b, width, height);
+    free(b);
+}
+
 void writeBitmap(SplashBitmap*bitmap, char*filename)
 {
     int y,x;
@@ -301,16 +349,20 @@ void writeBitmap(SplashBitmap*bitmap, char*filename)
 
     gfxcolor_t*data = (gfxcolor_t*)malloc(sizeof(gfxcolor_t)*width*height);
 
+    if(bitmap->getMode()==splashModeMono1) {
+        writeMonoBitmap(bitmap, filename);
+        return;
+    }
+
     for(y=0;y<height;y++) {
 	gfxcolor_t*line = &data[y*width];
 	for(x=0;x<width;x++) {
-            Guchar c[4];
+            Guchar c[4] = {0,0,0,0};
 	    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;
+	    line[x].a =  bitmap->getAlpha(x,y);
 	}
     }
     writePNG(filename, (unsigned char*)data, width, height);
@@ -323,6 +375,11 @@ void writeAlpha(SplashBitmap*bitmap, char*filename)
     
     int width = bitmap->getWidth();
     int height = bitmap->getHeight();
+    
+    if(bitmap->getMode()==splashModeMono1) {
+        writeMonoBitmap(bitmap, filename);
+        return;
+    }
 
     gfxcolor_t*data = (gfxcolor_t*)malloc(sizeof(gfxcolor_t)*width*height);
 
@@ -331,15 +388,14 @@ void writeAlpha(SplashBitmap*bitmap, char*filename)
 	for(x=0;x<width;x++) {
 	    int a = bitmap->getAlpha(x,y);
 	    line[x].r = a;
-	    line[x].g = a;
+	    line[x].g = 0;
 	    line[x].b = a;
-	    line[x].a = 255;
+	    line[x].a = a;
 	}
     }
     writePNG(filename, (unsigned char*)data, width, height);
     free(data);
 }
-static int dbg_btm_counter=1;
 
 static const char*STATE_NAME[] = {"parallel", "textabovebitmap", "bitmapabovetext"};
 
@@ -375,36 +431,140 @@ int checkAlphaSanity(SplashBitmap*boolbtm, SplashBitmap*alphabtm)
     return 1;
 }
 
-GBool BitmapOutputDev::checkNewText(int x1, int y1, int x2, int y2)
+static inline GBool fixBBox(int*x1, int*y1, int*x2, int*y2, int width, int height)
 {
-    /* called once some new text was drawn on booltextdev, and
-       before the same thing is drawn on gfxdev */
-   
-    msg("<trace> Testing new text data against current bitmap data, state=%s, counter=%d\n", STATE_NAME[layerstate], dbg_btm_counter);
+    if(!(*x1|*y1|*x2|*y2)) {
+        // undefined bbox
+        *x1 = *y1 = 0;
+        *x2 = width;
+        *y2 = height;
+        return gTrue;
+    }
+    if(*x2<=*x1) return gFalse;
+    if(*x2<0) return gFalse;
+    if(*x1<0) *x1 = 0;
+    if(*x1>=width) return gFalse;
+    if(*x2>width) *x2=width;
+
+    if(*y2<=*y1) return gFalse;
+    if(*y2<0) return gFalse;
+    if(*y1<0) *y1 = 0;
+    if(*y1>=height) return gFalse;
+    if(*y2>height) *y2=height;
+    return gTrue;
+}
+
+static void update_bitmap(SplashBitmap*bitmap, SplashBitmap*update, int x1, int y1, int x2, int y2, char overwrite)
+{
+    assert(bitmap->getMode()==splashModeMono1);
+    assert(update->getMode()==splashModeMono1);
+
+    int width8 = (bitmap->getWidth()+7)/8;
+    assert(width8 == bitmap->getRowSize());
+    assert(width8 == update->getRowSize());
+    int height = bitmap->getHeight();
+    assert(height == update->getHeight());
+
+    if(!fixBBox(&x1, &y1, &x2, &y2, bitmap->getWidth(), bitmap->getHeight()))
+	return;
+    
+    Guchar*b = bitmap->getDataPtr() + y1*width8 + x1/8;
+    Guchar*u = update->getDataPtr() + y1*width8 + x1/8;
+    int yspan = y2-y1;
+    int xspan = (x2+7)/8 - x1/8;
+    int size = (y2-y1)*width8;
+
+    if(overwrite) {
+	int y;
+	for(y=0;y<yspan;y++) {
+	    memcpy(b, u, xspan);
+	    b += width8;
+	    u += width8;
+	}
+    } else {
+	if(((ptroff_t)b&7)==((ptroff_t)u&7)) {
+	    int x,y;
+	    for(y=0;y<yspan;y++) {
+		Guchar*e1 = b+xspan-8;
+		Guchar*e2 = b+xspan;
+		while(((ptroff_t)b&7) && b<e1) {
+		    *b |= *u;
+		    b++;u++;
+		}
+		while(b<e1) {
+		    *(long long*)b |= *(long long*)u;
+		    b+=8;u+=8;
+		}
+		while(b<e2) {
+		    *b |= *u;
+		    b++;u++;
+		}
+		b += width8-xspan;
+		u += width8-xspan;
+	    }
+	} else {
+	    int x,y;
+	    for(y=0;y<yspan;y++) {
+		for(x=0;x<xspan;x++) {
+		    b[x] |= u[x];
+		}
+		b += width8;
+		u += width8;
+	    }
+	}
+    }
+}
+
+static void clearBooleanBitmap(SplashBitmap*btm, int x1, int y1, int x2, int y2)
+{
+    if(!fixBBox(&x1, &y1, &x2, &y2, btm->getWidth(), btm->getHeight()))
+	return;
     
-    char filename1[80];
-    char filename2[80];
-    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(btm->getMode()==splashModeMono1) {
+	int width8 = (btm->getWidth()+7)/8;
+	assert(width8 == btm->getRowSize());
+	int width = btm->getWidth();
+	int height = btm->getHeight();
+	Guchar*data = btm->getDataPtr();
+	memset(data+y1*width8, 0, width8*(y2-y1));
+    } else {
+	int width = btm->getAlphaRowSize();
+	int height = btm->getHeight();
+	memset(btm->getAlphaPtr(), 0, width*height);
+    }
+}
+
+void BitmapOutputDev::dbg_newdata(char*newdata)
+{
     if(0) {
+        char filename1[80];
+        char filename2[80];
+        char filename3[80];
+        sprintf(filename1, "state%03dboolbitmap_after%s.png", dbg_btm_counter, newdata);
+        sprintf(filename2, "state%03dbooltext_after%s.png", dbg_btm_counter, newdata);
+        sprintf(filename3, "state%03dbitmap_after%s.png", dbg_btm_counter, newdata);
         msg("<verbose> %s %s %s", filename1, filename2, filename3);
-	writeAlpha(boolpolybitmap, filename1);
+	writeAlpha(stalepolybitmap, filename1);
 	writeAlpha(booltextbitmap, filename2);
 	writeBitmap(rgbdev->getBitmap(), filename3);
     }
     dbg_btm_counter++;
+}
 
+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("<trace> Testing new text data against current bitmap data, state=%s, counter=%d\n", STATE_NAME[layerstate], dbg_btm_counter);
+    
     GBool ret = false;
-    if(intersection(x1,y1,x2,y2)) {
+    if(intersection(booltextbitmap, stalepolybitmap, 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 */
+	    /* the new text is above the bitmap. So record that fact. */
 	    msg("<verbose> Text is above current bitmap/polygon data");
 	    layerstate=STATE_TEXT_IS_ABOVE;
-	    clearBoolPolyDev(x1,y1,x2,y2);
+	    update_bitmap(staletextbitmap, booltextbitmap, x1, y1, x2, y2, 0);
 	} 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*
@@ -413,70 +573,57 @@ GBool BitmapOutputDev::checkNewText(int x1, int y1, int x2, int y2)
 	    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(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);
+	   
+	    clearBoolTextDev();
+	    /* re-apply the update (which we would otherwise lose) */
+	    update_bitmap(staletextbitmap, booltextbitmap, x1, y1, x2, y2, 1);
             ret = true;
 	} else {
 	    /* we already know that the current text section is
 	       above the current bitmap section- now just new
 	       bitmap data *and* new text data was drawn, and
-	       *again* it's above the current bitmap- so clear
-	       the polygon bitmap again, so we can check for
-	       new intersections */
+	       *again* it's above the current bitmap. */
 	    msg("<verbose> Text is still above current bitmap/polygon data");
-	    clearBoolPolyDev(x1,y1,x2,y2);
+	    update_bitmap(staletextbitmap, booltextbitmap, x1, y1, x2, y2, 0);
 	}
-    } 
+    }  else {
+	update_bitmap(staletextbitmap, booltextbitmap, x1, y1, x2, y2, 0);
+    }
+    
+    /* clear the thing we just drew from our temporary drawing bitmap */
+    clearBooleanBitmap(booltextbitmap, x1, y1, x2, y2);
+
     return ret;
 }
-
 GBool BitmapOutputDev::checkNewBitmap(int x1, int y1, int x2, int y2)
 {
     /* similar to checkNewText() above, only in reverse */
     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];
-    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++;
-
     GBool ret = false;
-    if(intersection(x1,y1,x2,y2)) {
+    if(intersection(boolpolybitmap, staletextbitmap, x1,y1,x2,y2)) {
 	if(layerstate==STATE_PARALLEL) {
 	    msg("<verbose> Bitmap is above current text data");
 	    layerstate=STATE_BITMAP_IS_ABOVE;
-	    clearBoolTextDev(x1,y1,x2,y2);
+	    update_bitmap(stalepolybitmap, boolpolybitmap, x1, y1, x2, y2, 0);
 	} 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(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);
+	    clearBoolPolyDev();
+	    update_bitmap(stalepolybitmap, boolpolybitmap, x1, y1, x2, y2, 1);
             ret = true;
 	} else {
 	    msg("<verbose> Bitmap is still above current text data");
-	    clearBoolTextDev(x1,y1,x2,y2);
+	    update_bitmap(stalepolybitmap, boolpolybitmap, x1, y1, x2, y2, 0);
 	}
-    } 
+    }  else {
+	update_bitmap(stalepolybitmap, boolpolybitmap, x1, y1, x2, y2, 0);
+    }
+    
+    /* clear the thing we just drew from our temporary drawing bitmap */
+    clearBooleanBitmap(boolpolybitmap, x1, y1, x2, y2);
+
     return ret;
 }
 
@@ -501,41 +648,27 @@ GBool BitmapOutputDev::checkNewBitmap(int x1, int y1, int x2, int y2)
 GBool BitmapOutputDev::clip0and1differ(int x1,int y1,int x2,int y2)
 {
     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();
+        int width = clip0bitmap->getWidth();
+	int width8 = (width+7)/8;
+	int height = clip0bitmap->getHeight();
+
+        if(!fixBBox(&x1,&y1,&x2,&y2,width,height)) {
+            /* area is outside or null */
+            return gFalse;
+        }
 	
 	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))
+	    unsigned char*row2 = &clip1bitmap->getDataPtr()[width8*y+x18];
+	    if(memcmp(row1, row2, x28-x18)) {
 		return gTrue;
+            }
 	}
 	return gFalse;
     } else {
@@ -543,107 +676,164 @@ GBool BitmapOutputDev::clip0and1differ(int x1,int y1,int x2,int y2)
 	SplashBitmap*clip1 = clip1bitmap;
 	int width = clip0->getAlphaRowSize();
 	int height = clip0->getHeight();
-	return memcmp(clip0->getAlphaPtr(), clip1->getAlphaPtr(), width*height);
+
+        if(!fixBBox(&x1, &y1, &x2, &y2, width, height)) {
+            x1=y1=0;x2=y2=1;
+        }
+
+        Guchar*a0 = clip0->getAlphaPtr();
+        Guchar*a1 = clip1->getAlphaPtr();
+        int x,y;
+        char differs=0;
+        for(y=y1;y<y2;y++) {
+            for(x=x1;x<x2;x++) {
+                if(a0[y*width+x]!=a1[y*width+x]) {
+                    differs=1;
+                    break;
+                }
+            }
+            if(differs)
+                break;
+        }
+	char differs2 = memcmp(a0, a1, width*height);
+        if(differs && !differs2) 
+            msg("<warning> Strange internal error (2)");
+        else if(!differs && differs2) {
+            msg("<warning> Bad Bounding Box: Difference in clip0 and clip1 outside bbox");
+            msg("<warning> %d %d %d %d", x1, y1, x2, y2);
+        }
+        return differs2;
     }
 }
 
-static void clearBooleanBitmap(SplashBitmap*btm, int x1, int y1, int x2, int y2)
+GBool compare8(unsigned char*data1, unsigned char*data2, int len)
 {
-    if(!(x1|y1|x2|y2)) {
-        x1 = y1 = 0;
-        x2 = btm->getWidth();
-        y2 = btm->getHeight();
+    if(!len)
+        return 0;
+    if(((ptroff_t)data1&7)==((ptroff_t)data2&7)) {
+        // oh good, we can align both to 8 byte
+        while((ptroff_t)data1&7) {
+            if(*data1&*data2)
+                return 1;
+            data1++;
+            data2++;
+            if(!--len)
+                return 0;
+        }
     }
-    if(btm->getMode()==splashModeMono1) {
-	int width8 = (btm->getWidth()+7)/8;
-	int width = btm->getWidth();
-	int height = btm->getHeight();
-	memset(btm->getDataPtr(), 0, width8*height);
-    } else {
-	int width = btm->getAlphaRowSize();
-	int height = btm->getHeight();
-	memset(btm->getAlphaPtr(), 0, width*height);
+    /* use 64 bit for the (hopefully aligned) middle section */
+    int l8 = len/8;
+    long long unsigned int*d1 = (long long unsigned int*)data1;
+    long long unsigned int*d2 = (long long unsigned int*)data2;
+    long long unsigned int x = 0;
+    int t;
+    for(t=0;t<l8;t++) {
+        x |= d1[t]&d2[t];
     }
-}
+    if(x)
+        return 1;
 
-long long unsigned int compare64(long long unsigned int*data1, long long unsigned int*data2, int len)
-{
-    long long unsigned int c;
-    int t;
+    data1+=l8*8;
+    data2+=l8*8;
+    len -= l8*8;
     for(t=0;t<len;t++) {
-        c |= data1[t]&data2[t];
+        if(data1[t]&data2[t]) {
+            return 1;
+        }
     }
-    return c;
+    return 0;
 }
 
-GBool BitmapOutputDev::intersection(int x1, int y1, int x2, int y2)
+GBool BitmapOutputDev::intersection(SplashBitmap*boolpoly, SplashBitmap*booltext, int x1, int y1, int x2, int y2)
 {
-    SplashBitmap*boolpoly = boolpolybitmap;
-    SplashBitmap*booltext = booltextbitmap;
-	
     if(boolpoly->getMode()==splashModeMono1) {
 	/* alternative implementation, using one bit per pixel-
-	   would work if xpdf wouldn't try to dither everything */
+	   needs the no-dither patch in xpdf */
+	
+        int width = boolpoly->getWidth();
+	int height = boolpoly->getHeight();
+
+        if(!fixBBox(&x1,&y1,&x2,&y2, width, height)) {
+            return gFalse;
+        }
 
 	Guchar*polypixels = boolpoly->getDataPtr();
 	Guchar*textpixels = booltext->getDataPtr();
 
-	int width8 = (width+7)/8;
-	int height = boolpoly->getHeight();
+        int width8 = (width+7)/8;
+        int runx = width8;
+        int runy = height;
 	
 	if(x1|y1|x2|y2) {
-	    if(y1>=0 && y1<=y2 && y2<=height) {
-		polypixels+=y1*width8;
-		textpixels+=y1*width8;
-		height=y2-y1;
-	    }
+            polypixels+=y1*width8+x1/8;
+            textpixels+=y1*width8+x1/8;
+            runx=(x2+7)/8 - x1/8;
+            runy=y2-y1;
 	}
 	
 	int t;
-	int len = height*width8;
-	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)
-	    /* if graphic data and the characters overlap, they have common bits */
-	    return gTrue;
-	else
-	    return gFalse;
+	unsigned char c=0;
+        
+        /*assert(sizeof(unsigned long long int)==8);
+        if(((ptroff_t)polypixels&7) || ((ptroff_t)textpixels&7)) {
+            //msg("<warning> Non-optimal alignment");
+        }*/
+
+        int x,y;
+        unsigned char*data1 = (unsigned char*)polypixels;
+        unsigned char*data2 = (unsigned char*)textpixels;
+        msg("<verbose> Testing area (%d,%d,%d,%d), runx=%d,runy=%d", x1,y1,x2,y2, runx, runy);
+        for(y=0;y<runy;y++) {
+            if(compare8(data1,data2,runx))
+                return gTrue;
+            data1+=width8;
+            data2+=width8;
+        }
+        return gFalse;
     } else {
-	Guchar*polypixels = boolpoly->getAlphaPtr();
-	Guchar*textpixels = booltext->getAlphaPtr();
-	
 	int width = boolpoly->getAlphaRowSize();
 	int height = boolpoly->getHeight();
-	
-	int t;
-	int len = height*width;
-	unsigned int c=0;
-	if(len & (sizeof(unsigned int)-1)) {
-	    Guchar c2=0;
-	    for(t=0;t<len;t++) {
-		if(polypixels[t]&&textpixels[t])
-		    return gTrue;
-	    }
-	} else {
-	    len /= sizeof(unsigned int);
-	    for(t=0;t<len;t++) {
-		if((((unsigned int*)polypixels)[t]) & (((unsigned int*)textpixels)[t]))
-		    return gTrue;
-	    }
-	}
-	return gFalse;
+
+        if(!fixBBox(&x1, &y1, &x2, &y2, width, height)) {
+            x1=y1=0;x2=y2=1;
+        }
+	Guchar*polypixels = boolpoly->getAlphaPtr();
+	Guchar*textpixels = booltext->getAlphaPtr();
+
+        int x,y;
+        char overlap1 = 0;
+        char overlap2 = 0;
+        for(x=x1;x<x2;x++) {
+            for(y=y1;y<y2;y++) {
+                if(polypixels[width*y+x]&&textpixels[width*y+x])
+                    overlap1 = 1;
+            }
+        }
+        int ax1=0,ay1=0,ax2=0,ay2=0;
+        for(y=0;y<height;y++) {
+            for(x=0;x<width;x++) {
+                if(polypixels[width*y+x]&&textpixels[width*y+x]) {
+                    overlap2 = 1;
+                    if(!(ax1|ay1|ax2|ay2)) {
+                        ax1 = ax2 = x;
+                        ay1 = ay2 = y;
+                    } else {
+                        ax1 = ax1<x?ax1:x;
+                        ay1 = ay1<y?ay1:y;
+                        ax2 = ax2>x?ax2:x;
+                        ay2 = ay2>y?ay2:y;
+                    }
+                }
+            }
+        }
+        if(overlap1 && !overlap2)
+            msg("<warning> strange internal error");
+        if(!overlap1 && overlap2) {
+            msg("<warning> Bad bounding box: intersection outside bbox");
+            msg("<warning> given bbox: %d %d %d %d", x1, y1, x2, y2);
+            msg("<warning> changed area: %d %d %d %d", ax1, ay1, ax2, ay2);
+        }
+	return overlap2;
     }
 }
 
@@ -668,7 +858,6 @@ void BitmapOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, do
     this->width = (int)(x2-x1);
     this->height = (int)(y2-y1);
 
-    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);
@@ -677,7 +866,15 @@ void BitmapOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, do
     gfxdev->startPage(pageNum, state, crop_x1, crop_y1, crop_x2, crop_y2);
 
     boolpolybitmap = boolpolydev->getBitmap();
+    stalepolybitmap = new SplashBitmap(boolpolybitmap->getWidth(), boolpolybitmap->getHeight(), 1, boolpolybitmap->getMode(), 0);
+    assert(stalepolybitmap->getRowSize() == boolpolybitmap->getRowSize());
+
     booltextbitmap = booltextdev->getBitmap();
+    staletextbitmap = new SplashBitmap(booltextbitmap->getWidth(), booltextbitmap->getHeight(), 1, booltextbitmap->getMode(), 0);
+    assert(staletextbitmap->getRowSize() == booltextbitmap->getRowSize());
+    
+    msg("<debug> startPage %dx%d (%dx%d)", this->width, this->height, booltextbitmap->getWidth(), booltextbitmap->getHeight());
+
     clip0bitmap = clip0dev->getBitmap();
     clip1bitmap = clip1dev->getBitmap();
     rgbbitmap = rgbdev->getBitmap();
@@ -686,8 +883,8 @@ void BitmapOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, do
 
     /* just in case any device did draw a white background rectangle 
        into the device */
-    clearBoolTextDev(UNKNOWN_BOUNDING_BOX);
-    clearBoolPolyDev(UNKNOWN_BOUNDING_BOX);
+    clearBoolTextDev();
+    clearBoolPolyDev();
 
     this->layerstate = STATE_PARALLEL;
     this->emptypage = 1;
@@ -1088,30 +1285,73 @@ void BitmapOutputDev::updateTextShift(GfxState *state, double shift)
     gfxdev->updateTextShift(state, shift);
 }
 
+double max(double x, double y) 
+{
+    return x>y?x:y;
+}
+double min(double x, double y) 
+{
+    return x<y?x:y;
+}
+
+gfxbbox_t BitmapOutputDev::getBBox(GfxState*state)
+{
+    GfxPath * path = state->getPath();
+    int num = path->getNumSubpaths();
+    gfxbbox_t bbox = {0,0,1,1};
+    char valid=0;
+    int t;
+    for(t = 0; t < num; t++) {
+	GfxSubpath *subpath = path->getSubpath(t);
+	int subnum = subpath->getNumPoints();
+        int s;
+	for(s=0;s<subnum;s++) {
+	   double x,y;
+	   state->transform(subpath->getX(s),subpath->getY(s),&x,&y);
+           if(!valid) {
+               bbox.xmin = x; bbox.ymin = y;
+               bbox.xmax = x; bbox.ymax = y;
+               valid = 1;
+           } else {
+               bbox.xmin = min(bbox.xmin, x);
+               bbox.ymin = min(bbox.ymin, y);
+               bbox.xmax = max(bbox.xmax, x);
+               bbox.ymax = max(bbox.ymax, y);
+           }
+        }
+    }
+    return bbox;
+}
+
 void BitmapOutputDev::stroke(GfxState *state)
 {
     msg("<debug> stroke");
     boolpolydev->stroke(state);
-    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+    gfxbbox_t bbox = getBBox(state);
+    double width = state->getTransformedLineWidth();
+    bbox.xmin -= width; bbox.ymin -= width;
+    bbox.xmax += width; bbox.ymax += width;
+    checkNewBitmap(bbox.xmin, bbox.ymin, ceil(bbox.xmax), ceil(bbox.ymax));
     rgbdev->stroke(state);
+    dbg_newdata("stroke");
 }
 void BitmapOutputDev::fill(GfxState *state)
 {
     msg("<debug> fill");
     boolpolydev->fill(state);
-    if(checkNewBitmap(UNKNOWN_BOUNDING_BOX)) {
-        boolpolydev->fill(state);
-    }
+    gfxbbox_t bbox = getBBox(state);
+    checkNewBitmap(bbox.xmin, bbox.ymin, ceil(bbox.xmax), ceil(bbox.ymax));
     rgbdev->fill(state);
+    dbg_newdata("fill");
 }
 void BitmapOutputDev::eoFill(GfxState *state)
 {
     msg("<debug> eoFill");
     boolpolydev->eoFill(state);
-    if(checkNewBitmap(UNKNOWN_BOUNDING_BOX)) {
-        boolpolydev->eoFill(state);
-    }
+    gfxbbox_t bbox = getBBox(state);
+    checkNewBitmap(bbox.xmin, bbox.ymin, ceil(bbox.xmax), ceil(bbox.ymax));
     rgbdev->eoFill(state);
+    dbg_newdata("eofill");
 }
 #if (xpdfMajorVersion*10000 + xpdfMinorVersion*100 + xpdfUpdateVersion) < 30207
 void BitmapOutputDev::tilingPatternFill(GfxState *state, Object *str,
@@ -1124,6 +1364,7 @@ void BitmapOutputDev::tilingPatternFill(GfxState *state, Object *str,
     boolpolydev->tilingPatternFill(state, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep);
     checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     rgbdev->tilingPatternFill(state, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep);
+    dbg_newdata("tilingpatternfill");
 }
 #else
 void BitmapOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx, Object *str,
@@ -1136,6 +1377,7 @@ void BitmapOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx, Object *str,
     boolpolydev->tilingPatternFill(state, gfx, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep);
     checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     rgbdev->tilingPatternFill(state, gfx, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep);
+    dbg_newdata("tilingpatternfill");
 }
 #endif
 
@@ -1197,15 +1439,6 @@ void BitmapOutputDev::beginStringOp(GfxState *state)
     booltextdev->beginStringOp(state);
     gfxdev->beginStringOp(state);
 }
-void BitmapOutputDev::endStringOp(GfxState *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("<debug> beginString");
@@ -1214,28 +1447,19 @@ void BitmapOutputDev::beginString(GfxState *state, GString *s)
     booltextdev->beginString(state, s);
     gfxdev->beginString(state, s);
 }
-void BitmapOutputDev::endString(GfxState *state)
-{
-    msg("<debug> endString");
-    clip0dev->endString(state);
-    clip1dev->endString(state);
-    booltextdev->endString(state);
-    checkNewText(UNKNOWN_BOUNDING_BOX);
-    gfxdev->endString(state);
-}
 
 void BitmapOutputDev::clearClips()
 {
     clearBooleanBitmap(clip0bitmap, 0, 0, 0, 0);
     clearBooleanBitmap(clip1bitmap, 0, 0, 0, 0);
 }
-void BitmapOutputDev::clearBoolPolyDev(int x1, int y1, int x2, int y2)
+void BitmapOutputDev::clearBoolPolyDev()
 {
-    clearBooleanBitmap(boolpolybitmap, x1, y1, x2, y2);
+    clearBooleanBitmap(stalepolybitmap, 0, 0, stalepolybitmap->getWidth(), stalepolybitmap->getHeight());
 }
-void BitmapOutputDev::clearBoolTextDev(int x1, int y1, int x2, int y2)
+void BitmapOutputDev::clearBoolTextDev()
 {
-    clearBooleanBitmap(booltextbitmap, x1, y1, x2, y2);
+    clearBooleanBitmap(staletextbitmap, 0, 0, staletextbitmap->getWidth(), staletextbitmap->getHeight());
 }
 void BitmapOutputDev::drawChar(GfxState *state, double x, double y,
 		      double dx, double dy,
@@ -1250,10 +1474,13 @@ void BitmapOutputDev::drawChar(GfxState *state, double x, double y,
         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(state->getRender()&RENDER_STROKE) {
+	// we're drawing as stroke
+	boolpolydev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
+	rgbdev->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
@@ -1263,23 +1490,24 @@ void BitmapOutputDev::drawChar(GfxState *state, double x, double y,
    
 	/* 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);
-        if(!path) {
-            if(code)
-                msg("<error> couldn't create outline for char %d", code);
-            return;
-        }
-	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;
+        SplashFont*font = clip0dev->getCurrentFont();
+	SplashPath*path = font?font->getGlyphPath(code):NULL;
+        x-=originX;
+        y-=originY;
+	if(path) {
+	    path->offset((SplashCoord)x, (SplashCoord)y);
+	    int t;
+	    for(t=0;t<path->getLength();t++) {
+		double xx,yy;
+		Guchar f;
+		path->getPoint(t,&xx,&yy,&f);
+		state->transform(xx,yy,&xx,&yy);
+		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;
+	    }
+	    delete(path);path=0;
 	}
 
 	/* if this character is affected somehow by the various clippings (i.e., it looks
@@ -1288,7 +1516,7 @@ void BitmapOutputDev::drawChar(GfxState *state, double x, double y,
 	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(UNKNOWN_BOUNDING_BOX);
+	    checkNewBitmap(x1,y1,x2,y2);
 	    rgbdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
 	    if(config_extrafontdata) {
 		int oldrender = state->getRender();
@@ -1297,6 +1525,7 @@ void BitmapOutputDev::drawChar(GfxState *state, double x, double y,
 		state->setRender(oldrender);
 	    }
 	} else {
+
 	    /* 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);
@@ -1305,15 +1534,12 @@ void BitmapOutputDev::drawChar(GfxState *state, double x, double y,
 	    gfxdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
 	}
     }
+    dbg_newdata("text");
 }
 void BitmapOutputDev::drawString(GfxState *state, GString *s)
 {
     msg("<error> internal error: drawString not implemented");
     return;
-    clip0dev->drawString(state, s);
-    clip1dev->drawString(state, s);
-    booltextdev->drawString(state, s);
-    gfxdev->drawString(state, s);
 }
 void BitmapOutputDev::endTextObject(GfxState *state)
 {
@@ -1322,9 +1548,34 @@ void BitmapOutputDev::endTextObject(GfxState *state)
     clip0dev->endTextObject(state);
     clip1dev->endTextObject(state);
     booltextdev->endTextObject(state);
-    /* TODO: do this only if rendermode!=0 */
-    checkNewText(UNKNOWN_BOUNDING_BOX);
+    /* the only thing "drawn" here is clipping */
+    //checkNewText(UNKNOWN_BOUNDING_BOX);
     gfxdev->endTextObject(state);
+    dbg_newdata("endtextobject");
+}
+void BitmapOutputDev::endString(GfxState *state)
+{
+    msg("<debug> endString");
+    clip0dev->endString(state);
+    clip1dev->endString(state);
+    booltextdev->endString(state);
+    int render = state->getRender();
+    if(render != RENDER_INVISIBLE && render != RENDER_FILL) {
+	/* xpdf draws things like stroke text or fill+stroke text in the
+	   endString() method */
+        checkNewText(UNKNOWN_BOUNDING_BOX);
+    }
+    gfxdev->endString(state);
+    dbg_newdata("endstring");
+}
+void BitmapOutputDev::endStringOp(GfxState *state)
+{
+    msg("<debug> endStringOp");
+    clip0dev->endStringOp(state);
+    clip1dev->endStringOp(state);
+    booltextdev->endStringOp(state);
+    gfxdev->endStringOp(state);
+    dbg_newdata("endstringop");
 }
 
 /* TODO: these four operations below *should* do nothing, as type3
@@ -1383,37 +1634,61 @@ class CopyStream: public Object
     Stream* getStream() {return this->memstream;};
 };
 
+gfxbbox_t BitmapOutputDev::getImageBBox(GfxState*state)
+{
+    gfxbbox_t bbox;
+    double x,y;
+    state->transform(0, 1, &x, &y);
+    bbox.xmin=bbox.xmax = x;
+    bbox.ymin=bbox.ymax = y;
+    state->transform(0, 0, &x, &y);
+    bbox.xmin=min(bbox.xmin,x);
+    bbox.ymin=min(bbox.ymin,y);
+    bbox.xmax=max(bbox.xmax,x);
+    bbox.ymax=max(bbox.ymax,y);
+    state->transform(1, 0, &x, &y);
+    bbox.xmin=min(bbox.xmin,x);
+    bbox.ymin=min(bbox.ymin,y);
+    bbox.xmax=max(bbox.xmax,x);
+    bbox.ymax=max(bbox.ymax,y);
+    state->transform(1, 1, &x, &y);
+    bbox.xmin=min(bbox.xmin,x);
+    bbox.ymin=min(bbox.ymin,y);
+    bbox.xmax=max(bbox.xmax,x);
+    bbox.ymax=max(bbox.ymax,y);
+    return bbox;
+}
 void BitmapOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
 			   int width, int height, GBool invert,
 			   GBool inlineImg)
 {
     msg("<debug> drawImageMask streamkind=%d", str->getKind());
-    CopyStream*cpystr = 0;
-    if(inlineImg) {
-	cpystr = new CopyStream(str, height * ((width + 7) / 8));
-	str = cpystr->getStream();
-    }
+
+    CopyStream*cpystr = new CopyStream(str, height * ((width + 7) / 8));
+    str = cpystr->getStream();
+    
     boolpolydev->drawImageMask(state, ref, str, width, height, invert, inlineImg);
-    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+    gfxbbox_t bbox = getImageBBox(state);
+    checkNewBitmap(bbox.xmin, bbox.ymin, ceil(bbox.xmax), ceil(bbox.ymax));
     rgbdev->drawImageMask(state, ref, str, width, height, invert, inlineImg);
-    if(cpystr)
-	delete cpystr;
+    delete cpystr;
+    dbg_newdata("imagemask");
 }
 void BitmapOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
 		       int width, int height, GfxImageColorMap *colorMap,
 		       int *maskColors, GBool inlineImg)
 {
     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();
-    }
+	
+    CopyStream*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(UNKNOWN_BOUNDING_BOX);
+    gfxbbox_t bbox=getImageBBox(state);
+    checkNewBitmap(bbox.xmin, bbox.ymin, ceil(bbox.xmax), ceil(bbox.ymax));
     rgbdev->drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
-    if(cpystr)
-	delete cpystr;
+    delete cpystr;
+    dbg_newdata("image");
 }
 void BitmapOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,
 			     int width, int height,
@@ -1422,9 +1697,16 @@ void BitmapOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,
 			     GBool maskInvert)
 {
     msg("<debug> drawMaskedImage streamkind=%d", str->getKind());
+    
+    CopyStream*cpystr = new CopyStream(str, height * ((width * colorMap->getNumPixelComps() * colorMap->getBits() + 7) / 8));
+    str = cpystr->getStream();
+
     boolpolydev->drawMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskInvert);
-    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+    gfxbbox_t bbox=getImageBBox(state);
+    checkNewBitmap(bbox.xmin, bbox.ymin, ceil(bbox.xmax), ceil(bbox.ymax));
     rgbdev->drawMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskInvert);
+    delete cpystr;
+    dbg_newdata("maskedimage");
 }
 void BitmapOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
 				 int width, int height,
@@ -1434,9 +1716,16 @@ void BitmapOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *
 				 GfxImageColorMap *maskColorMap)
 {
     msg("<debug> drawSoftMaskedImage %dx%d (%dx%d) streamkind=%d", width, height, maskWidth, maskHeight, str->getKind());
+
+    CopyStream*cpystr = new CopyStream(str, height * ((width * colorMap->getNumPixelComps() * colorMap->getBits() + 7) / 8));
+    str = cpystr->getStream();
+
     boolpolydev->drawSoftMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskColorMap);
-    checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+    gfxbbox_t bbox=getImageBBox(state);
+    checkNewBitmap(bbox.xmin, bbox.ymin, ceil(bbox.xmax), ceil(bbox.ymax));
     rgbdev->drawSoftMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskColorMap);
+    delete cpystr;
+    dbg_newdata("softmaskimage");
 }
 void BitmapOutputDev::drawForm(Ref id)
 {
@@ -1474,6 +1763,7 @@ void BitmapOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
     clip1dev->beginTransparencyGroup(state, bbox, blendingColorSpace, isolated, knockout, forSoftMask);
     delete state1;
     delete state2;
+    dbg_newdata("endtransparencygroup");
 }
 void BitmapOutputDev::endTransparencyGroup(GfxState *state)
 {
@@ -1495,6 +1785,7 @@ void BitmapOutputDev::endTransparencyGroup(GfxState *state)
     delete state1;
     delete state2;
     clip1dev->endTransparencyGroup(state);
+    dbg_newdata("endtransparencygroup");
 }
 void BitmapOutputDev::paintTransparencyGroup(GfxState *state, double *bbox)
 {
@@ -1503,6 +1794,7 @@ void BitmapOutputDev::paintTransparencyGroup(GfxState *state, double *bbox)
     checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     rgbdev->paintTransparencyGroup(state,bbox);
     clip1dev->paintTransparencyGroup(state,bbox);
+    dbg_newdata("painttransparencygroup");
 }
 void BitmapOutputDev::setSoftMask(GfxState *state, double *bbox, GBool alpha, Function *transferFunc, GfxColor *backdropColor)
 {
@@ -1511,6 +1803,7 @@ void BitmapOutputDev::setSoftMask(GfxState *state, double *bbox, GBool alpha, Fu
     checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     rgbdev->setSoftMask(state, bbox, alpha, transferFunc, backdropColor);
     clip1dev->setSoftMask(state, bbox, alpha, transferFunc, backdropColor);
+    dbg_newdata("setsoftmask");
 }
 void BitmapOutputDev::clearSoftMask(GfxState *state)
 {
@@ -1519,4 +1812,5 @@ void BitmapOutputDev::clearSoftMask(GfxState *state)
     checkNewBitmap(UNKNOWN_BOUNDING_BOX);
     rgbdev->clearSoftMask(state);
     clip1dev->clearSoftMask(state);
+    dbg_newdata("clearsoftmask");
 }