X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.cc;h=16e5e911c79c9e3b1e45e301e8f9db8cd292792c;hb=6c994aa888cbc794002e876cc8ebe85eebdfe463;hp=863f46431dac083a302fd87914531970b7fd8ae6;hpb=d75c1277468b4045fc96b44bcf4ffd058744ee0f;p=swftools.git

diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc
index 863f464..16e5e91 100644
--- a/lib/pdf/GFXOutputDev.cc
+++ b/lib/pdf/GFXOutputDev.cc
@@ -1960,7 +1960,7 @@ void GFXOutputDev::updateFont(GfxState *state)
 
 unsigned char* antialize(unsigned char*data, int width, int height, int newwidth, int newheight, int palettesize)
 {
-    if((newwidth<2 || newheight<2) ||
+    if((newwidth<1 || newheight<1) ||
        (width<=newwidth || height<=newheight))
 	return 0;
     unsigned char*newdata;
@@ -2079,6 +2079,8 @@ void GFXOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
 				   GBool inlineImg, int mask, int*maskColors,
 				   Stream *maskStr, int maskWidth, int maskHeight, GBool maskInvert, GfxImageColorMap*maskColorMap)
 {
+  /* the code in this function is *old*. It's not pretty, but it works. */
+
   double x1,y1,x2,y2,x3,y3,x4,y4;
   ImageStream *imgStr;
   Guchar pixBuf[4];
@@ -2202,10 +2204,6 @@ void GFXOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
 	    pic[width*y+x] = buf[0];
       }
       
-      /* the size of the drawn image is added to the identifier
-	 as the same image may require different bitmaps if displayed
-	 at different sizes (due to antialiasing): */
-      int found = -1;
       if(type3active) {
 	  unsigned char*pic2 = 0;
 	  numpalette = 16;
@@ -2263,7 +2261,23 @@ void GFXOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
 	  pic[width*y+x].b = (unsigned char)(colToByte(rgb.b));
 	  pic[width*y+x].a = 255;//(U8)(rgb.a * 255 + 0.5);
 	  if(maskbitmap) {
-	      pic[width*y+x].a = maskbitmap[(y*maskHeight/height)*maskWidth+(x*maskWidth/width)];
+              int x1 = x*maskWidth/width;
+              int y1 = y*maskHeight/height;
+              int x2 = (x+1)*maskWidth/width;
+              int y2 = (y+1)*maskHeight/height;
+              int xx,yy;
+              unsigned int alpha=0;
+              unsigned int count=0;
+              for(xx=x1;xx<x2;xx++)
+              for(yy=y1;yy<y2;yy++) {
+                  alpha += maskbitmap[yy*maskWidth+xx];
+                  count ++;
+              }
+              if(count) {
+                pic[width*y+x].a = alpha / count;
+              } else {
+                pic[width*y+x].a = maskbitmap[y1*maskWidth+x1];
+              }
 	  }
 	}
       }
@@ -2557,17 +2571,20 @@ void GFXOutputDev::preparePage(int pdfpage, int outputpage)
 
     if(!this->pages) {
 	this->pagebuflen = 1024;
+	if(pdfpage > this->pagebuflen)
+	    this->pagebuflen = pdfpage+1;
 	this->pages = (int*)malloc(this->pagebuflen*sizeof(int));
 	memset(this->pages, -1, this->pagebuflen*sizeof(int));
-    } else {
-	while(pdfpage >= this->pagebuflen)
-	{
-	    int oldlen = this->pagebuflen;
-	    this->pagebuflen+=1024;
-	    this->pages = (int*)realloc(this->pages, this->pagebuflen*sizeof(int));
-	    memset(&this->pages[oldlen], -1, (this->pagebuflen-oldlen)*sizeof(int));
-	}
     }
+
+    while(pdfpage >= this->pagebuflen)
+    {
+	int oldlen = this->pagebuflen;
+	this->pagebuflen+=1024;
+	this->pages = (int*)realloc(this->pages, this->pagebuflen*sizeof(int));
+	memset(&this->pages[oldlen], -1, (this->pagebuflen-oldlen)*sizeof(int));
+    }
+
     this->pages[pdfpage] = outputpage;
     if(pdfpage>this->pagepos)
 	this->pagepos = pdfpage;