X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=17e378845ea9adbd1b7b0ca962cebf90309699fa;hb=602d0f0a1c8ad614029f235cc6ff38bfe26334e8;hp=885733acc83726743c3cd6c0d3b841dd185c7810;hpb=af362434b81e89338d136e152aa4207edbc9f376;p=swftools.git

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index 885733a..17e3788 100644
--- a/pdf2swf/SWFOutputDev.cc
+++ b/pdf2swf/SWFOutputDev.cc
@@ -622,7 +622,7 @@ GBool SWFOutputDev::beginType3Char(GfxState *state,
     type3active = 1;
     /* the character itself is going to be passed using
        drawImageMask() */
-    return gFalse;
+    return gFalse; /* gTrue= is_in_cache? */
 }
 
 void SWFOutputDev::endType3Char(GfxState *state)
@@ -1218,9 +1218,61 @@ void SWFOutputDev::updateFont(GfxState *state)
 int pic_xids[1024];
 int pic_yids[1024];
 int pic_ids[1024];
+int pic_width[1024];
+int pic_height[1024];
 int picpos = 0;
 int pic_id = 0;
 
+#define SQR(x) ((x)*(x))
+
+unsigned char* antialize(unsigned char*data, int width, int height, int newwidth, int newheight, int palettesize)
+{
+    if((newwidth<2 || newheight<2) ||
+       (width<=newwidth || height<=newheight))
+	return 0;
+    unsigned char*newdata;
+    int x,y;
+    newdata= (unsigned char*)malloc(newwidth*newheight);
+    int t;
+    double fx = (double)(width)/newwidth;
+    double fy = (double)(height)/newheight;
+    double px = 0;
+    int blocksize = (int)(8192/(fx*fy));
+    int r = 8192*256/palettesize;
+    for(x=0;x<newwidth;x++) {
+	double ex = px + fx;
+	int fromx = (int)px;
+	int tox = (int)ex;
+	int xweight1 = (int)(((fromx+1)-px)*256);
+	int xweight2 = (int)((ex-tox)*256);
+	double py =0;
+	for(y=0;y<newheight;y++) {
+	    double ey = py + fy;
+	    int fromy = (int)py;
+	    int toy = (int)ey;
+	    int yweight1 = (int)(((fromy+1)-py)*256);
+	    int yweight2 = (int)((ey-toy)*256);
+	    int a = 0;
+	    int xx,yy;
+	    for(xx=fromx;xx<=tox;xx++)
+	    for(yy=fromy;yy<=toy;yy++) {
+		int b = 1-data[width*yy+xx];
+		int weight=256;
+		if(xx==fromx) weight = (weight*xweight1)/256;
+		if(xx==tox) weight = (weight*xweight2)/256;
+		if(yy==fromy) weight = (weight*yweight1)/256;
+		if(yy==toy) weight = (weight*yweight2)/256;
+		a+=b*weight;
+	    }
+	    //if(a) a=(palettesize-1)*r/blocksize;
+	    newdata[y*newwidth+x] = (a*blocksize)/r;
+	    py = ey;
+	}
+	px = ex;
+    }
+    return newdata;
+}
+
 void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
 				   int width, int height, GfxImageColorMap*colorMap, GBool invert,
 				   GBool inlineImg, int mask)
@@ -1279,38 +1331,86 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
       int xid = 0;
       int yid = 0;
       int x,y;
-      int width2 = (width+3)&(~3);
-      unsigned char*pic = new unsigned char[width2*height];
+      unsigned char*pic = new unsigned char[width*height];
       RGBA pal[256];
       GfxRGB rgb;
       state->getFillRGB(&rgb);
+      memset(pal,255,sizeof(pal));
       pal[0].r = (int)(rgb.r*255); pal[0].g = (int)(rgb.g*255); 
       pal[0].b = (int)(rgb.b*255); pal[0].a = 255;
       pal[1].r = 0; pal[1].g = 0; pal[1].b = 0; pal[1].a = 0;
+      int numpalette = 2;
       xid += pal[1].r*3 + pal[1].g*11 + pal[1].b*17;
       yid += pal[1].r*7 + pal[1].g*5 + pal[1].b*23;
