X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2FBitmapOutputDev.cc;h=2889e5eaf03d83dbd22215e247b0f8e544727957;hp=5831a59cf5771acbdcf9cdf6afd4c0140b75a546;hb=87d83a44189289390d90638357b508f461c4895b;hpb=ab2f7a4cd0eda09ff3af29058c45d098f869b598

diff --git a/lib/pdf/BitmapOutputDev.cc b/lib/pdf/BitmapOutputDev.cc
index 5831a59..2889e5e 100644
--- a/lib/pdf/BitmapOutputDev.cc
+++ b/lib/pdf/BitmapOutputDev.cc
@@ -158,11 +158,37 @@ 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)
+typedef struct _ibbox {
+    int xmin,ymin,xmax,ymax;
+    struct _ibbox*next;
+} ibbox_t;
+
+static ibbox_t* ibbox_new(int x1, int y1, int x2, int y2)
+{
+    ibbox_t*b = (ibbox_t*)rfx_calloc(sizeof(ibbox_t)); 
+    b->xmin = x1;
+    b->ymin = y1;
+    b->xmax = x2;
+    b->ymax = y2;
+    return b;
+}
+
+static void ibbox_destroy(ibbox_t*b)
+{
+    while(b) {
+	ibbox_t*next = b->next;
+	free(b);
+	b = next;
+    }
+}
+
+static ibbox_t*getBitmapBBoxes(Guchar*alpha, int width, int height)
 {
-    *ymin = -1;
-    *xmin = width;
-    *xmax = 0;
+    int ymin = -1;
+    int ymax = -1;
+    int xmin = width;
+    int xmax = 0;
+
     int x,y;
     for(y=0;y<height;y++) {
 	Guchar*a = &alpha[y*width];
@@ -176,113 +202,118 @@ static void getBitmapBBox(Guchar*alpha, int width, int height, int*xmin, int*ymi
 	}
 
 	if(left!=width) {
-	    if(*ymin<0) 
-		*ymin=y;
-	    *ymax=y+1;
-	    if(left<*xmin) *xmin = left;
-	    if(right>*xmax) *xmax = right;
+	    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;
+    ibbox_t* bbox = 0;
+    if(xmin<xmax || ymin<ymax) {
+	bbox = ibbox_new(xmin, ymin, xmax, ymax);
     }
+    return bbox;
 }
 
 void BitmapOutputDev::flushBitmap()
 {
     int width = rgbdev->getBitmapWidth();
     int height = rgbdev->getBitmapHeight();
+
+    if(sizeof(SplashColor)!=3) {
+	msg("<error> sizeof(SplashColor)!=3");
+	return;
+    }
     
     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);
+    ibbox_t* boxes = getBitmapBBoxes(alpha, width, height);
+    ibbox_t*b;
 
-    /* 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;
+    for(b=boxes;boxes;boxes=boxes->next) {
+	int xmin = b->xmin;
+	int ymin = b->ymin;
+	int xmax = b->xmax;
+	int ymax = b->ymax;
 
-    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;
+	/* 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;
 
-    if(sizeof(SplashColor)!=3) {
-	msg("<error> sizeof(SplashColor)!=3");
-	return;
-    }
-    //xmin = ymin = 0;
-    //xmax = width;
-    //ymax = height;
-    
-    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];
+	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
+	    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)*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" */
+	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;
 }
 
@@ -417,13 +448,13 @@ GBool BitmapOutputDev::checkNewText(int x1, int y1, int x2, int y2)
    
     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];
-    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) {
+        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);
         msg("<verbose> %s %s %s", filename1, filename2, filename3);
 	writeAlpha(boolpolybitmap, filename1);
 	writeAlpha(booltextbitmap, filename2);
@@ -476,14 +507,13 @@ 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) {
+        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);
         msg("<verbose> %s %s %s", filename1, filename2, filename3);
 	writeAlpha(boolpolybitmap, filename1);
 	writeAlpha(booltextbitmap, filename2);
@@ -563,7 +593,7 @@ GBool BitmapOutputDev::clip0and1differ(int x1,int y1,int x2,int y2)
 	int width8 = (width+7)/8;
 	int height = clip0bitmap->getHeight();
 
-        if(fixBBox(&x1,&y1,&x2,&y2,width,height)) {
+        if(!fixBBox(&x1,&y1,&x2,&y2,width,height)) {
             /* area is outside or null */
             return gFalse;
         }
@@ -576,9 +606,10 @@ GBool BitmapOutputDev::clip0and1differ(int x1,int y1,int x2,int y2)
 
 	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 {
@@ -1450,6 +1481,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);