+      int realwidth = (int)sqrt(SQR(x2-x3) + SQR(y2-y3));
+      int realheight = (int)sqrt(SQR(x1-x2) + SQR(y1-y2));
       for (y = 0; y < height; ++y)
       for (x = 0; x < width; ++x)
       {
 	    imgStr->getPixel(buf);
-	    // if(invert) buf[0]=255-buf[0]?
+	    if(invert) 
+		buf[0]=1-buf[0];
 	    pic[width*y+x] = buf[0];
 	    xid+=x*buf[0]+1;
-	    yid+=y*buf[0]+1;
+	    yid+=y*buf[0]*3+1;
+      }
+      
+      /* 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): */
+      if(type3active) {
+	  xid += realwidth;
+	  yid += realheight;
       }
       int t,found = -1;
       for(t=0;t<picpos;t++)
       {
 	  if(pic_xids[t] == xid &&
 	     pic_yids[t] == yid) {
+	      /* if the image was antialiased, the size has changed: */
+	      width = pic_width[t];
+	      height = pic_height[t];
 	      found = t;break;
 	  }
       }
       if(found<0) {
-	  pic_ids[picpos] = swfoutput_drawimagelossless256(&output, pic, pal, width, height, 
-		  x1,y1,x2,y2,x3,y3,x4,y4);
+	  if(type3active) {
+	      numpalette = 16;
+	      unsigned char*pic2 = 0;
+	      
+	      pic2 = antialize(pic,width,height,realwidth,realheight, numpalette);
+
+	      if(pic2) {
+		  width = realwidth;
+		  height = realheight;
+		  free(pic);
+		  pic = pic2;
+		  /* make a black/white palette */
+		  int t;
+		  GfxRGB rgb2;
+		  rgb2.r = 1 - rgb.r;
+		  rgb2.g = 1 - rgb.g;
+		  rgb2.b = 1 - rgb.b;
+
+		  float r = 255/(numpalette-1);
+		  for(t=0;t<numpalette;t++) {
+		      /*pal[t].r = (U8)(t*r*rgb.r+(numpalette-1-t)*r*rgb2.r);
+		      pal[t].g = (U8)(t*r*rgb.g+(numpalette-1-t)*r*rgb2.g);
+		      pal[t].b = (U8)(t*r*rgb.b+(numpalette-1-t)*r*rgb2.b);
+		      pal[t].a = 255; */
+		      pal[t].r = (U8)(255*rgb.r);
+		      pal[t].g = (U8)(255*rgb.g);
+		      pal[t].b = (U8)(255*rgb.b);
+		      pal[t].a = (U8)(t*r);
+		  }
+	      }
+	  }
+	  pic_ids[picpos] = swfoutput_drawimagelosslessN(&output, pic, pal, width, height, 
+		  x1,y1,x2,y2,x3,y3,x4,y4, numpalette);
 	  pic_xids[picpos] = xid;
 	  pic_yids[picpos] = yid;
+	  pic_width[picpos] = width;
+	  pic_height[picpos] = height;
 	  if(picpos<1024)
 	      picpos++;
       } else {
@@ -1359,6 +1459,8 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
 		      x1,y1,x2,y2,x3,y3,x4,y4);
 	  pic_xids[picpos] = xid;
 	  pic_yids[picpos] = yid;
+	  pic_width[picpos] = width;
+	  pic_height[picpos] = height;
 	  if(picpos<1024)
 	      picpos++;
       } else {
@@ -1404,10 +1506,12 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
 	  }
       }
       if(found<0) {
-	  pic_ids[picpos] = swfoutput_drawimagelossless256(&output, pic, pal, width, height, 
-		  x1,y1,x2,y2,x3,y3,x4,y4);
+	  pic_ids[picpos] = swfoutput_drawimagelosslessN(&output, pic, pal, width, height, 
+		  x1,y1,x2,y2,x3,y3,x4,y4,256);
 	  pic_xids[picpos] = xid;
 	  pic_yids[picpos] = yid;
+	  pic_width[picpos] = width;
+	  pic_height[picpos] = height;
 	  if(picpos<1024)
 	      picpos++;
       } else {
@@ -1511,7 +1615,8 @@ void pdfswf_init(char*filename, char*userPassword)
 
   // print doc info
   doc->getDocInfo(&info);
-  if (info.isDict()) {
+  if (info.isDict() &&
+    (screenloglevel>=LOGLEVEL_NOTICE)) {
     printInfoString(info.getDict(), "Title",        "Title:        %s\n");
     printInfoString(info.getDict(), "Subject",      "Subject:      %s\n");
     printInfoString(info.getDict(), "Keywords",     "Keywords:     %s\n");
@@ -1520,24 +1625,23 @@ void pdfswf_init(char*filename, char*userPassword)
     printInfoString(info.getDict(), "Producer",     "Producer:     %s\n");
     printInfoDate(info.getDict(),   "CreationDate", "CreationDate: %s\n");
     printInfoDate(info.getDict(),   "ModDate",      "ModDate:      %s\n");
+    printf("Pages:        %d\n", doc->getNumPages());
+    printf("Linearized:   %s\n", doc->isLinearized() ? "yes" : "no");
+    printf("Encrypted:    ");
+    if (doc->isEncrypted()) {
+      printf("yes (print:%s copy:%s change:%s addNotes:%s)\n",
+	     doc->okToPrint() ? "yes" : "no",
+	     doc->okToCopy() ? "yes" : "no",
+	     doc->okToChange() ? "yes" : "no",
+	     doc->okToAddNotes() ? "yes" : "no");
+    } else {
+      printf("no\n");
+    }
   }
   info.free();
 
-  // print page count
-  printf("Pages:        %d\n", doc->getNumPages());
   numpages = doc->getNumPages();
-  
-  // print linearization info
-  printf("Linearized:   %s\n", doc->isLinearized() ? "yes" : "no");
-
-  // print encryption info
-  printf("Encrypted:    ");
   if (doc->isEncrypted()) {
-    printf("yes (print:%s copy:%s change:%s addNotes:%s)\n",
-	   doc->okToPrint() ? "yes" : "no",
-	   doc->okToCopy() ? "yes" : "no",
-	   doc->okToChange() ? "yes" : "no",
-	   doc->okToAddNotes() ? "yes" : "no");
 	/*ERROR: This pdf is encrypted, and disallows copying.
 	  Due to the DMCA, paragraph 1201, (2) A-C, circumventing
 	  a technological measure that efficively controls access to
@@ -1550,12 +1654,8 @@ void pdfswf_init(char*filename, char*userPassword)
 	}
 	if(!doc->okToChange() || !doc->okToAddNotes())
 	    swfoutput_setprotected();
-    }
-  else {
-    printf("no\n");
   }
 
-
   output = new SWFOutputDev();
   output->startDoc(doc->getXRef());
 }
@@ -1641,3 +1741,4 @@ void pdfswf_close()
     gMemReport(stderr);
 }
 
+